@rancher/shell 0.1.2 → 0.1.3

package/store/catalog.js

@@ -652,7 +652,9 @@ export function filterAndArrangeCharts(charts, {
       const searchTokens = searchQuery.split(/\s*[, ]\s*/).map(x => ensureRegex(x, false));
 
       for ( const token of searchTokens ) {
-        if ( !c.chartNameDisplay.match(token) && (c.chartDescription && !c.chartDescription.match(token)) ) {
+        const chartDescription = c.chartDescription || '';
+
+        if ( !c.chartNameDisplay.match(token) && !chartDescription.match(token) ) {
           return false;
         }
       }

package/store/i18n.js

@@ -1,6 +1,5 @@
 import merge from 'lodash/merge';
 import IntlMessageFormat from 'intl-messageformat';
-import { LOCALE } from '@shell/config/cookies';
 import { get } from '@shell/utils/object';
 import en from '@shell/assets/translations/en-us.yaml';
 import { getProduct, getVendor, DOCS_BASE } from '@shell/config/private-label';
@@ -208,8 +207,10 @@ export const mutations = {
 };
 
 export const actions = {
-  init({ state, commit, dispatch }) {
-    let selected = this.$cookies.get(LOCALE, { parseJSON: false });
+  init({
+    state, commit, dispatch, rootGetters
+  }) {
+    let selected = rootGetters['prefs/get']('locale');
 
     // We might be using a locale that is loaded by a plugin that is no longer loaded
     const exists = !!state.available.find(loc => loc === selected);
@@ -259,8 +260,11 @@ export const actions = {
     state,
     rootState,
     commit,
-    dispatch
+    dispatch,
+    getters
   }, locale) {
+    const currentLocale = getters['current']();
+
     if ( locale === NONE ) {
       commit('setSelected', locale);
 
@@ -308,13 +312,14 @@ export const actions = {
     }
 
     commit('setSelected', locale);
-    this.$cookies.set(LOCALE, locale, {
-      encode:   x => x,
-      maxAge:   86400 * 365,
-      path:     '/',
-      sameSite: true,
-      secure:   true,
-    });
+
+    // Ony update the preference if the locale changed
+    if (currentLocale !== locale) {
+      dispatch('prefs/set', {
+        key:   'locale',
+        value: state.selected
+      }, { root: true });
+    }
   },
 
   toggleNone({ state, dispatch }) {

package/store/index.js

@@ -1,6 +1,6 @@
 import Steve from '@shell/plugins/steve';
 import {
-  COUNT, NAMESPACE, NORMAN, MANAGEMENT, FLEET, UI, VIRTUAL_HARVESTER_PROVIDER, HCI, DEFAULT_WORKSPACE
+  COUNT, NAMESPACE, NORMAN, MANAGEMENT, FLEET, UI, VIRTUAL_HARVESTER_PROVIDER, DEFAULT_WORKSPACE
 } from '@shell/config/types';
 import { CLUSTER as CLUSTER_PREF, NAMESPACE_FILTERS, LAST_NAMESPACE, WORKSPACE } from '@shell/store/prefs';
 import { allHash, allHashSettled } from '@shell/utils/promise';
@@ -14,7 +14,6 @@ import { setBrand, setVendor } from '@shell/config/private-label';
 import { addParam } from '@shell/utils/url';
 import { SETTING } from '@shell/config/settings';
 import semver from 'semver';
-import { NAME as VIRTUAL } from '@shell/config/product/harvester';
 import { BACK_TO } from '@shell/config/local-storage';
 import { STEVE_MODEL_TYPES } from '@shell/plugins/steve/getters';
 import { BY_TYPE } from '@shell/plugins/dashboard-store/classify';
@@ -52,12 +51,6 @@ export const plugins = [
     supportsStream: false, // The norman API doesn't support streaming
     modelBaseClass: STEVE_MODEL_TYPES.NORMAN,
   }),
-  Steve({
-    namespace:      'harvester',
-    baseUrl:        '', // URL is dynamically set for the selected cluster
-    supportsStream: false, // true, -- Disabled due to report that it's sometimes much slower in Chrome
-  }),
-
 ];
 
 const getActiveNamespaces = (state, getters) => {
@@ -450,47 +443,14 @@ export const getters = {
     return '/';
   },
 
-  isSingleProduct(state, rootGetters) {
+  isSingleProduct(state) {
     if (state.isSingleProduct !== undefined) {
       return state.isSingleProduct;
     }
 
-    if (rootGetters.isSingleVirtualCluster) {
-      return {
-        logo:            require('~shell/assets/images/providers/harvester.svg'),
-        productNameKey:  'product.harvester',
-        version:         rootGetters['harvester/byId'](HCI.SETTING, 'server-version')?.value,
-        afterLoginRoute: {
-          name:   'c-cluster-product',
-          params: { product: VIRTUAL },
-        },
-        logoRoute: {
-          name:   'c-cluster-product-resource',
-          params: {
-            product:  VIRTUAL,
-            resource: HCI.DASHBOARD,
-          }
-        },
-        enableSessionCheck: true
-      };
-    }
-
     return false;
   },
 
-  isSingleVirtualCluster(state, getters, rootState, rootGetters) {
-    const clusterId = getters.defaultClusterId;
-    const cluster = rootGetters['management/byId'](MANAGEMENT.CLUSTER, clusterId);
-
-    return !getters.isMultiCluster && cluster?.status?.provider === VIRTUAL_HARVESTER_PROVIDER;
-  },
-
-  isMultiVirtualCluster(state, getters, rootState, rootGetters) {
-    const localCluster = rootGetters['management/byId'](MANAGEMENT.CLUSTER, 'local');
-
-    return getters.isMultiCluster && localCluster?.status?.provider !== VIRTUAL_HARVESTER_PROVIDER;
-  },
-
   isVirtualCluster(state, getters) {
     const cluster = getters['currentCluster'];
 
@@ -509,9 +469,7 @@ export const mutations = {
     state.clusterReady = ready;
   },
 
-  updateNamespaces(state, getters) {
-    const { filters, all } = getters;
-
+  updateNamespaces(state, { filters, all }) {
     state.namespaceFilters = filters.filter(x => !!x);
 
     if ( all ) {
@@ -644,7 +602,7 @@ export const actions = {
     }
 
     res = await allHash(promises);
-
+    dispatch('i18n/init');
     let isMultiCluster = true;
 
     if ( res.clusters.length === 1 && res.clusters[0].metadata?.name === 'local' ) {
@@ -701,11 +659,6 @@ export const actions = {
       return;
     }
 
-    if (oldProduct === VIRTUAL) {
-      await dispatch('harvester/unsubscribe');
-      commit('harvester/reset');
-    }
-
     const oldPkgClusterStore = oldPkg?.stores.find(
       s => getters[`${ s.storeName }/isClusterStore`]
     )?.storeName;
@@ -767,7 +720,6 @@ export const actions = {
     // If we've entered a new store ensure everything has loaded correctly
     if (newPkgClusterStore) {
       // Mirror actions on the 'cluster' store for our specific pkg `cluster` store
-      dispatch(`${ newPkgClusterStore }/loadSchemas`, true);
       await dispatch(`${ newPkgClusterStore }/loadCluster`, { id });
 
       commit('clusterReady', true);
@@ -872,135 +824,6 @@ export const actions = {
     commit('updateNamespaces', { filters: ids, ...getters });
   },
 
-  async loadVirtual({
-    state, commit, dispatch, getters
-  }, { id, oldProduct }) {
-    const isMultiCluster = getters['isMultiCluster'];
-
-    if (isMultiCluster && id === 'local') {
-      return;
-    }
-
-    if ( state.clusterId && state.clusterId === id && oldProduct === VIRTUAL) {
-      // Do nothing, we're already connected/connecting to this cluster
-      return;
-    }
-
-    if (oldProduct !== VIRTUAL) {
-      await dispatch('cluster/unsubscribe');
-      commit('cluster/reset');
-    }
-
-    if ( state.clusterId && id ) {
-      commit('clusterReady', false);
-
-      await dispatch('harvester/unsubscribe');
-      commit('harvester/reset');
-
-      await dispatch('management/watch', {
-        type:      MANAGEMENT.PROJECT,
-        namespace: state.clusterId,
-        stop:      true
-      });
-
-      commit('management/forgetType', MANAGEMENT.PROJECT);
-    }
-
-    if (id) {
-      commit('clusterId', id);
-    }
-
-    console.log(`Loading ${ isMultiCluster ? 'ECM ' : '' }cluster...`); // eslint-disable-line no-console
-
-    // This is a workaround for a timing issue where the mgmt cluster schema may not be available
-    // Try and wait until the schema exists before proceeding
-    await dispatch('management/waitForSchema', { type: MANAGEMENT.CLUSTER });
-
-    // See if it really exists
-    const cluster = await dispatch('management/find', {
-      type: MANAGEMENT.CLUSTER,
-      id,
-      opt:  { url: `${ MANAGEMENT.CLUSTER }s/${ escape(id) }` }
-    });
-
-    let virtualBase = `/k8s/clusters/${ escape(id) }/v1/harvester`;
-
-    if (id === 'local') {
-      virtualBase = `/v1/harvester`;
-    }
-
-    if ( !cluster ) {
-      commit('clusterId', null);
-      commit('harvester/applyConfig', { baseUrl: null });
-      throw new ClusterNotFoundError(id);
-    }
-
-    // Update the Steve client URLs
-    commit('harvester/applyConfig', { baseUrl: virtualBase });
-
-    await Promise.all([
-      dispatch('harvester/loadSchemas', true),
-    ]);
-
-    dispatch('harvester/subscribe');
-
-    let isRancher = false;
-    const projectArgs = {
-      type: MANAGEMENT.PROJECT,
-      opt:  {
-        url:            `${ MANAGEMENT.PROJECT }/${ escape(id) }`,
-        watchNamespace: id
-      }
-    };
-
-    if (getters['management/schemaFor'](MANAGEMENT.PROJECT)) {
-      isRancher = true;
-    }
-
-    if (id !== 'local' && getters['harvester/schemaFor'](MANAGEMENT.SETTING)) { // multi-cluster
-      const settings = await dispatch('harvester/findAll', {
-        type: MANAGEMENT.SETTING,
-        id:   SETTING.SYSTEM_NAMESPACES,
-        opt:  { url: `${ virtualBase }/${ MANAGEMENT.SETTING }s/`, force: true }
-      });
-
-      const systemNamespaces = settings?.find(x => x.id === SETTING.SYSTEM_NAMESPACES);
-
-      if (systemNamespaces) {
-        const namespace = (systemNamespaces.value || systemNamespaces.default)?.split(',');
-
-        commit('setSystemNamespaces', namespace);
-      }
-    }
-
-    const hash = {
-      projects:          isRancher && dispatch('management/findAll', projectArgs),
-      virtualCount:      dispatch('harvester/findAll', { type: COUNT }),
-      virtualNamespaces: dispatch('harvester/findAll', { type: NAMESPACE }),
-      settings:          dispatch('harvester/findAll', { type: HCI.SETTING }),
-    };
-
-    if (getters['harvester/schemaFor'](HCI.UPGRADE)) {
-      hash.upgrades = dispatch('harvester/findAll', { type: HCI.UPGRADE });
-    }
-
-    const res = await allHash(hash);
-
-    await dispatch('cleanNamespaces');
-
-    const filters = getters['prefs/get'](NAMESPACE_FILTERS)?.[id];
-
-    commit('updateNamespaces', {
-      filters: filters || [ALL_USER],
-      all:     res.virtualNamespaces,
-      ...getters
-    });
-
-    commit('clusterReady', true);
-
-    console.log('Done loading virtual cluster.'); // eslint-disable-line no-console
-  },
-
   async cleanNamespaces({ getters, dispatch }) {
     // Initialise / Remove any filters that the user no-longer has access to
     await dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }); // So they can be got byId below

package/store/prefs.js

@@ -4,6 +4,11 @@ import { clone } from '@shell/utils/object';
 import { SETTING } from '@shell/config/settings';
 
 const definitions = {};
+/**
+ * Key/value of prefrences are stored before login here and cookies due lack of access permission.
+ * Once user is logged in while setting asUserPreference, update stored before login Key/value to the backend in loadServer function.
+ */
+let prefsBeforeLogin = {};
 
 export const create = function(name, def, opt = {}) {
   const parseJSON = opt.parseJSON === true;
@@ -243,7 +248,7 @@ export const mutations = {
 };
 
 export const actions = {
-  async set({ dispatch, commit }, opt) {
+  async set({ dispatch, commit, rootGetters }, opt) {
     let { key, value } = opt; // eslint-disable-line prefer-const
     const definition = definitions[key];
     let server;
@@ -264,6 +269,15 @@ export const actions = {
     }
 
     if ( definition.asUserPreference ) {
+      const checkLogin = rootGetters['auth/loggedIn'];
+
+      // Check for login status
+      if (!checkLogin) {
+        prefsBeforeLogin[key] = value;
+
+        return;
+      }
+
       try {
         server = await dispatch('loadServer', key); // There's no watch on prefs, so get before set...
 
@@ -373,7 +387,9 @@ export const actions = {
     }
   },
 
-  async loadServer({ state, dispatch, commit }, ignoreKey) {
+  async loadServer( {
+    state, dispatch, commit, rootState, rootGetters
+  }, ignoreKey) {
     let server = { data: {} };
 
     try {
@@ -399,6 +415,18 @@ export const actions = {
       return;
     }
 
+    // if prefsBeforeLogin has values from login page, update the backend
+    if (Object.keys(prefsBeforeLogin).length > 0) {
+      Object.keys(prefsBeforeLogin).forEach((key) => {
+        server.data[key] = prefsBeforeLogin[key];
+      });
+
+      await server.save({ redirectUnauthorized: false });
+
+      // Clear prefsBeforeLogin, as we have now saved theses
+      prefsBeforeLogin = {};
+    }
+
     for (const key in definitions) {
       const definition = definitions[key];
       let value = clone(server.data[key]);

package/store/type-map.js

@@ -41,6 +41,7 @@
 //   public,                  -- If true, show to all users.  If false, only show when the Developer Tools pref is on (default true)
 //   category,                -- Group to show the product in for the nav hamburger menu
 //   typeStoreMap,            -- An object mapping types to the store that should be used to retrieve information about the type
+//   hideSystemResources      -- Hide resources in namespaces where namespace.isSystem === true, or a namespace managed by fleet (per its annotation) and hide those namespaces from ns/project list and nsfilter (default false)
 // })
 //
 // externalLink(stringOrFn)  The product has an external page (function gets context object
@@ -130,8 +131,7 @@ import {
   ensureRegex, escapeHtml, escapeRegex, ucFirst, pluralize
 } from '@shell/utils/string';
 import {
-  importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveDetail
-
+  importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveDetail, importDialog
 } from '@shell/utils/dynamic-importer';
 
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
@@ -167,7 +167,6 @@ export const IF_HAVE = {
   NO_PROJECT:               'no-project',
   NOT_V1_ISTIO:             'not-v1-istio',
   MULTI_CLUSTER:            'multi-cluster',
-  HARVESTER_SINGLE_CLUSTER: 'harv-multi-cluster',
   NEUVECTOR_NAMESPACE:      'neuvector-namespace',
 };
 
@@ -217,7 +216,7 @@ export function DSL(store, product, module = 'type-map') {
     headers(type, headers) {
       headers.forEach((header) => {
         // If on the client, then use the value getter if there is one
-        if (process.client && header.getValue) {
+        if (header.getValue) {
           header.value = header.getValue;
         }
 
@@ -1090,24 +1089,11 @@ export const getters = {
     };
   },
 
-  hasCustomPromptRemove(state, getters) {
-    return (rawType) => {
-      const type = getters.componentFor(rawType);
-
-      const cache = state.cache.promptRemove;
-
-      if ( cache[type] !== undefined ) {
-        return cache[type];
-      }
-
-      try {
-        require.resolve(`@shell/promptRemove/${ type }`);
-        cache[type] = true;
-      } catch (e) {
-        cache[type] = false;
-      }
+  hasCustomPromptRemove(state, getters, rootState) {
+    return (rawType, subType) => {
+      const key = getters.componentFor(rawType, subType);
 
-      return cache[type];
+      return hasCustom(state, rootState, 'promptRemove', key, () => require.resolve(`@shell/promptRemove/${ key }`));
     };
   },
 
@@ -1125,6 +1111,12 @@ export const getters = {
     };
   },
 
+  importDialog(state, getters, rootState) {
+    return (rawType, subType) => {
+      return loadExtension(rootState, 'dialog', getters.componentFor(rawType, subType), importDialog);
+    };
+  },
+
   importList(state, getters, rootState) {
     return (rawType) => {
       return loadExtension(rootState, 'list', getters.componentFor(rawType), importList);
@@ -1143,11 +1135,9 @@ export const getters = {
     };
   },
 
-  importCustomPromptRemove(state, getters) {
-    return (rawType) => {
-      const type = getters.componentFor(rawType);
-
-      return importCustomPromptRemove(type);
+  importCustomPromptRemove(state, getters, rootState) {
+    return (rawType, subType) => {
+      return loadExtension(rootState, 'promptRemove', getters.componentFor(rawType, subType), importCustomPromptRemove);
     };
   },
 
@@ -1739,9 +1729,6 @@ function ifHave(getters, option) {
   case IF_HAVE.MULTI_CLUSTER: {
     return getters.isMultiCluster;
   }
-  case IF_HAVE.HARVESTER_SINGLE_CLUSTER: {
-    return getters.isSingleVirtualCluster;
-  }
   case IF_HAVE.NEUVECTOR_NAMESPACE: {
     return getters[`cluster/all`](NAMESPACE).find(n => n.metadata.name === NEU_VECTOR_NAMESPACE);
   }

package/utils/cluster.js

@@ -13,7 +13,7 @@ export function filterOnlyKubernetesClusters(mgmtClusters) {
 
 export function isHarvesterCluster(mgmtCluster) {
   // Use the provider if it is set otherwise use the label
-  const provider = mgmtCluster?.status?.provider || mgmtCluster?.metadata?.labels?.[CAPI.PROVIDER];
+  const provider = mgmtCluster?.metadata?.labels?.[CAPI.PROVIDER] || mgmtCluster?.status?.provider;
 
   return provider === VIRTUAL_HARVESTER_PROVIDER;
 }

package/utils/custom-validators.js

@@ -8,12 +8,7 @@ import { cronSchedule } from '@shell/utils/validators/cron-schedule';
 import { podAffinity } from '@shell/utils/validators/pod-affinity';
 import { roleTemplateRules } from '@shell/utils/validators/role-template';
 import { clusterName } from '@shell/utils/validators/cluster-name';
-import { isHttps, backupTarget } from '@shell/utils/validators/setting';
-
-import { imageUrl, fileRequired } from '@shell/utils/validators/vm-image';
-
-import { vmNetworks, vmDisks } from '@shell/utils/validators/vm';
-import { dataVolumeSize } from '@shell/utils/validators/vm-datavolumes';
+import { isHttps } from '@shell/utils/validators/setting';
 
 /**
 * Custom validation functions beyond normal scalr types
@@ -36,10 +31,4 @@ export default {
   podAffinity,
   roleTemplateRules,
   isHttps,
-  backupTarget,
-  imageUrl,
-  dataVolumeSize,
-  vmNetworks,
-  vmDisks,
-  fileRequired,
 };

package/utils/dynamic-importer.js

@@ -63,7 +63,7 @@ export function importDialog(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "dialog" */ `@shell/components/dialog/${name}`);
+  return () => import(/* webpackChunkName: "dialog" */ `@shell/dialog/${name}`);
 }
 
 export function importWindowComponent(name) {

package/utils/validators/setting.js

@@ -11,38 +11,3 @@ export function isHttps(value, getters, errors, validatorArgs, displayKey) {
 
   return errors;
 }
-
-export function backupTarget(value, getters, errors, validatorArgs) {
-  const t = getters['i18n/t'];
-
-  const parseValue = JSON.parse(value);
-  const type = parseValue.type;
-
-  if (!type) {
-    return errors;
-  }
-
-  if (type === 's3') {
-    if (!parseValue.accessKeyId) {
-      errors.push(t('validation.required', { key: 'accessKeyId' }));
-    }
-
-    if (!parseValue.secretAccessKey) {
-      errors.push(t('validation.required', { key: 'secretAccessKey' }));
-    }
-
-    if (!parseValue.bucketRegion) {
-      errors.push(t('validation.required', { key: 'bucketRegion' }));
-    }
-
-    if (!parseValue.bucketName) {
-      errors.push(t('validation.required', { key: 'bucketName' }));
-    }
-  }
-
-  if (!parseValue.endpoint) {
-    errors.push(t('validation.required', { key: 'endpoint' }));
-  }
-
-  return errors;
-}