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

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/pagination-table-headers.js

@@ -1,7 +1,9 @@
+import { UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
 import {
   STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
   EVENT_LAST_SEEN_TIME,
-  EVENT_TYPE
+  EVENT_TYPE,
+  SECRET_CLONE
 } from '@shell/config/table-headers';
 
 // This file contains table headers
@@ -78,3 +80,8 @@ export const STEVE_LIST_GROUPS = [{
   tooltipKey:    'resourceTable.groupBy.namespace',
   groupLabelKey: 'groupByLabel',
 }];
+
+export const STEVE_SECRET_CLONE = {
+  ...SECRET_CLONE,
+  sort: `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`,
+};

package/config/private-label.js

@@ -59,7 +59,6 @@ export function matches(pl) {
 
 export function getVendor() {
 
-
   return 'HCI';
 }
 // export function getVendor() {

package/config/product/auth.js

@@ -24,11 +24,11 @@ export function init(store) {
     spoofedType,
     virtualType,
   } = DSL(store, NAME);
-  console.log('------------------------------------------------2')
+
   product({
     ifHaveType:          new RegExp(`${ MANAGEMENT.USER }|${ MANAGEMENT.AUTH_CONFIG }`, 'i'),
     ifHaveVerb:          'GET',
-    // ifFeature:           MULTI_CLUSTER,
+    ifFeature:           MULTI_CLUSTER,
     inStore:             'management',
     icon:                'user',
     removable:           false,
@@ -62,8 +62,19 @@ export function init(store) {
       }
     }
   });
+
   configureType(MANAGEMENT.USER, { showListMasthead: false });
 
+  configureType(MANAGEMENT.OIDC_CLIENT, {
+    listCreateButtonLabelKey: 'oidcclient.listViewCreate',
+    isCreatable:              true,
+    isEditable:               true,
+    isRemovable:              true,
+    showAge:                  true,
+    showState:                true,
+    canYaml:                  true,
+  });
+
   spoofedType({
     labelKey:          'typeLabel."group.principal"',
     type:              NORMAN.SPOOFED.GROUP_PRINCIPAL,
@@ -132,6 +143,7 @@ export function init(store) {
         }));
     }
   });
