@rancher/shell 3.0.5 → 3.0.7

package/scripts/typegen.sh

@@ -39,6 +39,8 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/hybrid-class.js --d
 # # mixins
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch-namespaced.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch-api-pagination.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
 
 # # models
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null

package/store/auth.js

@@ -207,7 +207,7 @@ export const actions = {
 
     commit('cookies/set', {
       key: KEY, value: strung, options
-    });
+    }, { root: true });
 
     return strung;
   },
@@ -371,7 +371,7 @@ export const actions = {
   loggedInAs({ commit }, principalId) {
     commit('loggedInAs', principalId);
 
-    commit('cookies/remove', { key: KEY });
+    commit('cookies/remove', { key: KEY }, { root: true });
   },
 
   uiLogout({ commit, dispatch }) {

package/store/index.js

@@ -40,6 +40,7 @@ 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';
 
 // 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 +231,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 +261,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 +627,6 @@ export const getters = {
     return `${ base }/latest`;
   },
 
-  sideNavCache(state) {
-    return state.sideNavCache;
-  },
-
   ...gcGetters
 };
 
@@ -773,10 +767,6 @@ export const mutations = {
     state.$plugin = markRaw(pluginDefinition || {});
   },
 
-  setSideNavCache(state, sideNavCache) {
-    state.sideNavCache = sideNavCache;
-  },
-
   showWorkspaceSwitcher(state, value) {
     state.showWorkspaceSwitcher = value;
   },
@@ -855,7 +845,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 } });
@@ -1033,7 +1023,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 +1122,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
@@ -1187,6 +1179,8 @@ export const actions = {
       }
     });
 
+    sideNavService.reset();
+
     await dispatch('management/unsubscribe');
     commit('managementChanged', { ready: false });
     commit('management/reset');
@@ -1308,10 +1302,6 @@ export const actions = {
     });
   },
 
-  setSideNavCache({ commit }, sideNavCache) {
-    commit('setSideNavCache', sideNavCache);
-  },
-
   showWorkspaceSwitcher({ commit }, value) {
     commit('showWorkspaceSwitcher', value);
   },

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/resources/settings.d.ts

@@ -1,25 +1,32 @@
-
 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?: {
       /**
-       * Enable for all resources in this store
+       * Specific resource type to enable
        */
-      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,
-      },
-    }
+      enabled?: (string | { resource: string, context: string[]})[],
+      /**
+       * 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
+       */
+      generic?: boolean,
+    },
   }
 }
 
+/**
+ * Determine which resources can utilise server-side pagination
+ */
+export interface PaginationSettingsStores {
+  [store: string]: PaginationSettingsStore
+}
+
 export type PaginationFeature = 'listAutoRefreshToggle' | 'listManualRefresh'
 
 /**
@@ -33,7 +40,7 @@ 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