dashboard-shell-shell 3.0.2-rc.105 → 3.0.2-test.20250913

package/components/SortableTable/index.vue

@@ -417,7 +417,7 @@ export default {
     const isLoading = this.loading || false;
 
     let isCreatable = false;
-    const lastPath = this.$route.path.split('/').pop();
+    const lastPath = this.$route?.path.split('/').pop();
 
     if (lastPath.includes('.')) {
       isCreatable = this.$store.getters['type-map/optionsFor'](lastPath).isCreatable;
@@ -1753,10 +1753,11 @@ export default {
                 @mouseover="setBulkActionOfInterest(act)"
                 @mouseleave="setBulkActionOfInterest(null)"
               >
-                <i
+                <!-- <i
                   v-if="act.icon"
                   :class="act.icon"
-                />
+                  style="line-height: 12px;height: 12px;font-size: 12px;"
+                /> -->
                 <span v-clean-html="act.label" />
               </button>
               <template v-if="featureDropdownMenu">

package/components/form/KeyValue.vue

@@ -388,17 +388,6 @@ export default {
         });
       }
 
-      rows = rows.map((item) => {
-        if (item.key && item.key.includes('harvester')) {
-          item.key = item.key.replace('harvester', 'cloud');
-        }
-        if (item.key && item.value.includes('harvester')) {
-          item.value = item.value.replace('harvester', 'cloud');
-        }
-
-        return item;
-      });
-
       return rows;
     },
 
@@ -409,8 +398,6 @@ export default {
         [this.valueName]: value,
       };
 
-      obj.key = obj.key?.replace('harvester', 'cloud');
-      obj.value = obj.value?.replace('harvester', 'cloud');
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -492,8 +479,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName].replace('cloud', 'harvester') || '').trim();
-          let value = (row[valueName].replace('cloud', 'harvester') || '').trim();
+          const key = (row[keyName] || '').trim();
+          let value = (row[valueName] || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));

package/components/form/MatchExpressions.vue

