dashboard-shell-shell 1.0.122 → 1.0.1000000082

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -22,10 +22,12 @@ import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import { findBy, removeObject, clear } from '@shell/utils/array';
 import { createYaml } from '@shell/utils/create-yaml';
 import {
-  clone, diff, set, get, isEmpty, mergeWithReplaceArrays
+  clone, diff, set, get, isEmpty, mergeWithReplace
 } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
-import { getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
+import {
+  getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon, initSchedulingCustomization
+} from '@shell/utils/cluster';
 
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
@@ -63,7 +65,6 @@ import ClusterAppearance from '@shell/components/form/ClusterAppearance';
 import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
 import VsphereUtils, { VMWARE_VSPHERE } from '@shell/utils/v-sphere';
 import { mapGetters } from 'vuex';
-import { SCHEDULING_CUSTOMIZATION } from '@shell/store/features';
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
 const NETBIOS_TRUNCATION_LENGTH = 15;
@@ -149,7 +150,13 @@ export default {
     await this.initSpecs();
     await this.initAddons();
     await this.initRegistry();
-    await this.initSchedulingCustomization();
+    const sc = await initSchedulingCustomization(this.value.spec, this.features, this.$store, this.mode);
+
+    this.clusterAgentDefaultPC = sc.clusterAgentDefaultPC;
+    this.clusterAgentDefaultPDB = sc.clusterAgentDefaultPDB;
+    this.schedulingCustomizationFeatureEnabled = sc.schedulingCustomizationFeatureEnabled;
+    this.schedulingCustomizationOriginallyEnabled = sc.schedulingCustomizationOriginallyEnabled;
+    this.errors = this.errors.concat(sc.errors);
 
     Object.entries(this.chartValues).forEach(([name, value]) => {
       const key = this.chartVersionKey(name);
@@ -243,20 +250,21 @@ export default {
       fvFormRuleSets:                  [{
         path: 'metadata.name', rules: ['subDomain'], translationKey: 'nameNsDescription.name.label'
       }],
-      harvesterVersionRange:                 {},
-      cisOverride:                           false,
+      harvesterVersionRange:                    {},
+      cisOverride:                              false,
       truncateLimit,
-      busy:                                  false,
-      machinePoolValidation:                 {}, // map of validation states for each machine pool
-      machinePoolErrors:                     {},
-      addonConfigValidation:                 {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
-      allNamespaces:                         [],
-      extensionTabs:                         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
-      clusterAgentDeploymentCustomization:   null,
-      schedulingCustomizationFeatureEnabled: false,
-      clusterAgentDefaultPC:                 null,
-      clusterAgentDefaultPDB:                null,
-      activeTab:                             null,
+      busy:                                     false,
+      machinePoolValidation:                    {}, // map of validation states for each machine pool
+      machinePoolErrors:                        {},
+      addonConfigValidation:                    {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
+      allNamespaces:                            [],
+      extensionTabs:                            getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
+      clusterAgentDeploymentCustomization:      null,
+      schedulingCustomizationFeatureEnabled:    false,
+      schedulingCustomizationOriginallyEnabled: false,
+      clusterAgentDefaultPC:                    null,
+      clusterAgentDefaultPDB:                   null,
+      activeTab:                                null,
       REGISTRIES_TAB_NAME,
       labelForAddon
 
@@ -568,7 +576,7 @@ export default {
         out.tooltip[role] = this.t(`cluster.machinePool.nodeTotals.tooltip.${ role }`, { count: counts[role] });
       }
 
-      if (counts.etcd === 0) {
+      if (counts.etcd <= 0) {
         out.color.etcd = NODE_TOTAL.error.color;
         out.icon.etcd = NODE_TOTAL.error.icon;
       } else if (counts.etcd === 1 || counts.etcd % 2 === 0 || counts.etcd > 7) {
@@ -576,7 +584,7 @@ export default {
         out.icon.etcd = NODE_TOTAL.warning.icon;
       }
 
-      if (counts.controlPlane === 0) {
+      if (counts.controlPlane <= 0) {
         out.color.controlPlane = NODE_TOTAL.error.color;
         out.icon.controlPlane = NODE_TOTAL.error.icon;
       } else if (counts.controlPlane === 1) {
@@ -584,7 +592,7 @@ export default {
         out.icon.controlPlane = NODE_TOTAL.warning.icon;
       }
 
-      if (counts.worker === 0) {
+      if (counts.worker <= 0) {
         out.color.worker = NODE_TOTAL.error.color;
         out.icon.worker = NODE_TOTAL.error.icon;
       } else if (counts.worker === 1) {
@@ -1062,24 +1070,6 @@ export default {
       }
     },
 
-    async initSchedulingCustomization() {
-      this.schedulingCustomizationFeatureEnabled = this.features(SCHEDULING_CUSTOMIZATION);
-      try {
-        this.clusterAgentDefaultPC = JSON.parse((await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS })).value) || null;
-      } catch (e) {
-        this.errors.push(e);
-      }
-      try {
-        this.clusterAgentDefaultPDB = JSON.parse((await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET })).value) || null;
-      } catch (e) {
-        this.errors.push(e);
-      }
-
-      if (this.schedulingCustomizationFeatureEnabled && this.mode === _CREATE && isEmpty(this.value?.spec?.clusterAgentDeploymentCustomization?.schedulingCustomization)) {
-        set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
-      }
-    },
-
     setSchedulingCustomization(val) {
       if (val) {
         set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
@@ -1315,7 +1305,7 @@ export default {
         delete clonedCurrentConfig.metadata;
 
         if (this.provider === VMWARE_VSPHERE) {
-          machinePool.config = mergeWithReplaceArrays(clonedLatestConfig, clonedCurrentConfig);
+          machinePool.config = mergeWithReplace(clonedLatestConfig, clonedCurrentConfig, { mutateOriginal: true });
         } else {
           machinePool.config = merge(clonedLatestConfig, clonedCurrentConfig);
         }
@@ -1701,7 +1691,7 @@ export default {
       const defaultChartValue = this.versionInfo[name];
       const key = this.chartVersionKey(name);
 
-      return mergeWithReplaceArrays(defaultChartValue?.values, this.userChartValues[key]);
+      return mergeWithReplace(defaultChartValue?.values, this.userChartValues[key]);
     },
 
     initServerAgentArgs() {
@@ -2450,6 +2440,7 @@ export default {
             :scheduling-customization-feature-enabled="schedulingCustomizationFeatureEnabled"
             :default-p-c="clusterAgentDefaultPC"
             :default-p-d-b="clusterAgentDefaultPDB"
+            :scheduling-customization-originally-enabled="schedulingCustomizationOriginallyEnabled"
             @scheduling-customization-changed="setSchedulingCustomization"
           />
         </Tab>

package/edit/provisioning.cattle.io.cluster/tabs/Advanced.vue

@@ -119,14 +119,17 @@ export default {
       >
         <template #default="{row, i}">
           <template v-if="row.value.machineLabelSelector">
-            <h3>{{ t('cluster.advanced.argInfo.machineSelector.title') }}</h3>
             <MatchExpressions
               v-model:value="row.value.machineLabelSelector"
               class="mb-20"
               :mode="mode"
               :show-remove="false"
               :initial-empty-row="true"
-            />
+            >
+              <template #header>
+                <h3>{{ t('cluster.advanced.argInfo.machineSelector.title') }}</h3>
+              </template>
+            </MatchExpressions>
             <h3>{{ t('cluster.advanced.argInfo.machineSelector.subTitle') }}</h3>
           </template>
           <h3 v-else>

package/edit/provisioning.cattle.io.cluster/tabs/AgentConfiguration.vue

@@ -48,6 +48,11 @@ export default {
       type:     Boolean,
       required: false
     },
+    schedulingCustomizationOriginallyEnabled: {
+      type:    Boolean,
+      default: false
+    },
+
     defaultPC: {
       type:    Object,
       default: () => {},
@@ -149,7 +154,7 @@ export default {
     },
 
     schedulingCustomizationVisible() {
-      return this.schedulingCustomizationFeatureEnabled || (this.isEdit && this.value.schedulingCustomization );
+      return this.schedulingCustomizationFeatureEnabled || this.schedulingCustomizationOriginallyEnabled;
     },
 
     affinityOptions() {

package/edit/provisioning.cattle.io.cluster/tabs/MachinePool.vue

@@ -8,6 +8,8 @@ import AdvancedSection from '@shell/components/AdvancedSection.vue';
 import { Banner } from '@components/Banner';
 import UnitInput from '@shell/components/form/UnitInput.vue';
 import { randomStr } from '@shell/utils/string';
+import FormValidation from '@shell/mixins/form-validation';
+import { MACHINE_POOL_VALIDATION } from '@shell/utils/validators/machine-pool';
 
 export default {
 
@@ -25,6 +27,8 @@ export default {
     UnitInput
   },
 
+  mixins: [FormValidation],
+
   props: {
     value: {
       type:     Object,
@@ -122,6 +126,12 @@ export default {
       uuid: randomStr(),
 
       unhealthyNodeTimeoutInteger: this.value.pool.unhealthyNodeTimeout ? parseDuration(this.value.pool.unhealthyNodeTimeout) : 0,
+
+      validationErrors: [],
+
+      MACHINE_POOL_VALIDATION,
+
+      fvFormRuleSets: MACHINE_POOL_VALIDATION.RULESETS,
     };
   },
 
@@ -136,7 +146,7 @@ export default {
 
     isWindows() {
       return this.value?.config?.os === 'windows';
-    },
+    }
   },
 
   watch: {
@@ -148,6 +158,20 @@ export default {
       } else {
         this.value.pool.machineOS = 'linux';
       }
+    },
+
+    validationErrors: {
+      handler(newValue) {
+        this.$emit('validationChanged', newValue.length === 0);
+      },
+      deep: true
+    },
+
+    fvFormIsValid: {
+      handler(newValue) {
+        this.$emit('validationChanged', newValue);
+      },
+      deep: true
     }
   },
 
@@ -227,6 +251,8 @@ export default {
           :label="t('cluster.machinePool.name.label')"
           :required="true"
           :disabled="!value.config || !!value.config.id || busy"
+          :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.NAME)"
+          data-testid="machine-pool-name-input"
         />
       </div>
       <div class="col span-4">
@@ -238,6 +264,8 @@ export default {
           type="number"
           min="0"
           :required="true"
+          :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.QUANTITY)"
+          data-testid="machine-pool-quantity-input"
         />
       </div>
       <div class="col span-4 pt-5">
@@ -264,7 +292,10 @@ export default {
         />
       </div>
     </div>
-    <hr class="mt-10">
+    <hr
+      class="mt-10"
+      role="none"
+    >
     <component
       :is="configComponent"
       v-if="value.config && configComponent"

package/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue

@@ -48,7 +48,7 @@ export default {
       return this.value.spec.rkeConfig.etcd;
     },
     argsEtcdExposeMetrics() {
-      return !!this.selectedVersion?.serverArgs['etcd-expose-metrics'];
+      return !!this.selectedVersion?.serverArgs?.['etcd-expose-metrics'];
     },
     configEtcdExposeMetrics() {
       return !!this.value.spec.rkeConfig.machineGlobalConfig['etcd-expose-metrics'];
@@ -90,8 +90,8 @@ export default {
           v-model:value="etcd.snapshotRetention"
           :mode="mode"
           :label="t('cluster.rke2.etcd.snapshotRetention.label')"
-          :suffix="t('cluster.rke2.snapshots.suffix')"
-          :tooltip="t('cluster.rke2.etcd.snapshotRetention.tooltip')"
+          :suffix="s3Backup ? t('cluster.rke2.snapshots.s3Suffix') : t('cluster.rke2.snapshots.suffix')"
+          :tooltip="s3Backup ? t('cluster.rke2.etcd.snapshotRetention.tooltip') : undefined"
         />
       </div>
     </div>

package/edit/service.vue

@@ -521,9 +521,6 @@ export default {
               "
               :label="t('servicesPage.affinity.timeout.label')"
               :placeholder="t('servicesPage.affinity.timeout.placeholder')"
-              @input="
-                (e) => value.spec.sessionAffinityConfig.clientIP.timeoutSeconds = e
-              "
             />
           </div>
         </div>

package/edit/token.vue

@@ -175,6 +175,15 @@ export default {
 
 <template>
   <div v-if="!created">
+    <div
+      v-for="(err,idx) in errors"
+      :key="idx"
+    >
+      <Banner
+        color="error"
+        :label="err"
+      />
+    </div>
     <div class="pl-10 pr-10">
       <LabeledInput
         key="description"
@@ -184,19 +193,20 @@ export default {
         mode="edit"
         :min-height="30"
       />
+      <div class="mt-20">
+        <LabeledSelect
+          v-model:value="value.clusterId"
+          class="scope-select"
+          label-key="accountAndKeys.apiKeys.add.scope"
+          :options="scopes"
+        />
+      </div>
 
-      <LabeledSelect
-        v-model:value="value.clusterId"
-        class="mt-20 scope-select"
-        label-key="accountAndKeys.apiKeys.add.scope"
-        :options="scopes"
-      />
-
-      <h5 class="pt-20">
+      <div style="font-size: 14px; margin-top: 32px;">
         {{ t('accountAndKeys.apiKeys.add.expiry.label') }}
-      </h5>
+      </div>
 
-      <div class="ml-10">
+      <div class="mt-20">
         <RadioGroup
           v-model:value="form.expiryType"
           :options="expiryOptions"
@@ -204,12 +214,14 @@ export default {
           class="mr-20"
           name="expiryGroup"
         />
-        <div class="ml-20 mt-10 expiry">
+        <div class="mt-20 expiry">
           <input
             v-model="form.customExpiry"
             :disabled="form.expiryType !== 'custom'"
             type="number"
+            class="expire-input"
             :mode="mode"
+            :aria-label="t('accountAndKeys.apiKeys.add.ariaLabel.expiration')"
           >
           <Select
             v-model:value="form.customExpiryUnits"
@@ -217,6 +229,7 @@ export default {
             :options="expiryUnitsOptions"
             :clearable="false"
             :reduce="opt=>opt.value"
+            :aria-label="t('accountAndKeys.apiKeys.add.ariaLabel.expirationUnits')"
           />
         </div>
       </div>
@@ -297,6 +310,14 @@ export default {
       flex: 0 0 200px;
       margin-right: 10px;
     }
+    .expire-input{
+      border: solid var(--border-width) var(--input-border);
+      padding: 0px 0px 0px 11px;
+      line-height: 30px;
+      /* &['disabled']{
+        border: solid var(--border-width) var(--input-border);
+      } */
+    }
   }
 
   .buttons {

package/edit/workload/Job.vue

@@ -161,7 +161,7 @@ export default {
           :suffix="t('suffix.times', {count: completions})"
           label-key="workload.job.completions.label"
           tooltip-key="workload.job.completions.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
       <div
@@ -174,7 +174,7 @@ export default {
           :suffix="t('suffix.times', {count: parallelism})"
           label-key="workload.job.parallelism.label"
           tooltip-key="workload.job.parallelism.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
     </div>
@@ -189,7 +189,7 @@ export default {
           :suffix="t('suffix.times', {count: backoffLimit})"
           label-key="workload.job.backoffLimit.label"
           tooltip-key="workload.job.backoffLimit.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
       <div
@@ -202,7 +202,7 @@ export default {
           :suffix="t('suffix.seconds', {count: activeDeadlineSeconds})"
           label-key="workload.job.activeDeadlineSeconds.label"
           tooltip-key="workload.job.activeDeadlineSeconds.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
     </div>
@@ -245,7 +245,7 @@ export default {
             :suffix="t('suffix.seconds', {count: startingDeadlineSeconds})"
             label-key="workload.job.startingDeadlineSeconds.label"
             tooltip-key="workload.job.startingDeadlineSeconds.tip"
-            @input="update"
+            @update:value="update"
           />
         </div>
         <div
@@ -257,7 +257,7 @@ export default {
             :suffix="t('suffix.seconds', { count: terminationGracePeriodSeconds })"
             :label="t('workload.upgrading.activeDeadlineSeconds.label')"
             :mode="mode"
-            @input="update"
+            @update:value="update"
           >
             <template #label>
               <label

package/edit/workload/__tests__/Job.test.ts

@@ -64,7 +64,6 @@ describe('component: Job', () => {
       const newValue = 123;
 
       input.setValue(newValue);
-      input.trigger('blur');
 
       expect(wrapper.emitted('update:value')).toHaveLength(1);
     });

package/edit/workload/index.vue

@@ -599,6 +599,7 @@ export default {
               v-if="!isView"
               type="button"
               class="btn-sm role-link"
+              data-testid="workload-button-add-container"
               @click="addContainerBtn"
             >
               <i class="icon icon-plus pr-5" /> {{ t('workload.container.addContainer') }}

package/edit/workload/mixins/workload.js

@@ -52,6 +52,8 @@ import { TYPES as SECRET_TYPES } from '@shell/models/secret';
 import { defaultContainer } from '@shell/models/workload';
 import { allHash } from '@shell/utils/promise';
 
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
+
 const TAB_WEIGHT_MAP = {
   general:              99,
   healthCheck:          98,
@@ -169,7 +171,7 @@ export default {
   data() {
     serialMaker.setPrefix('container-');
     serialMaker.setSeq(0);
-    let type = this.$route.params.resource;
+    let type = cloud2harvesterhci(this.$route.params.resource);
     const createSidecar = !!this.$route.query.sidecar;
 
     if (type === 'workload') {
@@ -618,8 +620,6 @@ export default {
     this.registerBeforeHook(this.getPorts, 'getPorts');
 
     this.registerAfterHook(this.saveService, 'saveService');
-
-    this.selectContainer(this.container);
   },
 
   methods: {

package/initialize/install-plugins.js

@@ -26,6 +26,7 @@ import replaceAll from '@shell/plugins/replaceall';
 import steveCreateWorker from '@shell/plugins/steve-create-worker';
 import emberCookie from '@shell/plugins/ember-cookie';
 import ShortKey from '@shell/plugins/shortkey';
+import internalApiPlugin from '@shell/plugins/internal-api';
 
 import 'floating-vue/dist/style.css';
 import { floatingVueOptions } from '@shell/plugins/floating-vue';
@@ -46,7 +47,7 @@ export async function installPlugins(vueApp) {
 }
 
 export async function installInjectedPlugins(app, vueApp) {
-  const pluginDefinitions = [config, cookieUniversal, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie];
+  const pluginDefinitions = [config, cookieUniversal, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie, internalApiPlugin];
 
   const installations = pluginDefinitions.map(async(pluginDefinition) => {
     if (typeof pluginDefinition === 'function') {

package/list/harvesterhci.io.management.cluster.vue

@@ -178,7 +178,10 @@ export default {
       <div class="no-clusters">
         {{ t('harvesterManager.cluster.none') }}
       </div>
-      <hr class="info-section">
+      <hr
+        class="info-section"
+        role="none"
+      >
       <div class="logo">
         <BrandImage
           file-name="harvester.png"

package/list/management.cattle.io.feature.vue

@@ -225,6 +225,7 @@ export default {
       height="auto"
       styles="max-height: 100vh;"
       :click-to-close="!restart || !waiting"
+      :trigger-focus-trap="true"
       @close="close"
     >
       <Card

package/list/namespace.vue

@@ -41,7 +41,9 @@ export default {
     },
     headers() {
       const headersFromSchema = this.$store.getters['type-map/headersFor'](this.schema);
-
+      [headersFromSchema[0], headersFromSchema[1]] = [headersFromSchema[1], headersFromSchema[0]];
+      headersFromSchema[0].width = '200px';
+      headersFromSchema[1].width = '100px';
       if (this.hasHarvesterResourceQuotaSchema) {
         headersFromSchema.splice(2, 0, NS_SNAPSHOT_QUOTA);
       }

package/list/provisioning.cattle.io.cluster.vue

@@ -113,24 +113,32 @@ export default {
     },
 
     createLocation() {
-      return {
-        name:   'c-cluster-product-resource-create',
-        params: {
-          product:  this.$store.getters['currentProduct'].name,
-          resource: this.resource
-        },
+      const options = this.$store.getters[`type-map/optionsFor`](this.resource)?.custom || {};
+      const params = {
+        product:  this.$store.getters['currentProduct'].name,
+        resource: this.resource
+      };
+      const defaultLocation = {
+        name: 'c-cluster-product-resource-create',
+        params
       };
+
+      return options.createLocation ? options.createLocation(params) : defaultLocation;
     },
 
     importLocation() {
-      return {
-        name:   'c-cluster-product-resource-create',
-        params: {
-          product:  this.$store.getters['currentProduct'].name,
-          resource: this.resource
-        },
+      const options = this.$store.getters[`type-map/optionsFor`](this.resource)?.custom || {};
+      const params = {
+        product:  this.$store.getters['currentProduct'].name,
+        resource: this.resource
+      };
+      const defaultLocation = {
+        name:  'c-cluster-product-resource-create',
+        params,
         query: { [MODE]: _IMPORT }
       };
+
+      return options.importLocation ? options.importLocation(params) : defaultLocation;
     },
 
     canImport() {

package/list/workload.vue

@@ -5,6 +5,7 @@ import {
 } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 const workloadSchema = {
   id:         'workload',
@@ -26,10 +27,10 @@ const $loadingResources = ($route, $store) => {
     }
   });
 
-  const allTypes = $route.params.resource === workloadSchema.id;
+  const allTypes = cloud2harvesterhci($route.params.resource) === workloadSchema.id;
 
   return {
-    loadResources:     allTypes ? allowedResources : [$route.params.resource],
+    loadResources:     allTypes ? allowedResources : [cloud2harvesterhci($route.params.resource)],
     loadIndeterminate: allTypes,
   };
 };
@@ -54,7 +55,7 @@ export default {
     if (this.allTypes && this.loadResources.length) {
       this.$initializeFetchData(this.loadResources[0], this.loadResources);
     } else {
-      this.$initializeFetchData(this.$route.params.resource);
+      this.$initializeFetchData(cloud2harvesterhci(this.$route.params.resource));
     }
 
     try {
@@ -73,7 +74,7 @@ export default {
         return this.$fetchType(allowed, this.loadResources);
       }));
     } else {
-      const type = this.$route.params.resource;
+      const type = cloud2harvesterhci(this.$route.params.resource);
 
       if ( this.$store.getters['cluster/schemaFor'](type) ) {
         const resource = await this.$fetchType(type);
@@ -88,7 +89,7 @@ export default {
     const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
 
     const { params:{ resource: type } } = this.$route;
-    const allTypes = this.$route.params.resource === workloadSchema.id;
+    const allTypes = cloud2harvesterhci(this.$route.params.resource) === workloadSchema.id;
     const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
     const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
 
@@ -143,7 +144,7 @@ export default {
         this.$fetchType(POD);
         this.$fetchType(WORKLOAD_TYPES.JOB);
       } else {
-        const type = this.$route.params.resource;
+        const type = cloud2harvesterhci(this.$route.params.resource);
 
         if (type === WORKLOAD_TYPES.JOB || type === POD) {
           // Ignore job and pods (we're fetching this anyway, plus they contain their own state)