dashboard-shell-shell 1.0.1000000083 → 1.0.1000000090

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,15 +86,12 @@ 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 hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.resource);
 
-    console.log(hasEditComponent, ' hasEditComponent------------------------------------1');
-    
-
     const yamlRoute = {
       name:  `${ cloud2harvesterhci(this.$route.name) }-create`,
       params,
@@ -189,23 +186,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/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,28 +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);
-    }
-
-    console.log(hasEditComponent, ' hasEditComponent------------------------------------2');
-
     return {
-      hasEditComponent,
       refreshButtonPhase:         isLoading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION,
       expanded:                   {},
       searchQuery,
@@ -1242,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/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

@@ -9,15 +9,52 @@ import { install as installClusters } from '@shell/config/router/navigation-guar
 import { install as installHandleInstallRedirect } from '@shell/config/router/navigation-guards/install-redirect';
 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';
+import { harvester2cloud } from '@shell/utils/router';
 
 /**
- * Install our router navigation guards. i.e. router.beforeEach(), router.afterEach()
+ * Install router navigation guards
+ * 1. 保留原有导航守卫顺序
+ * 2. 不在 beforeEach 改 params，只在 push/replace & afterEach 改 URL
  */
 export function installNavigationGuards(router, context) {
-  // NOTE: the order of the installation matters.
-  // Be intentional when adding, removing or modifying the guards that are installed.
+  // 最早执行：保证进入逻辑时 params 始终是 harvester
+  router.beforeEach((to, from, next) => {
+    // 内部逻辑统一用 harvesterManager
+    if (to?.params?.product) {
+      to.params.product = to.params.product.replace(/cloud/g, 'harvester')
+    }
 
-  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installRecordLastRoute, installServerUpgradeGrowl];
+    if (to?.params?.cluster) {
+      to.params.cluster = to.params.cluster.replace(/cloud/g, 'harvester')
+    }
 
-  navigationGuardInstallers.forEach((installer) => installer(router, context));
+    next();
+  });
+
+  const navigationGuardInstallers = [
+    installLoadInitialSettings,
+    installAttemptFirstLogin,
+    installAuthentication,
+    installProducts,
+    installClusters,
+    installRuntimeExtensionRoute,
+    installI18N,
+    installHandleInstallRedirect,
+    installPageTitle,
+    installRecordLastRoute,
+    installServerUpgradeGrowl
+  ];
+
+  navigationGuardInstallers.forEach(installer => installer(router, context));
+
+  // 🔹 最后执行：只改地址栏，不改内部
+  router.afterEach((to) => {
+    const cloudPath = to.fullPath
+      .replace(/harvester/g, 'cloud')
+
+    if (cloudPath !== to.fullPath) {
+      window.history.replaceState({}, '', cloudPath);
+    }
+  });
 }
+

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.1000000083",
+  "version": "1.0.1000000090",
   "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/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
   // ----------------------------------------------------------------------------
@@ -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;

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;