@rancher/shell 3.0.6 → 3.0.8-rc.1

package/store/auth.js

@@ -17,6 +17,7 @@ const SLO_TOKENS_ENDPOINT_LOGOUT_RES_BASETYPE = ['authConfigLogoutOutput'];
 
 export const BASE_SCOPES = {
   github:       ['read:org'],
+  githubapp:    ['read:org'],
   googleoauth:  ['openid profile email'],
   azuread:      [],
   keycloakoidc: ['openid profile email'],
@@ -374,11 +375,11 @@ export const actions = {
     commit('cookies/remove', { key: KEY }, { root: true });
   },
 
-  uiLogout({ commit, dispatch }) {
+  uiLogout({ commit, dispatch }, options = {}) {
     removeEmberPage();
 
     commit('loggedOut');
-    dispatch('onLogout', null, { root: true });
+    dispatch('onLogout', options, { root: true });
 
     dispatch('uiplugins/setReady', false, { root: true });
   },
@@ -430,6 +431,10 @@ export const actions = {
     } catch (e) {
     }
 
-    dispatch('uiLogout');
+    const propagateOptions = {};
+
+    propagateOptions.sessionIdle = options.sessionIdle;
+
+    dispatch('uiLogout', propagateOptions);
   }
 };

package/store/aws.js

