dashboard-shell-shell 1.0.1000000082 → 1.0.1000000086

package/components/ExplorerProjectsNamespaces.vue

@@ -416,6 +416,7 @@ export default {
 </script>
 
 <template>
+  测试111111111111111111111111
   <div class="project-namespaces outlet">
     <Masthead
       :schema="projectSchema"

package/components/ResourceDetail/Masthead.vue

@@ -17,7 +17,6 @@ import TabTitle from '@shell/components/TabTitle';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // i18n-uses resourceDetail.header.*
 
@@ -256,7 +255,7 @@ export default {
       const defaultLocation = {
         name:   'c-cluster-product-resource',
         params: {
-          resource: harvesterhci2cloud(this.resource),
+          resource: this.resource,
           product,
         }
       };
@@ -425,7 +424,7 @@ export default {
       
       const resources = this.location?.params?.resource || ''
 
-      return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(resources));
+      return this.$store.getters['type-map/groupsForVirTypes'](product, resources);
     },
 
     location() {

package/components/ResourceDetail/index.vue

@@ -16,7 +16,6 @@ import ForceDirectedTreeChart from '@shell/components/fleet/ForceDirectedTreeCha
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import { stringify } from '@shell/utils/error';
 import { Banner } from '@components/Banner';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 function modeFor(route) {
   if ( route.query?.mode === _IMPORT ) {
@@ -96,7 +95,7 @@ export default {
     const route = this.$route;
     const params = route.params;
     const cloneParams = clone(params)
-    let resourceType = this.resourceOverride || cloud2harvesterhci(cloneParams.resource);
+    let resourceType = this.resourceOverride || cloneParams.resource;
 
     const inStore = this.storeOverride || store.getters['currentStore'](resourceType);
     const realMode = this.realMode;
@@ -422,7 +421,7 @@ export default {
       const id = userId || this.$route.params.id;
       // const paramsResource = this.$route.params.resource
       const routerResource = clone(this.$route.params.resource)
-      const resource = resourceOverride || this.resourceOverride || cloud2harvesterhci(routerResource);
+      const resource = resourceOverride || this.resourceOverride || routerResource;
       const options = this.$store.getters[`type-map/optionsFor`](resource);
 
       const detailResource = options.resourceDetail || options.resource || resource;

package/components/ResourceList/Masthead.vue

@@ -6,7 +6,6 @@ import { get } from '@shell/utils/object';
 import { AS, _YAML } from '@shell/config/query-params';
 import ResourceLoadingIndicator from './ResourceLoadingIndicator';
 import TabTitle from '@shell/components/TabTitle';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 /**
  * Resource List Masthead component.
@@ -86,14 +85,14 @@ export default {
   data() {
     const params = { ...this.$route.params };
 
-    params.resource = harvesterhci2cloud(params.resource)
+    params.resource = params.resource
 
-    const formRoute = { name: `${ cloud2harvesterhci(this.$route.name) }-create`, params };
+    const formRoute = { name: `${ this.$route.name }-create`, params };
 
     const hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.resource);
 
     const yamlRoute = {
-      name:  `${ cloud2harvesterhci(this.$route.name) }-create`,
+      name:  `${ this.$route.name }-create`,
       params,
       query: { [AS]: _YAML },
     };
@@ -131,7 +130,7 @@ export default {
       return this.$store.getters['type-map/labelFor'](this.schema, 99);
     },
     _descriptionDisplay() {
-      const key = cloud2harvesterhci(this.$route.path.split('/').pop());
+      const key = this.$route.path.split('/').pop();
 
       return this.$store.getters['i18n/t'](`typeDescription."${ key.toLowerCase() }"`);
     },
@@ -186,23 +185,6 @@ export default {
     _createButtonlabel() {
       return this.createButtonLabel || this.t('resourceList.head.create');
     },
-
-    canCreateCustom() {
-      return this.hasEditComponent && this._isCreatable;
-    },
-  },
-
-  watch: {
-    canCreateCustom: {
-      immediate: true,
-      handler(newVal) {
-
-        console.log(newVal, ' newVal---------------------------');
-        
-
-        this.$store.commit('type-map/setMastheadCreatable', newVal);
-      }
-    }
   }
 };
 </script>

package/components/ResourceList/index.vue

@@ -9,7 +9,6 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
-import { cloud2harvesterhci } from '@shell/utils/router'
 
 export default {
   name: ResourceListComponentName,
@@ -41,7 +40,7 @@ export default {
 
   async fetch() {
     const store = this.$store;
-    const resource = cloud2harvesterhci(this.resource);
+    const resource = this.resource;
 
     const schema = this.schema;
 
@@ -89,7 +88,7 @@ export default {
   data() {
     const getters = this.$store.getters;
     const params = { ...this.$route.params };
-    const resource = cloud2harvesterhci(params.resource);
+    const resource = params.resource;
 
     const hasListComponent = getters['type-map/hasCustomList'](resource);
 
@@ -201,7 +200,7 @@ export default {
   created() {
     let listComponent = false;
 
-    const resource = cloud2harvesterhci(this.$route.params.resource);
+    const resource = this.$route.params.resource;
     const hasListComponent = this.$store.getters['type-map/hasCustomList'](resource);
 
     if ( hasListComponent ) {

package/components/SideNav.vue

@@ -20,7 +20,6 @@ import { TYPE_MODES } from '@shell/store/type-map';
 import { NAME as NAVLINKS } from '@shell/config/product/navlinks';
 import Group from '@shell/components/nav/Group';
 import LocaleSelector from '@shell/components/LocaleSelector';
-import { cloud2harvesterhci, harvester2cloud } from '@shell/utils/router';
 
 export default {
   name:       'SideNav',
@@ -155,7 +154,7 @@ export default {
     },
 
     isVirtualProduct() {
-      return this.rootProduct.name === harvester2cloud(HARVESTER);
+      return this.rootProduct.name === HARVESTER;
     },
 
     allNavLinks() {
@@ -237,7 +236,7 @@ export default {
 
     getProductsGroups(out, loadProducts, namespaceMode, productMap) {
       const clusterId = this.$store.getters['clusterId'];
-      const currentType = cloud2harvesterhci(this.$route.params.resource) || '';
+      const currentType = this.$route.params.resource || '';
 
       for ( const productId of loadProducts ) {
         const modes = [TYPE_MODES.BASIC];

package/components/SortableTable/index.vue

@@ -27,7 +27,6 @@ import ButtonMultiAction from '@shell/components/ButtonMultiAction.vue';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import ActionDropdownShell from '@shell/components/ActionDropdownShell.vue';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // Uncomment for table performance debugging
 // import tableDebug from './debug';
@@ -416,7 +415,7 @@ export default {
     const isLoading = this.loading || false;
 
     let isCreatable = false;
-    const lastPath = cloud2harvesterhci(this.$route.path.split('/').pop());
+    const lastPath = this.$route.path.split('/').pop();
 
     if (lastPath.includes('.')) {
       isCreatable = this.$store.getters['type-map/optionsFor'](lastPath).isCreatable;
@@ -637,7 +636,6 @@ export default {
   computed: {
     ...mapGetters({ isTooManyItemsToAutoUpdate: 'resource-fetch/isTooManyItemsToAutoUpdate' }),
     ...mapGetters({ isManualRefreshLoading: 'resource-fetch/manualRefreshIsLoading' }),
-    ...mapGetters('type-map', ['mastheadCreatable']),
     namespaces() {
       return this.$store.getters['activeNamespaceCache'];
     },
@@ -1225,11 +1223,10 @@ export default {
     ref="container"
     :data-testid="componentTestid + '-list-container'"
   >
-    {{ mastheadCreatable }}
     <div
       :class="{'titled': $slots.title && $slots.title.length,  'mb-40': isFilterLabel, 'mb-20': search || isCreatable}"
       class="sortable-table-header "
-       :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable && mastheadCreatable ? '100px' : '-10px',maxHeight: '32px'}"
+       :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable ? '100px' : '-10px',maxHeight: '32px'}"
     >
       <slot name="title" />
       <div

package/components/nav/NamespaceFilter.vue

@@ -20,7 +20,6 @@ import { KEY } from '@shell/utils/platform';
 import pAndNFiltering from '@shell/plugins/steve/projectAndNamespaceFiltering.utils';
 import { SETTING } from '@shell/config/settings';
 import paginationUtils from '@shell/utils/pagination-utils';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE];
 
@@ -145,9 +144,6 @@ export default {
 
       const params = { ...this.$route.params };
       let resource = params.resource;
-      if (params.resource) {
-        resource = cloud2harvesterhci(resource)
-      }
 
       // Sometimes, different pages may have different namespaces to filter
       const notFilterNamespaces = this.$store.getters[`type-map/optionsFor`](resource).notFilterNamespace || [];

package/components/rancherResourceDetail/Masthead.vue

@@ -17,7 +17,6 @@ import TabTitle from '@shell/components/TabTitle';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // i18n-uses resourceDetail.header.*
 
@@ -256,7 +255,7 @@ export default {
       const defaultLocation = {
         name:   'c-cluster-product-resource',
         params: {
-          resource: harvesterhci2cloud(this.resource),
+          resource: this.resource,
           product,
         }
       };
@@ -423,7 +422,7 @@ export default {
       
       const resources = this.location?.params?.resource || ''
 
-      return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(resources));
+      return this.$store.getters['type-map/groupsForVirTypes'](product, resources);
     },
 
     location() {

package/components/rancherResourceDetail/index.vue

@@ -16,7 +16,6 @@ import ForceDirectedTreeChart from '@shell/components/fleet/ForceDirectedTreeCha
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import { stringify } from '@shell/utils/error';
 import { Banner } from '@components/Banner';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 function modeFor(route) {
   if ( route.query?.mode === _IMPORT ) {
@@ -96,7 +95,7 @@ export default {
     const route = this.$route;
     const params = route.params;
     const cloneParams = clone(params)
-    let resourceType = this.resourceOverride || cloud2harvesterhci(cloneParams.resource);
+    let resourceType = this.resourceOverride || cloneParams.resource;
 
     const inStore = this.storeOverride || store.getters['currentStore'](resourceType);
     const realMode = this.realMode;
@@ -422,7 +421,7 @@ export default {
       const id = userId || this.$route.params.id;
       // const paramsResource = this.$route.params.resource
       const routerResource = clone(this.$route.params.resource)
-      const resource = resourceOverride || this.resourceOverride || cloud2harvesterhci(routerResource);
+      const resource = resourceOverride || this.resourceOverride || routerResource;
       const options = this.$store.getters[`type-map/optionsFor`](resource);
 
       const detailResource = options.resourceDetail || options.resource || resource;

package/components/rancherResourceList/Masthead-btn.vue

@@ -6,7 +6,6 @@ import { get } from '@shell/utils/object';
 import { AS, _YAML } from '@shell/config/query-params';
 import ResourceLoadingIndicator from './ResourceLoadingIndicator';
 import TabTitle from '@shell/components/TabTitle';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 /**
  * Resource List Masthead component.
@@ -70,14 +69,14 @@ export default {
   data() {
     const params = { ...this.$route.params };
 
-    params.resource = harvesterhci2cloud(params.resource)
+    params.resource = params.resource
 
-    const formRoute = { name: `${ cloud2harvesterhci(this.$route.name) }-create`, params };
+    const formRoute = { name: `${ this.$route.name }-create`, params };
 
     const hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.resource);
 
     const yamlRoute = {
-      name:  `${ cloud2harvesterhci(this.$route.name) }-create`,
+      name:  `${ this.$route.name }-create`,
       params,
       query: { [AS]: _YAML },
     };

package/components/rancherResourceList/Masthead.vue

@@ -6,7 +6,6 @@ import { get } from '@shell/utils/object';
 import { AS, _YAML } from '@shell/config/query-params';
 import ResourceLoadingIndicator from './ResourceLoadingIndicator';
 import TabTitle from '@shell/components/TabTitle';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 /**
  * Resource List Masthead component.
@@ -91,14 +90,14 @@ export default {
   data() {
     const params = { ...this.$route.params };
 
-    params.resource = harvesterhci2cloud(params.resource)
+    params.resource = params.resource
 
-    const formRoute = { name: `${ cloud2harvesterhci(this.$route.name) }-create`, params };
+    const formRoute = { name: `${ this.$route.name }-create`, params };
 
     const hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.resource);
 
     const yamlRoute = {
-      name:  `${ cloud2harvesterhci(this.$route.name) }-create`,
+      name:  `${ this.$route.name }-create`,
       params,
       query: { [AS]: _YAML },
     };
@@ -139,7 +138,7 @@ export default {
       return this.$store.getters['type-map/labelFor'](this.schema, 99);
     },
     _descriptionDisplay() {
-      const key = cloud2harvesterhci(this.$route.path.split('/').pop());
+      const key = this.$route.path.split('/').pop();
 
       return this.$store.getters['i18n/t'](`typeDescription."${ key.toLowerCase() }"`);
     },

package/components/rancherResourceList/index.vue

@@ -9,7 +9,6 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
-import { cloud2harvesterhci } from '@shell/utils/router'
 
 export default {
   name: ResourceListComponentName,
@@ -41,7 +40,7 @@ export default {
 
   async fetch() {
     const store = this.$store;
-    const resource = cloud2harvesterhci(this.resource);
+    const resource = this.resource;
 
     const schema = this.schema;
 
@@ -89,7 +88,7 @@ export default {
   data() {
     const getters = this.$store.getters;
     const params = { ...this.$route.params };
-    const resource = cloud2harvesterhci(params.resource);
+    const resource = params.resource;
 
     const hasListComponent = getters['type-map/hasCustomList'](resource);
 
@@ -201,7 +200,7 @@ export default {
   created() {
     let listComponent = false;
 
-    const resource = cloud2harvesterhci(this.$route.params.resource);
+    const resource = this.$route.params.resource;
     const hasListComponent = this.$store.getters['type-map/hasCustomList'](resource);
 
     if ( hasListComponent ) {

package/components/rancherSortableTable/index.vue

@@ -27,7 +27,6 @@ import ButtonMultiAction from '@shell/components/ButtonMultiAction.vue';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import ActionDropdownShell from '@shell/components/ActionDropdownShell.vue';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // Uncomment for table performance debugging
 // import tableDebug from './debug';
@@ -416,7 +415,7 @@ export default {
     const isLoading = this.loading || false;
 
     let isCreatable = false;
-    const lastPath = cloud2harvesterhci(this.$route.path.split('/').pop());
+    const lastPath = this.$route.path.split('/').pop();
 
     if (lastPath.includes('.')) {
       isCreatable = this.$store.getters['type-map/optionsFor'](lastPath).isCreatable;

package/config/router/navigation-guards/index.js

@@ -10,14 +10,107 @@ import { install as installHandleInstallRedirect } from '@shell/config/router/na
 import { install as installPageTitle } from '@shell/config/router/navigation-guards/page-title';
 import { install as installServerUpgradeGrowl } from '@shell/config/router/navigation-guards/server-upgrade-growl';
 
+
 /**
- * Install our router navigation guards. i.e. router.beforeEach(), router.afterEach()
+ * 获取内部 product/resource，始终是 harvester 形式
  */
-export function installNavigationGuards(router, context) {
-  // NOTE: the order of the installation matters.
-  // Be intentional when adding, removing or modifying the guards that are installed.
+export function getInternalProduct(route) {
+  return route.params?.product;
+}
 
-  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installRecordLastRoute, installServerUpgradeGrowl];
+export function getInternalResource(route) {
+  return route.params?.resource;
+}
+
+/**
+ * Install our router navigation guards with cloud/harvester mapping.
+ */
+export function installNavigationGuards(router, context) {
+  // ---------------------------
+  // 1. 安装原有导航守卫
+  // ---------------------------
+  const navigationGuardInstallers = [
+    installLoadInitialSettings,
+    installAttemptFirstLogin,
+    installAuthentication,
+    installProducts,
+    installClusters,
+    installRuntimeExtensionRoute,
+    installI18N,
+    installHandleInstallRedirect,
+    installPageTitle,
+    installRecordLastRoute,
+    installServerUpgradeGrowl
+  ];
 
   navigationGuardInstallers.forEach((installer) => installer(router, context));
+
+  // ---------------------------
+  // 2. 入口层 beforeEach: cloud -> harvester
+  // ---------------------------
+  router.beforeEach((to, from, next) => {
+    const newParams = { ...to.params };
+    let changed = false;
+
+    if (newParams.product) {
+      const newProduct = newParams.product;
+      if (newProduct !== newParams.product) {
+        newParams.product = newProduct;
+        changed = true;
+      }
+    }
+
+    if (newParams.resource) {
+      const newResource = newParams.resource;
+      if (newResource !== newParams.resource) {
+        newParams.resource = newResource;
+        changed = true;
+      }
+    }
+
+    // 只有实际修改才 redirect，避免无限循环
+    if (changed) {
+      next({ ...to, params: newParams, replace: true });
+    } else {
+      next();
+    }
+  });
+
+  // ---------------------------
+  // 3. 出口层 wrapNav: harvester -> cloud
+  // ---------------------------
+  const wrapNav = (fn) => function(location, ...args) {
+    if (typeof location === 'string') {
+      location = location;
+    } else if (location?.params) {
+      Object.keys(location.params).forEach(key => {
+        const val = location.params[key];
+        if (typeof val === 'string') {
+          location.params[key] = val;
+        }
+      });
+    } else if (location?.path) {
+      location.path = location.path;
+    }
+
+    return fn.call(this, location, ...args);
+  };
+
+  router.push = wrapNav(router.push.bind(router));
+  router.replace = wrapNav(router.replace.bind(router));
+
+  // ---------------------------
+  // 4. afterEach: 确保用户看到的 URL 是 cloud
+  // ---------------------------
+  router.afterEach((to) => {
+    let cloudPath = to.fullPath;
+
+    // 使用正则替换所有 harvester → cloud
+    cloudPath = cloudPath.replace(/harvesterManager/g, 'cloudManager');
+    cloudPath = cloudPath.replace(/harvesterhci\.io\.management\.cluster/g, 'cloudhci.io.management.cluster');
+
+    if (cloudPath !== to.fullPath) {
+      window.history.replaceState({}, '', cloudPath);
+    }
+  });
 }

package/edit/workload/mixins/workload.js

@@ -52,7 +52,6 @@ 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,
@@ -171,7 +170,7 @@ export default {
   data() {
     serialMaker.setPrefix('container-');
     serialMaker.setSeq(0);
-    let type = cloud2harvesterhci(this.$route.params.resource);
+    let type = this.$route.params.resource;
     const createSidecar = !!this.$route.query.sidecar;
 
     if (type === 'workload') {

package/list/workload.vue

@@ -5,7 +5,6 @@ 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',
@@ -27,10 +26,10 @@ const $loadingResources = ($route, $store) => {
     }
   });
 
-  const allTypes = cloud2harvesterhci($route.params.resource) === workloadSchema.id;
+  const allTypes = $route.params.resource === workloadSchema.id;
 
   return {
-    loadResources:     allTypes ? allowedResources : [cloud2harvesterhci($route.params.resource)],
+    loadResources:     allTypes ? allowedResources : [$route.params.resource],
     loadIndeterminate: allTypes,
   };
 };
@@ -55,7 +54,7 @@ export default {
     if (this.allTypes && this.loadResources.length) {
       this.$initializeFetchData(this.loadResources[0], this.loadResources);
     } else {
-      this.$initializeFetchData(cloud2harvesterhci(this.$route.params.resource));
+      this.$initializeFetchData(this.$route.params.resource);
     }
 
     try {
@@ -74,7 +73,7 @@ export default {
         return this.$fetchType(allowed, this.loadResources);
       }));
     } else {
-      const type = cloud2harvesterhci(this.$route.params.resource);
+      const type = this.$route.params.resource;
 
       if ( this.$store.getters['cluster/schemaFor'](type) ) {
         const resource = await this.$fetchType(type);
@@ -89,7 +88,7 @@ export default {
     const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
 
     const { params:{ resource: type } } = this.$route;
-    const allTypes = cloud2harvesterhci(this.$route.params.resource) === workloadSchema.id;
+    const allTypes = 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 });
 
@@ -144,7 +143,7 @@ export default {
         this.$fetchType(POD);
         this.$fetchType(WORKLOAD_TYPES.JOB);
       } else {
-        const type = cloud2harvesterhci(this.$route.params.resource);
+        const type = 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)

package/mixins/resource-fetch.js

@@ -3,7 +3,6 @@ import { COUNT, MANAGEMENT } from '@shell/config/types';
 import { SETTING, DEFAULT_PERF_SETTING } from '@shell/config/settings';
 import ResourceFetchNamespaced from '@shell/mixins/resource-fetch-namespaced';
 import ResourceFetchApiPagination from '@shell/mixins/resource-fetch-api-pagination';
-import { cloud2harvesterhci } from '@shell/utils/router'
 
 // Number of pages to fetch when loading incrementally
 const PAGES = 4;
@@ -35,7 +34,7 @@ export default {
     // Normally owner components supply `resource` and `inStore` as part of their data, however these are needed here before parent data runs
     // So set up both here
     const params = { ...this.$route.params };
-    const resource = cloud2harvesterhci(params.resource) || this.schema?.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
+    const resource = params.resource || this.schema?.id; // Resource can either be on a page showing single list, or a page of a resource showing a list of another resource
     const inStore = this.$store.getters['currentStore'](resource);
 
     return {

package/models/management.cattle.io.setting.js

@@ -2,7 +2,6 @@ import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { isServerUrl } from '@shell/utils/validators/setting';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
-import { harvester2cloud } from '@shell/utils/router'
 import {
   _EDIT,
   _UNFLAG,
@@ -55,7 +54,7 @@ export default class Setting extends HybridModel {
   goToEdit(moreQuery = {}) {
     if (this.$rootGetters['currentProduct'].inStore === HARVESTER) {
       location.name = `${ HARVESTER }-c-cluster-brand`;
-      location.params = { cluster: this.$rootGetters['currentCluster'].id, product: harvester2cloud(HARVESTER) };
+      location.params = { cluster: this.$rootGetters['currentCluster'].id, product: HARVESTER };
 
       location.query = {
         ...location.query,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000082",
+  "version": "1.0.1000000086",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/auth/login.vue

@@ -32,7 +32,6 @@ import loadPlugins from '@shell/plugins/plugin';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import TabTitle from '@shell/components/TabTitle.vue';
-import { harvester2cloud } from '@shell/utils/router'
 
 export default {
   name:       'Login',
@@ -79,7 +78,7 @@ export default {
     },
 
     isHarvester() {
-      return this.isSingleProduct?.productName === harvester2cloud(HARVESTER);
+      return this.isSingleProduct?.productName === HARVESTER;
     },
 
     singleProvider() {

package/pages/auth copy/login.vue

@@ -32,7 +32,6 @@ import loadPlugins from '@shell/plugins/plugin';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import TabTitle from '@shell/components/TabTitle.vue';
-import { harvester2cloud } from '@shell/utils/router'
 
 export default {
   name:       'Login',
@@ -78,7 +77,7 @@ export default {
     },
 
     isHarvester() {
-      return this.isSingleProduct?.productName === harvester2cloud(HARVESTER);
+      return this.isSingleProduct?.productName === HARVESTER;
     },
 
     singleProvider() {

package/pages/prefs.vue

@@ -18,7 +18,6 @@ import { addObject } from '@shell/utils/array';
 import LocaleSelector from '@shell/components/LocaleSelector';
 import TabTitle from '@shell/components/TabTitle';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
-import { harvester2cloud } from '@shell/utils/router'
 
 export default {
   components: {
@@ -45,7 +44,7 @@ export default {
     ...mapGetters({ hasMultipleLocales: 'i18n/hasMultipleLocales' }),
 
     isHarvester() {
-      return this.isSingleProduct?.productName === harvester2cloud(HARVESTER);
+      return this.isSingleProduct?.productName === HARVESTER;
     },
 
     theme: {

package/plugins/dashboard-store/normalize.js

@@ -2,8 +2,6 @@ import { SCHEMA } from '@shell/config/types';
 
 import { applyChangeset, changeset, changesetConflicts } from '@shell/utils/object';
 
-import { cloud2harvesterhci } from '@shell/utils/router'
-
 export const KEY_FIELD_FOR = {
   [SCHEMA]: '_id',
   default:  'id',
@@ -16,7 +14,7 @@ export function keyFieldFor(type) {
 export function normalizeType(type) {
   type = (type?.type || type || '').toLowerCase();
 
-  return cloud2harvesterhci(type);
+  return type;
 }
 
 // Detect and resolve conflicts from a 409 response.

package/plugins/dashboard-store/resource-class.js

@@ -34,7 +34,6 @@ import { markRaw } from 'vue';
 
 import { ExtensionPoint, ActionLocation } from '@shell/core/types';
 import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 export const DNS_LIKE_TYPES = ['dnsLabel', 'dnsLabelRestricted', 'hostname'];
 
@@ -1270,7 +1269,7 @@ export default class Resource {
       params: {
         product:  this.$rootGetters['productId'],
         cluster:  this.$rootGetters['clusterId'],
-        resource: harvesterhci2cloud(this.type),
+        resource: this.type,
       }
     };
   }
@@ -1285,7 +1284,7 @@ export default class Resource {
       params: {
         product:   this.$rootGetters['productId'],
         cluster:   this.$rootGetters['clusterId'],
-        resource:  harvesterhci2cloud(this.type),
+        resource:  this.type,
         namespace: this.metadata?.namespace,
         id,
       }

package/store/type-map.js

@@ -432,13 +432,10 @@ export const state = function() {
       'cloud-credential': {}
 
     },
-    mastheadCreatable:       true,
   };
 };
 
 export const getters = {
-  mastheadCreatable: (state) => state.mastheadCreatable,
-
   // ----------------------------------------------------------------------------
   // 1 ) Getting info
   // ----------------------------------------------------------------------------
@@ -510,7 +507,7 @@ export const getters = {
 
   groupForBasicType(state) {
     return (product, schemaId) => {
-      return state.basicTypes?.[product]?.[cloud2harvesterhci(schemaId)];
+      return state.basicTypes?.[product]?.[schemaId];
     };
   },
   
@@ -1487,10 +1484,6 @@ export const getters = {
 };
 
 export const mutations = {
-  setMastheadCreatable(state, value) {
-    state.mastheadCreatable = value;
-  },
-
   schemaChanged(state) {
     state.schemaGeneration = state.schemaGeneration + 1;
   },

package/types/cloud-shell/index.d.ts

@@ -3858,10 +3858,8 @@ export function state(): {
         'machine-config': {};
         'cloud-credential': {};
     };
-    mastheadCreatable: boolean;
 };
 export namespace getters {
-    function mastheadCreatable(state: any): any;
     function labelFor(state: any, getters: any, rootState: any, rootGetters: any): (schema: any, count?: number, language?: any) => any;
     function groupLabelFor(state: any): (schemaOrName: any) => any;
     function groupForBasicType(state: any): (product: any, schemaId: any) => any;
@@ -3924,7 +3922,6 @@ export namespace getters {
     function productByName(state: any): (productName: any) => any;
 }
 export namespace mutations {
-    function setMastheadCreatable(state: any, value: any): void;
     function schemaChanged(state: any): void;
     function remove(state: any, { product, plugin }: {
         product: any;
@@ -9410,10 +9407,8 @@ export function state(): {
         'machine-config': {};
         'cloud-credential': {};
     };
-    mastheadCreatable: boolean;
 };
 export namespace getters {
-    function mastheadCreatable(state: any): any;
     function labelFor(state: any, getters: any, rootState: any, rootGetters: any): (schema: any, count?: number, language?: any) => any;
     function groupLabelFor(state: any): (schemaOrName: any) => any;
     function groupForBasicType(state: any): (product: any, schemaId: any) => any;
@@ -9476,7 +9471,6 @@ export namespace getters {
     function productByName(state: any): (productName: any) => any;
 }
 export namespace mutations {
-    function setMastheadCreatable(state: any, value: any): void;
     function schemaChanged(state: any): void;
     function remove(state: any, { product, plugin }: {
         product: any;