dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

package/store/auth.js

@@ -14,6 +14,7 @@ export const BASE_SCOPES = {
   azuread:      [],
   keycloakoidc: ['openid profile email'],
   genericoidc:  ['openid profile email'],
+  cognito:      ['openid email'],
 };
 
 const KEY = 'rc_nonce';
@@ -355,6 +356,8 @@ export const actions = {
 
     commit('loggedOut');
     dispatch('onLogout', null, { root: true });
+
+    dispatch('uiplugins/setReady', false, { root: true });
   },
 
   async logout({ dispatch, getters, rootState }, options = {}) {

package/store/catalog.js

@@ -1,4 +1,4 @@
-import { CATALOG, EXPERIMENTAL, DEPRECATED } from '@shell/config/types';
+import { CATALOG, EXPERIMENTAL, DEPRECATED, CATALOG_SORT_OPTIONS } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { addParams } from '@shell/utils/url';
 import { allHash, allHashSettled } from '@shell/utils/promise';
@@ -31,6 +31,12 @@ const CERTIFIED_SORTS = {
   other:                               3,
 };
 
+export const APP_STATUS = {
+  INSTALLED:   'installed',
+  DEPRECATED:  'deprecated',
+  UPGRADEABLE: 'upgradeable'
+};
+
 export const APP_UPGRADE_STATUS = {
   NOT_APPLICABLE:    'not_applicable', // managed by fleet
   NO_UPGRADE:        'no_upgrade', // no upgrade found
@@ -498,35 +504,52 @@ function addChart(ctx, map, chart, repo) {
 
   if ( !obj ) {
     if ( ctx ) { }
+    const experimental = !!chart.annotations?.[CATALOG_ANNOTATIONS.EXPERIMENTAL];
+    const windowsIncompatible = !(chart.annotations?.[CATALOG_ANNOTATIONS.PERMITTED_OS] || '').includes('windows');
+    const deploysOnWindows = (chart.annotations?.[CATALOG_ANNOTATIONS.DEPLOYED_OS] || '').includes('windows');
+    const tags = [];
+
+    if (experimental) {
+      tags.push(ctx.rootGetters['i18n/withFallback']('generic.experimental'));
+    }
+    if (windowsIncompatible) {
+      tags.push(ctx.rootGetters['i18n/withFallback']('catalog.charts.windowsIncompatible'));
+    }
+    if (deploysOnWindows) {
+      tags.push(ctx.rootGetters['i18n/withFallback']('catalog.charts.deploysOnWindows'));
+    }
+
     obj = classify(ctx, {
       key,
-      type:                'chart',
-      id:                  key,
+      type:             'chart',
+      id:               key,
       certified,
       sideLabel,
       repoType,
       repoName,
-      repoNameDisplay:     ctx.rootGetters['i18n/withFallback'](`catalog.repo.name."${ repoName }"`, null, repoName),
-      certifiedSort:       CERTIFIED_SORTS[certified] || 99,
-      icon:                chart.icon,
-      color:               repo.color,
-      chartType:           chart.annotations?.[CATALOG_ANNOTATIONS.TYPE] || CATALOG_ANNOTATIONS._APP,
-      chartName:           chart.name,
-      chartNameDisplay:    chart.annotations?.[CATALOG_ANNOTATIONS.DISPLAY_NAME] || chart.name,
-      chartDescription:    chart.description,
-      featured:            chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED],
-      repoKey:             repo._key,
-      versions:            [],
-      categories:          filterCategories(chart.keywords),
-      deprecated:          !!chart.deprecated,
-      experimental:        !!chart.annotations?.[CATALOG_ANNOTATIONS.EXPERIMENTAL],
-      hidden:              !!chart.annotations?.[CATALOG_ANNOTATIONS.HIDDEN],
-      targetNamespace:     chart.annotations?.[CATALOG_ANNOTATIONS.NAMESPACE],
-      targetName:          chart.annotations?.[CATALOG_ANNOTATIONS.RELEASE_NAME],
-      scope:               chart.annotations?.[CATALOG_ANNOTATIONS.SCOPE],
-      provides:            [],
-      windowsIncompatible: !(chart.annotations?.[CATALOG_ANNOTATIONS.PERMITTED_OS] || '').includes('windows'),
-      deploysOnWindows:    (chart.annotations?.[CATALOG_ANNOTATIONS.DEPLOYED_OS] || '').includes('windows')
+      repoNameDisplay:  ctx.rootGetters['i18n/withFallback'](`catalog.repo.name."${ repoName }"`, null, repoName),
+      certifiedSort:    CERTIFIED_SORTS[certified] || 99,
+      icon:             chart.icon,
+      color:            repo.color,
+      chartType:        chart.annotations?.[CATALOG_ANNOTATIONS.TYPE] || CATALOG_ANNOTATIONS._APP,
+      chartName:        chart.name,
+      chartNameDisplay: chart.annotations?.[CATALOG_ANNOTATIONS.DISPLAY_NAME] || chart.name,
+      chartDescription: chart.description,
+      featured:         chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED],
+      featuredIndex:    chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED] ? Number(chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED]) : Number.MAX_SAFE_INTEGER,
+      repoKey:          repo._key,
+      versions:         [],
+      categories:       filterCategories(chart.keywords),
+      deprecated:       !!chart.deprecated,
+      experimental,
+      hidden:           !!chart.annotations?.[CATALOG_ANNOTATIONS.HIDDEN],
+      targetNamespace:  chart.annotations?.[CATALOG_ANNOTATIONS.NAMESPACE],
+      targetName:       chart.annotations?.[CATALOG_ANNOTATIONS.RELEASE_NAME],
+      scope:            chart.annotations?.[CATALOG_ANNOTATIONS.SCOPE],
+      provides:         [],
+      windowsIncompatible,
+      deploysOnWindows,
+      tags
     });
 
     map[key] = obj;
