@rancher/shell 3.0.7 → 3.0.8-rc.10

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 {
@@ -41,6 +41,7 @@ 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.
@@ -262,7 +263,7 @@ export const state = () => {
     $route:                  markRaw({}),
     $plugin:                 markRaw({}),
     showWorkspaceSwitcher:   true,
-
+    localCluster:            null,
   };
 };
 
@@ -271,10 +272,20 @@ export const getters = {
     return state.clusterReady === true;
   },
 
+  /**
+   * Cache of the mgmt cluster fetched at start up
+   *
+   * We cannot rely on the store to cache this as the store may contain a page without the local cluster
+   */
+  localCluster(state) {
+    return state.localCluster;
+  },
+
   isMultiCluster(state, getters) {
-    const clusters = getters['management/all'](MANAGEMENT.CLUSTER);
+    const clusterCount = getters['management/all'](COUNT)?.[0]?.counts?.[MANAGEMENT.CLUSTER]?.summary?.count || 0;
+    const localCluster = getters['localCluster'];
 
-    if (clusters.length === 1 && clusters[0].metadata?.name === 'local') {
+    if (clusterCount === 1 && !!localCluster) {
       return false;
     } else {
       return true;
@@ -591,10 +602,9 @@ export const getters = {
   },
 
   isStandaloneHarvester(state, getters) {
-    const clusters = getters['management/all'](MANAGEMENT.CLUSTER);
-    const cluster = clusters.find((c) => c.id === 'local') || {};
+    const localCluster = getters['localCluster'];
 
-    return getters['isSingleProduct'] && cluster.isHarvester && !getters['isRancherInHarvester'];
+    return getters['isSingleProduct'] && localCluster?.isHarvester && !getters['isRancherInHarvester'];
   },
 
   showTopLevelMenu(getters) {
@@ -639,9 +649,10 @@ export const mutations = {
   clearPageActionHandler(state) {
     state.pageActionHandler = null;
   },
-  managementChanged(state, { ready, isRancher }) {
+  managementChanged(state, { ready, isRancher, localCluster }) {
     state.managementReady = ready;
     state.isRancher = isRancher;
+    state.localCluster = localCluster;
   },
   clusterReady(state, ready) {
     state.clusterReady = ready;
@@ -845,11 +856,21 @@ export const actions = {
 
     res = await allHash(promises);
 
+    let localCluster = null;
+
     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 } });
+      await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER, opt: { watch: false } });
       toWatch.push(MANAGEMENT.CLUSTER);
+
+      localCluster = getters['management/byId'](MANAGEMENT.CLUSTER, 'local');
+    } else {
+      try {
+        localCluster = await dispatch('management/find', {
+          type: MANAGEMENT.CLUSTER, id: 'local', opt: { watch: false }
+        });
+      } catch (e) { // we don't care about errors, specifically 404s
+      }
     }
 
     // See comment above. Now that we have feature flags we can watch resources
@@ -857,11 +878,7 @@ export const actions = {
       dispatch('management/watch', { type });
     });
 
-    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[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` } });
       const rancherManagerSupport = harvesterSetting.find((setting) => setting.id === 'rancher-manager-support');
@@ -890,6 +907,8 @@ export const actions = {
     // Add the notification for the release notes
     if (isRancher) {
       await addReleaseNotesNotification(dispatch, getters);
+
+      fetchAndProcessDynamicContent(dispatch, getters, this.$axios);
     }
 
     if (systemNamespaces) {
@@ -901,6 +920,7 @@ export const actions = {
     commit('managementChanged', {
       ready: true,
       isRancher,
+      localCluster
     });
 
     if ( res[FLEET.WORKSPACE] ) {
@@ -911,6 +931,8 @@ export const actions = {
       });
     }
 
+    const isMultiCluster = getters['isMultiCluster'];
+
     console.log(`Done loading management; isRancher=${ isRancher }; isMultiCluster=${ isMultiCluster }`); // eslint-disable-line no-console
   },
 
@@ -1168,7 +1190,7 @@ export const actions = {
     }
   },
 
-  async onLogout(store) {
+  async onLogout(store, options = {}) {
     const { dispatch, commit, state } = store;
 
     store.dispatch('gcStopIntervals');
@@ -1210,7 +1232,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 }` : '';
@@ -1226,10 +1251,10 @@ export const actions = {
     }
   },
 
-  nuxtClientInit({ dispatch, commit, rootState }, nuxt) {
-    commit('setRouter', nuxt.app.router);
-    commit('setRoute', nuxt.route);
-    commit('setPlugin', nuxt.app.$plugin);
+  dashboardClientInit({ dispatch, commit, rootState }, context) {
+    commit('setRouter', context.app.router);
+    commit('setRoute', context.route);
+    commit('setPlugin', context.app.$plugin);
 
     dispatch('management/rehydrateSubscribe');
     dispatch('cluster/rehydrateSubscribe');

package/store/notifications.ts

@@ -1,6 +1,12 @@
 import { md5 } from '@shell/utils/crypto';
 import { randomStr } from '@shell/utils/string';
-import { EncryptedNotification, Notification, StoredNotification } from '@shell/types/notifications';
+import {
+  EncryptedNotification,
+  Notification,
+  NotificationLevel,
+  NotificationHandlerExtensionName,
+  StoredNotification
+} from '@shell/types/notifications';
 import { encrypt, decrypt, deriveKey } from '@shell/utils/crypto/encryption';
 
 /**
@@ -65,6 +71,9 @@ async function saveEncryptedNotification(getters: any, notification: Notificatio
     level:           notification.level,
     primaryAction:   notification.primaryAction,
     secondaryAction: notification.secondaryAction,
+    preference:      notification.preference,
+    handlerName:     notification.handlerName,
+    data:            notification.data,
   };
 
   const localStorageKey = getters['localStorageKey'];
@@ -108,15 +117,23 @@ export const getters = {
     return state.notifications;
   },
 
+  visible: (state: NotificationsStore) => {
+    return state.notifications.filter((n) => n.level !== NotificationLevel.Hidden);
+  },
+
+  hidden: (state: NotificationsStore) => {
+    return state.notifications.filter((n) => n.level === NotificationLevel.Hidden);
+  },
+
   item: (state: NotificationsStore) => {
     return (id: string) => {
       return state.notifications.find((i) => i.id === id);
     };
   },
 
-  // Count of unread notifications
+  // Count of unread notifications - only considers visible notifications
   unreadCount: (state: NotificationsStore) => {
-    return state.notifications.filter((n) => !n.read).length;
+    return state.notifications.filter((n) => !n.read && n.level !== NotificationLevel.Hidden).length;
   },
 
   /**
@@ -192,9 +209,10 @@ export const mutations = {
     syncIndex(state);
   },
 
+  // Only mark visible notifications as read via mark all
   markAllRead(state: NotificationsStore) {
     state.notifications.forEach((notification) => {
-      if (!notification.read) {
+      if (!notification.read && notification.level !== NotificationLevel.Hidden) {
         notification.read = true;
       }
     });
@@ -252,6 +270,20 @@ export const mutations = {
   },
 };
 
+async function callNotifyHandler({ $extension }: any, notification: Notification, read: boolean) {
+  if (notification?.handlerName) {
+    const handler = $extension.getDynamic(NotificationHandlerExtensionName, notification.handlerName);
+
+    if (handler) {
+      try {
+        await handler.onReadUpdated(notification, read);
+      } catch (e) {
+        console.error('Error invoking notification handler', e); // eslint-disable-line no-console
+      }
+    }
+  }
+}
+
 export const actions = {
   async add( { commit, dispatch, getters }: any, notification: Notification) {
     // We encrypt the notification on add - this is the only time we will encrypt it
@@ -295,6 +327,10 @@ export const actions = {
     if (notification?.preference) {
       await dispatch('prefs/set', notification.preference, { root: true });
     }
+
+    if (notification?.handlerName) {
+      await callNotifyHandler({ $extension: (this as any).$extension }, notification, true);
+    }
   },
 
   async markUnread({ commit, dispatch, getters }: any, id: string) {
@@ -309,6 +345,10 @@ export const actions = {
         value: notification.preference.unsetValue || '',
       }, { root: true });
     }
+
+    if (notification?.handlerName) {
+      await callNotifyHandler({ $extension: (this as any).$extension }, notification, false);
+    }
   },
 
   async markAllRead({ commit, dispatch, getters }: any) {
@@ -321,6 +361,13 @@ export const actions = {
     for (let i = 0; i < withPreference.length; i++) {
       await dispatch('prefs/set', withPreference[i].preference, { root: true });
     }
+
+    // For all notifications that have a handler, call the handler
+    const withHandler = getters.all.filter((n: Notification) => !!n.handlerName);
+
+    for (let i = 0; i < withHandler.length; i++) {
+      await callNotifyHandler({ $extension: (this as any).$extension }, withHandler[i], true);
+    }
   },
 
   remove({ commit, getters }: any, id: string) {

package/store/plugins.js

@@ -43,7 +43,6 @@ export const rke1Supports = [
 // Map a credential driver name to a component name
 // e.g. ec2 and eks both use the 'aws' driver to share the same pool of creds.
 const driverMap = {
-  aks:                             'azure',
   amazonec2:                       'aws',
   amazoneks:                       'aws',
   amazonelasticcontainerservice:   'aws',
@@ -62,6 +61,9 @@ const driverToFieldMap = {
   aws:    'amazonec2',
   gcp:    'google',
   oracle: 'oci',
+  aks:    'azure',
+  eks:    'amazonec2',
+  gke:    'google'
 };
 
 // Machine driver fields that are probably a credential field
@@ -107,8 +109,10 @@ const driverToCloudProviderMap = {
   linode:              '', // Show restricted options
   vmwarevsphere:       'rancher-vsphere',
   ovhcloudpubliccloud: '',
-
-  custom: undefined // Show all options
+  aks:                 'azure',
+  eks:                 'aws',
+  gke:                 'google',
+  custom:              undefined // Show all options
 };
 
 // Dynamically loaded drivers can call this eventually to register their options

package/store/prefs.js

@@ -1,6 +1,7 @@
 import { SETTING } from '@shell/config/settings';
 import { MANAGEMENT, STEVE } from '@shell/config/types';
 import { clone } from '@shell/utils/object';
+import { getBrandMeta } from '@shell/utils/brand';
 
 const definitions = {};
 /**
@@ -114,6 +115,13 @@ 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 });
+export const READ_ANNOUNCEMENTS = create('read-announcements', '', { parseJSON });
+
 // --------------------
 
 const cookiePrefix = 'R_';
@@ -515,16 +523,14 @@ export const actions = {
   setBrandStyle({ rootState, rootGetters }, dark = false) {
     if (rootState.managementReady) {
       try {
-        const brandSetting = rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.BRAND);
-
-        if (brandSetting && brandSetting.value && brandSetting.value !== '') {
-          const brand = brandSetting.value;
+        const brandSetting = rootGetters['management/brand'];
 
-          const brandMeta = require(`~shell/assets/brand/${ brand }/metadata.json`);
+        if (brandSetting !== '') {
+          const brandMeta = getBrandMeta(brandSetting);
           const hasStylesheet = brandMeta.hasStylesheet === 'true';
 
           if (hasStylesheet) {
-            document.body.classList.add(brand);
+            document.body.classList.add(brandMeta);
           } else {
             // TODO option apply color at runtime
           }

package/store/type-map.js

@@ -1895,7 +1895,7 @@ function ifHave(getters, option) {
   case IF_HAVE.NOT_V1_ISTIO: {
     return !isV1Istio(getters);
   }
-  case IF_HAVE.MULTI_CLUSTER: {
+  case IF_HAVE.MULTI_CLUSTER: { // Used by harvester extension
     return getters.isMultiCluster;
   }
   case IF_HAVE.NEUVECTOR_NAMESPACE: {
@@ -1904,10 +1904,10 @@ function ifHave(getters, option) {
   case IF_HAVE.ADMIN: {
     return isAdminUser(getters);
   }
-  case IF_HAVE.MCM_DISABLED: {
+  case IF_HAVE.MCM_DISABLED: { // There's a general MCM ff, this is conflating it with a harvester concept
     return !getters['isRancherInHarvester'];
   }
-  case IF_HAVE.NOT_STANDALONE_HARVESTER: {
+  case IF_HAVE.NOT_STANDALONE_HARVESTER: { // Not used by harvester extension...
     return !getters['isStandaloneHarvester'];
   }
   default:

package/store/ui-context.ts

@@ -0,0 +1,86 @@
+interface Context {
+  tag: string;
+  value: any;
+  hookId?: string;
+  description?: string;
+  icon?: string;
+}
+
+interface Element {
+  id: number;
+  context: Context
+}
+
+interface State {
+  idCounter: number;
+  elements: Record<string, Element>;
+}
+
+export const state = function(): State {
+  return {
+    idCounter: 0,
+    elements:  {}
+  };
+};
+
+export const getters = {
+  all: (state: State) => {
+    return Object.values(state.elements)
+      .map((e) => e.context)
+      .sort((a, b) => (a.tag || '').localeCompare(b.tag || '') || 0);
+  },
+};
+
+export const mutations = {
+  add(state: State, element: Element) {
+    state.elements[element.id] = element;
+  },
+
+  update(state: State, element: Element) {
+    const existingElement = state.elements[element.id];
+
+    if (existingElement) {
+      existingElement.context = element.context;
+    }
+  },
+
+  remove(state: State, element: Element) {
+    delete state.elements[element.id];
+  }
+};
+
+let id = null;
+
+export const actions = {
+  add({ commit, state }: { commit: Function, state: State }, context: Context) {
+    if (context?.value === undefined || !context?.tag) {
+      throw new Error(`[ui-context] context {{${ JSON.stringify(context) }}} is not valid`);
+    }
+
+    id = `ctx-${ state.idCounter++ }`;
+
+    commit('add', { id, context });
+
+    return id;
+  },
+
+  update({ commit, state }: { commit: Function, state: State }, element: Element) {
+    const old = state.elements[element.id];
+
+    if (!old) {
+      throw new Error(`[ui-context] element with id {{${ element.id }}} not found`);
+    }
+
+    commit('update', element);
+  },
+
+  remove({ commit, state }: { commit: Function, state: State }, id: number) {
+    const element = state.elements[id];
+
+    if (!element) {
+      throw new Error(`[ui-context] element with id {{${ id }}} not found`);
+    }
+
+    commit('remove', element);
+  }
+};