dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

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,10 +62,20 @@ 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;
-        const navPath = routeMetaNav.replace(':cluster', cluster);
+        const product = this.$route.params?.product;
+        const navPath = routeMetaNav
+          .replace(':cluster', cluster)
+          .replace(':product', product);
 
         if (navPath === typeFullPath) {
           return true;
@@ -138,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);"
@@ -155,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}"
            />
@@ -196,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/components/nav/WindowManager/ContainerLogs.vue

@@ -10,8 +10,11 @@ import AsyncButton from '@shell/components/AsyncButton';
 import Select from '@shell/components/form/Select';
 import VirtualList from 'vue3-virtual-scroll-list';
 import LogItem from '@shell/components/LogItem';
+import ContainerLogsActions from '@shell/components/nav/WindowManager/ContainerLogsActions.vue';
 import { shallowRef } from 'vue';
+import { useStore } from 'vuex';
 import { debounce } from 'lodash';
+import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 
 import { escapeRegex } from '@shell/utils/string';
 import { HARVESTER_NAME as VIRTUAL } from '@shell/config/features';
@@ -91,6 +94,7 @@ export default {
     Checkbox,
     AsyncButton,
     VirtualList,
+    ContainerLogsActions,
   },
 
   props: {
@@ -130,6 +134,13 @@ export default {
     }
   },
 
+  setup() {
+    const store = useStore();
+    const { featureDropdownMenu } = useRuntimeFlag(store);
+
+    return { featureDropdownMenu };
+  },
+
   data() {
     return {
       container:           this.initialContainer || this.pod?.defaultContainerName,
@@ -145,7 +156,8 @@ export default {
       lines:               [],
       now:                 new Date(),
       logItem:             shallowRef(LogItem),
-      isContainerMenuOpen: false
+      isContainerMenuOpen: false,
+      range:               '',
     };
   },
 
@@ -636,72 +648,85 @@ export default {
         </div>
 
         <div class="log-action log-action-group ml-5">
-          <div
-            role="menu"
-            tabindex="0"
-            :aria-label="t('wm.containerLogs.logActionMenu')"
-            @click="openContainerMenu"
-            @blur.capture="closeContainerMenu"
-            @keyup.enter="openContainerMenu"
-            @keyup.space="openContainerMenu"
-          >
-            <v-dropdown
-              :triggers="[]"
-              :shown="isContainerMenuOpen"
-              placement="top"
-              popperClass="containerLogsDropdown"
-              :autoHide="false"
-              :flip="false"
-              :container="false"
-              @focus.capture="openContainerMenu"
+          <template v-if="featureDropdownMenu">
+            <ContainerLogsActions
+              :range="range"
+              :range-options="rangeOptions"
+              :wrap="wrap"
+              :timestamps="timestamps"
+              @toggle-range="toggleRange"
+              @toggle-wrap="toggleWrap"
+              @toggle-timestamps="toggleTimestamps"
+            />
+          </template>
+          <template v-else>
+            <div
+              role="menu"
+              tabindex="0"
+              :aria-label="t('wm.containerLogs.logActionMenu')"
+              @click="openContainerMenu"
+              @blur.capture="closeContainerMenu"
+              @keyup.enter="openContainerMenu"
+              @keyup.space="openContainerMenu"
             >
-              <button
-                class="btn role-primary btn-cog"
-                role="button"
-                :aria-label="t('wm.containerLogs.options')"
+              <v-dropdown
+                :triggers="[]"
+                :shown="isContainerMenuOpen"
+                placement="top"
+                popperClass="containerLogsDropdown"
+                :autoHide="false"
+                :flip="false"
+                :container="false"
+                @focus.capture="openContainerMenu"
               >
-                <i
-                  class="icon icon-gear"
-                  :alt="t('wm.containerLogs.options')"
-                />
-                <i
-                  class="icon icon-chevron-up"
-                  :alt="t('wm.containerLogs.expand')"
-                />
-              </button>
-
-              <template #popper>
-                <div class="filter-popup">
-                  <LabeledSelect
-                    v-model:value="range"
-                    class="range"
-                    :label="t('wm.containerLogs.range.label')"
-                    :options="rangeOptions"
-                    :clearable="false"
-                    placement="top"
-                    role="menuitem"
-                    @update:value="toggleRange($event)"
+                <button
+                  class="btn role-primary btn-cog"
+                  role="button"
+                  :aria-label="t('wm.containerLogs.options')"
+                >
+                  <i
+                    class="icon icon-gear"
+                    :alt="t('wm.containerLogs.options')"
                   />
-                  <div>
-                    <Checkbox
-                      :label="t('wm.containerLogs.wrap')"
-                      :value="wrap"
-                      role="menuitem"
-                      @update:value="toggleWrap"
-                    />
-                  </div>
-                  <div>
-                    <Checkbox
-                      :label="t('wm.containerLogs.timestamps')"
-                      :value="timestamps"
+                  <i
+                    class="icon icon-chevron-up"
+                    :alt="t('wm.containerLogs.expand')"
+                  />
+                </button>
+
+                <template #popper>
+                  <div class="filter-popup">
+                    <LabeledSelect
+                      v-model:value="range"
+                      class="range"
+                      :label="t('wm.containerLogs.range.label')"
+                      :options="rangeOptions"
+                      :clearable="false"
+                      placement="top"
                       role="menuitem"
-                      @update:value="toggleTimestamps"
+                      @update:value="toggleRange($event)"
                     />
+                    <div>
+                      <Checkbox
+                        :label="t('wm.containerLogs.wrap')"
+                        :value="wrap"
+                        role="menuitem"
+                        @update:value="toggleWrap"
+                      />
+                    </div>
+                    <div>
+                      <Checkbox
+                        :label="t('wm.containerLogs.timestamps')"
+                        :value="timestamps"
+                        role="menuitem"
+                        @update:value="toggleTimestamps"
+                      />
+                    </div>
                   </div>
-                </div>
-              </template>
-            </v-dropdown>
-          </div>
+                </template>
+              </v-dropdown>
+            </div>
+          </template>
         </div>
 
         <div class="log-action log-action-group ml-5">
@@ -874,4 +899,5 @@ export default {
       }
     }
   }
