@rancher/shell 0.3.13 → 0.3.15

package/utils/object.js

@@ -43,7 +43,7 @@ export function getAllValues(obj, path) {
   keysInOrder.forEach((currentKey) => {
     currentValue = currentValue.map((indexValue) => {
       if (Array.isArray(indexValue)) {
-        return indexValue.map(arr => arr[currentKey]).flat();
+        return indexValue.map((arr) => arr[currentKey]).flat();
       } else if (indexValue) {
         return indexValue[currentKey];
       } else {
@@ -52,7 +52,7 @@ export function getAllValues(obj, path) {
     }).flat();
   });
 
-  return currentValue.filter(val => val !== null);
+  return currentValue.filter((val) => val !== null);
 }
 
 export function get(obj, path) {
@@ -131,7 +131,7 @@ export function isSimpleKeyValue(obj) {
   return obj !== null &&
     !Array.isArray(obj) &&
     typeof obj === 'object' &&
-    Object.values(obj || {}).every(v => typeof v !== 'object');
+    Object.values(obj || {}).every((v) => typeof v !== 'object');
 }
 
 /*
@@ -174,7 +174,7 @@ export function definedKeys(obj) {
     if ( Array.isArray(val) ) {
       return key;
     } else if ( isObject(val) ) {
-      return ( definedKeys(val) || [] ).map(subkey => `${ key }.${ subkey }`);
+      return ( definedKeys(val) || [] ).map((subkey) => `${ key }.${ subkey }`);
     } else {
       return key;
     }
@@ -375,5 +375,5 @@ export function pickBy(obj = {}, predicate = (value, key) => false) {
  * @returns
  */
 export const toDictionary = (array, callback) => Object.assign(
-  {}, ...array.map(item => ({ [item]: callback(item) }))
+  {}, ...array.map((item) => ({ [item]: callback(item) }))
 );

package/utils/pod-security-admission.ts

@@ -7,7 +7,7 @@ import { PSA } from '@shell/types/pod-security-admission';
  * Return PSA labels present in the resource
  * @returns string[]
  */
-export const getPSALabels = (resource: PSA): string[] => filter(keys(resource?.metadata?.labels), key => PSALabelsNamespaces.includes(key));
+export const getPSALabels = (resource: PSA): string[] => filter(keys(resource?.metadata?.labels), (key) => PSALabelsNamespaces.includes(key));
 
 /**
  * Return boolean value if the label is a PSA label

package/utils/projectAndNamespaceFiltering.utils.ts

@@ -51,7 +51,7 @@ class ProjectAndNamespaceFiltering {
     }
 
     const projectsOrNamespaces = namespaceFilter
-      .map(f => f.replace(NAMESPACE_FILTER_NS_FULL_PREFIX, '')
+      .map((f) => f.replace(NAMESPACE_FILTER_NS_FULL_PREFIX, '')
         .replace(NAMESPACE_FILTER_P_FULL_PREFIX, ''))
       .join(',');
 

package/utils/select.js

@@ -3,10 +3,10 @@ export function onClickOption(option, e) {
     return;
   }
 
-  const getValue = opt => (this.optionKey ? this.get(opt, this.optionKey) : this.getOptionLabel(opt));
+  const getValue = (opt) => (this.optionKey ? this.get(opt, this.optionKey) : this.getOptionLabel(opt));
   const optionValue = getValue(option);
   const value = this.value || [];
-  const optionIndex = value.findIndex(option => getValue(option) === optionValue);
+  const optionIndex = value.findIndex((option) => getValue(option) === optionValue);
 
   if (optionIndex < 0) {
     return;

package/utils/selector.js

@@ -53,7 +53,7 @@ export function parse(labelSelector) {
     }
   }
 
-  const parts = labelSelector.split(/\s*,\s*/).filter(x => !!x);
+  const parts = labelSelector.split(/\s*,\s*/).filter((x) => !!x);
 
   for ( let rule of parts ) {
     rule = rule.trim();
@@ -224,5 +224,5 @@ export function matches(obj, selector, labelKey = 'metadata.labels') {
 }
 
 export function matching(ary, selector, labelKey) {
-  return ary.filter(obj => matches(obj, selector, labelKey));
+  return ary.filter((obj) => matches(obj, selector, labelKey));
 }

package/utils/settings.ts

@@ -1,6 +1,7 @@
 import { MANAGEMENT } from '@shell/config/types';
 import { Store } from 'vuex';
 import { DEFAULT_PERF_SETTING, SETTING } from '@shell/config/settings';
+import { GC_PREFERENCES } from 'utils/gc/gc-types';
 
 export const fetchOrCreateSetting = async(store: Store<any>, id: string, val: string, save = true): Promise<any> => {
   let setting;
@@ -27,7 +28,7 @@ export const fetchOrCreateSetting = async(store: Store<any>, id: string, val: st
   * We fetch all settings - reality is Rancher will have done this already, so there's no overhead in doing
   * this - but if we fetch a specific setting that does not exist, we will get a 404, which we don't want
   */
-export const fetchSetting = async(store: Store<any>, id: string) => {
+export const fetchSetting = async(store: Store<any>, id: string): Promise<any> => {
   const all = await store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
   const setting = (all || []).find((setting: any) => setting.id === id);
 
@@ -43,7 +44,21 @@ export const setSetting = async(store: Store<any>, id: string, val: string): Pro
   return setting;
 };
 
-export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string, arg1: string) => any>) => {
+export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string, arg1: string) => any>): {
+  inactivity: {
+      enabled: boolean;
+      threshold: number;
+  };
+  incrementalLoading: {
+      enabled: boolean;
+      threshold: number;
+  };
+  manualRefresh: {};
+  disableWebsocketNotification: boolean;
+  garbageCollection: GC_PREFERENCES;
+  forceNsFilterV2: {};
+  advancedWorker: {};
+} => {
   const perfSettingResource = rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE);
   let perfSetting = {};
 

package/utils/socket.js

@@ -49,6 +49,7 @@ export default class Socket extends EventTarget {
   disconnectCallBacks = [];
   disconnectedAt = 0;
   closingId = 0;
+  autoReconnectUrl = null;
 
   constructor(url, autoReconnect = true, frameTimeout = null, protocol = null, maxTries = null, idAsTimestamp = false) {
     super();
@@ -199,6 +200,13 @@ export default class Socket extends EventTarget {
     this.autoReconnect = autoReconnect;
   }
 
+  /**
+   * Supply an async fn that will provide a new url to reconnect to
+   */
+  setAutoReconnectUrl(autoReconnectUrl) {
+    this.autoReconnectUrl = autoReconnectUrl;
+  }
+
   // "Private"
   _close() {
     const socket = this.socket;
@@ -329,12 +337,28 @@ export default class Socket extends EventTarget {
         // dispatch an event which will trigger a growl from steve-plugin sockets warning users that we've given up trying to reconnect
         this.dispatchEvent(new CustomEvent(EVENT_DISCONNECT_ERROR));
       } else {
-        this._log('closed. Attempting to reconnect');
-        const delay = Math.max(1000, Math.min(1000 * this.tries, 30000));
-
-        this.reconnectTimer = setTimeout(() => {
-          this.connect();
-        }, delay);
+        const reconnect = () => {
+          this._log('closed. Attempting to reconnect');
+          const delay = Math.max(1000, Math.min(1000 * this.tries, 30000));
+
+          this.reconnectTimer = setTimeout(() => {
+            this.connect();
+          }, delay);
+        };
+
+        if (this.autoReconnectUrl) {
+          this.autoReconnectUrl()
+            .then((url) => {
+              this.setUrl(url);
+
+              reconnect();
+            })
+            .catch((e) => {
+              console.error('Failed to fetch socket auto reconnect url', e); // eslint-disable-line no-console
+            });
+        } else {
+          reconnect();
+        }
       }
     } else {
       this.state = STATE_DISCONNECTED;

package/utils/sort.js

@@ -217,7 +217,7 @@ export function sortableNumericSuffix(str) {
     return str;
   }
 
-  return str.split(splitRegex).map(x => x.match(notNumericRegex) ? strPad(x, 10, '0') : x).join('').trim();
+  return str.split(splitRegex).map((x) => x.match(notNumericRegex) ? strPad(x, 10, '0') : x).join('').trim();
 }
 
 export function isNumeric(num) {

package/utils/string.js

@@ -272,7 +272,7 @@ const quotedMatch = /[^."']+|"([^"]*)"|'([^']*)'/g;
 export function splitObjectPath(path) {
   if ( path.includes('"') || path.includes("'") ) {
     // Path with quoted section
-    return path.match(quotedMatch).map(x => x.replace(/['"]/g, ''));
+    return path.match(quotedMatch).map((x) => x.replace(/['"]/g, ''));
   }
 
   // Regular path

package/utils/url.ts

@@ -48,7 +48,7 @@ export function removeParam(url: string, key: string): string {
   return stringify(parsed);
 }
 
-export function parseLinkHeader(str: string) {
+export function parseLinkHeader(str: string): Record<string, string> {
   const out: { [key: string]: string} = { };
   const lines = (str || '').split(',');
 

package/utils/validators/formRules/index.ts

@@ -53,7 +53,7 @@ export interface ValidationOptions {
 }
 
 // "t" is the function name we use for getting a translated string
-export default function(t: Translation, { key = 'Value' }: ValidationOptions) {
+export default function(t: Translation, { key = 'Value' }: ValidationOptions): unknown {
   // utility validators these validators only get used by other validators
   const startDot: ValidatorFactory = (label: string): Validator => (val: string) => val?.slice(0, 1) === '.' ? t(`validation.dns.${ label }.startDot`, { key }) : undefined;
 
@@ -103,7 +103,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions) {
 
     if (matchedChars) {
       return t('validation.chars', {
-        key, count: matchedChars.length, chars: matchedChars.map(char => char === ' ' ? 'Space' : `"${ char }"`).join(', ')
+        key, count: matchedChars.length, chars: matchedChars.map((char) => char === ' ' ? 'Space' : `"${ char }"`).join(', ')
       });
     }
 
@@ -386,7 +386,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions) {
   };
 
   // The existing validator for clusterIp never actually returns an error
-  const clusterIp: Validator = val => undefined;
+  const clusterIp: Validator = (val) => undefined;
 
   const backupTarget: Validator = (val) => {
     const parseValue = JSON.parse(val);

package/utils/validators/role-template.js

@@ -2,18 +2,18 @@ import { RBAC } from '@shell/config/types';
 import isEmpty from 'lodash/isEmpty';
 
 export function roleTemplateRules(rules = [], getters, errors, validatorArgs = []) {
-  if (rules.some(rule => isEmpty(rule.verbs))) {
+  if (rules.some((rule) => isEmpty(rule.verbs))) {
     errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingVerb'));
   }
 
   if (validatorArgs[0] === RBAC.ROLE) {
-    if (rules.some(rule => isEmpty(rule.resources))) {
+    if (rules.some((rule) => isEmpty(rule.resources))) {
       errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingResource'));
     }
-    if (rules.some(rule => isEmpty(rule.apiGroups))) {
+    if (rules.some((rule) => isEmpty(rule.apiGroups))) {
       errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingApiGroup'));
     }
-  } else if (rules.some(rule => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) {
+  } else if (rules.some((rule) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) {
     errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingOneResource'));
   }
 }

package/utils/version.js

@@ -17,7 +17,7 @@ export function parse(str) {
 }
 
 export function sortable(str) {
-  return parse(str).map(x => sortableNumericSuffix(x)).join('.');
+  return parse(str).map((x) => sortableNumericSuffix(x)).join('.');
 }
 
 export function compare(in1, in2) {
@@ -125,3 +125,16 @@ export async function markReadReleaseNotes(store) {
     await store.dispatch('prefs/set', { key: READ_WHATS_NEW, value: getVersionInfo(store).fullVersion });
   }
 }
+
+export function generateSupportLink(version) {
+  const defaultSupportURL = 'https://rancher.com/support-maintenance-terms';
+
+  if (!version || isDevBuild(version)) {
+    return defaultSupportURL;
+  }
+
+  const baseUrl = 'https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-';
+  const formattedVersion = version.split('.').join('-');
+
+  return baseUrl + formattedVersion;
+}

package/vue.config.js

@@ -162,7 +162,7 @@ module.exports = function(dir, _appConfig) {
     const items = fs.readdirSync(path.relative(dir, './pkg'));
 
     // Ignore hidden folders
-    items.filter(name => !name.startsWith('.')).forEach((name) => {
+    items.filter((name) => !name.startsWith('.')).forEach((name) => {
       const f = require(path.join(dir, 'pkg', name, 'package.json'));
 
       // Package file must have rancher field to be a plugin
@@ -200,7 +200,7 @@ module.exports = function(dir, _appConfig) {
   const pkgImport = new webpack.NormalModuleReplacementPlugin(/^@pkg/, (resource) => {
     const ctx = resource.context.split('/');
     // Find 'pkg' folder in the contxt
-    const index = ctx.findIndex(s => s === 'pkg');
+    const index = ctx.findIndex((s) => s === 'pkg');
 
     if (index !== -1 && (index + 1) < ctx.length) {
       const pkg = ctx[index + 1];
@@ -271,6 +271,9 @@ module.exports = function(dir, _appConfig) {
   }
   const rancherEnv = process.env.RANCHER_ENV || 'web';
 
+  const loginLocaleSelector = process.env.LOGIN_LOCALE_SELECTOR || 'true';
+  const excludeOperatorPkg = process.env.EXCLUDE_OPERATOR_PKG || 'false';
+
   console.log(`API: '${ api }'. Env: '${ rancherEnv }'`); // eslint-disable-line no-console
   const proxy = {
     ...appConfig.proxies,
@@ -330,7 +333,7 @@ module.exports = function(dir, _appConfig) {
 
         server.websocketProxies.push({
           upgrade(req, socket, head) {
-            const path = Object.keys(socketProxies).find(path => req.url.startsWith(path));
+            const path = Object.keys(socketProxies).find((path) => req.url.startsWith(path));
 
             if (path) {
               const proxy = socketProxies[path];
@@ -381,6 +384,7 @@ module.exports = function(dir, _appConfig) {
       config.resolve.alias['@pkg'] = path.join(dir, 'pkg');
       config.resolve.alias['./node_modules'] = path.join(dir, 'node_modules');
       config.resolve.alias['@components'] = COMPONENTS_DIR;
+      config.resolve.alias['vue$'] = dev ? path.resolve(process.cwd(), 'node_modules', 'vue') : 'vue';
       config.resolve.modules.push(__dirname);
       config.plugins.push(virtualModules);
       config.plugins.push(autoImport);
@@ -389,17 +393,19 @@ module.exports = function(dir, _appConfig) {
       // DefinePlugin does string replacement within our code. We may want to consider replacing it with something else. In code we'll see something like
       // process.env.commit even though process and env aren't even defined objects. This could cause people to be mislead.
       config.plugins.push(new webpack.DefinePlugin({
-        'process.client':              JSON.stringify(true),
-        'process.env.commit':          JSON.stringify(commit),
-        'process.env.version':         JSON.stringify(dashboardVersion),
-        'process.env.dev':             JSON.stringify(dev),
-        'process.env.pl':              JSON.stringify(pl),
-        'process.env.perfTest':        JSON.stringify(perfTest),
-        'process.env.rancherEnv':      JSON.stringify(rancherEnv),
-        'process.env.harvesterPkgUrl': JSON.stringify(process.env.HARVESTER_PKG_URL),
-        'process.env.api':             JSON.stringify(api),
+        'process.client':                  JSON.stringify(true),
+        'process.env.commit':              JSON.stringify(commit),
+        'process.env.version':             JSON.stringify(dashboardVersion),
+        'process.env.dev':                 JSON.stringify(dev),
+        'process.env.pl':                  JSON.stringify(pl),
+        'process.env.perfTest':            JSON.stringify(perfTest),
+        'process.env.loginLocaleSelector': JSON.stringify(loginLocaleSelector),
+        'process.env.excludeOperatorPkg':  JSON.stringify(excludeOperatorPkg),
+        'process.env.rancherEnv':          JSON.stringify(rancherEnv),
+        'process.env.harvesterPkgUrl':     JSON.stringify(process.env.HARVESTER_PKG_URL),
+        'process.env.api':                 JSON.stringify(api),
         // Store the Router Base as env variable that we can use in `shell/config/router.js`
-        'process.env.routerBase':      JSON.stringify(routerBasePath),
+        'process.env.routerBase':          JSON.stringify(routerBasePath),
 
         // This is a replacement of the nuxt publicRuntimeConfig
         'nuxt.publicRuntimeConfig': JSON.stringify({