mirror of
https://github.com/portainer/portainer.git
synced 2025-07-22 14:59:41 +02:00
fix: fetching values from both install and upgrade views - release 2.31 [R8S-368] (#821)
This commit is contained in:
parent
dca0e35e24
commit
1831af9c48
7 changed files with 111 additions and 45 deletions
|
@ -44,7 +44,6 @@ export function UpgradeButton({
|
|||
useCache
|
||||
);
|
||||
const versions = helmRepoVersionsQuery.data;
|
||||
const repo = versions?.[0]?.Repo;
|
||||
|
||||
// Combined loading state
|
||||
const isLoading =
|
||||
|
@ -63,17 +62,28 @@ export function UpgradeButton({
|
|||
latestVersionQuery?.data &&
|
||||
semverCompare(latestVersionAvailable, latestVersionQuery?.data) === 1
|
||||
);
|
||||
const currentVersion = release?.chart.metadata?.version;
|
||||
|
||||
const currentRepo = versions?.find(
|
||||
(v) =>
|
||||
v.Chart === release?.chart.metadata?.name &&
|
||||
v.AppVersion === release?.chart.metadata?.appVersion &&
|
||||
v.Version === release?.chart.metadata?.version
|
||||
)?.Repo;
|
||||
|
||||
const editableHelmRelease: UpdateHelmReleasePayload = {
|
||||
name: releaseName,
|
||||
namespace: namespace || '',
|
||||
values: release?.values?.userSuppliedValues,
|
||||
chart: release?.chart.metadata?.name || '',
|
||||
version: currentVersion,
|
||||
repo,
|
||||
appVersion: release?.chart.metadata?.appVersion,
|
||||
version: release?.chart.metadata?.version,
|
||||
repo: currentRepo ?? '',
|
||||
};
|
||||
|
||||
const filteredVersions = currentRepo
|
||||
? versions?.filter((v) => v.Repo === currentRepo) || []
|
||||
: versions || [];
|
||||
|
||||
return (
|
||||
<div className="relative">
|
||||
<LoadingButton
|
||||
|
@ -151,7 +161,7 @@ export function UpgradeButton({
|
|||
async function handleUpgrade() {
|
||||
const submittedUpgradeValues = await openUpgradeHelmModal(
|
||||
editableHelmRelease,
|
||||
versions
|
||||
filteredVersions
|
||||
);
|
||||
|
||||
if (submittedUpgradeValues) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue