check harvester resource quota schema to prevent unexpected error

harvester · Sep 9, 2024 · 61b06b9 · 61b06b9
1 parent 810f105
commit 61b06b9
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 21 deletions.
diff --git a/pkg/harvester/config/harvester.js b/pkg/harvester/config/harvester.js
@@ -24,7 +24,6 @@ import {
   CONFIGURED_PROVIDERS,
   SUB_TYPE,
   ADDRESS,
-  NS_SNAPSHOT_QUOTA
 } from '@shell/config/table-headers';
 
 import {
@@ -253,7 +252,7 @@ export function init($plugin, store) {
 
   // singleVirtualCluster
   if (isSingleVirtualCluster) {
-    headers(NAMESPACE, [STATE, NAME_UNLINKED, NS_SNAPSHOT_QUOTA, AGE]);
+    headers(NAMESPACE, [STATE, NAME_UNLINKED, AGE]);
     basicType([NAMESPACE]);
     virtualType({
       labelKey:   'harvester.namespace.label',

diff --git a/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
@@ -59,25 +59,31 @@ export default {
 
   data() {
     return {
-      switchToCloud: false,
+      hasResourceQuotaSchema: false,
+      switchToCloud:          false,
       VM_METRICS_DETAIL_URL,
-      showVmMetrics: false,
+      showVmMetrics:          false,
     };
   },
 
   async created() {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
+    this.hasResourceQuotaSchema = !!this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA);
+
     const hash = {
-      pods:           this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
-      services:       this.$store.dispatch(`${ inStore }/findAll`, { type: SERVICE }),
-      events:         this.$store.dispatch(`${ inStore }/findAll`, { type: EVENT }),
-      allSSHs:        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SSH }),
-      vmis:           this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMI }),
-      restore:        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
-      resourceQuotas: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA }),
+      pods:     this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+      services: this.$store.dispatch(`${ inStore }/findAll`, { type: SERVICE }),
+      events:   this.$store.dispatch(`${ inStore }/findAll`, { type: EVENT }),
+      allSSHs:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SSH }),
+      vmis:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMI }),
+      restore:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
     };
 
+    if (this.hasResourceQuotaSchema) {
+      hash.resourceQuotas = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA });
+    }
+
     await allHash(hash);
 
     setPromiseResult(
@@ -198,7 +204,7 @@ export default {
         <OverviewKeypairs v-model="value" />
       </Tab>
 
-      <Tab name="quotas" :label="t('harvester.tab.quotas')" :weight="3">
+      <Tab v-if="hasResourceQuotaSchema" name="quotas" :label="t('harvester.tab.quotas')" :weight="3">
         <LabelValue
           :name="t('harvester.snapshot.totalSnapshotSize')"
           :value="totalSnapshotSize"

diff --git a/pkg/harvester/list/kubevirt.io.virtualmachine.vue b/pkg/harvester/list/kubevirt.io.virtualmachine.vue
@@ -75,13 +75,16 @@ export default {
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
     const _hash = {
-      vms:            this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
-      pod:            this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
-      restore:        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
-      backups:        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }),
-      resourceQuotas: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA }),
+      vms:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
+      pod:     this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+      restore: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
+      backups: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }),
     };
 
+    if (this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA)) {
+      _hash.resourceQuotas = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA });
+    }
+
     if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
       _hash.nodes = this.$store.dispatch(`${ inStore }/findAll`, { type: NODE });
       this.hasNode = true;

diff --git a/pkg/harvester/store/harvester-store/actions.ts b/pkg/harvester/store/harvester-store/actions.ts
@@ -81,7 +81,6 @@ export default {
 
     const hash: { [key: string]: Promise<any>} = {
       projects:          fetchProjects(),
-      resourceQuota:     dispatch('findAll', { type: HCI.RESOURCE_QUOTA }),
       virtualCount:      dispatch('findAll', { type: COUNT }),
       virtualNamespaces: dispatch('findAll', { type: NAMESPACE }),
       settings:          dispatch('findAll', { type: HCI.SETTING }),
@@ -91,6 +90,10 @@ export default {
       }, { root: true }),
     };
 
+    if (getters['schemaFor'](HCI.RESOURCE_QUOTA)) {
+      hash.resourceQuota = dispatch('findAll', { type: HCI.RESOURCE_QUOTA });
+    }
+
     if (getters['schemaFor'](HCI.UPGRADE)) {
       hash.upgrades = dispatch('findAll', { type: HCI.UPGRADE });
     }

diff --git a/shell/components/ExplorerProjectsNamespaces.vue b/shell/components/ExplorerProjectsNamespaces.vue
@@ -3,7 +3,7 @@ import { mapGetters } from 'vuex';
 import ResourceTable from '@shell/components/ResourceTable';
 import { STATE, AGE, NAME, NS_SNAPSHOT_QUOTA } from '@shell/config/table-headers';
 import { uniq } from '@shell/utils/array';
-import { MANAGEMENT, NAMESPACE, VIRTUAL_TYPES } from '@shell/config/types';
+import { MANAGEMENT, NAMESPACE, VIRTUAL_TYPES, HCI } from '@shell/config/types';
 import { PROJECT_ID, FLAT_VIEW } from '@shell/config/query-params';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import { mapPref, GROUP_RESOURCES, ALL_NAMESPACES, DEV } from '@shell/store/prefs';
@@ -36,6 +36,7 @@ export default {
   async fetch() {
     const inStore = this.$store.getters['currentStore'](NAMESPACE);
 
+    this.harvesterResourceQuotaSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA);
     this.schema = this.$store.getters[`${ inStore }/schemaFor`](NAMESPACE);
     this.projectSchema = this.$store.getters[`management/schemaFor`](MANAGEMENT.PROJECT);
 
@@ -54,6 +55,7 @@ export default {
     return {
       loadResources:                [NAMESPACE],
       loadIndeterminate:            true,
+      harvesterResourceQuotaSchema: null,
       schema:                       null,
       projects:                     [],
       projectSchema:                null,
@@ -105,7 +107,7 @@ export default {
         headers.push(projectHeader);
       }
 
-      if (this.isHarvester) {
+      if (this.isHarvester && this.harvesterResourceQuotaSchema) {
         headers.push(NS_SNAPSHOT_QUOTA);
       }
 

diff --git a/shell/list/namespace.vue b/shell/list/namespace.vue
@@ -1,7 +1,8 @@
 <script>
 import { mapGetters } from 'vuex';
+import { NS_SNAPSHOT_QUOTA } from '../config/table-headers';
 import ResourceTable from '@shell/components/ResourceTable';
-
+import { HCI } from '@shell/config/types';
 export default {
   name:       'ListNamespace',
   components: { ResourceTable },
@@ -30,7 +31,20 @@ export default {
 
   computed: {
     ...mapGetters(['currentProduct']),
+    hasHarvesterResourceQuotaSchema() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return !!this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA);
+    },
+    headers() {
+      const headersFromSchema = this.$store.getters['type-map/headersFor'](this.schema);
 
+      if (this.hasHarvesterResourceQuotaSchema) {
+        headersFromSchema.splice(2, 0, NS_SNAPSHOT_QUOTA);
+      }
+
+      return headersFromSchema;
+    },
     filterRow() {
       if (this.currentProduct.hideSystemResources) {
         return this.rows.filter( (N) => {
@@ -53,6 +67,7 @@ export default {
     v-bind="$attrs"
     :rows="filterRow"
     :groupable="false"
+    :headers="headers"
     :schema="schema"
     key-field="_key"
     :loading="loading"