@rancher/shell 3.0.5-rc.5 → 3.0.5-rc.7

package/config/product/settings.js

@@ -1,5 +1,5 @@
 import { DSL } from '@shell/store/type-map';
-import { MANAGEMENT, HELM } from '@shell/config/types';
+import { FLEET, MANAGEMENT, HELM } from '@shell/config/types';
 import {
   STATE,
   FEATURE_DESCRIPTION,
@@ -35,7 +35,7 @@ export function init(store) {
     labelKey:   'advancedSettings.label',
     name:       'settings',
     namespaced: false,
-    weight:     100,
+    weight:     101,
     icon:       'folder',
     route:      {
       name:   'c-cluster-product-resource',
@@ -51,7 +51,7 @@ export function init(store) {
     labelKey:   'featureFlags.label',
     name:       'features',
     namespaced: false,
-    weight:     99,
+    weight:     100,
     icon:       'folder',
     route:      {
       name:   'c-cluster-product-resource',
@@ -64,22 +64,22 @@ export function init(store) {
 
   virtualType({
     ifHaveType: MANAGEMENT.SETTING,
-    labelKey:   'branding.label',
-    name:       'brand',
+    labelKey:   'banner.settingName',
+    name:       'banners',
     namespaced: false,
-    weight:     98,
+    weight:     99,
     icon:       'folder',
-    route:      { name: 'c-cluster-settings-brand' }
+    route:      { name: 'c-cluster-settings-banners' }
   });
 
   virtualType({
     ifHaveType: MANAGEMENT.SETTING,
-    labelKey:   'banner.settingName',
-    name:       'banners',
+    labelKey:   'branding.label',
+    name:       'brand',
     namespaced: false,
     weight:     98,
     icon:       'folder',
-    route:      { name: 'c-cluster-settings-banners' }
+    route:      { name: 'c-cluster-settings-brand' }
   });
 
   virtualType({
@@ -102,13 +102,24 @@ export function init(store) {
     route:      { name: 'c-cluster-settings-links' }
   });
 
+  virtualType({
+    ifHaveType: FLEET.GIT_REPO,
+    labelKey:   'fleet.settings.label',
+    name:       'fleet-settings',
+    namespaced: false,
+    weight:     95,
+    icon:       'folder',
+    route:      { name: 'c-cluster-settings-fleet' }
+  });
+
   basicType([
     'settings',
     'features',
     'brand',
     'banners',
     'performance',
-    'links'
+    'links',
+    'fleet-settings'
   ]);
 
   configureType(MANAGEMENT.SETTING, {

package/config/query-params.js

@@ -79,3 +79,16 @@ export const CLOUD_CREDENTIAL = 'cloud';
 // NAMESPACE/PROJECT
 export const PROJECT_ID = 'projectId';
 export const FLAT_VIEW = 'flatView';
+
+/**
+ * Used on the secret create/edit page to determine
+ * 1. if the user is creating a normal secret, or a project scoped secret
+ * 2. where to return the user on cancel/save
+ */
+export const SECRET_QUERY_PARAMS = {
+  NAMESPACED:     'namespaced',
+  PROJECT_SCOPED: 'project-scoped'
+};
+export const SECRET_SCOPE = 'scope';
+// RANCHER OIDC CLIENT
+export const RANCHER_AS_OIDC_QUERY_PARAMS = ['scope', 'client_id', 'redirect_uri', 'response_type'];

package/config/roles.ts

@@ -264,7 +264,7 @@ export const SCOPED_RESOURCES = {
         'Jobs',
       ]
     },
-    'cis.cattle.io': {
+    'compliance.cattle.io': {
       resources: [
         'ClusterScans',
         'ClusterScanReports'

package/config/router/navigation-guards/authentication.js

@@ -1,12 +1,58 @@
 import { routeRequiresAuthentication } from '@shell/utils/router';
 import { isLoggedIn, notLoggedIn, noAuth, findMe } from '@shell/utils/auth';
+import { RANCHER_AS_OIDC_QUERY_PARAMS } from '@shell/config/query-params';
+
+const R_OIDC_PROV_PARAMS = 'rancher-as-oidc-prov-params';
+
+/**
+ * Detect if we've come from an OIDC client
+ */
+function isRancherOidcProviderLogin(queryParams) {
+  return queryParams && Object.keys(queryParams).length && RANCHER_AS_OIDC_QUERY_PARAMS.every((item) => Object.keys(queryParams).includes(item));
+}
+
+/**
+ * If we've logged in on a request from an OIDC client return to it
+ */
+function handleOidcRedirectToCallbackUrl() {
+  const rancherAsOidcProvider = sessionStorage.getItem(R_OIDC_PROV_PARAMS);
+
+  if (rancherAsOidcProvider) {
+    window.location.href = `${ window.location.origin }/oidc/authorize${ rancherAsOidcProvider }&code_challenge_method=S256`;
+    sessionStorage.removeItem(R_OIDC_PROV_PARAMS);
+  }
+}
 
 export function install(router, context) {
   router.beforeEach(async(to, from, next) => await authenticate(to, from, next, context));
 }
 
+/**
+ * Generate an object that includes both the v3User and the me data
+ * @param {*} v3User V3 user information
+ * @param {*} me Me user data
+ * @returns User info to be passed to `isLoggedIn`
+ */
+function getUserObject(v3User, me) {
+  return {
+    id: me.id,
+    me,
+    v3User,
+  };
+}
+
 export async function authenticate(to, from, next, { store }) {
   if (!routeRequiresAuthentication(to)) {
+    if (to.name === 'auth-login') {
+      if (isRancherOidcProviderLogin(to.query)) {
+        // If redirected here from an oidc client persist the values we need to return to it once rancher auth is complete...
+        sessionStorage.setItem(R_OIDC_PROV_PARAMS, window.location.search);
+      } else if (sessionStorage.getItem(R_OIDC_PROV_PARAMS)) {
+        // ... otherwise clear it (to avoid a redirect to it on successful log in)
+        sessionStorage.removeItem(R_OIDC_PROV_PARAMS);
+      }
+    }
+
     return next();
   }
 
@@ -25,10 +71,12 @@ export async function authenticate(to, from, next, { store }) {
 
     if ( fromHeader === 'none' ) {
       noAuth(store);
+      handleOidcRedirectToCallbackUrl();
     } else if ( fromHeader === 'true' ) {
       const me = await findMe(store);
 
-      isLoggedIn(store, me);
+      await isLoggedIn(store, getUserObject(v3User, me));
+      handleOidcRedirectToCallbackUrl();
     } else if ( fromHeader === 'false' ) {
       notLoggedIn(store, next, to);
 
@@ -38,7 +86,8 @@ export async function authenticate(to, from, next, { store }) {
       try {
         const me = await findMe(store);
 
-        isLoggedIn(store, me);
+        await isLoggedIn(store, getUserObject(v3User, me));
+        handleOidcRedirectToCallbackUrl();
       } catch (e) {
         const status = e?._status;
 

package/config/router/routes.js

@@ -1,13 +1,15 @@
 import { NAME as APPS } from '@shell/config/product/apps';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { NAME as MANAGER } from '@shell/config/product/manager';
-import { CAPI, MANAGEMENT, BACKUP_RESTORE, CIS } from '@shell/config/types';
+import {
+  CAPI, MANAGEMENT, BACKUP_RESTORE, COMPLIANCE, VIRTUAL_TYPES
+} from '@shell/config/types';
 import { NAME as AUTH } from '@shell/config/product/auth';
 
 // All these imports are related to the install-redirect.js navigation guard.
 import { installRedirectRouteMeta } from '@shell/config/router/navigation-guards/install-redirect';
 import { NAME as BACKUP_NAME, CHART_NAME as BACKUP_CHART_NAME } from '@shell/config/product/backup';
-import { NAME as CIS_NAME, CHART_NAME as CIS_CHART_NAME } from '@shell/config/product/cis';
+import { NAME as COMPLIANCE_NAME, CHART_NAME as COMPLIANCE_CHART_NAME } from '@shell/config/product/compliance';
 import { NAME as GATEKEEPER_NAME, CHART_NAME as GATEKEEPER_CHART_NAME } from '@shell/config/product/gatekeeper';
 import { NAME as ISTIO_NAME, CHART_NAME as ISTIO_CHART_NAME } from '@shell/config/product/istio';
 import { NAME as LOGGING_NAME, CHART_NAME as LOGGING_CHART_NAME } from '@shell/config/product/logging';
@@ -207,17 +209,25 @@ export default [
         name: 'c-cluster-backup',
         meta: { ...installRedirectRouteMeta(BACKUP_NAME, BACKUP_CHART_NAME, BACKUP_RESTORE.BACKUP) }
       }, {
-        path: '/c/:cluster/cis',
-        name: 'c-cluster-cis',
-        meta: { ...installRedirectRouteMeta(CIS_NAME, CIS_CHART_NAME, CIS.CLUSTER_SCAN) }
+        path: '/c/:cluster/compliance',
+        name: 'c-cluster-compliance',
+        meta: { ...installRedirectRouteMeta(COMPLIANCE_NAME, COMPLIANCE_CHART_NAME, COMPLIANCE.CLUSTER_SCAN) }
       }, {
         path:      '/c/:cluster/fleet',
         component: () => interopDefault(import('@shell/pages/c/_cluster/fleet/index.vue')),
         name:      'c-cluster-fleet',
+        meta:      {
+          detailLocation: 'c-cluster-fleet-application-resource-namespace-id',
+          doneOverride:   'c-cluster-fleet',
+        },
       }, {
         path:      '/c/:cluster/fleet/application',
         component: () => interopDefault(import('@shell/pages/c/_cluster/fleet/application/index.vue')),
         name:      'c-cluster-fleet-application',
+        meta:      {
+          detailLocation: 'c-cluster-fleet-application-resource-namespace-id',
+          doneOverride:   'c-cluster-fleet-application',
+        },
       }, {
         path:      '/c/:cluster/fleet/application/create',
         component: () => interopDefault(import('@shell/pages/c/_cluster/fleet/application/create.vue')),
@@ -225,11 +235,19 @@ export default [
       }, {
         path:      '/c/:cluster/fleet/application/:resource/create',
         component: () => interopDefault(import('@shell/pages/c/_cluster/fleet/application/_resource/create.vue')),
-        name:      'c-cluster-fleet-application-resource-create'
+        name:      'c-cluster-fleet-application-resource-create',
+        meta:      {
+          detailLocation: 'c-cluster-fleet-application-resource-namespace-id',
+          doneOverride:   'c-cluster-fleet-application',
+        },
       }, {
         path:      '/c/:cluster/fleet/application/:resource/:namespace/:id?',
         component: () => interopDefault(import('@shell/pages/c/_cluster/fleet/application/_resource/_id.vue')),
-        name:      'c-cluster-fleet-application-resource-namespace-id'
+        name:      'c-cluster-fleet-application-resource-namespace-id',
+        meta:      {
+          detailLocation: 'c-cluster-fleet-application-resource-namespace-id',
+          doneOverride:   'c-cluster-fleet-application'
+        },
       }, {
         path:      '/c/:cluster/gatekeeper',
         component: () => interopDefault(import('@shell/pages/c/_cluster/gatekeeper/index.vue')),
@@ -240,18 +258,6 @@ export default [
         component: () => interopDefault(import('@shell/pages/c/_cluster/istio/index.vue')),
         name:      'c-cluster-istio',
         meta:      { ...installRedirectRouteMeta(ISTIO_NAME, ISTIO_CHART_NAME) }
-      }, {
-        path: '/c/:cluster/legacy',
-        redirect(to) {
-          return {
-            name:   'c-cluster-legacy-project',
-            params: {
-              ...(to?.params || {}),
-              product: EXPLORER,
-            }
-          };
-        },
-        name: 'c-cluster-legacy'
       }, {
         path:      '/c/:cluster/logging',
         component: () => interopDefault(import('@shell/pages/c/_cluster/logging/index.vue')),
@@ -309,6 +315,20 @@ export default [
             component: () => interopDefault(import('@shell/pages/c/_cluster/apps/charts/install.vue')),
             name:      'c-cluster-apps-charts-install',
           },
+          {
+            path: '/c/:cluster/apps/catalog.cattle.io.clusterrepo',
+            name: 'c-cluster-apps-catalog-repo',
+            redirect(to) {
+              return {
+                name:   'c-cluster-product-resource',
+                params: {
+                  ...to.params,
+                  product:  APPS,
+                  resource: 'catalog.cattle.io.clusterrepo',
+                }
+              };
+            },
+          },
         ]
       },
       {
@@ -331,10 +351,6 @@ export default [
         path:      '/c/:cluster/gatekeeper/constraints',
         component: () => interopDefault(import('@shell/pages/c/_cluster/gatekeeper/constraints/index.vue')),
         name:      'c-cluster-gatekeeper-constraints'
-      }, {
-        path:      '/c/:cluster/legacy/project',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/legacy/project/index.vue')),
-        name:      'c-cluster-legacy-project'
       }, {
         path:      '/c/:cluster/manager/cloudCredential',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/cloudCredential/index.vue')),
@@ -379,6 +395,10 @@ export default [
         path:      '/c/:cluster/settings/performance',
         component: () => interopDefault(import('@shell/pages/c/_cluster/settings/performance.vue')),
         name:      'c-cluster-settings-performance'
+      }, {
+        path:      '/c/:cluster/settings/fleet',
+        component: () => interopDefault(import('@shell/pages/c/_cluster/fleet/settings/index.vue')),
+        name:      'c-cluster-settings-fleet'
       }, {
         path:      '/c/:cluster/auth/group.principal/assign-edit',
         component: () => interopDefault(import('@shell/pages/c/_cluster/auth/group.principal/assign-edit.vue')),
@@ -416,14 +436,6 @@ export default [
         path:      '/c/:cluster/auth/config/:id',
         component: () => interopDefault(import('@shell/pages/c/_cluster/auth/config/_id.vue')),
         name:      'c-cluster-auth-config-id'
-      }, {
-        path:      '/c/:cluster/legacy/pages/:page?',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/legacy/pages/_page.vue')),
-        name:      'c-cluster-legacy-pages-page'
-      }, {
-        path:      '/c/:cluster/legacy/project/:page',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/legacy/project/_page.vue')),
-        name:      'c-cluster-legacy-project-page'
       }, {
         path:      '/c/:cluster/manager/cloudCredential/:id',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/cloudCredential/_id.vue')),
@@ -497,6 +509,10 @@ export default [
         component: () => interopDefault(import('@shell/pages/c/_cluster/_product/_resource/_id.vue')),
         name:      'c-cluster-product-resource-id',
         meta:      { asyncSetup: true }
+      }, {
+        path:      `/c/:cluster/:product/${ VIRTUAL_TYPES.PROJECT_SECRETS }/:namespace/:id`,
+        component: () => interopDefault(import(`@shell/pages/c/_cluster/explorer/${ VIRTUAL_TYPES.PROJECT_SECRETS }.vue`)),
+        name:      `c-cluster-product-${ VIRTUAL_TYPES.PROJECT_SECRETS }-namespace-id`,
       }, {
         path:      '/c/:cluster/:product/:resource/:namespace/:id',
         component: () => interopDefault(import('@shell/pages/c/_cluster/_product/_resource/_namespace/_id.vue')),

package/config/settings.ts

@@ -45,11 +45,11 @@ export const SETTING = {
   AUTH_TOKEN_MAX_TTL_MINUTES:                    'auth-token-max-ttl-minutes',
   KUBECONFIG_GENERATE_TOKEN:                     'kubeconfig-generate-token',
   KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES:          'kubeconfig-default-token-ttl-minutes',
-  ENGINE_URL:                                    'engine-install-url',
   ENGINE_ISO_URL:                                'engine-iso-url',
   FIRST_LOGIN:                                   'first-login',
   INGRESS_IP_DOMAIN:                             'ingress-ip-domain',
   SERVER_URL:                                    'server-url',
+  RKE_METADATA_CONFIG:                           'rke-metadata-config',
   EULA_AGREED:                                   'eula-agreed',
   AUTH_USER_INFO_MAX_AGE_SECONDS:                'auth-user-info-max-age-seconds',
   AUTH_USER_SESSION_TTL_MINUTES:                 'auth-user-session-ttl-minutes',
@@ -106,6 +106,7 @@ export const SETTING = {
   DISABLE_INACTIVE_USER_AFTER:                   'disable-inactive-user-after',
   DELETE_INACTIVE_USER_AFTER:                    'delete-inactive-user-after',
   K3S_UPGRADER_UNINSTALL_CONCURRENCY:            'k3s-based-upgrader-uninstall-concurrency',
+  SYSTEM_AGENT_UPGRADER_INSTALL_CONCURRENCY:     'system-agent-upgrader-install-concurrency',
   IMPORTED_CLUSTER_VERSION_MANAGEMENT:           'imported-cluster-version-management',
   CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS:          'cluster-agent-default-priority-class',
   CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET: 'cluster-agent-default-pod-disruption-budget'
@@ -114,7 +115,6 @@ export const SETTING = {
 // These are the settings that are allowed to be edited via the UI
 export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.CA_CERTS]:            { kind: 'multiline', readOnly: true },
-  [SETTING.ENGINE_URL]:          {},
   [SETTING.ENGINE_ISO_URL]:      {},
   [SETTING.PASSWORD_MIN_LENGTH]: {
     kind:    'integer',
@@ -146,6 +146,7 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]: { kind: 'integer' },
   [SETTING.AUTH_USER_INFO_RESYNC_CRON]:           {},
   [SETTING.SERVER_URL]:                           { kind: 'url', canReset: true },
+  [SETTING.RKE_METADATA_CONFIG]:                  { kind: 'json' },
   [SETTING.SYSTEM_DEFAULT_REGISTRY]:              {},
   [SETTING.UI_INDEX]:                             {},
   [SETTING.UI_DASHBOARD_INDEX]:                   {},
@@ -160,6 +161,10 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     options: ['strict', 'system-store'],
     warning: 'agent-tls-mode'
   },
+  [SETTING.SYSTEM_AGENT_UPGRADER_INSTALL_CONCURRENCY]: {
+    kind:    'integer',
+    ruleSet: [{ name: 'minValue', factoryArg: 1 }]
+  },
   [SETTING.K3S_UPGRADER_UNINSTALL_CONCURRENCY]: {
     kind:    'integer',
     ruleSet: [{ name: 'minValue', factoryArg: 1 }]
@@ -170,7 +175,20 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
 
 };
 
-export const PROVISIONING_SETTINGS = ['engine-iso-url', 'engine-install-url', 'imported-cluster-version-management', 'cluster-agent-default-priority-class', 'cluster-agent-default-pod-disruption-budget'];
+/**
+ * Show settings in a special cluster provisioning section
+ *
+ * These should probably be an option in the maps above...
+ */
+export const PROVISIONING_SETTINGS = [
+  SETTING.ENGINE_ISO_URL,
+  SETTING.RKE_METADATA_CONFIG,
+  SETTING.K3S_UPGRADER_UNINSTALL_CONCURRENCY,
+  SETTING.IMPORTED_CLUSTER_VERSION_MANAGEMENT,
+  SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS,
+  SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET
+];
+
 /**
  * Settings on how to handle warnings returning in api responses, specifically which to show as growls
  */

package/config/store.js

@@ -38,6 +38,7 @@ let store = {};
   resolveStoreModules(require('../store/wm.js'), 'wm.js');
   resolveStoreModules(require('../store/customisation.js'), 'customisation.js');
   resolveStoreModules(require('../store/cru-resource.ts'), 'cru-resource.ts');
+  resolveStoreModules(require('../store/notifications.ts'), 'notifications.ts');
 
   // If the environment supports hot reloading...
 
@@ -67,6 +68,7 @@ let store = {};
       '../store/wm.js',
       '../store/customisation.js',
       '../store/cru-resource.ts',
+      '../store/notifications.ts',
     ], () => {
       // Update `root.modules` with the latest definitions.
       updateModules();

package/config/system-namespaces.js

@@ -12,7 +12,7 @@ export default [
   'linkerd',
   'security-scan',
   'tekton-pipelines',
-  'cis-operator-system',
+  'compliance-operator-system',
   'istio-system',
   'longhorn-system',
 ];

package/config/table-headers.js

@@ -1,4 +1,4 @@
-import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
@@ -383,6 +383,29 @@ export const SECRET_DATA = {
   formatter: 'SecretData'
 };
 
+export const SECRET_CLONE = {
+  name:      'secret-clone',
+  labelKey:  'tableHeaders.secret.project-clone',
+  tooltip:   'tableHeaders.secret.project-clone-tooltip',
+  value:     'isProjectSecretCopy',
+  sort:      `metadata.annotations."${ UI_PROJECT_SECRET_COPY }"`,
+  search:    false,
+  formatter: 'Checked',
+};
+
+export const SECRET_PROJECT_SCOPED = {
+  name:     'secret-project-scoped',
+  labelKey: 'tableHeaders.secret.project-scoped',
+  tooltip:  'tableHeaders.secret.project-scoped-tooltip',
+  value:    'clusterAndProjectLabel',
+  // Cannot _sort_ upstream secrets by if they are cluster scoped
+  // https://github.com/rancher/rancher/issues/51001
+  // metadata.labels[management.cattle.io/project-scoped-secret] - covers both cluster scoped AND clones
+  // metadata.annotations[management.cattle.io/project-scoped-secret-copy]
+  // sort:     [`metadata.labels[${ UI_PROJECT_SECRET }]`, `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`],
+  search:   false,
+};
+
 export const TARGET_KIND = {
   name:     'target-kind',
   labelKey: 'tableHeaders.targetKind',
@@ -784,7 +807,7 @@ export const FLEET_APPLICATION_TARGET = {
   name:     'applicationTarget',
   labelKey: 'fleet.tableHeaders.applicationTarget',
   value:    'targetInfo.modeDisplay',
-  sort:     ['targetInfo.modeDisplay', 'targetInfo.cluster', 'targetInfo.clusterGroup'],
+  sort:     ['targetInfo.modeDisplay'],
 };
 
 export const FLEET_APPLICATION_CLUSTERS_READY = {
@@ -1102,7 +1125,7 @@ export const FLEET_REPO_TARGET = {
   name:     'target',
   labelKey: 'tableHeaders.target',
   value:    'targetInfo.modeDisplay',
-  sort:     ['targetInfo.modeDisplay', 'targetInfo.cluster', 'targetInfo.clusterGroup'],
+  sort:     ['targetInfo.modeDisplay'],
 };
 
 export const FLEET_REPO = {
@@ -1145,3 +1168,9 @@ export const UI_PLUGIN_CATALOG = [
     value:    'repo.metadata.name'
   }
 ];
+
+// SECRETS
+export const PROJECT = {
+  name:     'project',
+  labelKey: 'tableHeaders.project',
+};

package/config/types.js

@@ -14,7 +14,6 @@ export const STEVE = {
 export const NORMAN = {
   APP:                           'app',
   AUTH_CONFIG:                   'authconfig',
-  ETCD_BACKUP:                   'etcdbackup',
   CLUSTER:                       'cluster',
   CLUSTER_TOKEN:                 'clusterregistrationtoken',
   CLUSTER_ROLE_TEMPLATE_BINDING: 'clusterroletemplatebinding',
@@ -134,6 +133,14 @@ export const CATALOG = {
   REPO:         'catalog.cattle.io.repo',
 };
 
+// Charts/Apps
+export const CATALOG_SORT_OPTIONS = {
+  RECOMMENDED:       'recommended',
+  LAST_UPDATED_DESC: 'lastupdatedDescending',
+  ALPHABETICAL_ASC:  'alphaAscending',
+  ALPHABETICAL_DESC: 'alphaDescending'
+};
+
 // UI Plugin type
 export const UI_PLUGIN = 'catalog.cattle.io.uiplugin';
 
@@ -211,7 +218,8 @@ export const MANAGEMENT = {
   GLOBAL_DNS_PROVIDER:           'management.cattle.io.globaldnsprovider',
   RKE_TEMPLATE:                  'management.cattle.io.clustertemplate',
   RKE_TEMPLATE_REVISION:         'management.cattle.io.clustertemplaterevision',
-  CLUSTER_PROXY_CONFIG:          'management.cattle.io.clusterproxyconfig'
+  CLUSTER_PROXY_CONFIG:          'management.cattle.io.clusterproxyconfig',
+  OIDC_CLIENT:                   'management.cattle.io.oidcclient'
 };
 
 export const CAPI = {
@@ -294,11 +302,11 @@ export const BACKUP_RESTORE = {
   RESTORE:      'resources.cattle.io.restore',
 };
 
-export const CIS = {
-  CLUSTER_SCAN:         'cis.cattle.io.clusterscan',
-  CLUSTER_SCAN_PROFILE: 'cis.cattle.io.clusterscanprofile',
-  BENCHMARK:            'cis.cattle.io.clusterscanbenchmark',
-  REPORT:               'cis.cattle.io.clusterscanreport'
+export const COMPLIANCE = {
+  CLUSTER_SCAN:         'compliance.cattle.io.clusterscan',
+  CLUSTER_SCAN_PROFILE: 'compliance.cattle.io.clusterscanprofile',
+  BENCHMARK:            'compliance.cattle.io.clusterscanbenchmark',
+  REPORT:               'compliance.cattle.io.clusterscanreport'
 };
 
 export const UI = { NAV_LINK: 'ui.cattle.io.navlink' };
@@ -307,6 +315,7 @@ export const VIRTUAL_TYPES = {
   CLUSTER_MEMBERS:    'cluster-members',
   PROJECT_NAMESPACES: 'projects-namespaces',
   NAMESPACES:         'namespaces',
+  PROJECT_SECRETS:    'projectsecret',
   JWT_AUTHENTICATION: 'jwt.authentication'
 };
 

package/config/version.js

@@ -30,4 +30,4 @@ export function setKubeVersionData(v) {
   _kubeVersionData = JSON.parse(JSON.stringify(v));
 }
 
-export const CURRENT_RANCHER_VERSION = '2.11';
+export const CURRENT_RANCHER_VERSION = '2.12';

package/core/plugin.ts

@@ -14,7 +14,8 @@ import {
   ExtensionPoint,
   TabLocation,
   ModelExtensionConstructor,
-  PluginRouteRecordRaw, RegisterStore, UnregisterStore, CoreStoreSpecifics, CoreStoreConfig, OnNavToPackage, OnNavAwayFromPackage, OnLogOut,
+  PluginRouteRecordRaw, RegisterStore, UnregisterStore, CoreStoreSpecifics, CoreStoreConfig,
+  NavHooks, OnNavToPackage, OnNavAwayFromPackage, OnLogIn, OnLogOut,
   ExtensionEnvironment
 } from './types';
 import coreStore, { coreStoreModule, coreStoreState } from '@shell/plugins/dashboard-store';
@@ -43,6 +44,7 @@ export class Plugin implements IPlugin {
   public onEnter: OnNavToPackage = () => Promise.resolve();
   public onLeave: OnNavAwayFromPackage = () => Promise.resolve();
   public _onLogOut: OnLogOut = () => Promise.resolve();
+  public onLogIn: OnLogIn = () => Promise.resolve();
 
   public uiConfig: { [key: string]: any } = {};
 
@@ -314,13 +316,36 @@ export class Plugin implements IPlugin {
   }
 
   public addNavHooks(
-    onEnter: OnNavToPackage = () => Promise.resolve(),
-    onLeave: OnNavAwayFromPackage = () => Promise.resolve(),
-    onLogOut: OnLogOut = () => Promise.resolve(),
+    onEnter?: OnNavToPackage | NavHooks,
+    onLeave?: OnNavAwayFromPackage,
+    onLogOut?: OnLogOut,
+    onLogIn?: OnLogIn,
   ): void {
-    this.onEnter = onEnter;
-    this.onLeave = onLeave;
-    this._onLogOut = onLogOut;
+    if (typeof onEnter === 'object') {
+      const hooks = onEnter as NavHooks;
+
+      if (hooks.onEnter) {
+        this.onEnter = hooks.onEnter;
+      }
+
+      if (hooks.onLeave) {
+        this.onLeave = hooks.onLeave;
+      }
+
+      if (hooks.onLogout) {
+        this._onLogOut = hooks.onLogout;
+      }
+
+      if (hooks.onLogin) {
+        this.onLogIn = hooks.onLogin;
+      }
+    } else {
+      // No first arg, or first arg is not an object, so this is the legacy invocation
+      this.onEnter = (onEnter as OnNavToPackage) || (() => Promise.resolve());
+      this.onLeave = onLeave || (() => Promise.resolve());
+      this._onLogOut = onLogOut || (() => Promise.resolve());
+      this.onLogIn = onLogIn || (() => Promise.resolve());
+    }
   }
 
   public async onLogOut(store: any) {

package/core/types.ts

@@ -39,6 +39,17 @@ export type OnEnterLeavePackageConfig = {
 export type OnNavToPackage = (store: any, config: OnEnterLeavePackageConfig) => Promise<void>;
 export type OnNavAwayFromPackage = (store: any, config: OnEnterLeavePackageConfig) => Promise<void>;
 export type OnLogOut = (store: any) => Promise<void>;
+export type OnLogIn = (store: any) => Promise<void>;
+
+/**
+ * Navigation hooks specified as an object
+ */
+export type NavHooks = {
+  onEnter?: OnNavToPackage,
+  onLeave?: OnNavAwayFromPackage,
+  onLogout?: OnLogOut,
+  onLogin?: OnLogIn,
+}
 
 /** Enum regarding the extensible areas/places of the UI */
 export enum ExtensionPoint {
@@ -324,6 +335,10 @@ export interface HeaderOptions {
 }
 
 export interface ConfigureTypeOptions {
+  /**
+   * Override for the create button string on a list view
+   */
+  listCreateButtonLabelKey?: boolean;
   /**
    * The resource can edit/show yaml
    */
@@ -644,8 +659,10 @@ export interface IPlugin {
   addNavHooks(
     onEnter?: OnNavToPackage,
     onLeave?: OnNavAwayFromPackage,
-    onLogOut?: OnLogOut
+    onLogOut?: OnLogOut,
+    onLogIn?: OnLogIn,
   ): void;
+  addNavHooks(hooks: NavHooks): void;
 
   /**
    * Adds a model extension