fix

komodorio · Jul 11, 2023 · e9ee5bc · e9ee5bc
1 parent 7f8ac7f
commit e9ee5bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/dashboard/src/components/modal/InstallChartModal/InstallChartModal.tsx b/dashboard/src/components/modal/InstallChartModal/InstallChartModal.tsx
@@ -61,7 +61,9 @@ export const InstallChartModal = ({
  },
  onSuccess: (data) => {
  const selectedVersion = (data || []).find(
- ({ version }) => version === (isUpgrade ? latestVersion : currentlyInstalledChartVersion)
+ ({ version }) =>
+ version ===
+ (isUpgrade ? latestVersion : currentlyInstalledChartVersion)
  ) || { version: "", repository: "" };
 
  setSelectedVersionData(selectedVersion);
@@ -249,7 +251,9 @@ export const InstallChartModal = ({
  setIsLoadingDiff(true);
  try {
  const [currentVerData, selectedVerData] = await Promise.all([
- currentVersion ? fetchVersionData({ version: currentVersion }) : Promise.resolve({manifest: ''}),
+ currentVersion
+ ? fetchVersionData({ version: currentVersion })
+ : Promise.resolve({ manifest: "" }),
  fetchVersionData({ version: selectedVersion || "", userValues }),
  ]);
  const formData = new FormData();
@@ -324,7 +328,7 @@ export const InstallChartModal = ({
  <GeneralDetails
  releaseName={isInstall ? chart : String(releaseName)}
  disabled={isUpgrade || (!isUpgrade && !isInstall)}
- namespace={namespace}
+ namespace={namespace ? namespace : isInstall ? "default" : ""}
  onReleaseNameInput={(releaseName) => setChart(releaseName)}
  onNamespaceInput={(namespace) => setNamespace(namespace)}
  />

diff --git a/dashboard/src/components/repository/ChartViewer.tsx b/dashboard/src/components/repository/ChartViewer.tsx
@@ -44,7 +44,7 @@ function ChartViewer({ chart }: ChartViewerProps) {
  {showInstallModal && (
  <InstallChartModal
  chartName={chart.name}
- chartVersion={chart.version}
+ currentlyInstalledChartVersion={chart.version}
  isOpen={showInstallModal}
  onClose={() => setShowInstallModal(false)}
  isInstall={true}

diff --git a/dashboard/src/components/revision/RevisionDetails.tsx b/dashboard/src/components/revision/RevisionDetails.tsx
@@ -177,7 +177,7 @@ export default function RevisionDetails({
  <InstallChartModal
  isOpen={isReconfigureModalOpen}
  chartName={release.chart_name}
- chartVersion={release.chart_ver}
+ currentlyInstalledChartVersion={release.chart_ver}
  latestVersion={latestVerData?.[0]?.version}
  isUpgrade={canUpgrade}
  onClose={() => {