@rancher/shell 3.0.9 → 3.0.11

package/components/GlobalRoleBindings.vue

@@ -49,10 +49,6 @@ export default {
     userId: {
       type:    String,
       default: ''
-    },
-    watchOverride: {
-      type:    Boolean,
-      default: true,
     }
   },
   async fetch() {
@@ -142,7 +138,7 @@ export default {
       this.update();
     },
     userId(userId, oldUserId) {
-      if (userId === oldUserId || this.watchOverride === true) {
+      if (userId === oldUserId) {
         return;
       }
       this.update();

package/components/LazyImage.vue

@@ -1,5 +1,6 @@
 <script>
 import { BLANK_IMAGE } from '@shell/utils/style';
+import genericCatalogSvg from '@shell/assets/images/generic-catalog.svg';
 
 export default {
   props: {
@@ -10,7 +11,7 @@ export default {
 
     errorSrc: {
       type:    String,
-      default: require('@shell/assets/images/generic-catalog.svg'),
+      default: genericCatalogSvg,
     },
 
     src: {

package/components/Resource/Detail/Card/Scaler.vue

@@ -54,9 +54,9 @@ const i18n = useI18n(store);
 .scaler {
   display: inline-flex;
   align-items: center;
-  background-color: hsl(from var(--primary) h s calc(l + 30));
+  background-color: var(--accent-btn);
   border-radius: var(--border-radius-md);
-  border: 1px solid var(--primary);
+  border: solid thin var(--primary);
   overflow: hidden;
 
   button {
@@ -77,7 +77,7 @@ const i18n = useI18n(store);
     }
 
     &:hover {
-      background-color: hsl(from var(--primary) h s calc(l + 20));
+      background-color: var(--accent-btn);
     }
 
     &[disabled] {
@@ -88,7 +88,7 @@ const i18n = useI18n(store);
   }
 
   .value {
-    color: initial;
+    color: var(--body-text);
     cursor: default;
     padding: 4px;
     padding-top: 5px;

package/components/ResourceDetail/index.vue

@@ -403,25 +403,6 @@ export default {
       // Remove id? How does subtype get in (cluster/node)
       this.detailComponent = this.$store.getters['type-map/importDetail'](detailResource, id);
       this.editComponent = this.$store.getters['type-map/importEdit'](editResource, id);
-    },
-    /**
-     * Sets the mode and initializes the resource components.
-     *
-     * This method sets the mode of the component and configures the resource
-     * components based on the provided user and resource.
-     *
-     * @param {Object} payload - An object containing the mode, user, and
-     * resource properties.
-     * @param {string} payload.mode - The mode to set.
-     * @param {Object} payload.user - The user object containing user-specific
-     * information.
-     * @param {string} payload.resource - The resource string to use for
-     * initialization.
-     */
-    setMode({ mode, userId, resource }) {
-      this.mode = mode;
-      this.value.id = userId;
-      this.configureResource(userId, resource);
     }
   }
 };
@@ -444,7 +425,6 @@ export default {
     :class="{'flex-content': flexContent}"
     :resource-errors="errors"
     @update:value="$emit('input', $event)"
-    @update:mode="setMode"
     @set-subtype="setSubtype"
   />
   <div v-else>
@@ -514,7 +494,6 @@ export default {
       :real-mode="realMode"
       :class="{'flex-content': flexContent}"
       @update:value="$emit('input', $event)"
-      @update:mode="setMode"
       @set-subtype="setSubtype"
     />
 

package/components/Tabbed/index.vue

@@ -76,6 +76,12 @@ export default {
       type:    Boolean,
       default: true,
     },
+
+    extensionParams: {
+      type:    Object,
+      default: null,
+    },
+
     /**
      * Inherited global identifier prefix for tests
      * Define a term based on the parent component to avoid conflicts on multiple components

package/components/__tests__/ConsumptionGauge.test.ts

@@ -64,6 +64,37 @@ describe('component: ConsumptionGauge', () => {
     expect(slotTitle.text()).toBe('some-resource-name');
   });
 
+  it('should display the default "Used" label when usedLabel is not provided', () => {
+    const wrapper = mount(ConsumptionGauge, {
+      props: {
+        resourceName: 'some-resource-name',
+        capacity:     100,
+        used:         50,
+      }
+    });
+
+    const usedSpan = wrapper.find('.consumption-gauge .numbers span:nth-child(1)');
+
+    expect(usedSpan.exists()).toBe(true);
+    expect(usedSpan.text()).toBe('%node.detail.glance.consumptionGauge.used%');
+  });
+
+  it('usedLabel should override the default "Used" label text', () => {
+    const wrapper = mount(ConsumptionGauge, {
+      props: {
+        resourceName: 'some-resource-name',
+        capacity:     100,
+        used:         50,
+        usedLabel:    'Running'
+      }
+    });
+
+    const usedSpan = wrapper.find('.consumption-gauge .numbers span:nth-child(1)');
+
+    expect(usedSpan.exists()).toBe(true);
+    expect(usedSpan.text()).toBe('Running');
+  });
+
   it('passing slot TITLE should render correctly', () => {
     const colorStops = {
       0: '--success', 30: '--warning', 70: '--error'

package/components/__tests__/CruResource.test.ts

@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils';
 import CruResource from '@shell/components/CruResource.vue';
-import { _EDIT, _YAML } from '@shell/config/query-params';
+import { _CREATE, _EDIT, _VIEW, _YAML } from '@shell/config/query-params';
 import TextAreaAutoGrow from '@components/Form/TextArea/TextAreaAutoGrow.vue';
 
 describe('component: CruResource', () => {
@@ -171,6 +171,40 @@ describe('component: CruResource', () => {
     expect(event.preventDefault).toHaveBeenCalledWith();
   });
 
+  it.each([
+    [_EDIT, true],
+    [_CREATE, true],
+    [_VIEW, false],
+  ])('should render CruResourceFooter when mode is %s: %s', (mode: string, shouldRender: boolean) => {
+    const wrapper = mount(CruResource, {
+      props: {
+        canYaml:  false,
+        mode,
+        resource: {}
+      },
+      global: {
+        mocks: {
+          $store: {
+            getters: {
+              currentStore:              () => 'current_store',
+              'current_store/schemaFor': jest.fn(),
+              'current_store/all':       jest.fn(),
+              'i18n/t':                  jest.fn(),
+              'i18n/exists':             jest.fn(),
+            },
+            dispatch: jest.fn(),
+          },
+          $route:  { query: { AS: _YAML } },
+          $router: { applyQuery: jest.fn() },
+        },
+      }
+    });
+
+    const footer = wrapper.find('.cru-resource-footer');
+
+    expect(footer.exists()).toBe(shouldRender);
+  });
+
   it('should not prevent default events on keypress Enter', async() => {
     const event = { preventDefault: jest.fn() };
     const wrapper = mount(CruResource, {

package/components/form/ProjectMemberEditor.vue

@@ -61,11 +61,6 @@ export default {
           label: this.t('projectMembers.projectPermissions.ingressManage'),
           value: false,
         },
-        {
-          key:   'projectcatalogs-manage',
-          label: this.t('projectMembers.projectPermissions.projectcatalogsManage'),
-          value: false,
-        },
         {
           key:   'projectroletemplatebindings-manage',
           label: this.t('projectMembers.projectPermissions.projectroletemplatebindingsManage'),
@@ -111,11 +106,6 @@ export default {
           label: this.t('projectMembers.projectPermissions.monitoringUiView'),
           value: false,
         },
-        {
-          key:   'projectcatalogs-view',
-          label: this.t('projectMembers.projectPermissions.projectcatalogsView'),
-          value: false,
-        },
         {
           key:   'projectroletemplatebindings-view',
           label: this.t('projectMembers.projectPermissions.projectroletemplatebindingsView'),

package/components/nav/TopLevelMenu.helper.ts

@@ -107,7 +107,6 @@ export interface TopLevelMenuHelper {
 
 export abstract class BaseTopLevelMenuHelper {
   protected $store: VuexStore;
-  protected hasProvCluster: boolean;
 
   /**
   * Filter mgmt clusters by
@@ -143,11 +142,9 @@ export abstract class BaseTopLevelMenuHelper {
     $store: VuexStore,
 }) {
     this.$store = $store;
-
-    this.hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
   }
 
-  protected convertToCluster(mgmtCluster: MgmtCluster, provCluster: ProvCluster): TopLevelMenuCluster {
+  protected convertToCluster(mgmtCluster: MgmtCluster, provCluster?: ProvCluster): TopLevelMenuCluster {
     return {
       id:              mgmtCluster.id,
       label:           mgmtCluster.nameDisplay,
@@ -173,7 +170,6 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
 
   private clustersPinnedWrapper: PaginationWrapper<any>;
   private clustersOthersWrapper: PaginationWrapper<any>;
-  private provClusterWrapper: PaginationWrapper<any>;
 
   private clusterCount = 0;
 
@@ -223,43 +219,10 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
       },
       formatResponse: { classify: true },
     });
-    // Fetch all prov clusters for the mgmt clusters we have
-    this.provClusterWrapper = new PaginationWrapper({
-      $store,
-      id:       'top-level-menu-prov-clusters',
-      onChange: async({ forceWatch, revision }) => {
-        if (!this.args) {
-          return;
-        }
-        try {
-          await this.update({
-            ...this.args,
-            forceWatch,
-            provClusterRevision: revision,
-          });
-        } catch {
-          // Failures should be logged lower down, not much we can do here except catch to prevent whole ui page warnings in dev mode
-        }
-      },
-      enabledFor: {
-        store:    STORE.MANAGEMENT,
-        resource: {
-          id:      CAPI.RANCHER_CLUSTER,
-          context: 'side-bar',
-        }
-      },
-      formatResponse: { classify: true }
-    });
   }
 
   // ---------- requests ----------
   async update(args: UpdateArgs) {
-    if (!this.hasProvCluster) {
-      // We're filtering out mgmt clusters without prov clusters, so if the user can't see any prov clusters at all
-      // exit early
-      return;
-    }
-
     this.args = args;
     const promises = {
       pinned:    this.updatePinned(args),
@@ -271,22 +234,11 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
       notPinned: MgmtCluster[]
     } = await allHash(promises) as any;
 
-    const provClusters = await this.updateProvCluster(res.notPinned, res.pinned, args);
-    const provClustersByMgmtId = provClusters.reduce((res: { [mgmtId: string]: ProvCluster}, provCluster: ProvCluster) => {
-      if (provCluster.mgmtClusterId) {
-        res[provCluster.mgmtClusterId] = provCluster;
-      }
-
-      return res;
-    }, {} as { [mgmtId: string]: ProvCluster});
-
     // Filter out mgmt clusters that don't have matching prov cluster and convert remaining to required format
     const _clustersNotPinned = res.notPinned
-      .filter((mgmtCluster) => !!provClustersByMgmtId[mgmtCluster.id])
-      .map((mgmtCluster) => this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+      .map((mgmtCluster) => this.convertToCluster(mgmtCluster));
     const _clustersPinned = res.pinned
-      .filter((mgmtCluster) => !!provClustersByMgmtId[mgmtCluster.id])
-      .map((mgmtCluster) => this.convertToCluster(mgmtCluster, provClustersByMgmtId[mgmtCluster.id]));
+      .map((mgmtCluster) => this.convertToCluster(mgmtCluster));
 
     this.clustersPinned.length = 0;
     this.clustersOthers.length = 0;
@@ -298,7 +250,6 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
   async destroy() {
     this.clustersPinnedWrapper.onDestroy();
     this.clustersOthersWrapper.onDestroy();
-    this.provClusterWrapper.onDestroy();
   }
 
   /**
@@ -445,41 +396,21 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
       console.warn('Unable to set saved count for clusters', err); // eslint-disable-line no-console
     }
   }
-
-  /**
-   * Find all provisioning clusters associated with the displayed mgmt clusters
-   */
-  private async updateProvCluster(notPinned: MgmtCluster[], pinned: MgmtCluster[], args: UpdateArgs): Promise<ProvCluster[]> {
-    return this.provClusterWrapper.request({
-      forceWatch: args.forceWatch,
-      pagination: {
-        filters: [
-          PaginationParamFilter.createMultipleFields(
-            [...notPinned, ...pinned]
-              .map((mgmtCluster) => ({
-                field: 'status.clusterName', value: mgmtCluster.id, equals: true, exact: true
-              }))
-          )
-        ],
-        page:                 1,
-        sort:                 [],
-        projectsOrNamespaces: []
-      },
-      revision: args.provClusterRevision
-    })
-      .then((r) => r.data);
-  }
 }
 
 /**
  * Helper designed to supply non-paginated results for the top level menu cluster resources
  */
 export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
+  protected hasProvCluster: boolean;
+
   constructor({ $store }: {
     $store: VuexStore,
   }) {
     super({ $store });
 
+    this.hasProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
+
     if (this.hasProvCluster) {
       $store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
     }
@@ -664,9 +595,6 @@ class TopLevelMenuHelperService {
     const canPagination = $store.getters[`management/paginationEnabled`]({
       id:      MANAGEMENT.CLUSTER,
       context: 'side-bar',
-    }) && $store.getters[`management/paginationEnabled`]({
-      id:      CAPI.RANCHER_CLUSTER,
-      context: 'side-bar',
     });
 
     this._helper = canPagination ? new TopLevelMenuHelperPagination({ $store }) : new TopLevelMenuHelperLegacy({ $store });

package/components/nav/__tests__/TopLevelMenu.helper.test.ts

@@ -102,7 +102,7 @@ describe('topLevelMenu.helper', () => {
     it('should initialize PaginationWrappers', () => {
       mockStore.getters['management/schemaFor'].mockReturnValue(true);
       new TopLevelMenuHelperPagination({ $store: mockStore });
-      expect(PaginationWrapper).toHaveBeenCalledTimes(3);
+      expect(PaginationWrapper).toHaveBeenCalledTimes(2);
     });
 
     it('should update clusters correctly', async() => {
@@ -113,19 +113,13 @@ describe('topLevelMenu.helper', () => {
       const mgmtOthers = [{
         id: 'c2', nameDisplay: 'Other', isReady: true, pinned: false, pin: jest.fn(), unpin: jest.fn()
       }];
-      const provClusters = [
-        { mgmtClusterId: 'c1' },
-        { mgmtClusterId: 'c2' }
-      ];
 
       const mockRequestPinned = jest.fn().mockResolvedValue({ data: mgmtPinned });
       const mockRequestOthers = jest.fn().mockResolvedValue({ data: mgmtOthers });
-      const mockRequestProv = jest.fn().mockResolvedValue({ data: provClusters });
 
       (PaginationWrapper as unknown as jest.Mock)
         .mockImplementationOnce(() => ({ request: mockRequestPinned, onDestroy: jest.fn() }))
-        .mockImplementationOnce(() => ({ request: mockRequestOthers, onDestroy: jest.fn() }))
-        .mockImplementationOnce(() => ({ request: mockRequestProv, onDestroy: jest.fn() }));
+        .mockImplementationOnce(() => ({ request: mockRequestOthers, onDestroy: jest.fn() }));
 
       const helper = new TopLevelMenuHelperPagination({ $store: mockStore });
 
@@ -169,57 +163,12 @@ describe('topLevelMenu.helper', () => {
         },
         revision: undefined
       });
-      expect(mockRequestProv).toHaveBeenCalledWith({
-        forceWatch: undefined,
-        pagination: {
-          filters: [{
-            equals: true,
-            fields: [{
-              equals: true, exact: true, field: 'status.clusterName', value: mgmtOthers[0].id
-            }, {
-              equals: true, exact: true, field: 'status.clusterName', value: mgmtPinned[0].id
-            }],
-            param: 'filter'
-          }],
-          page:                 1,
-          projectsOrNamespaces: [],
-          sort:                 []
-        },
-        revision: undefined
-      });
 
       expect(helper.clustersPinned).toHaveLength(1);
       expect(helper.clustersPinned[0].id).toBe('c1');
       expect(helper.clustersOthers).toHaveLength(1);
       expect(helper.clustersOthers[0].id).toBe('c2');
     });
-
-    it('should filter out mgmt clusters without matching prov clusters', async() => {
-      mockStore.getters['management/schemaFor'].mockReturnValue(true);
-      const mgmtOthers = [{
-        id: 'c2', nameDisplay: 'Other', isReady: true, pinned: false, pin: jest.fn(), unpin: jest.fn()
-      }];
-      // No prov cluster for c2
-      const provClusters: any[] = [];
-
-      const mockRequestPinned = jest.fn().mockResolvedValue({ data: [] });
-      const mockRequestOthers = jest.fn().mockResolvedValue({ data: mgmtOthers });
-      const mockRequestProv = jest.fn().mockResolvedValue({ data: provClusters });
-
-      (PaginationWrapper as unknown as jest.Mock)
-        .mockImplementationOnce(() => ({ request: mockRequestPinned, onDestroy: jest.fn() }))
-        .mockImplementationOnce(() => ({ request: mockRequestOthers, onDestroy: jest.fn() }))
-        .mockImplementationOnce(() => ({ request: mockRequestProv, onDestroy: jest.fn() }));
-
-      const helper = new TopLevelMenuHelperPagination({ $store: mockStore });
-
-      await helper.update({
-        searchTerm: '',
-        pinnedIds:  [],
-      });
-
-      expect(helper.clustersOthers).toHaveLength(0);
-    });
   });
 
   describe('class: TopLevelMenuHelperService', () => {

package/composables/useIsNewDetailPageEnabled.test.ts

@@ -0,0 +1,98 @@
+import { useIsNewDetailPageEnabled } from '@shell/composables/useIsNewDetailPageEnabled';
+
+const mockStore: any = { getters: {} };
+const mockRoute: any = { query: {} };
+
+jest.mock('vuex', () => ({ useStore: () => mockStore }));
+jest.mock('vue-router', () => ({ useRoute: () => mockRoute }));
+
+const mockGetVersionInfo = jest.fn(() => ({ fullVersion: '2.12.0' }));
+
+jest.mock('@shell/utils/version', () => ({ getVersionInfo: (...args: any[]) => mockGetVersionInfo(...args) }));
+
+describe('useIsNewDetailPageEnabled', () => {
+  beforeEach(() => {
+    mockRoute.query = {};
+    mockGetVersionInfo.mockReturnValue({ fullVersion: '2.12.0' });
+  });
+
+  describe('version gating', () => {
+    it('should return false when version is below 2.12.0', () => {
+      mockGetVersionInfo.mockReturnValue({ fullVersion: '2.11.9' });
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(false);
+    });
+
+    it('should return false when version is 2.10.0', () => {
+      mockGetVersionInfo.mockReturnValue({ fullVersion: '2.10.0' });
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(false);
+    });
+
+    it('should return true when version is exactly 2.12.0 and no legacy query', () => {
+      mockGetVersionInfo.mockReturnValue({ fullVersion: '2.12.0' });
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(true);
+    });
+
+    it('should return true when version is above 2.12.0', () => {
+      mockGetVersionInfo.mockReturnValue({ fullVersion: '2.13.0' });
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(true);
+    });
+
+    it('should return false when version is undefined', () => {
+      mockGetVersionInfo.mockReturnValue({ fullVersion: undefined });
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(false);
+    });
+
+    it('should return false when version is null', () => {
+      mockGetVersionInfo.mockReturnValue({ fullVersion: null });
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(false);
+    });
+
+    it('should handle pre-release version strings', () => {
+      mockGetVersionInfo.mockReturnValue({ fullVersion: 'v2.12.1-rc1' });
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(true);
+    });
+  });
+
+  describe('legacy query param (with version >= 2.12.0)', () => {
+    it('should return true when no legacy query param is present', () => {
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(true);
+    });
+
+    it('should return false when legacy query param is "true"', () => {
+      mockRoute.query = { legacy: 'true' };
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(false);
+    });
+
+    it('should return true when legacy query param is "false"', () => {
+      mockRoute.query = { legacy: 'false' };
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(true);
+    });
+
+    it('should return true when legacy query param has an unexpected value', () => {
+      mockRoute.query = { legacy: 'something' };
+      const result = useIsNewDetailPageEnabled();
+
+      expect(result.value).toBe(true);
+    });
+  });
+});

package/composables/useIsNewDetailPageEnabled.ts

@@ -1,6 +1,9 @@
 import { useRoute } from 'vue-router';
 import { LEGACY } from '@shell/config/query-params';
 import { computed } from 'vue';
+import { getVersionInfo } from '@shell/utils/version';
+import semver from 'semver';
+import { useStore } from 'vuex';
 
 const enabledByDefault = true;
 
@@ -8,6 +11,15 @@ export const useIsNewDetailPageEnabled = () => {
   const route = useRoute();
 
   return computed(() => {
+    const store = useStore();
+    const { fullVersion } = getVersionInfo(store);
+
+    const coerced = semver.coerce(fullVersion) || { version: '0.0.0' };
+
+    if (!semver.gte(coerced.version, '2.12.0')) {
+      return false;
+    }
+
     if (enabledByDefault) {
       return route?.query?.[LEGACY] !== 'true';
     }

package/config/private-label.js

@@ -1,5 +1,6 @@
 import { SETTING } from './settings';
 import { CURRENT_RANCHER_VERSION } from './version';
+import { requireAsset } from '@shell/utils/require-asset';
 
 export const ANY = 0;
 export const STANDARD = 1;
@@ -78,7 +79,7 @@ export function setTitle() {
   const v = getVendor();
 
   if (v === 'Harvester') {
-    const ico = require(`~shell/assets/images/pl/harvester.png`);
+    const ico = requireAsset(`~shell/assets/images/pl/harvester.png`);
 
     document.title = 'Harvester';
     const link = document.createElement('link');

package/config/product/apps.js

@@ -53,6 +53,7 @@ export function init(store) {
 
   configureType(CATALOG.APP, { isCreatable: false, isEditable: false });
   configureType(CATALOG.OPERATION, { isCreatable: false, isEditable: false });
+  configureType(CATALOG.CLUSTER_REPO, { listCreateButtonLabelKey: 'catalog.repo.add' });
 
   const repoType = {
     name:     'type',

package/config/product/explorer.js

@@ -19,7 +19,7 @@ import {
   USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, USER_LAST_LOGIN, USER_DISABLED_IN, USER_DELETED_IN, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
-  DESCRIPTION, SUB_TYPE, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
+  ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, LAST_USED, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
   DURATION, MESSAGE, REASON, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA,
   EVENT_LAST_SEEN_TIME,
   EVENT_FIRST_SEEN_TIME,
@@ -546,6 +546,16 @@ export function init(store) {
     AGE
   ]);
 
+  headers(NORMAN.TOKEN, [
+    EXPIRY_STATE,
+    ACCESS_KEY,
+    DESCRIPTION,
+    SCOPE_NORMAN,
+    LAST_USED,
+    EXPIRES,
+    AGE_NORMAN
+  ]);
+
   virtualType({
     label:      store.getters['i18n/t']('clusterIndexPage.header'),
     group:      'Root',

package/config/table-headers.js

@@ -1033,15 +1033,6 @@ export const SCOPE_NORMAN = {
   sort:  ['clusterId'],
 };
 
-export const NORMAN_KEY_DEPRECATION = {
-  name:        'isNormanKeyDeprecated',
-  labelKey:    'tableHeaders.isLegacy',
-  value:       (row) => row.isDeprecated ? 'True' : undefined,
-  sort:        'isDeprecated',
-  align:       'left',
-  dashIfEmpty: true,
-};
-
 export const EXPIRES = {
   name:      'expires',
   value:     'expiresAt',

package/config/types.js

@@ -269,7 +269,6 @@ export const EXT = {
   GROUP_MEMBERSHIP_REFRESH_REQUESTS: 'ext.cattle.io.groupmembershiprefreshrequest',
   PASSWORD_CHANGE_REQUESTS:          'ext.cattle.io.passwordchangerequest',
   KUBECONFIG:                        'ext.cattle.io.kubeconfig',
-  TOKEN:                             'ext.cattle.io.token',
 };
 
 export const CAPI = {