diff --git a/pkg/harvester/components/DiskTags.vue b/pkg/harvester/components/DiskTags.vue index b86c593b..63121061 100644 --- a/pkg/harvester/components/DiskTags.vue +++ b/pkg/harvester/components/DiskTags.vue @@ -3,7 +3,7 @@ import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params'; import Tag from '@shell/components/Tag'; export default { - name: 'DiskTags', + name: 'Tags', components: { Tag }, diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue index f451292a..da4c6c7c 100644 --- a/pkg/harvester/components/HarvesterUpgrade.vue +++ b/pkg/harvester/components/HarvesterUpgrade.vue @@ -35,13 +35,23 @@ export default { version: '', enableLogging: true, readyReleaseNote: false, - isOpen: false, + isOpen: false }; }, 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); @@ -133,7 +143,7 @@ export default { />