@@ -543,6 +566,10 @@ function addChart(ctx, map, chart, repo) {
   }
 
   obj.versions.push(chart);
+
+  if (!obj.durationSinceRelease) {
+    obj.durationSinceRelease = Date.now() - new Date(obj.versions[0].created).getTime();
+  }
 }
 
 function preferSameRepo(matching, repoType, repoName) {
@@ -582,6 +609,16 @@ function normalizeCategory(c) {
   return c.replace(/\s+/g, '').toLowerCase();
 }
 
+export function normalizeFilterQuery(value) {
+  if (Array.isArray(value)) {
+    return value.map((v) => v.toLowerCase());
+  } else if (value) {
+    return [value.toLowerCase()];
+  }
+
+  return undefined;
+}
+
 /*
 catalog.cattle.io/deplys-on-os: OS -> requires global.cattle.OS.enabled: true
   default: nothing
@@ -614,7 +651,9 @@ export function filterAndArrangeCharts(charts, {
   clusterProvider = '',
   operatingSystems,
   category,
+  tag,
   searchQuery,
+  sort,
   showDeprecated = false,
   showHidden = false,
   showPrerelease = true,
@@ -641,11 +680,16 @@ export function filterAndArrangeCharts(charts, {
       return false;
     }
 
-    if ( category && !c.categories.includes(category) ) {
+    if (category?.length && !c.categories.some((cat) => category.includes(cat.toLowerCase()))) {
       // The category filter doesn't match
       return false;
     }
 
+    if (tag?.length && !c.tags.some((t) => tag.includes(t.toLowerCase()))) {
+      // The tag filter doesn't match
+      return false;
+    }
+
     if ( searchQuery ) {
       // The search filter doesn't match
       const searchTokens = searchQuery.split(/\s*[, ]\s*/).map((x) => ensureRegex(x, false));
@@ -662,5 +706,21 @@ export function filterAndArrangeCharts(charts, {
     return true;
   });
 
+  if (sort === CATALOG_SORT_OPTIONS.RECOMMENDED) {
+    return sortBy(out, ['featuredIndex', 'certifiedSort', 'repoName', 'chartNameDisplay']);
+  }
+
+  if (sort === CATALOG_SORT_OPTIONS.LAST_UPDATED_DESC) {
+    return sortBy(out, ['durationSinceRelease', 'featuredIndex', 'certifiedSort', 'repoName', 'chartNameDisplay']);
+  }
+
+  if (sort === CATALOG_SORT_OPTIONS.ALPHABETICAL_ASC) {
+    return sortBy(out, ['chartNameDisplay', 'featuredIndex', 'certifiedSort', 'repoName']);
+  }
+
+  if (sort === CATALOG_SORT_OPTIONS.ALPHABETICAL_DESC) {
+    return sortBy(out, ['chartNameDisplay'], true);
+  }
+
   return sortBy(out, ['certifiedSort', 'repoName', 'chartNameDisplay']);
 }

