Merge pull request #1086 from harvester/mergify/bp/release-harvester-…

…v1.4/pr-1081 Hide Upgrade button when upgrade is in progress (backport #1081)
harvester · Jul 30, 2024 · 0ce97b8 · 0ce97b8
2 parents e3ecb25 + 5433792
commit 0ce97b8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue
@@ -41,6 +41,16 @@ export default {
   computed: {
     ...mapGetters(['currentCluster']),
 
+    latestUpgrade() {
+      return this.upgrade?.find(u => u.isLatestUpgrade);
+    },
+
+    isUpgradeInProgress() {
+      return this.latestUpgrade &&
+        !this.latestUpgrade.isUpgradeSucceeded &&
+        !this.latestUpgrade.isUpgradeFailed;
+    },
+
     versionOptions() {
       const versions = this.$store.getters['harvester/all'](HCI.VERSION);
 
@@ -131,7 +141,12 @@ export default {
           :cluster="currentCluster.nameDisplay"
         />
       </h1>
-      <button v-if="versionOptions.length" type="button" class="btn bg-warning btn-sm" @click="open">
+      <button
+        v-if="versionOptions.length && !isUpgradeInProgress"
+        type="button"
+        class="btn bg-warning btn-sm"
+        @click="open"
+      >
         <t k="harvester.upgradePage.upgrade" />
       </button>
     </header>

diff --git a/pkg/harvester/models/harvesterhci.io.upgrade.js b/pkg/harvester/models/harvesterhci.io.upgrade.js
@@ -9,6 +9,10 @@ export default class HciUpgrade extends HarvesterResource {
     return this?.metadata?.labels?.[HCI.LATEST_UPGRADE] === 'true';
   }
 
+  get isUpgradeFailed() {
+    return this?.metadata?.labels?.[HCI.UPGRADE_STATE] === 'Failed';
+  }
+
   get isUpgradeSucceeded() {
     return this?.metadata?.labels?.[HCI.UPGRADE_STATE] === 'Succeeded';
   }