@@ -289,7 +289,7 @@ export default {
         :data-testid="`input-match-type-field-${index}`"
       >
         <div v-if="isView">
-          {{ row.matching.replace('harvester', 'cloud') }}
+          {{ row.matching }}
           <!-- {{ row.matching }} -->
         </div>
         <LabeledSelect
@@ -305,7 +305,7 @@ export default {
         :data-testid="`input-match-expression-key-${index}`"
       >
         <div v-if="isView" class="view-item-value">
-          {{ row.key.replace('harvester', 'cloud') }}
+          {{ row.key }}
         </div>
         <input
           v-else-if="!hasKeySelectOptions"

package/components/form/NameNsDescription.vue

@@ -252,7 +252,7 @@ export default {
       const options = namespaces
         .map((namespace) => ({ nameDisplay: namespace, id: namespace }))
         .map(props.namespaceMapper || ((obj) => ({
-          label: obj.nameDisplay.replace('harvester', 'cloud'),
+          label: obj.nameDisplay,
           value: obj.id,
         })));
 

package/components/nav/NamespaceFilter.vue

@@ -753,7 +753,7 @@ export default {
           :data-testid="`namespaces-value-${j}`"
           class="ns-value"
         >
-          <div>{{ ns.label.replace('harvester', 'cloud') }}</div>
+          <div>{{ ns.label }}</div>
           <!-- block user from removing the last selection if ns forced filtering is on -->
           <i
             v-if="!namespaceFilterMode || value.length > 1"
@@ -864,7 +864,7 @@ export default {
               v-if="opt.kind === NAMESPACE_FILTER_KINDS.NAMESPACE"
               class="icon icon-folder"
             />
-            <div>{{ opt.label.replace('harvester', 'cloud') }}</div>
+            <div>{{ opt.label }}</div>
             <i
               v-if="opt.selected"
               class="icon icon-checkmark"

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

@@ -22,17 +22,17 @@ export function installNavigationGuards(router, context) {
     let changed = false;
     const params = { ...to.params };
 
-    if (params.product?.includes('cloud')) {
+    if (params?.product?.includes('cloud')) {
       params.product = params.product.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params.cluster?.includes('cloud')) {
+    if (params?.cluster?.includes('cloud')) {
       params.cluster = params.cluster.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params.resource?.includes('cloud')) {
+    if (params?.resource?.includes('cloud')) {
       params.resource = params.resource.replace(/cloud/g, 'harvester');
       changed = true;
     }
@@ -64,14 +64,22 @@ export function installNavigationGuards(router, context) {
 
   // 🔹 最后执行：只改地址栏，不改内部
   router.afterEach((to) => {
+    const base = router.options.history?.base || ''; // 获取 router base，防止丢失
+    let cloudPath = to.fullPath.replace(/harvester/g, 'cloud');
 
-    const cloudPath = to.fullPath
-      .replace(/harvester/g, 'cloud')
+    // fullPath 可能已经不带 base，需要拼回去
+    if (!cloudPath.startsWith(base)) {
+      cloudPath = base + cloudPath;
+    }
+
+    // 获取当前地址栏完整 URL（path + search + hash）
+    const currentLocation = window.location.pathname + window.location.search + window.location.hash;
 
-    if (cloudPath !== to.fullPath) {
+    // 只有在地址栏实际不同的时候才替换，避免死循环
+    if (cloudPath !== currentLocation) {
+      console.info('[URL Replace] Updating address bar:', currentLocation, '→', cloudPath);
       window.history.replaceState({}, '', cloudPath);
     }
-
   });
 }
 

package/config/table-headers.js

@@ -162,7 +162,7 @@ export const NAMESPACE = {
   name:        'namespace',
   labelKey:    'tableHeaders.namespace',
   value:       'namespace',
-  getValue:    row => row && row.namespace && row.namespace.replace('harvester', 'cloud'),
+  getValue:    row => row && row.namespace && row.namespace,
   sort:        'namespace',
   dashIfEmpty: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.2-rc.105",
+  "version": "3.0.2-test.20250913",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/auth/login.vue

@@ -307,47 +307,13 @@ export default {
           $plugin: this.$store.$plugin
         });
 
-        // 等待集群列表加载完成，确保 defaultClusterId 可用
-        await this.$store.dispatch('loadManagement'); // 确保管理模块初始化
-        const clusterId = this.$store.getters['defaultClusterId'];
-
-        let userRoute = {
-          name: 'c-cluster-product-resource',
-          params: {
-            cluster: '_',
-            product: 'auth',
-            resource: 'management.cattle.io.user',
-          }
-        }
-        
-        // 构造 Harvester 路由
-        let harvesterRoute = null;
-
-        if (clusterId) {
-          harvesterRoute = {
-            name: 'c-cluster-product-resource',
-            params: {
-              cluster: clusterId,
-              product: 'harvesterManager',
-              resource: 'harvesterhci.io.management.cluster'
-            }
-          };
-    
-          // 写入 AFTER_LOGIN_ROUTE（复用页面设置登录首页逻辑）
-          await this.$store.dispatch('prefs/set', {
-            key: AFTER_LOGIN_ROUTE,
-            value: harvesterRoute || userRoute
-          });
-        
-        } 
-
 
         // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
           this.$router.push({ name: 'auth-setup' });
         } else {
-          this.$router.push(harvesterRoute || userRoute);
+          this.$router.push({ name: 'index' });
         }
 
       } catch (err) {

package/store/type-map.js

@@ -513,7 +513,7 @@ export const getters = {
   
   groupsForVirTypes(state) {
     return (product, name) => {
-      return state.virtualTypes?.[product]?.find(item => item.name === name)?.icon || '';
+      return state.virtualTypes?.[product].find(item => item.name === name)?.icon;
     };
   },
 
@@ -718,7 +718,6 @@ export const getters = {
           route.params = route.params || {};
           route.params.cluster = clusterId;
           route.params.product = productId;
-          route.params.resource = route.params.resource;
         }
 
         group.children.push({

package/utils/error.js

@@ -138,6 +138,10 @@ export const normalizeError = (err) => {
   };
 };
 export function translateError(error) {
+  error = typeof error === 'string' 
+  ? error
+  : error?.message || error?.toString() || '';
+  
   const originError = error;
   error = error?.toLowerCase().replace(/admission webhook(.*?)denied the request:/g, (match, p1) => {
     return '';

package/utils/router.js

@@ -1,7 +1,7 @@
 import { INSTALL_REDIRECT_META_KEY } from '@shell/config/router/navigation-guards/install-redirect';
 
 export function harvesterhci2cloud(str) {
-  return str?.replace('harvesterhci.io', 'cloudhci.io')
+    return str?.replace('harvesterhci.io', 'cloudhci.io')
 }
 
 export function cloud2harvesterhci(str) {
@@ -14,11 +14,11 @@ export function cloud2harvesterhci(str) {
 }
 
 export function harvester2cloud(str) {
-  return str?.replace(/harvester/g, 'cloud');
+    return str?.replace('harvester', 'cloud')
 }
 
 export function cloud2harvester(str) {
-  return str?.replace(/cloud/g, 'harvester');
+    return str?.replace('cloud', 'harvester')
 }
 
 export function queryParamsFor(current, qp, defaults = {}) {
@@ -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');