+
   configureType(NORMAN.SPOOFED.GROUP_PRINCIPAL, {
     isCreatable:      false,
     showAge:          false,
@@ -139,9 +151,11 @@ export function init(store) {
     isRemovable:      false,
     showListMasthead: false,
   });
+
   // Use labelFor... so lookup succeeds with .'s in path.... and end result is 'trimmed' as per other entries
   mapType(NORMAN.SPOOFED.GROUP_PRINCIPAL, store.getters['type-map/labelFor']({ id: NORMAN.SPOOFED.GROUP_PRINCIPAL }, 2));
   weightType(NORMAN.SPOOFED.GROUP_PRINCIPAL, 101, true);
+  weightType(MANAGEMENT.OIDC_CLIENT, 90, true);
 
   virtualType({
     labelKey:   'auth.roleTemplate',
@@ -175,6 +189,7 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/azuread`, 'auth/azuread');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloakoidc`, 'auth/oidc');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
+  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/cognito`, 'auth/oidc');
 
   const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
 
@@ -183,7 +198,8 @@ export function init(store) {
       'config',
       USERS_VIRTUAL_TYPE,
       NORMAN.SPOOFED.GROUP_PRINCIPAL,
-      ROLES_VIRTUAL_TYPE
+      ROLES_VIRTUAL_TYPE,
+      MANAGEMENT.OIDC_CLIENT
     ]);
   } else {
     basicType([
@@ -192,6 +208,7 @@ export function init(store) {
     ]);
   }
 
+
   headers(NORMAN.SPOOFED.GROUP_PRINCIPAL, [
     GROUP_NAME,
     GROUP_ROLE_NAME

package/config/product/{cis.js → compliance.js}

@@ -1,9 +1,9 @@
 import { DSL } from '@shell/store/type-map';
-import { CIS } from '@shell/config/types';
+import { COMPLIANCE } from '@shell/config/types';
 import { STATE, NAME as NAME_HEADER, AGE } from '@shell/config/table-headers';
 
-export const NAME = 'cis';
-export const CHART_NAME = 'rancher-cis-benchmark';
+export const NAME = 'compliance';
+export const CHART_NAME = 'rancher-compliance';
 
 export function init(store) {
   const {
@@ -14,24 +14,21 @@ export function init(store) {
     headers
   } = DSL(store, NAME);
 
-  product({
-    ifHaveGroup: /^(.*\.)*cis\.cattle\.io$/,
-    icon:        'cis',
-  });
+  product({ ifHaveGroup: /^(.*\.)*compliance\.cattle\.io$/ });
 
-  weightType(CIS.CLUSTER_SCAN, 3, true);
-  weightType(CIS.CLUSTER_SCAN_PROFILE, 2, true);
-  weightType(CIS.BENCHMARK, 1, true);
+  weightType(COMPLIANCE.CLUSTER_SCAN, 3, true);
+  weightType(COMPLIANCE.CLUSTER_SCAN_PROFILE, 2, true);
+  weightType(COMPLIANCE.BENCHMARK, 1, true);
 
   basicType([
-    'cis.cattle.io.clusterscan',
-    'cis.cattle.io.clusterscanprofile',
-    'cis.cattle.io.clusterscanbenchmark',
+    'compliance.cattle.io.clusterscan',
+    'compliance.cattle.io.clusterscanprofile',
+    'compliance.cattle.io.clusterscanbenchmark',
   ]);
 
-  configureType(CIS.CLUSTER_SCAN, { canYaml: false, showAge: false });
+  configureType(COMPLIANCE.CLUSTER_SCAN, { canYaml: false, showAge: false });
 
-  headers(CIS.CLUSTER_SCAN, [
+  headers(COMPLIANCE.CLUSTER_SCAN, [
     STATE,
     NAME_HEADER,
     {
@@ -44,7 +41,7 @@ export function init(store) {
     },
     {
       name:      'total',
-      labelKey:  'cis.scan.total',
+      labelKey:  'compliance.scan.total',
       value:     'status.summary.total',
       formatter: 'ScanResult'
 
@@ -52,34 +49,34 @@ export function init(store) {
     {
       name:      'pass',
       value:     'status.summary.pass',
-      labelKey:  'cis.scan.pass',
+      labelKey:  'compliance.scan.pass',
       formatter: 'ScanResult'
 
     },
     {
       name:      'fail',
-      labelKey:  'cis.scan.fail',
+      labelKey:  'compliance.scan.fail',
       value:     'status.summary.fail',
       formatter: 'ScanResult'
 
     },
     {
       name:      'warn',
-      labelKey:  'cis.scan.warn',
+      labelKey:  'compliance.scan.warn',
       value:     'status.summary.warn',
       formatter: 'ScanResult'
 
     },
     {
       name:      'skip',
-      labelKey:  'cis.scan.skip',
+      labelKey:  'compliance.scan.skip',
       value:     'status.summary.skip',
       formatter: 'ScanResult'
 
     },
     {
       name:      'notApplicable',
-      labelKey:  'cis.scan.notApplicable',
+      labelKey:  'compliance.scan.notApplicable',
       value:     'status.summary.notApplicable',
       formatter: 'ScanResult'
 
@@ -107,12 +104,12 @@ export function init(store) {
     },
   ]);
 
-  headers(CIS.CLUSTER_SCAN_PROFILE, [
+  headers(COMPLIANCE.CLUSTER_SCAN_PROFILE, [
     STATE,
     NAME_HEADER,
     {
       name:          'benchmarkVersion',
-      labelKey:      'cis.benchmarkVersion',
+      labelKey:      'compliance.benchmarkVersion',
       value:         'spec.benchmarkVersion',
       formatter:     'Link',
       formatterOpts: { options: { internal: true }, urlKey: 'benchmarkVersionLink' },
@@ -120,18 +117,18 @@ export function init(store) {
     },
     {
       name:     'skippedTests',
-      labelKey: 'cis.testsSkipped',
+      labelKey: 'compliance.testsSkipped',
       value:    'numberTestsSkipped',
       sort:     ['numberTestsSkipped']
     }
   ]);
 
-  headers(CIS.BENCHMARK, [
+  headers(COMPLIANCE.BENCHMARK, [
     STATE,
     NAME_HEADER,
     {
       name:     'clusterProvider',
-      labelKey: 'cis.clusterProvider',
+      labelKey: 'compliance.clusterProvider',
       value:    'spec.clusterProvider',
     },
     {