dashboard-shell-shell 3.0.5-test.9 → 3.0.5-tsh-rh01

package/components/nav/TopLevelMenu.vue

@@ -52,10 +52,7 @@ export default {
       helper.update(args);
     }
 
-    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
-
     return {
-      topLevelPermissions,
       shown:             false,
       displayVersion,
       fullVersion,
@@ -492,10 +489,8 @@ export default {
         role="navigation"
         :aria-label="t('nav.ariaLabel.topLevelMenu')"
       >
-        
         <!-- ====================== 菜单头部（Logo + 菜单按钮） ====================== -->
         <div class="title">
-          
           <!-- 菜单按钮（汉堡图标） -->
           <div
             data-testid="top-level-menu"
@@ -507,7 +502,6 @@ export default {
             @keyup.space="toggle()"
             @click="toggle()"
           >
-
             <!-- 汉堡菜单SVG图标 -->
             <svg
               class="menu-icon"
@@ -523,19 +517,18 @@ export default {
           </div>
 
           <!-- 品牌Logo -->
-          <div v-if="topLevelPermissions && topLevelPermissions === 'superadmin'" class="side-menu-logo">
+          <div class="side-menu-logo">
             <BrandImage
               data-testid="side-menu__brand-img"
               :alt="t('nav.alt.mainMenuRancherLogo')"
-              file-name="logo.png"
+              file-name="logo.svg"
             />
           </div>
         </div>
 
         <!-- ====================== 菜单内容区 ====================== -->
         <div class="body">
-          <div v-if="topLevelPermissions && topLevelPermissions === 'superadmin'">
-            
+          <div>
             <!-- 首页按钮 -->
             <div @click="hide()">
               <router-link
@@ -544,7 +537,6 @@ export default {
                 role="link"
                 :aria-label="t('nav.ariaLabel.homePage')"
               >
-
                 <!-- 首页图标 -->
                 <svg
                   v-clean-tooltip="getTooltipConfig(t('nav.home'))"
@@ -562,7 +554,7 @@ export default {
                 </div>
               </router-link>
             </div>
-            
+
             <!-- 集群搜索框 -->
             <div
               v-if="showClusterSearch"
@@ -650,7 +642,7 @@ export default {
           </template>
 
           <!-- ====================== 集群列表 ====================== -->
-          <template v-if="topLevelPermissions && topLevelPermissions === 'superadmin' && !!allClustersCount">
+          <template v-if="!!allClustersCount">
             <div
               ref="clusterList"
               class="clusters"
@@ -667,7 +659,6 @@ export default {
                   :data-testid="`pinned-ready-cluster-${index}`"
                   @click="hide()"
                 >
-
                   <!-- 可用集群按钮 -->
                   <span
                     v-if="c.ready"
@@ -752,7 +743,6 @@ export default {
                   :data-testid="`top-level-menu-cluster-${index}`"
                   @click="hide()"
                 >
-                  
                   <!-- 可用集群 -->
                   <span
                     v-if="c.ready"
@@ -833,7 +823,7 @@ export default {
               </div>
             </div>
 
-            <!-- 查看所有集群按钮 -->
+            <!-- See all clusters -->
             <router-link
               v-if="allClustersCount > maxClustersToShow"
               class="clusters-all"
@@ -853,129 +843,106 @@ export default {
           </template>
 
           <!-- ====================== 多集群应用区 ====================== -->
-          <div :style="!(topLevelPermissions && topLevelPermissions === 'superadmin') ? { placeContent: 'flex-start', display: 'flex', flexDirection: 'column' } : {}" class="category">
+          <div class="category">
             <!-- 多集群应用 -->
             <template v-if="multiClusterApps.length">
-              <template v-if="topLevelPermissions && topLevelPermissions === 'superadmin'">
-                <div
-                  class="category-title"
+              <div
+                class="category-title"
+              >
+                <hr role="none">
+                <span>
+                  {{ t('nav.categories.multiCluster') }}
+                </span>
+              </div>
+              <div
+                v-for="(a, i) in appBar.multiClusterApps"
+                :key="i"
+                @click="hide()"
+              >
+                <router-link
+                  v-if="a.value !== 'fleet'"
+                  class="option"
+                  :class="{'active-menu-link': a.isMenuActive }"
+                  :to="a.to"
+                  role="link"
+                  :aria-label="`${t('nav.ariaLabel.multiClusterApps')} ${ a.label }`"
                 >
-                  <hr role="none">
-                  <span>
-                    {{ t('nav.categories.multiCluster') }}
-                  </span>
-                </div>
-                <template v-for="(a, i) in appBar.multiClusterApps" :key="i">
-                  <div
-                    v-if="a.value === 'harvesterManager'"
-                    @click="hide()"
-                  >
-                    <router-link
-                      class="option"
-                      :class="{'active-menu-link': a.isMenuActive }"
-                      :to="a.to"
-                      role="link"
-                      :aria-label="`${t('nav.ariaLabel.multiClusterApps')} ${ a.label }`"
-                    >
-                      <IconOrSvg
-                        v-clean-tooltip="getTooltipConfig(a.label)"
-                        class="app-icon"
-                        :icon="a.icon"
-                        :src="a.svg"
-                      />
-                      <span class="option-link">{{ a.label }}</span>
-                    </router-link>
-                  </div>
-                </template>
-              </template>
-              <template v-else>
-                <template v-for="(a, i) in appBar.multiClusterApps" :key="i">
-                  <div
-                    v-if="a.value === 'harvesterManager'"
-                    @click="hide()"
-                  >
-                    <router-link
-                      class="option"
-                      :class="{'active-menu-link': a.isMenuActive }"
-                      :to="a.to"
-                      role="link"
-                      :aria-label="`${t('nav.ariaLabel.multiClusterApps')} ${ a.label }`"
-                    >
-                      <IconOrSvg
-                        v-clean-tooltip="getTooltipConfig(a.label)"
-                        class="app-icon"
-                        :icon="a.icon"
-                        :src="a.svg"
-                      />
-                      <span class="option-link">{{ a.label }}</span>
-                    </router-link>
-                  </div>
-                </template>
-              </template>
+                  <IconOrSvg
+                    v-clean-tooltip="getTooltipConfig(a.label)"
+                    class="app-icon"
+                    :icon="a.icon"
+                    :src="a.svg"
+                  />
+                  <span class="option-link">{{ a.label }}</span>
+                </router-link>
+              </div>
             </template>
 
-            <!-- 配置类应用 -->
-             <div>
-               <template v-if="configurationApps.length">
-                 <template v-if="topLevelPermissions && topLevelPermissions === 'superadmin'">
-                   <div
-                     class="category-title"
-                   >
-                     <hr role="none">
-                     <span>
-                       {{ t('nav.categories.configuration') }}
-                     </span>
-                   </div>
-                  <div
-                    v-for="(a, i) in appBar.configurationApps"
-                    :key="i"
-                    @click="hide()"
-                  >
-                    <router-link
-                      class="option"
-                      :class="{'active-menu-link': a.isMenuActive }"
-                      :to="a.to"
-                      role="link"
-                      :aria-label="`${t('nav.ariaLabel.configurationApps')} ${ a.label }`"
-                    >
-                      <IconOrSvg
-                        v-clean-tooltip="getTooltipConfig(a.label)"
-                        class="app-icon"
-                        :icon="a.icon"
-                        :src="a.svg"
-                      />
-                      <div>{{ a.label }}</div>
-                    </router-link>
-                  </div>
-                 </template>
-                 <template v-else>
-                  <template v-for="(a, i) in appBar.configurationApps" :key="i">
-                    <div
-                      v-if="a.value === 'settings' || a.value === 'auth'"
-                      @click="hide()"
-                    >
-                      <router-link
-                        class="option"
-                        :class="{'active-menu-link': a.isMenuActive }"
-                        :to="a.to"
-                        role="link"
-                        :aria-label="`${t('nav.ariaLabel.configurationApps')} ${ a.label }`"
-                      >
-                        <IconOrSvg
-                          v-clean-tooltip="getTooltipConfig(a.label)"
-                          class="app-icon"
-                          :icon="a.icon"
-                          :src="a.svg"
-                        />
-                        <div>{{ a.label }}</div>
-                      </router-link>
-                    </div>
-                  </template>
-                 </template>
-                 <div style="height: 40px;"></div>
-               </template>
-             </div>
+            <!-- Configuration apps menu -->
+            <template v-if="configurationApps.length">
+              <div
+                class="category-title"
+              >
+                <hr role="none">
+                <span>
+                  {{ t('nav.categories.configuration') }}
+                </span>
+              </div>
+              <div
+                v-for="(a, i) in appBar.configurationApps"
+                :key="i"
+                @click="hide()"
+              >
+                <router-link
+                  class="option"
+                  :class="{'active-menu-link': a.isMenuActive }"
+                  :to="a.to"
+                  role="link"
+                  :aria-label="`${t('nav.ariaLabel.configurationApps')} ${ a.label }`"
+                >
+                  <IconOrSvg
+                    v-clean-tooltip="getTooltipConfig(a.label)"
+                    class="app-icon"
+                    :icon="a.icon"
+                    :src="a.svg"
+                  />
+                  <div>{{ a.label }}</div>
+                </router-link>
+              </div>
+            </template>
+          </div>
+        </div>
+
+        <!-- Footer -->
+        <div
+          class="footer"
+        >
+          <!-- <div
+            v-if="canEditSettings"
+            class="support"
+            @click="hide()"
+          >
+            <router-link
+              :to="{name: 'support'}"
+              role="link"
+              :aria-label="t('nav.ariaLabel.support')"
+            >
+              {{ t('nav.support', {hasSupport}) }}
+            </router-link>
           </div>
+          <div
+            class="version"
+            :class="{'version-small': largeAboutText}"
+            @click="hide()"
+          >
+            <router-link
+              :to="{ name: 'about' }"
+              role="link"
+              :aria-label="t('nav.ariaLabel.about')"
+            >
+              {{ aboutText }}
+            </router-link>
+          </div> -->
         </div>
       </div>
     </transition>
@@ -1644,7 +1611,7 @@ export default {
     }
 
     :deep() .v-popper__arrow-container {
-      display: none;
+      display: none !important;
     }
 
     :deep() .v-popper:focus {

package/components/nav/Type.vue

@@ -3,6 +3,7 @@ import Favorite from '@shell/components/nav/Favorite';
 import { TYPE_MODES } from '@shell/store/type-map';
 
 import TabTitle from '@shell/components/TabTitle';
+import { menuRouteMap } from '@shell/config/menuRouteMap';
 
 const showFavoritesFor = [TYPE_MODES.FAVORITE, TYPE_MODES.USED];
 
@@ -61,6 +62,13 @@ export default {
       const pageFullPath = this.$route.fullPath?.toLowerCase().split('#')[0]; // Ignore the shebang when comparing routes
       const routeMetaNav = this.$route.meta?.nav;
 
+      const resource = this.$route?.params?.resource || ''
+
+      // 菜单选中动态映射逻辑
+      if (menuRouteMap[this.type.name] && menuRouteMap[this.type.name].includes(resource)) {
+        return true;
+      }
+
       // If the route explicitly declares the nav path that should be highlighted, then use that
       if (routeMetaNav) {
         const cluster = this.$route.params?.cluster;
@@ -141,7 +149,7 @@ export default {
       <a
         role="link"
         :aria-label="type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label)"
-        :href="href"
+        :href="href.replace(/harvester/g, 'cloud')"
         class="type-link"
         :aria-current="isActive ? 'page' : undefined"
         @click="selectType(); navigate($event);"
@@ -158,7 +166,7 @@ export default {
          <div v-else style="display: flex; align-items: center;" class="labelKey_menu">
           <i v-if="!type.labelDisplay || (type.labelDisplay && type.labelDisplay.indexOf('</i>') === -1)" class="icon icon-fw icon-globe" style="color: var(--muted);width: 32px;text-align: left;"></i>
            <span
-             v-clean-html="type.labelDisplay.replace('设置', '基础设置') || type.label"
+             v-clean-html="type.labelDisplay || type.label"
              class="label"
              :class="{'no-icon': !type.icon}"
            />
@@ -199,7 +207,7 @@ export default {
   >
     <a
       role="link"
-      :href="type.link"
+      :href="type.link.replace(/harvester/g, 'cloud')"
       :target="type.target"
       rel="noopener noreferrer nofollow"
       :aria-label="type.label"

package/config/menuRouteMap.js

@@ -0,0 +1,10 @@
+// menuRouteMap.js
+export const menuRouteMap = {
+  'projects-namespaces': [
+    'management.cattle.io.project', // 创建项目
+    'namespace',
+  ],
+  'cluster-members': [
+    'management.cattle.io.clusterroletemplatebinding'
+  ]
+};

package/config/product/explorer.js

@@ -67,16 +67,37 @@ export function init(store) {
     }
   });
 
+  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
+
   basicType(['cluster-dashboard', 'cluster-tools']);
-  basicType([
-    'cluster-dashboard',
-    'projects-namespaces',
-    'namespaces',
-    NODE,
-    VIRTUAL_TYPES.CLUSTER_MEMBERS,
-    EVENT,
-    'c-cluster-explorer-tools'
-  ], 'cluster');
+
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'cluster-dashboard',
+      'projects-namespaces',
+      'namespaces',
+      'namespace',
+      NODE,
+      VIRTUAL_TYPES.CLUSTER_MEMBERS,
+      EVENT,
+      'c-cluster-explorer-tools',
+      'management.cattle.io.project',
+      'management.cattle.io.clusterroletemplatebinding'
+    ], 'cluster');
+  } else {
+    basicType([
+      'cluster-dashboard',
+      'projects-namespaces',
+      'namespaces',
+      'namespace',
+      NODE,
+      VIRTUAL_TYPES.CLUSTER_MEMBERS,
+      EVENT,
+      'management.cattle.io.project',
+      'management.cattle.io.clusterroletemplatebinding'
+    ], 'cluster');
+  }
+
   basicType([
     LIMIT_RANGE,
     NETWORK_POLICY,
@@ -95,6 +116,7 @@ export function init(store) {
     STORAGE_CLASS,
     SECRET,
     VIRTUAL_TYPES.PROJECT_SECRETS,
+    VIRTUAL_TYPES.NAMESPACES,
     CONFIG_MAP
   ], 'storage');
   basicType([
@@ -633,7 +655,7 @@ export function init(store) {
   virtualType({
     label:            store.getters['i18n/t'](`typeLabel.${ VIRTUAL_TYPES.PROJECT_SECRETS }`, { count: 2 }),
     group:            'storage',
-    icon:             'globe',
+    icon:             'default',
     namespaced:       false,
     ifRancherCluster: true,
     name:             VIRTUAL_TYPES.PROJECT_SECRETS,

package/config/product/manager.js

@@ -13,6 +13,7 @@ import { DSL } from '@shell/store/type-map';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export const NAME = 'manager';
+const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
 
 export function init(store) {
   const {
@@ -60,11 +61,17 @@ export function init(store) {
     route:      { name: 'c-cluster-manager-cloudCredential' },
   });
 
-  basicType([
-    CAPI.RANCHER_CLUSTER,
-    'cloud-credentials',
-    'drivers',
-  ]);
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      CAPI.RANCHER_CLUSTER,
+      'cloud-credentials',
+      'drivers',
+    ]);
+  } else {
+    basicType([
+      CAPI.RANCHER_CLUSTER,
+    ]);
+  }
 
   configureType(SNAPSHOT, { depaginate: true });
 
@@ -111,10 +118,12 @@ export function init(store) {
     exact:      true
   });
 
-  basicType([
-    'rke-kontainer-drivers',
-    'rke-node-drivers',
-  ], 'drivers');
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'rke-kontainer-drivers',
+      'rke-node-drivers',
+    ], 'drivers');
+  }
 
   weightType(CAPI.MACHINE_DEPLOYMENT, 4, true);
   weightType(CAPI.MACHINE_SET, 3, true);
@@ -123,14 +132,16 @@ export function init(store) {
   weightType(MANAGEMENT.PSA, 5, true);
   weightType(VIRTUAL_TYPES.JWT_AUTHENTICATION, 0, true);
 
-  basicType([
-    CAPI.MACHINE_DEPLOYMENT,
-    CAPI.MACHINE_SET,
-    CAPI.MACHINE,
-    CATALOG.CLUSTER_REPO,
-    MANAGEMENT.PSA,
-    VIRTUAL_TYPES.JWT_AUTHENTICATION
-  ], 'advanced');
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      CAPI.MACHINE_DEPLOYMENT,
+      CAPI.MACHINE_SET,
+      CAPI.MACHINE,
+      CATALOG.CLUSTER_REPO,
+      MANAGEMENT.PSA,
+      VIRTUAL_TYPES.JWT_AUTHENTICATION
+    ], 'advanced');
+  }
 
   weightGroup('advanced', -1, true);
 

package/config/product/uiplugins.js

@@ -5,14 +5,17 @@ export const NAME = 'uiplugins';
 export function init(store) {
   const { product } = DSL(store, NAME);
 
-  // Add a product for UI Plugins - will appear in the top-level menu
-  product({
-    ifHave:              IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
-    inStore:             'management',
-    icon:                'extension',
-    removable:           false,
-    showClusterSwitcher: false,
-    category:            'configuration',
-    weight:              50,
-  });
+  if (sessionStorage.getItem('TOPLEVELPERMISSIONS') && sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+    // Add a product for UI Plugins - will appear in the top-level menu
+    product({
+      ifHave:              IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
+      inStore:             'management',
+      icon:                'extension',
+      removable:           false,
+      showClusterSwitcher: false,
+      category:            'configuration',
+      weight:              50,
+    });
+  }
+
 }

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

@@ -11,13 +11,71 @@ import { install as installPageTitle } from '@shell/config/router/navigation-gua
 import { install as installServerUpgradeGrowl } from '@shell/config/router/navigation-guards/server-upgrade-growl';
 
 /**
- * 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) => {
+    let changed = false;
+    const params = { ...to.params };
+
+    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;
+    }
+
+    if (params?.resource?.includes('cloud')) {
+      params.resource = params.resource.replace(/cloud/g, 'harvester');
+      changed = true;
+    }
+
+    if (changed) {
+      // 触发路由重定向
+      return next({ ...to, params });
+    }
+
+    next();
+  });
+
 
   const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installRecordLastRoute, installServerUpgradeGrowl];
 
   navigationGuardInstallers.forEach((installer) => installer(router, context));
+
+  // 🔹 最后执行：只改地址栏，不改内部
+  router.afterEach((to) => {
+    const base = router.options.history?.base || '';
+    const pathParts = to.path.split('/');
+
+    const newPathParts = pathParts.map((part) => {
+      // 只替换 cluster/product/resource 对应的 segment
+      for (const key of ['cluster', 'product', 'resource']) {
+        if (to.params[key] && to.params[key] === part) {
+          return part.replace(/harvester/g, 'cloud');
+        }
+      }
+      return part;
+    });
+
+    let cloudPath = newPathParts.join('/');
+    if (!cloudPath.startsWith(base)) {
+      cloudPath = base + cloudPath;
+    }
+
+    const currentLocation = window.location.pathname + window.location.search + window.location.hash;
+
+    if (cloudPath !== currentLocation) {
+      console.info('[URL Replace] Updating address bar:', currentLocation, '→', cloudPath);
+      window.history.replaceState({}, '', cloudPath);
+    }
+  });
+
 }
+