@rancher/shell 2.0.1 → 3.0.0-rc.2

package/utils/auth.js

@@ -1,7 +1,7 @@
 import { Popup, popupWindowOptions } from '@shell/utils/window';
 import { parse as parseUrl, addParam } from '@shell/utils/url';
 import {
-  BACK_TO, SPA, _EDIT, _FLAGGED, TIMED_OUT
+  BACK_TO, SPA, _EDIT, _FLAGGED, TIMED_OUT, IS_SLO, LOGGED_OUT
 } from '@shell/config/query-params';
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
@@ -60,6 +60,11 @@ export function returnTo(opt, vm) {
     returnToUrl = addParam(returnToUrl, 'config', opt.config);
   }
 
+  if (opt.isSlo) {
+    returnToUrl = addParam(returnToUrl, IS_SLO, _FLAGGED);
+    returnToUrl = addParam(returnToUrl, LOGGED_OUT, _FLAGGED);
+  }
+
   return returnToUrl;
 }
 
@@ -67,7 +72,19 @@ export function returnTo(opt, vm) {
  * Determines common auth provider info as those that are available (non-local) and the location of the enabled provider
  */
 export const authProvidersInfo = async(store) => {
-  const rows = await store.dispatch(`management/findAll`, { type: MANAGEMENT.AUTH_CONFIG });
+  try {
+    const rows = await store.dispatch(`management/findAll`, { type: MANAGEMENT.AUTH_CONFIG });
+
+    return parseAuthProvidersInfo(rows);
+  } catch (error) {
+    return {};
+  }
+};
+
+/**
+ * Parses auth provider's info to return if there's an auth provider enabled
+ */
+export function parseAuthProvidersInfo(rows) {
   const nonLocal = rows.filter((x) => x.name !== 'local');
   const enabled = nonLocal.filter((x) => x.enabled === true );
 
@@ -84,7 +101,7 @@ export const authProvidersInfo = async(store) => {
     enabledLocation,
     enabled
   };
-};
+}
 
 export const checkSchemasForFindAllHash = (types, store) => {
   const hash = {};
@@ -187,9 +204,7 @@ export function setProduct(store, to) {
   (product && !store.getters['type-map/isProductRegistered'](product))) {
     const error = new Error(store.getters['i18n/t']('nav.failWhale.productNotFound', { productNotFound: product }, true));
 
-    store.dispatch('loadingError', error);
-
-    throw new Error('loadingError', new Error(store.getters['i18n/t']('nav.failWhale.productNotFound', { productNotFound: product }, true)));
+    return store.dispatch('loadingError', error);
   }
 
   if ( !product ) {

package/utils/axios.js

@@ -75,7 +75,7 @@ const createAxiosInstance = (axiosOptions) => {
 };
 
 const setupProgress = (axios) => {
-  // A noop loading inteterface for when $nuxt is not yet ready
+  // A noop loading inteterface for when $loading is not yet ready
   const noopLoading = {
     finish: () => { },
     start:  () => { },

package/utils/download.js

@@ -2,7 +2,7 @@ import JSZip from 'jszip';
 
 export async function downloadFile(fileName, content, contentType = 'text/plain;charset=utf-8') {
   const blob = new Blob([content], { type: contentType });
-  const { saveAs } = await import('file-saver');
+  const saveAs = (await import('file-saver')).default;
 
   return saveAs(blob, fileName);
 }

package/utils/dynamic-importer.js

@@ -2,12 +2,14 @@
 // So it can be disabled just on this file that does nothing else, instead of every file that uses
 // an import with a variable in the path.
 
+import { defineAsyncComponent } from 'vue';
+
 export function importCloudCredential(name) {
   if (!name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "cloud-credential" */ `@shell/cloud-credential/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "cloud-credential" */ `@shell/cloud-credential/${name}`));
 }
 
 export function importMachineConfig(name) {
@@ -15,7 +17,7 @@ export function importMachineConfig(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "machine-config" */ `@shell/machine-config/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "machine-config" */ `@shell/machine-config/${name}`));
 }
 
 export function importLogin(name) {
@@ -23,7 +25,7 @@ export function importLogin(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "login" */ `@shell/components/auth/login/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "login" */ `@shell/components/auth/login/${name}`));
 }
 
 export function importChart(name) {
@@ -31,7 +33,7 @@ export function importChart(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "chart" */ `@shell/chart/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "chart" */ `@shell/chart/${name}`));
 }
 
 export function importList(name) {
@@ -39,7 +41,7 @@ export function importList(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "list" */ `@shell/list/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "list" */ `@shell/list/${name}`));
 }
 
 export function importDetail(name) {
@@ -47,7 +49,7 @@ export function importDetail(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "detail" */ `@shell/detail/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "detail" */ `@shell/detail/${name}`));
 }
 
 export function importEdit(name) {
@@ -55,7 +57,7 @@ export function importEdit(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "edit" */ `@shell/edit/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "edit" */ `@shell/edit/${name}`));
 }
 
 export function importDialog(name) {
@@ -63,7 +65,7 @@ export function importDialog(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "dialog" */ `@shell/dialog/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "dialog" */ `@shell/dialog/${name}`));
 }
 
 export function importWindowComponent(name) {
@@ -71,7 +73,7 @@ export function importWindowComponent(name) {
     throw new Error('Name required');
   }
 
-  return () => import(/* webpackChunkName: "components/nav" */ `@shell/components/nav/WindowManager/${name}`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "components/nav" */ `@shell/components/nav/WindowManager/${name}`));
 }
 
 export function loadProduct(name) {
@@ -85,7 +87,7 @@ export function loadProduct(name) {
 
 export function listProducts() {
   const ctx = require.context('@shell/config/product', true, /.*/);
-  const products = ctx.keys().filter(path => !path.endsWith('.js')).map(path => path.substr(2));
+  const products = ctx.keys().filter(path => !path.endsWith('.js') && path.startsWith('./')).map(path => path.substr(2));
 
   return products;
 }
@@ -100,7 +102,7 @@ export function loadTranslation(name) {
 }
 
 export function importCustomPromptRemove(name) {
-  return () => import(/* webpackChunkName: "custom-prompt-remove" */ `@shell/promptRemove/${ name }`);
+  return defineAsyncComponent(() => import(/* webpackChunkName: "custom-prompt-remove" */ `@shell/promptRemove/${ name }`));
 }
 
 export function resolveList(key) {
@@ -129,4 +131,4 @@ export function resolveMachineConfigComponent(key) {
 
 export function resolveCloudCredentialComponent(key) {
   return require.resolve(`@shell/cloud-credential/${ key }`);
-}
+}

package/utils/error.js

@@ -1,11 +1,11 @@
 import { isArray } from '@shell/utils/array';
 
 export class ClusterNotFoundError extends Error {
-  static name = 'ClusterNotFoundError'
+  static NAME = 'ClusterNotFoundError'
 
   constructor(message) {
     super(message);
-    this.name = ClusterNotFoundError.name;
+    this.name = ClusterNotFoundError.NAME;
   }
 }
 
@@ -13,12 +13,12 @@ export class ClusterNotFoundError extends Error {
  * An error occurred and the user should be redirected to a certain location (where this is handled)
  */
 export class RedirectToError extends Error {
-  static name = 'RedirectToError'
+  static NAME = 'RedirectToError'
 
   constructor(message, url) {
     super(message);
     this.url = url;
-    this.name = RedirectToError.name;
+    this.name = RedirectToError.NAME;
   }
 }
 

package/utils/object.js

@@ -2,7 +2,6 @@ import cloneDeep from 'lodash/cloneDeep';
 import flattenDeep from 'lodash/flattenDeep';
 import compact from 'lodash/compact';
 import { JSONPath } from 'jsonpath-plus';
-import Vue from 'vue';
 import transform from 'lodash/transform';
 import isObject from 'lodash/isObject';
 import isArray from 'lodash/isArray';
@@ -24,10 +23,10 @@ export function set(obj, path, value) {
     const key = parts[i];
 
     if ( i === parts.length - 1 ) {
-      Vue.set(ptr, key, value);
+      ptr[key] = value;
     } else if ( !ptr[key] ) {
       // Make sure parent keys exist
-      Vue.set(ptr, key, {});
+      ptr[key] = {};
     }
 
     ptr = ptr[key];
@@ -95,14 +94,14 @@ export function remove(obj, path) {
   // Remove the very last part of the path
 
   if (parentAry.length === 1) {
-    Vue.set(obj, path, undefined);
+    obj[path] = undefined;
     delete obj[path];
   } else {
     const leafKey = parentAry.pop();
     const parent = get(obj, joinObjectPath(parentAry));
 
     if ( parent ) {
-      Vue.set(parent, leafKey, undefined);
+      parent[leafKey] = undefined;
       delete parent[leafKey];
     }
   }

package/utils/router.js

@@ -1,3 +1,5 @@
+import { INSTALL_REDIRECT_META_KEY } from '@shell/config/router/navigation-guards/install-redirect';
+
 export function queryParamsFor(current, qp, defaults = {}) {
   const query = Object.assign({}, current || {});
 
@@ -98,7 +100,11 @@ export const routeRequiresAuthentication = (to) => {
   return routeMatched(to, (matched) => matched.meta?.requiresAuthentication);
 };
 
-function findMeta(route, key) {
+export const routeRequiresInstallRedirect = (to) => {
+  return routeMatched(to, (matched) => matched.meta?.[INSTALL_REDIRECT_META_KEY]);
+};
+
+export function findMeta(route, key) {
   if (route?.meta) {
     const meta = Array.isArray(route.meta) ? route.meta : [route.meta];
 

package/utils/select.js

@@ -14,7 +14,7 @@ export function onClickOption(option, e) {
 
   this.value.splice(optionIndex, 1);
 
-  this.$emit('input', this.value);
+  this.$emit('update:value', this.value);
   e.preventDefault();
   e.stopPropagation();
 

package/utils/settings.ts

@@ -102,5 +102,7 @@ export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string,
   }
 
   // Start with the default and overwrite the values from the setting - ensures we have defaults for newly added options
-  return Object.assign(DEFAULT_PERF_SETTING, perfSetting || {});
+  const safeDefaults = Object.assign({}, DEFAULT_PERF_SETTING);
+
+  return Object.assign(safeDefaults, perfSetting || {});
 };

package/utils/unit-tests/ChildRenderingRouterLinkStub.ts

@@ -1,12 +1,12 @@
 import { RouterLinkStub } from '@vue/test-utils';
-import { NavigationFailure, Route } from 'vue-router';
+import { NavigationFailure, RouteLocationNormalized } from 'vue-router';
 
 /**
  * See {@link RouterLinkSlotArgument} in vue-router
  */
 export interface RouterLinkSlotArgumentOptional {
     href?: string;
-    route?: Route;
+    route?: RouteLocationNormalized;
     navigate?: (e?: MouseEvent) => Promise<undefined | NavigationFailure>;
     isActive?: boolean;
     isExactActive?: boolean;
@@ -24,9 +24,9 @@ export function createChildRenderingRouterLinkStub(slotProps?: RouterLinkSlotArg
   return {
     ...RouterLinkStub,
     render() {
-      return this.$scopedSlots.default({
+      return this.$slots.default({
         href:          slotProps?.href || '',
-        route:         slotProps?.route || ({} as any),
+        route:         slotProps?.route || undefined,
         navigate:      slotProps?.navigate || (() => {}),
         isActive:      slotProps?.isActive || false,
         isExactActive: slotProps?.isExactActive || false,