+
 </style>

package/components/nav/WindowManager/ContainerLogsActions.vue

@@ -0,0 +1,76 @@
+<script setup lang="ts">
+import {
+  RcDropdown,
+  RcDropdownTrigger,
+  RcDropdownItemCheckbox,
+  RcDropdownItemSelect,
+} from '@components/RcDropdown';
+
+defineProps({
+  range: {
+    type:    String,
+    default: '',
+  },
+  rangeOptions: {
+    type: Array,
+    default() {
+      return [];
+    },
+  },
+  wrap:       Boolean,
+  timestamps: Boolean,
+});
+
+defineEmits([
+  'toggleRange',
+  'toggleWrap',
+  'toggleTimestamps',
+]);
+
+</script>
+
+<template>
+  <rc-dropdown>
+    <rc-dropdown-trigger
+      class="condensed"
+    >
+      <i
+        class="icon icon-gear"
+        :alt="t('wm.containerLogs.options')"
+      />
+      <template #after>
+        <i
+          class="icon icon-chevron-up"
+          :alt="t('wm.containerLogs.expand')"
+        />
+      </template>
+    </rc-dropdown-trigger>
+    <template #dropdownCollection>
+      <rc-dropdown-item-select
+        :model-value="range"
+        :options="rangeOptions"
+        @select="$emit('toggleRange', $event)"
+      />
+      <rc-dropdown-item-checkbox
+        :model-value="wrap"
+        @click="$emit('toggleWrap', $event)"
+      >
+        {{ t('wm.containerLogs.wrap') }}
+      </rc-dropdown-item-checkbox>
+      <rc-dropdown-item-checkbox
+        :model-value="timestamps"
+        @click="$emit('toggleTimestamps', $event)"
+      >
+        {{ t('wm.containerLogs.timestamps') }}
+      </rc-dropdown-item-checkbox>
+    </template>
+  </rc-dropdown>
+</template>
+
+<style lang="scss" scoped>
+  .condensed {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+    min-height: 30px;
+  }
+</style>

package/components/nav/WindowManager/index.vue