package/store/features.js

@@ -28,7 +28,6 @@ export const mapFeature = function(name) {
 export const MULTI_CLUSTER = create('multi-cluster-management', true);
 export const LEGACY = create('legacy', false);
 export const RKE2 = create('rke2', true);
-export const RKE1_UI = create('rke1-ui', true);
 export const UNSUPPORTED_STORAGE_DRIVERS = create('unsupported-storage-drivers', false);
 export const FLEET = create('continuous-delivery', true);
 export const HARVESTER = create('harvester', true);

package/store/growl.js

@@ -1,8 +1,11 @@
 import { clear, findBy, removeObject } from '@shell/utils/array';
 import { stringify } from '@shell/utils/error';
+import { NotificationLevel } from '@shell/types/notifications';
 
 const DEFAULT_TIMEOUT = 5000;
 
+const MAX_GROWLS = 5;
+
 export const state = function() {
   return {
     nextId: 1,
@@ -13,18 +16,28 @@ export const state = function() {
 export const getters = {
   find: (state) => ({ key, val }) => {
     return findBy(state.stack, key, val);
+  },
+
+  // findBy is slow, so more efficient getter for id
+  byId: (state) => (id) => {
+    return state.stack.find((item) => item.id === id);
   }
 };
 
 export const mutations = {
   add(state, data) {
+    if (state.stack.length === MAX_GROWLS) {
+      // Remove the last one
+      state.stack.pop();
+    }
+
     state.stack = [
-      ...state.stack,
       {
         id:      state.nextId++,
         started: (new Date().getTime()),
         ...data
-      }
+      },
+      ...state.stack
     ];
   },
 
@@ -50,11 +63,29 @@ export const actions = {
     commit('remove', id);
   },
 
-  success({ commit }, data) {
+  async close({ commit, dispatch, getters }, id ) {
+    const growl = getters.byId(id);
+
+    commit('remove', id);
+
+    // If the growl has a notification, mark it as read if the user dismisses the growl
+    if (growl.notification) {
+      await dispatch('notifications/markRead', growl.notification, { root: true });
+    }
+  },
+
+  async success({ commit, dispatch }, data) {
+    // Send a notification for the growl
+    const notification = await dispatch('notifications/fromGrowl', {
+      ...data,
+      level: NotificationLevel.Success
+    }, { root: true });
+
     commit('add', {
       color:   'success',
       icon:    'checkmark',
       timeout: DEFAULT_TIMEOUT,
+      notification,
       ...data
     });
   },
@@ -68,31 +99,89 @@ export const actions = {
     });
   },
 
-  warning({ commit }, data) {
+  async warning({ commit, dispatch }, data) {
+    // Send a notification for the growl
+    const notification = await dispatch('notifications/fromGrowl', {
+      ...data,
+      level: NotificationLevel.Warning
+    }, { root: true });
+
     commit('add', {
       color:   'warning',
       icon:    'warning',
       timeout: DEFAULT_TIMEOUT,
+      notification,
       ...data
     });
   },
 
-  error({ commit }, data) {
+  async error({ commit, dispatch }, data) {
+    // Send a notification for the growl
+    const notification = await dispatch('notifications/fromGrowl', {
+      ...data,
+      level: NotificationLevel.Error
+    }, { root: true });
+
     commit('add', {
       color:   'error',
       icon:    'error',
-      timeout: 0, // Errors don't timeout
+      timeout: DEFAULT_TIMEOUT, // Errors timeout since they will be available as a notification
+      notification,
       ...data
     });
   },
 
-  fromError({ commit }, { title, err }) {
+  async fromError({ commit, dispatch }, { title, err }) {
+    // Send a notification for the growl
+    const notification = await dispatch('notifications/fromGrowl', {
+      title,
+      message: stringify(err),
+      level:   NotificationLevel.Error
+    }, { root: true });
+
     commit('add', {
       color:   'error',
       icon:    'error',
-      timeout: 0, // Errors don't timeout
+      timeout: DEFAULT_TIMEOUT, // Errors timeout since they will be available as a notification
+      notification,
       title,
       message: stringify(err),
     });
+  },
+
+  /**
+   * Used to create a growl when a notification is sent
+   *
+   * Growls are only shown for Success, Warning and Error notifications
+   */
+  notification({ commit }, notification) {
+    const growl = {
+      title:        notification.title,
+      message:      notification.message,
+      notification: notification.id,
+      timeout:      DEFAULT_TIMEOUT,
+    };
+
+    switch (notification.level) {
+    case NotificationLevel.Success:
+      growl.color = 'success';
+      growl.icon = 'checkmark';
+      break;
+    case NotificationLevel.Warning:
+      growl.color = 'warning';
+      growl.icon = 'warning';
+      break;
+    case NotificationLevel.Error:
+      growl.color = 'error';
+      growl.icon = 'error';
+      break;
+    default:
+      growl.skip = true;
+    }
+
+    // We don't show growls for info, announcement, task
+    if (!growl.skip) {
+      commit('add', growl);
+    }
   }
 };

package/store/i18n.js

@@ -18,7 +18,7 @@ export const state = function() {
   // const available = translationContext.keys().map(path => path.replace(/^.*\/([^\/]+)\.[^.]+$/, '$1'));
   // Using require.context() forces them to all be in the same webpack chunk name... just hardcode the list for now so zh-hans
   // gets generated as it's own chunk instead of being loaded all the time.
-  const available = ['zh-hans', DEFAULT_LOCALE ];
+  const available = ['zh-hans', DEFAULT_LOCALE];
 
   const out = {
     default:      DEFAULT_LOCALE,
@@ -108,6 +108,7 @@ export const getters = {
         ...args
       };
 
+      moreArgs['count'] = moreArgs['count'] !== undefined ? moreArgs['count'] : 1
       return formatter.format(moreArgs);
     } else {
       return '?';
@@ -231,6 +232,9 @@ export const actions = {
     if ( !selected || !exists) {
       selected = 'zh-hans';
     }
+    
+    // selected = 'none'
+    selected = 'zh-hans'
 
     return dispatch('switchTo', selected);
   },

package/store/index.js

@@ -39,6 +39,7 @@ import { STORE, BLANK_CLUSTER } from '@shell/store/store-types';
 import { isDevBuild } from '@shell/utils/version';
 import { markRaw } from 'vue';
 import paginationUtils from '@shell/utils/pagination-utils';
+import { addReleaseNotesNotification } from '@shell/utils/release-notes';
 
 // 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.
@@ -263,6 +264,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,
   };
 };
 
@@ -517,10 +519,10 @@ export const getters = {
              (!isAll && filteredMap && filteredMap[out] );
     }
 
-    out = rootGetters['prefs/get'](LAST_NAMESPACE);
-    if ( isOk() ) {
-      return out;
-    }
+    // out = rootGetters['prefs/get'](LAST_NAMESPACE);
+    // if ( isOk() ) {
+    //   return out;
+    // }
 
     out = 'default';
     if ( isOk() ) {
@@ -601,6 +603,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 +775,11 @@ export const mutations = {
 
   setSideNavCache(state, sideNavCache) {
     state.sideNavCache = sideNavCache;
-  }
+  },
+
+  showWorkspaceSwitcher(state, value) {
+    state.showWorkspaceSwitcher = value;
+  },
 };
 
 export const actions = {
@@ -801,7 +817,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 +832,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 +870,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` } });
@@ -862,11 +878,16 @@ export const actions = {
       const isRancherInHarvester = (rancherManagerSupport?.value || rancherManagerSupport?.default) === 'true';
 
       commit('isRancherInHarvester', isRancherInHarvester);
+
+      if (getters['isSingleProduct']) {
+        console.log('Detect standalone harvester, subscribe Rancher socket'); // eslint-disable-line no-console
+        await dispatch('rancher/subscribe');
+      }
     }
 
-    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);
@@ -876,6 +897,11 @@ export const actions = {
       setBrand(brand);
     }
 
+    // Add the notification for the release notes
+    if (isRancher) {
+      await addReleaseNotesNotification(dispatch, getters);
+    }
+
     if (systemNamespaces) {
       const namespace = (systemNamespaces.value || systemNamespaces.default)?.split(',');
 
@@ -887,10 +913,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
       });
     }
@@ -1286,5 +1312,9 @@ export const actions = {
     commit('setSideNavCache', sideNavCache);
   },
 
+  showWorkspaceSwitcher({ commit }, value) {
+    commit('showWorkspaceSwitcher', value);
+  },
+
   ...gcActions
 };