dashboard-shell-shell 1.0.1000000098 → 1.0.1000000099

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

@@ -256,7 +256,7 @@ export default {
       const defaultLocation = {
         name:   'c-cluster-product-resource',
         params: {
-          resource: harvesterhci2cloud(this.resource),
+          resource: this.resource,
           product,
         }
       };

package/components/ResourceList/Masthead.vue

@@ -86,7 +86,7 @@ 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 };
 
@@ -128,6 +128,8 @@ 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() {

package/components/SideNav.vue

@@ -155,7 +155,7 @@ export default {
     },
 
     isVirtualProduct() {
-      return this.rootProduct.name === harvester2cloud(HARVESTER);
+      return this.rootProduct.name === HARVESTER;
     },
 
     allNavLinks() {

package/components/SortableTable/index.vue

@@ -418,26 +418,13 @@ export default {
     let isCreatable = false;
     const lastPath = cloud2harvesterhci(this.$route.path.split('/').pop());
 
-    if (lastPath?.includes('.')) {
+    if (lastPath.includes('.')) {
       isCreatable = this.$store.getters['type-map/optionsFor'](lastPath).isCreatable;
     } else if (lastPath === 'namespace') {
       isCreatable = this.$store.getters['type-map/optionsFor'](this.$route.name).isCreatable;
     }
 
-    const resource = cloud2harvesterhci(this.$route.params.resource);
-
-    let hasEditComponent = false
-
-    if (lastPath?.includes('.')) {
-      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](lastPath);
-    } else if (lastPath === 'namespace') {
-      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.$route.name);
-    } else {
-      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](resource);
-    }
-
     return {
-      hasEditComponent,
       refreshButtonPhase:         isLoading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION,
       expanded:                   {},
       searchQuery,
@@ -1240,7 +1227,7 @@ export default {
     <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 && hasEditComponent ? '100px' : '-10px',maxHeight: '32px'}"
+       :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable ? '100px' : '-10px',maxHeight: '32px'}"
     >
       <slot name="title" />
       <div

package/components/auth/RoleDetailEdit.vue

@@ -737,7 +737,7 @@ export default {
         <Tab
           v-if="isRancherRoleTemplate"
           name="inherit-from"
-          label="继承表单"
+          label="Inherit From"
           :weight="0"
         >
           <ArrayList

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,
         }
       };

package/components/rancherResourceList/Masthead-btn.vue

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

package/components/rancherResourceList/Masthead.vue

@@ -91,7 +91,7 @@ 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 };
 

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

@@ -20,11 +20,12 @@ export function installNavigationGuards(router, context) {
   // 最早执行：保证进入逻辑时 params 始终是 harvester
   router.beforeEach((to, from, next) => {
 
-    console.log('-----------------------------------------------------1');
+    console.log(to.params.product,  'to.params.product-----------------------------------------------------1');
+    console.log(to.params.cluster,  'to.params.cluster-----------------------------------------------------1');
 
     // 内部逻辑统一用 harvesterManager
     if (to?.params?.product) {
-      // to.params.product = to.params.product.replace(/harvester/g, 'cloud')
+      to.params.product = to.params.product.replace(/cloud/g, 'harvester')
     }
 
     if (to?.params?.cluster) {
@@ -50,10 +51,11 @@ export function installNavigationGuards(router, context) {
 
   navigationGuardInstallers.forEach(installer => installer(router, context));
 
-  // 最后执行：只改地址栏，不改内部
+  // 🔹 最后执行：只改地址栏，不改内部
   router.afterEach((to) => {
 
-     console.log('-----------------------------------------------------3');
+    console.log(to.params.product,  'to.params.product-----------------------------------------------------3');
+    console.log(to.params.cluster,  'to.params.cluster-----------------------------------------------------3');
 
     const cloudPath = to.fullPath
       .replace(/harvester/g, 'cloud')

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.1000000099",
   "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/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/types/shell/index.d.ts

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