dashboard-shell-shell 1.0.10000011122 → 1.6.0-alpha.1

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/useClickOutside.ts

@@ -76,6 +76,6 @@ export const useClickOutside = <T extends OnClickOutsideOptions>(
 
   onBeforeUnmount(() => {
     window.removeEventListener('click', listener as any);
-    window.removeEventListener('pointerDown', setShouldListen);
+    window.removeEventListener('pointerdown', setShouldListen);
   });
 };

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

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,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',
@@ -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,13 +189,25 @@ 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')
+
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'config',
+      USERS_VIRTUAL_TYPE,
+      NORMAN.SPOOFED.GROUP_PRINCIPAL,
+      ROLES_VIRTUAL_TYPE,
+      MANAGEMENT.OIDC_CLIENT
+    ]);
+  } else {
+    basicType([
+      USERS_VIRTUAL_TYPE,
+      ROLES_VIRTUAL_TYPE
+    ]);
+  }
 
-  basicType([
-    'config',
-    USERS_VIRTUAL_TYPE,
-    NORMAN.SPOOFED.GROUP_PRINCIPAL,
-    ROLES_VIRTUAL_TYPE
-  ]);
 
   headers(NORMAN.SPOOFED.GROUP_PRINCIPAL, [
     GROUP_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',
     },
     {

package/config/product/explorer.js

@@ -21,7 +21,7 @@ import {
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
   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_LAST_SEEN_TIME,
 } from '@shell/config/table-headers';
 
 import { DSL } from '@shell/store/type-map';
@@ -32,7 +32,7 @@ import {
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
-import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
 
 export const NAME = 'explorer';
 
@@ -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,
@@ -94,6 +115,8 @@ export function init(store) {
     PVC,
     STORAGE_CLASS,
     SECRET,
+    VIRTUAL_TYPES.PROJECT_SECRETS,
+    VIRTUAL_TYPES.NAMESPACES,
     CONFIG_MAP
   ], 'storage');
   basicType([
@@ -106,6 +129,10 @@ export function init(store) {
     POD,
   ], 'workload');
 
+  setGroupDefaultType('workload', () => {
+    return store.getters['features/get'](STEVE_CACHE) ? WORKLOAD_TYPES.DEPLOYMENT : undefined;
+  });
+
   weightGroup('cluster', 99, true);
   weightGroup('workload', 98, true);
   weightGroup('serviceDiscovery', 96, true);
@@ -160,7 +187,7 @@ export function init(store) {
   mapGroup(/^(.*\.)?(k3s)\.cattle\.io$/, 'K3s');
   mapGroup(/^(.*\.)?(helm)\.cattle\.io$/, 'Helm');
   mapGroup(/^(.*\.)?upgrade\.cattle\.io$/, 'Upgrade Controller');
-  mapGroup(/^(.*\.)?cis\.cattle\.io$/, 'CIS');
+  mapGroup(/^(.*\.)?compliance\.cattle\.io$/, 'Compliance');
   mapGroup(/^(.*\.)?traefik\.containo\.us$/, 'Træfik');
   mapGroup(/^(catalog|management|project|ui)\.cattle\.io$/, 'Rancher');
   mapGroup(/^(.*\.)?istio\.io$/, 'Istio');
@@ -183,7 +210,12 @@ export function init(store) {
   configureType(NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
   configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
   configureType(SNAPSHOT, { depaginate: true });
-  configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
+
+  configureType(SECRET, { showListMasthead: false });
+  weightType(SECRET, 1, false);
+
+  configureType(VIRTUAL_TYPES.PROJECT_SECRETS, { showListMasthead: false });
+  weightType(VIRTUAL_TYPES.PROJECT_SECRETS, 2, false);
 
   configureType(EVENT, { limit: 500 });
   weightType(EVENT, -1, true);
@@ -283,7 +315,7 @@ export function init(store) {
       STEVE_NAMESPACE_COL,
       {
         ...INGRESS_TARGET,
-        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields)
+        sort:   'spec.rules[0].host', // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
         search: false, // This is broken in normal world, so disable here
       },
       {
@@ -294,7 +326,7 @@ export function init(store) {
       {
         ...INGRESS_CLASS,
         sort:   'spec.ingressClassName',
-        search: 'spec.ingressClassName', // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+        search: 'spec.ingressClassName',
       },
       STEVE_AGE_COL
     ]
@@ -305,8 +337,11 @@ export function init(store) {
     [
       STEVE_STATE_COL,
       STEVE_NAME_COL,
-      STEVE_NAMESPACE_COL,
-      TARGET_PORT,
+      STEVE_NAMESPACE_COL, {
+        ...TARGET_PORT,
+        sort:   false,
+        search: false,
+      },
       {
         // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
         ...SELECTOR,
@@ -315,8 +350,8 @@ export function init(store) {
       },
       {
         ...SPEC_TYPE,
-        sort:   false, // ['spec.type', 'spec.clusterIP'] Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
-        search: 'spec.type',
+        sort:   ['spec.type'],
+        search: 'spec.type'
       },
       STEVE_AGE_COL
     ]
@@ -345,10 +380,10 @@ export function init(store) {
       STEVE_STATE_COL,
       STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
-      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
-      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
-      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
-      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      HPA_REFERENCE, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
+      MIN_REPLICA, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
+      MAX_REPLICA, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
+      CURRENT_REPLICA, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
       STEVE_AGE_COL
     ]
   );
@@ -496,8 +531,8 @@ export function init(store) {
       },
       {
         ...STORAGE_CLASS_DEFAULT,
-        sort:   false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
-        search: false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+        sort:   [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
+        search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
       },
       STEVE_AGE_COL
     ]
@@ -617,6 +652,25 @@ export function init(store) {
     exact:            true,
   });
 
+  virtualType({
+    label:            store.getters['i18n/t'](`typeLabel.${ VIRTUAL_TYPES.PROJECT_SECRETS }`, { count: 2 }),
+    group:            'storage',
+    icon:             'globe',
+    namespaced:       false,
+    ifRancherCluster: true,
+    name:             VIRTUAL_TYPES.PROJECT_SECRETS,
+    weight:           -1,
+    route:            {
+      name:   'c-cluster-product-resource',
+      params: { resource: VIRTUAL_TYPES.PROJECT_SECRETS }
+    },
+    exact:      true,
+    ifHaveType: [{
+      store: 'management',
+      type:  SECRET
+    }],
+  });
+
   // Ignore these types as they are managed through the settings product
   ignoreType(MANAGEMENT.FEATURE);
   ignoreType(MANAGEMENT.SETTING);