dashboard-shell-shell 1.0.1000000098 → 1.0.1000000112

package/components/ResourceDetail/Masthead.vue

@@ -256,7 +256,7 @@ export default {
       const defaultLocation = {
         name:   'c-cluster-product-resource',
         params: {
-          resource: harvesterhci2cloud(this.resource),
+          resource: this.resource,
           product,
         }
       };
@@ -425,7 +425,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

@@ -96,7 +96,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 +422,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

@@ -86,14 +86,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 },
     };
@@ -128,10 +128,12 @@ export default {
         return '?';
       }
 
+      // console.log(this.$store.getters['type-map/labelFor'](this.schema, 99), ' type-map/labelFor---------------')
+
       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/ResourceList/index.vue

@@ -41,7 +41,7 @@ export default {
 
   async fetch() {
     const store = this.$store;
-    const resource = cloud2harvesterhci(this.resource);
+    const resource = this.resource;
 
     const schema = this.schema;
 
@@ -89,7 +89,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 +201,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

@@ -155,7 +155,7 @@ export default {
     },
 
     isVirtualProduct() {
-      return this.rootProduct.name === harvester2cloud(HARVESTER);
+      return this.rootProduct.name === HARVESTER;
     },
 
     allNavLinks() {
@@ -237,7 +237,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

@@ -416,7 +416,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;
@@ -424,7 +424,7 @@ export default {
       isCreatable = this.$store.getters['type-map/optionsFor'](this.$route.name).isCreatable;
     }
 
-    const resource = cloud2harvesterhci(this.$route.params.resource);
+    const resource = this.$route.params.resource;
 
     let hasEditComponent = false
 

package/components/nav/NamespaceFilter.vue

@@ -146,7 +146,7 @@ export default {
       const params = { ...this.$route.params };
       let resource = params.resource;
       if (params.resource) {
-        resource = cloud2harvesterhci(resource)
+        resource = resource
       }
 
       // Sometimes, different pages may have different namespaces to filter

package/components/rancherResourceDetail/Masthead.vue

@@ -256,7 +256,7 @@ export default {
       const defaultLocation = {
         name:   'c-cluster-product-resource',
         params: {
-          resource: harvesterhci2cloud(this.resource),
+          resource: this.resource,
           product,
         }
       };
@@ -423,7 +423,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

@@ -96,7 +96,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 +422,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

@@ -70,14 +70,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

@@ -91,14 +91,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 +139,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

@@ -41,7 +41,7 @@ export default {
 
   async fetch() {
     const store = this.$store;
-    const resource = cloud2harvesterhci(this.resource);
+    const resource = this.resource;
 
     const schema = this.schema;
 
@@ -89,7 +89,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 +201,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

@@ -416,7 +416,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/product/auth.js

@@ -24,7 +24,7 @@ export function init(store) {
     spoofedType,
     virtualType,
   } = DSL(store, NAME);
-
+  console.log('------------------------------------------------2')
   product({
     ifHaveType:          new RegExp(`${ MANAGEMENT.USER }|${ MANAGEMENT.AUTH_CONFIG }`, 'i'),
     ifHaveVerb:          'GET',

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

@@ -19,21 +19,33 @@ import { harvester2cloud } from '@shell/utils/router';
 export function installNavigationGuards(router, context) {
   // 最早执行：保证进入逻辑时 params 始终是 harvester
   router.beforeEach((to, from, next) => {
+    let changed = false;
+    const params = { ...to.params };
 
-    console.log('-----------------------------------------------------1');
+    if (params?.product?.includes('cloud')) {
+      params.product = params.product.replace(/cloud/g, 'harvester');
+      changed = true;
+    }
+
+    if (params?.cluster?.includes('cloud')) {
+      params.cluster = params.cluster.replace(/cloud/g, 'harvester');
+      changed = true;
+    }
 
-    // 内部逻辑统一用 harvesterManager
-    if (to?.params?.product) {
-      // to.params.product = to.params.product.replace(/harvester/g, 'cloud')
+    if (params?.resource?.includes('cloud')) {
+      params.resource = params.resource.replace(/cloud/g, 'harvester');
+      changed = true;
     }
 
-    if (to?.params?.cluster) {
-      to.params.cluster = to.params.cluster.replace(/cloud/g, 'harvester')
+    if (changed) {
+      // 触发路由重定向
+      return next({ ...to, params });
     }
 
     next();
   });
 
+
   const navigationGuardInstallers = [
     installLoadInitialSettings,
     installAttemptFirstLogin,
@@ -50,17 +62,16 @@ export function installNavigationGuards(router, context) {
 
   navigationGuardInstallers.forEach(installer => installer(router, context));
 
-  // 最后执行：只改地址栏，不改内部
+  // 🔹 最后执行：只改地址栏，不改内部
   router.afterEach((to) => {
 
-     console.log('-----------------------------------------------------3');
-
     const cloudPath = to.fullPath
       .replace(/harvester/g, 'cloud')
 
     if (cloudPath !== to.fullPath) {
       window.history.replaceState({}, '', cloudPath);
     }
+
   });
 }
 

package/edit/workload/mixins/workload.js

@@ -171,7 +171,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

@@ -27,10 +27,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 +55,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 +74,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 +89,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 +144,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

@@ -35,7 +35,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

@@ -55,7 +55,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.1000000098",
+  "version": "1.0.1000000112",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/auth/login.vue

@@ -79,7 +79,7 @@ export default {
     },
 
     isHarvester() {
-      return this.isSingleProduct?.productName === harvester2cloud(HARVESTER);
+      return this.isSingleProduct?.productName === HARVESTER;
     },
 
     singleProvider() {

package/pages/auth copy/login.vue

@@ -78,7 +78,7 @@ export default {
     },
 
     isHarvester() {
-      return this.isSingleProduct?.productName === harvester2cloud(HARVESTER);
+      return this.isSingleProduct?.productName === HARVESTER;
     },
 
     singleProvider() {

package/pages/prefs.vue

@@ -45,7 +45,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

@@ -16,7 +16,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

@@ -1270,7 +1270,7 @@ export default class Resource {
       params: {
         product:  this.$rootGetters['productId'],
         cluster:  this.$rootGetters['clusterId'],
-        resource: harvesterhci2cloud(this.type),
+        resource: this.type,
       }
     };
   }
@@ -1285,7 +1285,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

@@ -507,7 +507,7 @@ export const getters = {
 
   groupForBasicType(state) {
     return (product, schemaId) => {
-      return state.basicTypes?.[product]?.[cloud2harvesterhci(schemaId)];
+      return state.basicTypes?.[product]?.[schemaId];
     };
   },
   

package/types/shell/index.d.ts

@@ -4162,7 +4162,7 @@ export function setPromiseResult(promise: any, obj: any, key: any, label: any):
 
 declare module '@shell/utils/router' {
 export function harvesterhci2cloud(str: any): any;
-export function cloud2harvesterhci(str: any): any;
+export function str: any: any;
 export function harvester2cloud(str: any): any;
 export function cloud2harvester(str: any): any;
 export function queryParamsFor(current: any, qp: any, defaults?: {}): any;

package/utils/router.js

@@ -89,7 +89,7 @@ export const getPackageFromRoute = (route) => {
 };
 
 export const getResourceFromRoute = (to) => {
-  let resource = cloud2harvesterhci(to.params?.resource);
+  let resource = to.params?.resource;
 
   if (!resource) {
     resource = findMeta(to, 'resource');