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

package/store/index.js

@@ -263,6 +263,7 @@ export const state = () => {
      * 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,
   };
 };
 
@@ -601,6 +602,16 @@ export const getters = {
     return getters['isRancherInHarvester'] || getters['isMultiCluster'] || !getters['isSingleProduct'];
   },
 
+  showWorkspaceSwitcher(state, getters) {
+    const product = getters['currentProduct'];
+
+    if (!product) {
+      return false;
+    }
+
+    return product.showWorkspaceSwitcher && state.showWorkspaceSwitcher;
+  },
+
   targetRoute(state) {
     return state.targetRoute;
   },
@@ -763,7 +774,11 @@ export const mutations = {
 
   setSideNavCache(state, sideNavCache) {
     state.sideNavCache = sideNavCache;
-  }
+  },
+
+  showWorkspaceSwitcher(state, value) {
+    state.showWorkspaceSwitcher = value;
+  },
 };
 
 export const actions = {
@@ -801,7 +816,7 @@ export const actions = {
 
     const promises = {
       // Features checks on its own if they are available
-      features: dispatch('features/loadServer'),
+      [MANAGEMENT.FEATURE]: dispatch('features/loadServer'),
     };
 
     const toWatch = [
@@ -816,33 +831,33 @@ export const actions = {
     }
 
     if ( getters['management/schemaFor'](COUNT) ) {
-      promises['counts'] = dispatch('management/findAll', { type: COUNT, opt: { watch: false } });
+      promises[COUNT] = dispatch('management/findAll', { type: COUNT, opt: { watch: false } });
       toWatch.push(COUNT);
     }
 
     if ( getters['management/canList'](MANAGEMENT.SETTING) ) {
-      promises['settings'] = dispatch('management/findAll', { type: MANAGEMENT.SETTING, opt: { watch: false } });
+      promises[MANAGEMENT.SETTING] = dispatch('management/findAll', { type: MANAGEMENT.SETTING, opt: { watch: false } });
       toWatch.push(MANAGEMENT.SETTING);
     }
 
     if ( getters['management/schemaFor'](NAMESPACE) ) {
-      promises['namespaces'] = dispatch('management/findAll', { type: NAMESPACE, opt: { watch: false } });
+      promises[NAMESPACE] = dispatch('management/findAll', { type: NAMESPACE, opt: { watch: false } });
       toWatch.push(NAMESPACE);
     }
 
     const fleetSchema = getters['management/schemaFor'](FLEET.WORKSPACE);
 
     if (fleetSchema?.links?.collection) {
-      promises['workspaces'] = dispatch('management/findAll', { type: FLEET.WORKSPACE, opt: { watch: false } });
+      promises[FLEET.WORKSPACE] = dispatch('management/findAll', { type: FLEET.WORKSPACE, opt: { watch: false } });
       toWatch.push(FLEET.WORKSPACE);
     }
 
     res = await allHash(promises);
 
-    if (!res.settings || !paginateClusters(rootGetters)) {
+    if (!res[MANAGEMENT.SETTING] || !paginateClusters(rootGetters)) {
       // 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.clusters = await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } });
+      res[MANAGEMENT.CLUSTER] = await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } });
       toWatch.push(MANAGEMENT.CLUSTER);
     }
 
@@ -854,7 +869,7 @@ export const actions = {
     const isMultiCluster = getters['isMultiCluster'];
 
     // If the local cluster is a Harvester cluster and 'rancher-manager-support' is true, it means that the embedded Rancher is being used.
-    const localCluster = res.clusters?.find((c) => c.id === 'local');
+    const localCluster = res[MANAGEMENT.CLUSTER]?.find((c) => c.id === 'local');
 
     if (localCluster?.isHarvester) {
       const harvesterSetting = await dispatch('cluster/findAll', { type: HCI.SETTING, opt: { url: `/v1/harvester/${ HCI.SETTING }s` } });
@@ -869,9 +884,9 @@ export const actions = {
       }
     }
 
-    const pl = res.settings?.find((x) => x.id === 'ui-pl')?.value;
-    const brand = res.settings?.find((x) => x.id === SETTING.BRAND)?.value;
-    const systemNamespaces = res.settings?.find((x) => x.id === SETTING.SYSTEM_NAMESPACES);
+    const pl = res[MANAGEMENT.SETTING]?.find((x) => x.id === 'ui-pl')?.value;
+    const brand = res[MANAGEMENT.SETTING]?.find((x) => x.id === SETTING.BRAND)?.value;
+    const systemNamespaces = res[MANAGEMENT.SETTING]?.find((x) => x.id === SETTING.SYSTEM_NAMESPACES);
 
     if ( pl ) {
       setVendor(pl);
@@ -892,10 +907,10 @@ export const actions = {
       isRancher,
     });
 
-    if ( res.workspaces ) {
+    if ( res[FLEET.WORKSPACE] ) {
       commit('updateWorkspace', {
         value: getters['prefs/get'](WORKSPACE),
-        all:   res.workspaces,
+        all:   res[FLEET.WORKSPACE],
         getters
       });
     }
@@ -1291,5 +1306,9 @@ export const actions = {
     commit('setSideNavCache', sideNavCache);
   },
 
+  showWorkspaceSwitcher({ commit }, value) {
+    commit('showWorkspaceSwitcher', value);
+  },
+
   ...gcActions
 };

package/store/slideInPanel.ts

@@ -3,18 +3,21 @@ import { MutationTree, GetterTree, ActionTree } from 'vuex';
 
 export interface SlideInPanelState {
   isOpen: boolean;
+  isClosing: boolean;
   component: Component | null;
   componentProps: Record<string, any>;
 }
 
 const state = (): SlideInPanelState => ({
   isOpen:         false,
+  isClosing:      false,
   component:      null,
   componentProps: {}
 });
 
 const getters: GetterTree<SlideInPanelState, any> = {
   isOpen:         (state) => state.isOpen,
+  isClosing:      (state) => state.isClosing,
   component:      (state) => state.component,
   componentProps: (state) => state.componentProps
 };
@@ -26,12 +29,15 @@ const mutations: MutationTree<SlideInPanelState> = {
     state.componentProps = payload.componentProps || {};
   },
   close(state) {
+    state.isClosing = true;
     state.isOpen = false;
 
     // Delay clearing component/props for 500ms (same as transition duration)
     setTimeout(() => {
       state.component = null;
       state.componentProps = {};
+
+      state.isClosing = false;
     }, 500);
   }
 };

package/store/type-map.js

@@ -526,6 +526,7 @@ export const getters = {
       customRoute:            undefined,
       resourceEditMasthead:   true,
       custom:                 {},
+      subTypes:               [],
     };
 
     return (schemaOrType, pagination) => {

package/types/fleet.d.ts

@@ -1 +1,36 @@
 export type WorkloadType = 'workload' | 'pods' | 'apps.deployments' | 'replicasets' | 'daemonsets' | 'statefulsets' | 'jobs' | 'cronjobs'
+
+export interface FleetResourceState {
+  count: number,
+  label: string,
+  color?: string,
+  status?: string
+}
+
+export interface FleetDashboardState {
+  index: number,
+  id: string,
+  label: string,
+  color: string,
+  icon: string,
+  stateBackground: string
+}
+
+export interface FleetDashboardResourceStates {
+  stateDisplay: string,
+  stateSort: string,
+  statePanel: FleetDashboardState,
+  resources: object[]
+}
+
+// TODO complete type definition
+export interface Application {
+  id: string,
+  metadata: {
+    namespace: string,
+    name: string,
+  }
+  _detailLocation: {
+    name: string
+  }
+}

package/types/resources/settings.d.ts

@@ -20,6 +20,8 @@ export interface PaginationSettingsStore {
   }
 }
 
+export type PaginationFeature = 'listAutoRefreshToggle' | 'listManualRefresh'
+
 /**
  * Settings to handle server side pagination
  */
@@ -31,7 +33,23 @@ export interface PaginationSettings {
   /**
    * Should pagination be enabled for resources in a store
    */
-  stores: PaginationSettingsStore | undefined
+  stores?: PaginationSettingsStore,
+
+  /**
+   * List of specific features that can be enabled / disabled
+   */
+  features?: {
+    [key in PaginationFeature]: { // eslint-disable-line no-unused-vars
+      enabled: boolean,
+    }
+  },
+
+  /**
+   * Debounce the amount of time between a resource changing and the backend sending a resource.changes message
+   *
+   * This greatly reduces spam in systems with high resource churn. It needs to be more than it takes for the UI to make a http request to fetch changes
+   */
+  resourceChangesDebounceMs?: number
 }
 
 type Links = {