dashboard-shell-shell 1.0.1000000086 → 1.0.1000000091

package/components/ResourceDetail/Masthead.vue

@@ -17,6 +17,7 @@ import TabTitle from '@shell/components/TabTitle';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // i18n-uses resourceDetail.header.*
 

package/components/ResourceDetail/index.vue

@@ -16,6 +16,7 @@ import ForceDirectedTreeChart from '@shell/components/fleet/ForceDirectedTreeCha
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import { stringify } from '@shell/utils/error';
 import { Banner } from '@components/Banner';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 function modeFor(route) {
   if ( route.query?.mode === _IMPORT ) {

package/components/ResourceList/Masthead.vue

@@ -6,6 +6,7 @@ import { get } from '@shell/utils/object';
 import { AS, _YAML } from '@shell/config/query-params';
 import ResourceLoadingIndicator from './ResourceLoadingIndicator';
 import TabTitle from '@shell/components/TabTitle';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 /**
  * Resource List Masthead component.
@@ -130,7 +131,7 @@ export default {
       return this.$store.getters['type-map/labelFor'](this.schema, 99);
     },
     _descriptionDisplay() {
-      const key = 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

@@ -9,6 +9,7 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
+import { cloud2harvesterhci } from '@shell/utils/router'
 
 export default {
   name: ResourceListComponentName,

package/components/SideNav.vue

@@ -20,6 +20,7 @@ import { TYPE_MODES } from '@shell/store/type-map';
 import { NAME as NAVLINKS } from '@shell/config/product/navlinks';
 import Group from '@shell/components/nav/Group';
 import LocaleSelector from '@shell/components/LocaleSelector';
+import { cloud2harvesterhci, harvester2cloud } from '@shell/utils/router';
 
 export default {
   name:       'SideNav',

package/components/SortableTable/index.vue

@@ -27,6 +27,7 @@ import ButtonMultiAction from '@shell/components/ButtonMultiAction.vue';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import ActionDropdownShell from '@shell/components/ActionDropdownShell.vue';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // Uncomment for table performance debugging
 // import tableDebug from './debug';
@@ -415,7 +416,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;

package/components/nav/NamespaceFilter.vue

@@ -20,6 +20,7 @@ import { KEY } from '@shell/utils/platform';
 import pAndNFiltering from '@shell/plugins/steve/projectAndNamespaceFiltering.utils';
 import { SETTING } from '@shell/config/settings';
 import paginationUtils from '@shell/utils/pagination-utils';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 const forcedNamespaceValidTypes = [NAMESPACE_FILTER_KINDS.DIVIDER, NAMESPACE_FILTER_KINDS.PROJECT, NAMESPACE_FILTER_KINDS.NAMESPACE];
 
@@ -144,6 +145,9 @@ export default {
 
       const params = { ...this.$route.params };
       let resource = params.resource;
+      if (params.resource) {
+        resource = resource
+      }
 
       // Sometimes, different pages may have different namespaces to filter
       const notFilterNamespaces = this.$store.getters[`type-map/optionsFor`](resource).notFilterNamespace || [];

package/components/rancherResourceDetail/Masthead.vue

@@ -17,6 +17,7 @@ import TabTitle from '@shell/components/TabTitle';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // i18n-uses resourceDetail.header.*
 

package/components/rancherResourceDetail/index.vue

@@ -16,6 +16,7 @@ import ForceDirectedTreeChart from '@shell/components/fleet/ForceDirectedTreeCha
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import { stringify } from '@shell/utils/error';
 import { Banner } from '@components/Banner';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 function modeFor(route) {
   if ( route.query?.mode === _IMPORT ) {

package/components/rancherResourceList/Masthead-btn.vue

@@ -6,6 +6,7 @@ import { get } from '@shell/utils/object';
 import { AS, _YAML } from '@shell/config/query-params';
 import ResourceLoadingIndicator from './ResourceLoadingIndicator';
 import TabTitle from '@shell/components/TabTitle';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 /**
  * Resource List Masthead component.

package/components/rancherResourceList/Masthead.vue

@@ -6,6 +6,7 @@ import { get } from '@shell/utils/object';
 import { AS, _YAML } from '@shell/config/query-params';
 import ResourceLoadingIndicator from './ResourceLoadingIndicator';
 import TabTitle from '@shell/components/TabTitle';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 /**
  * Resource List Masthead component.
@@ -138,7 +139,7 @@ export default {
       return this.$store.getters['type-map/labelFor'](this.schema, 99);
     },
     _descriptionDisplay() {
-      const key = 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

@@ -9,6 +9,7 @@ import { ResourceListComponentName } from './resource-list.config';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
 import { sameContents } from '@shell/utils/array';
+import { cloud2harvesterhci } from '@shell/utils/router'
 
 export default {
   name: ResourceListComponentName,

package/components/rancherSortableTable/index.vue

@@ -27,6 +27,7 @@ import ButtonMultiAction from '@shell/components/ButtonMultiAction.vue';
 import ActionMenu from '@shell/components/ActionMenuShell.vue';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import ActionDropdownShell from '@shell/components/ActionDropdownShell.vue';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 // Uncomment for table performance debugging
 // import tableDebug from './debug';
@@ -415,7 +416,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;

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,26 +9,32 @@ 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';
 
 /**
- * 获取内部 product/resource，始终是 harvester 形式
+ * Install router navigation guards
+ * 1. 保留原有导航守卫顺序
+ * 2. 不在 beforeEach 改 params，只在 push/replace & afterEach 改 URL
  */
-export function getInternalProduct(route) {
-  return route.params?.product;
-}
+export function installNavigationGuards(router, context) {
+  // 最早执行：保证进入逻辑时 params 始终是 harvester
+  router.beforeEach((to, from, next) => {
 
-export function getInternalResource(route) {
-  return route.params?.resource;
-}
+    console.log('-----------------------------------------------------1');
+    
+
+    // 内部逻辑统一用 harvesterManager
+    if (to?.params?.product) {
+      to.params.product = to.params.product.replace(/cloud/g, 'harvester')
+    }
+
+    if (to?.params?.cluster) {
+      to.params.cluster = to.params.cluster.replace(/cloud/g, 'harvester')
+    }
+
+    next();
+  });
 
-/**
- * Install our router navigation guards with cloud/harvester mapping.
- */
-export function installNavigationGuards(router, context) {
-  // ---------------------------
-  // 1. 安装原有导航守卫
-  // ---------------------------
   const navigationGuardInstallers = [
     installLoadInitialSettings,
     installAttemptFirstLogin,
@@ -43,74 +49,19 @@ export function installNavigationGuards(router, context) {
     installServerUpgradeGrowl
   ];
 
-  navigationGuardInstallers.forEach((installer) => installer(router, context));
+  navigationGuardInstallers.forEach(installer => installer(router, context));
 
-  // ---------------------------
-  // 2. 入口层 beforeEach: cloud -> harvester
-  // ---------------------------
-  router.beforeEach((to, from, next) => {
-    const newParams = { ...to.params };
-    let changed = false;
-
-    if (newParams.product) {
-      const newProduct = newParams.product;
-      if (newProduct !== newParams.product) {
-        newParams.product = newProduct;
-        changed = true;
-      }
-    }
-
-    if (newParams.resource) {
-      const newResource = newParams.resource;
-      if (newResource !== newParams.resource) {
-        newParams.resource = newResource;
-        changed = true;
-      }
-    }
-
-    // 只有实际修改才 redirect，避免无限循环
-    if (changed) {
-      next({ ...to, params: newParams, replace: true });
-    } else {
-      next();
-    }
-  });
-
-  // ---------------------------
-  // 3. 出口层 wrapNav: harvester -> cloud
-  // ---------------------------
-  const wrapNav = (fn) => function(location, ...args) {
-    if (typeof location === 'string') {
-      location = location;
-    } else if (location?.params) {
-      Object.keys(location.params).forEach(key => {
-        const val = location.params[key];
-        if (typeof val === 'string') {
-          location.params[key] = val;
-        }
-      });
-    } else if (location?.path) {
-      location.path = location.path;
-    }
-
-    return fn.call(this, location, ...args);
-  };
-
-  router.push = wrapNav(router.push.bind(router));
-  router.replace = wrapNav(router.replace.bind(router));
-
-  // ---------------------------
-  // 4. afterEach: 确保用户看到的 URL 是 cloud
-  // ---------------------------
+  // 最后执行：只改地址栏，不改内部
   router.afterEach((to) => {
-    let cloudPath = to.fullPath;
 
-    // 使用正则替换所有 harvester → cloud
-    cloudPath = cloudPath.replace(/harvesterManager/g, 'cloudManager');
-    cloudPath = cloudPath.replace(/harvesterhci\.io\.management\.cluster/g, 'cloudhci.io.management.cluster');
+     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

@@ -52,6 +52,7 @@ import { TYPES as SECRET_TYPES } from '@shell/models/secret';
 import { defaultContainer } from '@shell/models/workload';
 import { allHash } from '@shell/utils/promise';
 
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 const TAB_WEIGHT_MAP = {
   general:              99,

package/list/workload.vue

@@ -1,187 +0,0 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
-import {
-  WORKLOAD_TYPES, SCHEMA, NODE, POD, LIST_WORKLOAD_TYPES
-} from '@shell/config/types';
-import ResourceFetch from '@shell/mixins/resource-fetch';
-import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
-
-const workloadSchema = {
-  id:         'workload',
-  type:       SCHEMA,
-  attributes: {
-    kind:       'Workload',
-    namespaced: true
-  },
-  metadata: { name: 'workload' },
-};
-
-const $loadingResources = ($route, $store) => {
-  const allowedResources = [];
-
-  Object.values(LIST_WORKLOAD_TYPES).forEach((type) => {
-    // You may not have RBAC to see some of the types
-    if ($store.getters['cluster/schemaFor'](type) ) {
-      allowedResources.push(type);
-    }
-  });
-
-  const allTypes = $route.params.resource === workloadSchema.id;
-
-  return {
-    loadResources:     allTypes ? allowedResources : [$route.params.resource],
-    loadIndeterminate: allTypes,
-  };
-};
-
-export default {
-  name:       'ListWorkload',
-  components: { ResourceTable, PaginatedResourceTable },
-  mixins:     [ResourceFetch],
-
-  props: {
-    useQueryParamsForSimpleFiltering: {
-      type:    Boolean,
-      default: false
-    }
-  },
-
-  async fetch() {
-    if (this.paginationEnabled) {
-      return;
-    }
-
-    if (this.allTypes && this.loadResources.length) {
-      this.$initializeFetchData(this.loadResources[0], this.loadResources);
-    } else {
-      this.$initializeFetchData(this.$route.params.resource);
-    }
-
-    try {
-      const schema = this.$store.getters[`cluster/schemaFor`](NODE);
-
-      if (schema) {
-        // Used for shell/components/formatter/Endpoints.vue (too see column page needs to be wide and per page setting 25 or under)
-        this.$fetchType(NODE);
-      }
-    } catch {}
-
-    this.loadHeathResources();
-
-    if ( this.allTypes ) {
-      this.resources = await Promise.all(this.loadResources.map((allowed) => {
-        return this.$fetchType(allowed, this.loadResources);
-      }));
-    } else {
-      const type = this.$route.params.resource;
-
-      if ( this.$store.getters['cluster/schemaFor'](type) ) {
-        const resource = await this.$fetchType(type);
-
-        this.resources = [resource];
-      }
-    }
-  },
-
-  data() {
-    // Ensure these are set on load (to determine if the NS filter is required) rather than too late on `fetch`
-    const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
-
-    const { params:{ resource: type } } = this.$route;
-    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 });
-
-    return {
-      allTypes,
-      schema,
-      paginationEnabled,
-      resources: [],
-      loadResources,
-      loadIndeterminate
-    };
-  },
-
-  computed: {
-    filteredRows() {
-      const out = [];
-
-      for ( const typeRows of this.resources ) {
-        if ( !typeRows ) {
-          continue;
-        }
-
-        for ( const row of typeRows ) {
-          if (!this.allTypes || !row.ownedByWorkload) {
-            out.push(row);
-          }
-        }
-      }
-
-      return out;
-    },
-
-    headers() {
-      return this.$store.getters['type-map/headersFor'](this.schema, false);
-    }
-  },
-
-  // All of the resources that we will load that we need for the loading indicator
-  $loadingResources($route, $store) {
-    return $loadingResources($route, $store);
-  },
-
-  methods: {
-    loadHeathResources() {
-      // See https://github.com/rancher/dashboard/issues/10417, health comes from selectors applied locally to all pods (bad)
-      if (this.paginationEnabled) {
-        return;
-      }
-
-      // Fetch these in the background to populate workload health
-      if ( this.allTypes ) {
-        this.$fetchType(POD);
-        this.$fetchType(WORKLOAD_TYPES.JOB);
-      } else {
-        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)
-          return;
-        }
-
-        if (type === WORKLOAD_TYPES.CRON_JOB) {
-          this.$fetchType(WORKLOAD_TYPES.JOB);
-        } else {
-          this.$fetchType(POD);
-        }
-      }
-    }
-  },
-
-  typeDisplay() {
-    // Used by shell/components/ResourceList/index.vue to override list title (usually found via schema, which doesn't exist for this virtual type)
-    return this.$store.getters['type-map/labelFor'](this.schema || workloadSchema, 99);
-  },
-};
-</script>
-
-<template>
-  <div>
-    <PaginatedResourceTable
-      v-if="paginationEnabled"
-      :schema="schema"
-      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    />
-    <ResourceTable
-      v-else
-      :loading="$fetchState.pending"
-      :schema="schema"
-      :headers="headers"
-      :rows="filteredRows"
-      :overflow-y="true"
-      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-    />
-  </div>
-</template>

package/mixins/resource-fetch.js

@@ -3,6 +3,7 @@ import { COUNT, MANAGEMENT } from '@shell/config/types';
 import { SETTING, DEFAULT_PERF_SETTING } from '@shell/config/settings';
 import ResourceFetchNamespaced from '@shell/mixins/resource-fetch-namespaced';
 import ResourceFetchApiPagination from '@shell/mixins/resource-fetch-api-pagination';
+import { cloud2harvesterhci } from '@shell/utils/router'
 
 // Number of pages to fetch when loading incrementally
 const PAGES = 4;

package/models/management.cattle.io.setting.js

@@ -2,6 +2,7 @@ import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { isServerUrl } from '@shell/utils/validators/setting';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+import { harvester2cloud } from '@shell/utils/router'
 import {
   _EDIT,
   _UNFLAG,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000086",
+  "version": "1.0.1000000091",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/auth/login.vue

@@ -32,6 +32,7 @@ import loadPlugins from '@shell/plugins/plugin';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import TabTitle from '@shell/components/TabTitle.vue';
+import { harvester2cloud } from '@shell/utils/router'
 
 export default {
   name:       'Login',

package/pages/auth copy/login.vue

@@ -32,6 +32,7 @@ import loadPlugins from '@shell/plugins/plugin';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import TabTitle from '@shell/components/TabTitle.vue';
+import { harvester2cloud } from '@shell/utils/router'
 
 export default {
   name:       'Login',

package/pages/prefs.vue

@@ -18,6 +18,7 @@ import { addObject } from '@shell/utils/array';
 import LocaleSelector from '@shell/components/LocaleSelector';
 import TabTitle from '@shell/components/TabTitle';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+import { harvester2cloud } from '@shell/utils/router'
 
 export default {
   components: {

package/plugins/dashboard-store/normalize.js

@@ -2,6 +2,8 @@ import { SCHEMA } from '@shell/config/types';
 
 import { applyChangeset, changeset, changesetConflicts } from '@shell/utils/object';
 
+import { cloud2harvesterhci } from '@shell/utils/router'
+
 export const KEY_FIELD_FOR = {
   [SCHEMA]: '_id',
   default:  'id',

package/plugins/dashboard-store/resource-class.js

@@ -34,6 +34,7 @@ import { markRaw } from 'vue';
 
 import { ExtensionPoint, ActionLocation } from '@shell/core/types';
 import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
 
 export const DNS_LIKE_TYPES = ['dnsLabel', 'dnsLabelRestricted', 'hostname'];
 

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 cloud2harvesterhci(str: any): any;
-export function harvester2cloud(str: any): any;
+export function str: any: any;
+export function 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;

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');