@@ -213,18 +213,20 @@ export const actions = {
 
       list.push({
         apiName,
-        currentGeneration:     row.CurrentGeneration || false,
+        currentGeneration:      row.CurrentGeneration || false,
         groupLabel,
         instanceClass,
-        memoryBytes:           row.MemoryInfo.SizeInMiB * 1024 * 1024,
-        supportedUsageClasses: row.SupportedUsageClasses,
-        label:                 rootGetters['i18n/t']('cluster.machineConfig.aws.sizeLabel', {
+        memoryBytes:            row.MemoryInfo.SizeInMiB * 1024 * 1024,
+        supportedUsageClasses:  row.SupportedUsageClasses,
+        supportedArchitectures: row.ProcessorInfo.SupportedArchitectures || [],
+        label:                  rootGetters['i18n/t']('cluster.machineConfig.aws.sizeLabel', {
           apiName,
-          cpu:    row.VCpuInfo.DefaultVCpus,
-          memory: row.MemoryInfo.SizeInMiB / 1024,
+          cpu:          row.VCpuInfo.DefaultVCpus,
+          memory:       row.MemoryInfo.SizeInMiB / 1024,
           storageSize,
           storageUnit,
           storageType,
+          architecture: (row.ProcessorInfo.SupportedArchitectures || []).map((a) => (a === 'arm64' ? 'ARM' : a)).join(', ')
         }),
       });
     }

package/store/features.js

@@ -37,6 +37,7 @@ export const STEVE_CACHE = create('ui-sql-cache', false);
 export const UIEXTENSION = create('uiextension', true);
 export const PROVISIONING_PRE_BOOTSTRAP = create('provisioningprebootstrap', false);
 export const SCHEDULING_CUSTOMIZATION = create(SCHEDULING_CUSTOMIZATION_FEATURE, false);
+export const SCC = create('rancher-scc-registration-extension', true);
 
 // Not currently used.. no point defining ones we don't use
 // export const EMBEDDED_CLUSTER_API = create('embedded-cluster-api', true);

package/store/index.js

@@ -2,7 +2,7 @@ import { BACK_TO } from '@shell/config/local-storage';
 import { setBrand, setVendor } from '@shell/config/private-label';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import {
-  LOGGED_OUT, IS_SSO, IS_SLO, TIMED_OUT, UPGRADED, _FLAGGED
+  LOGGED_OUT, IS_SSO, IS_SLO, TIMED_OUT, UPGRADED, _FLAGGED, IS_SESSION_IDLE
 } from '@shell/config/query-params';
 import { SETTING } from '@shell/config/settings';
 import {
@@ -40,6 +40,8 @@ import { isDevBuild } from '@shell/utils/version';
 import { markRaw } from 'vue';
 import paginationUtils from '@shell/utils/pagination-utils';
 import { addReleaseNotesNotification } from '@shell/utils/release-notes';
+import sideNavService from '@shell/components/nav/TopLevelMenu.helper';
+import { fetchAndProcessDynamicContent } from '@shell/utils/dynamic-content';
 
 // Disables strict mode for all store instances to prevent warning about changing state outside of mutations
 // because it's more efficient to do that sometimes.
@@ -230,8 +232,8 @@ const updateActiveNamespaceCache = (state, activeNamespaceCache) => {
 /**
  * Are we in the vai enabled world where mgmt clusters are paginated?
  */
-const paginateClusters = (rootGetters) => {
-  return paginationUtils.isEnabled({ rootGetters }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } });
+const paginateClusters = ({ rootGetters, state }) => {
+  return paginationUtils.isEnabled({ rootGetters, $plugin: state.$plugin }, { store: 'management', resource: { id: MANAGEMENT.CLUSTER, context: 'side-bar' } });
 };
 
 export const state = () => {
@@ -260,11 +262,8 @@ export const state = () => {
     $router:                 markRaw({}),
     $route:                  markRaw({}),
     $plugin:                 markRaw({}),
-    /**
-     * Cache state of side nav clusters. This avoids flickering when the user changes pages and the side nav component re-renders
-     */
-    sideNavCache:            undefined,
     showWorkspaceSwitcher:   true,
+
   };
 };
 
@@ -629,10 +628,6 @@ export const getters = {
     return `${ base }/latest`;
   },
 
-  sideNavCache(state) {
-    return state.sideNavCache;
-  },
-
   ...gcGetters
 };
 
@@ -773,10 +768,6 @@ export const mutations = {
     state.$plugin = markRaw(pluginDefinition || {});
   },
 
-  setSideNavCache(state, sideNavCache) {
-    state.sideNavCache = sideNavCache;
-  },
-
   showWorkspaceSwitcher(state, value) {
     state.showWorkspaceSwitcher = value;
   },
@@ -855,7 +846,7 @@ export const actions = {
 
     res = await allHash(promises);
 
-    if (!res[MANAGEMENT.SETTING] || !paginateClusters(rootGetters)) {
+    if (!res[MANAGEMENT.SETTING] || !paginateClusters({ rootGetters, state })) {
       // This introduces a synchronous request, however we need settings to determine if SSP is enabled
       // Eventually it will be removed when SSP is always on
       res[MANAGEMENT.CLUSTER] = await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } });
@@ -900,6 +891,8 @@ export const actions = {
     // Add the notification for the release notes
     if (isRancher) {
       await addReleaseNotesNotification(dispatch, getters);
+
+      fetchAndProcessDynamicContent(dispatch, getters, this.$axios);
     }
 
     if (systemNamespaces) {
@@ -1033,7 +1026,7 @@ export const actions = {
     await dispatch('management/waitForSchema', { type: MANAGEMENT.CLUSTER });
 
     // If SSP is on we won't have requested all clusters
-    if (!paginateClusters(rootGetters)) {
+    if (!paginateClusters({ rootGetters, state })) {
       await dispatch('management/waitForHaveAll', { type: MANAGEMENT.CLUSTER });
     }
 
@@ -1132,8 +1125,10 @@ export const actions = {
     commit('updateNamespaces', { filters: ids, getters });
   },
 
-  async cleanNamespaces({ getters, dispatch, rootGetters }) {
-    if (paginateClusters(rootGetters)) {
+  async cleanNamespaces({
+    getters, dispatch, rootGetters, state
+  }) {
+    if (paginateClusters({ rootGetters, state })) {
       // See https://github.com/rancher/dashboard/issues/12864
       // old world...
       // - loadManagement makes a request to fetch all mgmt clusters
@@ -1176,7 +1171,7 @@ export const actions = {
     }
   },
 
-  async onLogout(store) {
+  async onLogout(store, options = {}) {
     const { dispatch, commit, state } = store;
 
     store.dispatch('gcStopIntervals');
@@ -1187,6 +1182,8 @@ export const actions = {
       }
     });
 
+    sideNavService.reset();
+
     await dispatch('management/unsubscribe');
     commit('managementChanged', { ready: false });
     commit('management/reset');
@@ -1216,7 +1213,10 @@ export const actions = {
         window.localStorage.setItem(BACK_TO, window.location.href);
       }
 
-      let QUERY = (LOGGED_OUT in route.query) ? LOGGED_OUT : TIMED_OUT;
+      let QUERY = (LOGGED_OUT in route.query) || options.sessionIdle ? LOGGED_OUT : TIMED_OUT;
+
+      // adds IS_SESSION_IDLE query param to login route if logout came from a session idle (check auth/logout action)
+      QUERY += options.sessionIdle ? `&${ IS_SESSION_IDLE }` : '';
 
       // adds IS_SSO query param to login route if logout came with an auth provider enabled
       QUERY += (IS_SSO in route.query) ? `&${ IS_SSO }` : '';
@@ -1308,10 +1308,6 @@ export const actions = {
     });
   },
 
-  setSideNavCache({ commit }, sideNavCache) {
-    commit('setSideNavCache', sideNavCache);
-  },
-
   showWorkspaceSwitcher({ commit }, value) {
     commit('showWorkspaceSwitcher', value);
   },

package/store/prefs.js

@@ -114,6 +114,12 @@ export const PROVISIONER = create('provisioner', _RKE2, { options: [_RKE1, _RKE2
 export const MENU_MAX_CLUSTERS = 10;
 // Prompt for confirm when scaling down node pool in GUI and save the pref
 export const SCALE_POOL_PROMPT = create('scale-pool-prompt', null, { parseJSON });
+
+// Dynamic content
+export const READ_NEW_RELEASE = create('read-new-release', '', { parseJSON });
+export const READ_SUPPORT_NOTICE = create('read-support-notice', '', { parseJSON });
+export const READ_UPCOMING_SUPPORT_NOTICE = create('read-upcoming-support-notice', '', { parseJSON });
+
 // --------------------
 
 const cookiePrefix = 'R_';

package/types/extension-manager.ts

@@ -1,4 +1,11 @@
+import { EXT_IDS_VALUES } from '@shell/core/plugin';
 import { ClusterProvisionerContext } from '@shell/core/types';
+
+type ExtensionManagerType = { [name: string]: Function, }
+export type ExtensionManagerTypes =
+  { [type in EXT_IDS_VALUES]?: ExtensionManagerType } & // eslint-disable-line no-unused-vars
+  { [name: string]: ExtensionManagerType }
+
 export type ExtensionManager = {
   internal(): any;
   loadPluginAsync(plugin: any): Promise<void>;
@@ -12,7 +19,7 @@ export type ExtensionManager = {
   applyPlugin(plugin: any): void;
   register(type: string, name: string, fn: Function): void;
   unregister(type: string, name: string, fn: Function): void;
-  getAll(): any;
+  getAll(): ExtensionManagerTypes;
   getPlugins(): any;
   getDynamic(typeName: string, name: string): any;
   getValidator(name: string): any;

package/types/kube/kube-api.ts

@@ -30,5 +30,6 @@ export interface KubeMetadata {
 }
 
 export interface RancherKubeMetadata extends KubeMetadata {
-  namespace: string,
+  namespace?: string,
+  name: string
 }

package/types/rancher/index.d.ts

@@ -4,6 +4,7 @@ declare module '@rancher/auto-import' {
 
 declare module '@shell/store/type-map' {
   export function DSL(store: any, name: string): any;
+  export function isAdminUser(getters: any): boolean;
 }
 
 declare module '@shell/plugins/dashboard-store';

package/types/resources/settings.d.ts

@@ -1,26 +1,58 @@
-
 export interface PaginationSettingsStore {
-  [name: string]: {
-    resources: {
+  resources: {
+    /**
+     * Enable for all resources in this store
+     */
+    enableAll?: boolean,
+    /**
+     * Enable for only some resources in this store
+     */
+    enableSome?: {
+      /**
+       * Specific resource type to enable
+       */
+      enabled?: (string | { resource: string, context: string[]})[],
       /**
-       * Enable for all resources in this store
+       * Additional resource types that do not have any custom pagination settings (headers, lists, etc) but can be generated automatically (headers from CRD additionalPrinterColumns) can be enabled
        */
-      enableAll: boolean,
-      enableSome: {
-        /**
-         * Specific resource type to enable
-         */
-        enabled: (string | { resource: string, context: string[]})[],
-        /**
-         * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
-         */
-        generic: boolean,
-      },
-    }
+      generic?: boolean,
+    },
   }
 }
 
-export type PaginationFeature = 'listAutoRefreshToggle' | 'listManualRefresh'
+/*
+ * Determine which resources can utilise server-side pagination
+ */
+export interface PaginationSettingsStores {
+  [store: string]: PaginationSettingsStore
+}
+
+/**
+ * Names of pagination features used in pagination settings (not featureflags)
+ */
+export type PaginationFeatureName = 'listAutoRefreshToggle' | 'listManualRefresh' | 'homePageCluster'
+
+export type PaginationFeatureHomePageClusterConfig = {
+  threshold: number,
+  results: number,
+  pagesPerRow: number
+}
+
+/**
+ * Details of a specific pagination feature
+ */
+export type PaginationFeature<Config = any> = {
+  version: number,
+  enabled: boolean,
+  configuration?: Config,
+}
+
+/**
+ * List of specific features that can be enabled / disabled
+ */
+export type PaginationSettingsFeatures = {
+  [key in PaginationFeatureName]?: PaginationFeature
+}
 
 /**
  * Settings to handle server side pagination
@@ -33,16 +65,12 @@ export interface PaginationSettings {
   /**
    * Should pagination be enabled for resources in a store
    */
-  stores?: PaginationSettingsStore,
+  stores?: PaginationSettingsStores,
 
   /**
    * List of specific features that can be enabled / disabled
    */
-  features?: {
-    [key in PaginationFeature]: {
-      enabled: boolean,
-    }
-  },
+  features?: PaginationSettingsFeatures,
 
   /**
    * Debounce the amount of time between a resource changing and the backend sending a resource.changes message
@@ -75,6 +103,7 @@ type ManagedFields = {
   time: string;
 };
 
+// Note - this should now be @RancherKubeMetadata
 type Metadata = {
   creationTimestamp: string;
   fields: string[];