@@ -326,6 +326,7 @@ export default {
 
 <template>
   <div
+    v-if="open"
     id="windowmanager"
     data-testid="windowmanager"
     class="windowmanager"
@@ -427,9 +428,9 @@ export default {
       </div>
     </div>
     <div
-      v-for="(tab, i) in tabs"
+      v-for="tab in tabs"
       :id="`panel-${tab.id}`"
-      :key="i"
+      :key="tab.id"
       class="body"
       :class="{'active': tab.id === active}"
       draggable="false"

package/components/templates/default.vue

@@ -13,7 +13,6 @@ import WindowManager from '@shell/components/nav/WindowManager';
 import PromptRemove from '@shell/components/PromptRemove';
 import PromptRestore from '@shell/components/PromptRestore';
 import PromptModal from '@shell/components/PromptModal';
-import AssignTo from '@shell/components/AssignTo';
 import Header from '@shell/components/nav/Header';
 import Inactivity from '@shell/components/Inactivity';
 import Brand from '@shell/mixins/brand';
@@ -36,7 +35,6 @@ export default {
   components: {
     PromptRemove,
     PromptRestore,
-    AssignTo,
     PromptModal,
     Header,
     ActionMenu,
@@ -211,7 +209,6 @@ export default {
         <ActionMenu />
         <PromptRemove />
         <PromptRestore />
-        <AssignTo />
         <PromptModal />
         <ModalManager />
         <button

package/components/templates/plain.vue

@@ -3,7 +3,6 @@ import { mapPref, THEME_SHORTCUT } from '@shell/store/prefs';
 import ActionMenu from '@shell/components/ActionMenu';
 import Header from '@shell/components/nav/Header';
 import PromptRemove from '@shell/components/PromptRemove';
-import AssignTo from '@shell/components/AssignTo';
 import IndentedPanel from '@shell/components/IndentedPanel';
 import Brand from '@shell/mixins/brand';
 import FixedBanner from '@shell/components/FixedBanner';
@@ -21,7 +20,6 @@ export default {
 
   components: {
     ActionMenu,
-    AssignTo,
     Header,
     IndentedPanel,
     PromptRemove,
@@ -86,7 +84,6 @@ export default {
         <PromptRemove />
         <PromptModal />
         <ModalManager />
-        <AssignTo />
         <button
           v-if="themeShortcut"
           v-shortkey.once="['shift','t']"

package/composables/drawer.ts

@@ -0,0 +1,26 @@
+import { Component } from 'vue';
+import { useStore } from 'vuex';
+
+export const useDrawer = () => {
+  const store = useStore();
+
+  const open = (component: Component, returnFocusSelector: string, options?: Record<string, any>) => {
+    store.commit('slideInPanel/open', {
+      component,
+      componentProps: {
+        ...(options || {}),
+        triggerFocusTrap: true,
+        returnFocusSelector
+      }
+    });
+  };
+
+  const close = () => {
+    store.commit('slideInPanel/close');
+  };
+
+  return {
+    open,
+    close
+  };
+};

package/composables/focusTrap.ts

@@ -61,14 +61,14 @@ export function useWatcherBasedSetupFocusTrapWithDestroyIncluded(watchVar:any, f
           focusTrapInstance.activate();
         });
       });
-    } else if (!neu && Object.keys(focusTrapInstance).length && !useUnmountHook) {
+    } else if (!neu && focusTrapInstance && Object.keys(focusTrapInstance).length && !useUnmountHook) {
       focusTrapInstance.deactivate();
     }
-  });
+  }, { immediate: true });
 
   if (useUnmountHook) {
     onBeforeUnmount(() => {
-      if (Object.keys(focusTrapInstance).length) {
+      if (focusTrapInstance && Object.keys(focusTrapInstance).length) {
         focusTrapInstance.deactivate();
       }
     });

package/composables/resources.test.ts

@@ -0,0 +1,63 @@
+import { useResourceIdentifiers, useFetchResourceWithId } from '@shell/composables/resources';
+
+const mockStore: any = {
+  getters:  { 'cluster/schemaFor': jest.fn(() => ({ id: 'test-schema' })) },
+  dispatch: jest.fn()
+};
+const mockRoute: any = {
+  params: {
+    cluster:   'test-cluster',
+    namespace: 'test-namespace',
+    id:        'test-id',
+  },
+};
+
+jest.mock('vuex', () => ({ useStore: () => mockStore }));
+jest.mock('vue-router', () => ({ useRoute: () => mockRoute }));
+
+describe('resources', () => {
+  describe('useResourceIdentifiers', () => {
+    it('should return the correct value for a route with a namespace', async() => {
+      const { clusterId, id, schema } = useResourceIdentifiers('test-type');
+
+      expect(clusterId).toBe('test-cluster');
+      expect(id).toBe('test-namespace/test-id');
+      expect(schema).toStrictEqual({ id: 'test-schema' });
+    });
+
+    it('should return the correct value for a route without a namespace', async() => {
+      mockRoute.params.namespace = undefined;
+      const { clusterId, id, schema } = useResourceIdentifiers('test-type');
+
+      expect(clusterId).toBe('test-cluster');
+      expect(id).toBe('test-id');
+      expect(schema).toStrictEqual({ id: 'test-schema' });
+    });
+  });
+
+  describe('useFetchResourceWithId', () => {
+    it('should return the correct value given the correct arguments are passed to the dispatch method', async() => {
+      mockStore.dispatch.mockImplementation(() => Promise.resolve({ id: 'test-resource' }));
+      const resource = await useFetchResourceWithId('test-type', 'test-id');
+
+      expect(mockStore.dispatch).toHaveBeenCalledWith('cluster/find', { type: 'test-type', id: 'test-id' });
+      expect(resource).toStrictEqual({ id: 'test-resource' });
+    });
+
+    it('should dispatch a loadingError if a 404 occurs', async() => {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      mockStore.dispatch.mockImplementationOnce(() => Promise.reject({ status: 404 }));
+      await useFetchResourceWithId('test-type', 'test-id');
+
+      expect(mockStore.dispatch).toHaveBeenCalledWith('loadingError', new Error('nav.failWhale.resourceIdNotFound-{"resource":"test-type","fqid":"test-id"}'));
+    });
+
+    it('should dispatch a loadingError if a 403 occurs', async() => {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      mockStore.dispatch.mockImplementationOnce(() => Promise.reject({ status: 403 }));
+      await useFetchResourceWithId('test-type', 'test-id');
+
+      expect(mockStore.dispatch).toHaveBeenCalledWith('loadingError', new Error('nav.failWhale.resourceIdNotFound-{"resource":"test-type","fqid":"test-id"}'));
+    });
+  });
+});

package/composables/resources.ts

@@ -0,0 +1,38 @@
+import { useI18n } from '@shell/composables/useI18n';
+import { computed, Ref, toValue } from 'vue';
+import { useRoute } from 'vue-router';
+import { useStore } from 'vuex';
+
+type ResourceType = string | Ref<string>;
+type IdType = string | Ref<string>;
+
+export const useResourceIdentifiers = (type: ResourceType) => {
+  const route = useRoute();
+  const store = useStore();
+
+  const typeValue = toValue(type);
+
+  const id = computed(() => route.params.namespace ? `${ route.params.namespace }/${ route.params.id }` : `${ route.params.id }`);
+  const schema = computed(() => store.getters['cluster/schemaFor'](typeValue));
+  const clusterId = computed(() => route.params.cluster as string);
+
+  return {
+    clusterId: clusterId.value, id: id.value, schema: schema.value
+  };
+};
+
+export const useFetchResourceWithId = async(type: ResourceType, id: IdType, inStore = 'cluster') => {
+  const store = useStore();
+  const i18n = useI18n(store);
+
+  const typeValue = toValue(type);
+  const idValue = toValue(id);
+
+  try {
+    return await store.dispatch(`${ inStore }/find`, { type: typeValue, id: idValue });
+  } catch (ex: any) {
+    if (ex.status === 404 || ex.status === 403) {
+      store.dispatch('loadingError', new Error(i18n.t('nav.failWhale.resourceIdNotFound', { resource: type, fqid: id }, true)));
+    }
+  }
+};

package/composables/useI18n.ts

@@ -3,17 +3,6 @@ import { Store } from 'vuex';
 import { stringFor } from '@shell/plugins/i18n';
 
 let store: Store<any> | null = null;
-
-export const useI18n = (vuexStore: Store<any>): { t: typeof t } => {
-  store = vuexStore;
-
-  if (!store) {
-    throw new Error('usI18n() must be called from setup()');
-  }
-
-  return { t };
-};
-
 /**
  * Allows for consuming i18n strings with the Vue composition API.
  * @param key - The key for the i18n string to translate.
@@ -24,3 +13,15 @@ export const useI18n = (vuexStore: Store<any>): { t: typeof t } => {
 const t = (key: string, args?: unknown, raw?: boolean): string => {
   return stringFor(store, key, args, raw);
 };
+
+export type I18n = { t: typeof t };
+
+export const useI18n = (vuexStore: Store<any>): I18n => {
+  store = vuexStore;
+
+  if (!store) {
+    throw new Error('usI18n() must be called from setup()');
+  }
+
+  return { t };
+};

package/composables/useIsNewDetailPageEnabled.ts

@@ -0,0 +1,17 @@
+import { useRoute } from 'vue-router';
+import { LEGACY } from '@shell/config/query-params';
+import { computed } from 'vue';
+
+const enabledByDefault = true;
+
+export const useIsNewDetailPageEnabled = () => {
+  const route = useRoute();
+
+  return computed(() => {
+    if (enabledByDefault) {
+      return route?.query?.[LEGACY] !== 'true';
+    }
+
+    return route?.query?.[LEGACY] === 'false';
+  });
+};

package/config/labels-annotations.js

@@ -17,6 +17,8 @@ export const AZURE_MIGRATED = 'auth.cattle.io/azuread-endpoint-migrated';
 export const WORKSPACE_ANNOTATION = 'objectset.rio.cattle.io/id';
 export const NODE_ARCHITECTURE = 'kubernetes.io/arch';
 export const IMPORTED_CLUSTER_VERSION_MANAGEMENT = 'rancher.io/imported-cluster-version-management';
+export const UI_PROJECT_SECRET = 'management.cattle.io/project-scoped-secret';
+export const UI_PROJECT_SECRET_COPY = 'management.cattle.io/project-scoped-secret-copy';
 
 export const KUBERNETES = {
   SERVICE_ACCOUNT_UID:  'kubernetes.io/service-account.uid',
@@ -116,17 +118,20 @@ export const CATALOG = {
 };
 
 export const FLEET = {
-  REPO_NAME:            'fleet.cattle.io/repo-name',
-  CLUSTER_DISPLAY_NAME: 'management.cattle.io/cluster-display-name',
-  CLUSTER_NAME:         'management.cattle.io/cluster-name',
-  BUNDLE_ID:            'fleet.cattle.io/bundle-id',
-  BUNDLE_NAME:          'fleet.cattle.io/bundle-name',
-  BUNDLE_NAMESPACE:     'fleet.cattle.io/bundle-namespace',
-  MANAGED:              'fleet.cattle.io/managed',
-  CLUSTER_NAMESPACE:    'fleet.cattle.io/cluster-namespace',
-  CLUSTER:              'fleet.cattle.io/cluster',
-  CREATED_BY_USER_ID:   'fleet.cattle.io/created-by-user-id',
-  CREATED_BY_USER_NAME: 'fleet.cattle.io/created-by-display-name',
+  REPO_NAME:                    'fleet.cattle.io/repo-name',
+  HELM_NAME:                    'fleet.cattle.io/fleet-helm-name',
+  CLUSTER_DISPLAY_NAME:         'management.cattle.io/cluster-display-name',
+  CLUSTER_NAME:                 'management.cattle.io/cluster-name',
+  BUNDLE_ID:                    'fleet.cattle.io/bundle-id',
+  BUNDLE_NAME:                  'fleet.cattle.io/bundle-name',
+  BUNDLE_NAMESPACE:             'fleet.cattle.io/bundle-namespace',
+  MANAGED:                      'fleet.cattle.io/managed',
+  CLUSTER_NAMESPACE:            'fleet.cattle.io/cluster-namespace',
+  CLUSTER:                      'fleet.cattle.io/cluster',
+  CREATED_BY_USER_ID:           'fleet.cattle.io/created-by-user-id',
+  CREATED_BY_USER_NAME:         'fleet.cattle.io/created-by-display-name',
+  OCI_STORAGE_SECRET_DEFAULT:   'ui-default-oci-registry',
+  OCI_STORAGE_SECRET_GENERATED: 'fleet.cattle.io/bundle-internal-secret',
 };
 
 export const RBAC = { PRODUCT: 'management.cattle.io/ui-product' };
@@ -190,3 +195,9 @@ export const SYSTEM_LABELS = [
 ];
 
 export const CLOUD_CREDENTIALS = { EXPIRATION: 'rancher.io/expiration-timestamp' };
+
+export const OIDC_CLIENT_SECRET_ANNOTATIONS = {
+  CREATE: 'cattle.io/oidc-client-secret-create',
+  REGEN:  'cattle.io/oidc-client-secret-regenerate',
+  REMOVE: 'cattle.io/oidc-client-secret-remove',
+};

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'
+  ]
+};