consider PendingChartCreation as part of upgrade process (#4544)

replicatedhq · Apr 11, 2024 · 8685861 · 8685861
1 parent 9d84ee7
commit 8685861
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/web/src/utilities/utilities.js b/web/src/utilities/utilities.js
@@ -681,7 +681,8 @@ export const Utilities = {
     const normalizedState = this.clusterState(cluster.state);
     if (
       normalizedState === "Upgrading" ||
-      normalizedState === "Upgrading addons"
+      normalizedState === "Upgrading addons" ||
+      normalizedState === "Creating addons"
     ) {
       return true;
     }

diff --git a/web/src/utilities/utilities.test.js b/web/src/utilities/utilities.test.js
@@ -85,20 +85,28 @@ describe("Utilities", () => {
     });
 
     it("should return true if the user has tried to deploy the current version and a cluster upgrade is in progress", () => {
-      const apps = [
-        {
-          downstream: {
-            currentVersion: {
-              status: "deployed",
-            },
-            cluster: {
-              requiresUpgrade: true,
-              state: "Installing",
+      for (const installationState of [
+        "CopyingArtifacts",
+        "Enqueued",
+        "Installing",
+        "AddonsInstalling",
+        "PendingChartCreation",
+      ]) {
+        const apps = [
+          {
+            downstream: {
+              currentVersion: {
+                status: "deployed",
+              },
+              cluster: {
+                requiresUpgrade: true,
+                state: installationState,
+              },
             },
           },
-        },
-      ];
-      expect(Utilities.shouldShowClusterUpgradeModal(apps)).toBe(true);
+        ];
+        expect(Utilities.shouldShowClusterUpgradeModal(apps)).toBe(true);
+      }
     });
 
     it("should return false if there are is one installation that does not have a state", () => {