dashboard-shell-shell 1.0.1000000117 → 1.0.1000000118

package/types/shell/index.d.ts

@@ -4162,7 +4162,7 @@ export function setPromiseResult(promise: any, obj: any, key: any, label: any):
 
 declare module '@shell/utils/router' {
 export function harvesterhci2cloud(str: any): any;
-export function cloud2harvesterhci(str: any): any;
+export function str: any: any;
 export function harvester2cloud(str: any): any;
 export function cloud2harvester(str: any): any;
 export function queryParamsFor(current: any, qp: any, defaults?: {}): any;

package/utils/error.js

@@ -138,10 +138,6 @@ export const normalizeError = (err) => {
   };
 };
 export function translateError(error) {
-  error = typeof error === 'string' 
-  ? error
-  : error?.message || error?.toString() || '';
-  
   const originError = error;
   error = error?.toLowerCase().replace(/admission webhook(.*?)denied the request:/g, (match, p1) => {
     return '';

package/utils/router.js

@@ -1,7 +1,7 @@
 import { INSTALL_REDIRECT_META_KEY } from '@shell/config/router/navigation-guards/install-redirect';
 
 export function harvesterhci2cloud(str) {
-  return str?.replace('harvesterhci.io', 'cloudhci.io')
+    return str?.replace('harvesterhci.io', 'cloudhci.io')
 }
 
 export function cloud2harvesterhci(str) {
@@ -14,11 +14,11 @@ export function cloud2harvesterhci(str) {
 }
 
 export function harvester2cloud(str) {
-  return str?.replace(/harvester/g, 'cloud');
+    return str?.replace('harvester', 'cloud')
 }
 
 export function cloud2harvester(str) {
-  return str?.replace(/cloud/g, 'harvester');
+    return str?.replace('cloud', 'harvester')
 }
 
 export function queryParamsFor(current, qp, defaults = {}) {

package/vue.config.js

@@ -58,6 +58,11 @@ const getShellPaths = (dir) => {
     COMPONENTS_DIR = path.join(dir, 'pkg', 'rancher-components', 'src', 'components');
   }
 
+   if (fs.existsSync(path.join(dir, 'cloud-shell'))) {
+    SHELL_ABS = path.join(dir, 'cloud-shell');
+    COMPONENTS_DIR = path.join(dir, 'pkg', 'rancher-components', 'src', 'components');
+  }
+
   return { SHELL_ABS, COMPONENTS_DIR };
 };
 
@@ -157,7 +162,7 @@ const getLoaders = (SHELL_ABS) => [
     test:    /\.m?[tj]sx?$/,
     // This excludes no modules except for node_modules/@rancher/... so that plugins can properly compile
     // when referencing @rancher/shell
-    exclude: /node_modules\/(?!(@rancher)\/).*/,
+    exclude: /node_modules\/(?!(dashboard-shell-shell)\/).*/,
     use:     [
       {
         loader:  'cache-loader',

package/assets/images/action.svg

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -1960 -15 )">
-    <path d="M 4.8287499999999 2.354999999999997  L 6.447499999999991 3.571249999999999  C 6.944234952397892 3.296336798844159  7.471337243122889 3.0802940772178857  8.018125000000055 2.927500000000002  L 8.398124999999936 0.9375  L 11.7493750000001 0.9375  L 12.035000000000082 2.941875000000003  C 12.581875000000082 3.099375000000002  13.106250000000045 3.319375000000001  13.599999999999909 3.5974999999999966  L 15.275624999999991 2.458750000000002  L 17.64562500000011 4.828749999999999  L 16.429374999999936 6.447499999999998  C 16.704375000000027 6.943750000000001  16.920624999999973 7.469999999999999  17.07312499999989 8.018124999999998  L 19.0631249999999 8.3975  L 19.0631249999999 11.748750000000001  L 17.058749999999918 12.034374999999997  C 16.901757589331055 12.579743540043523  16.681731272105935 13.104954119959451  16.403125000000045 13.599375000000002  L 17.54187499999989 15.274999999999999  L 15.171875 17.645  L 13.553124999999909 16.428749999999997  C 13.056874999999991 16.70375  12.5306250000001 16.919999999999998  11.982500000000073 17.072499999999998  L 11.603125000000091 19.0625  L 8.251874999999927 19.0625  L 7.966249999999945 17.058124999999997  C 7.42088145995649 16.9011325893311  6.895670880040598 16.681106272105932  6.401249999999891 16.4025  L 4.724999999999909 17.541249999999998  L 2.355000000000018 15.17125  L 3.5712499999999636 13.552500000000002  C 3.2963316621476224 13.055767511417464  3.0802886889528054 12.52866460691385  2.927500000000009 11.981875000000002  L 0.9375 11.6025  L 0.9375 8.251249999999999  L 2.941874999999982 7.965625000000003  C 3.099375000000009 7.419375000000002  3.3193750000000364 6.894374999999997  3.597500000000082 6.400624999999998  L 2.458750000000009 4.725000000000001  L 4.8287499999999 2.354999999999997  Z M 10.916249999999991 3.958750000000002  L 10.664375000000064 2.1868750000000006  L 9.431250000000091 2.1868750000000006  L 9.09375 3.958750000000002  L 8.690624999999955 4.046875  C 7.99908602983669 4.198277484319469  7.339492954772595 4.469899520362475  6.741874999999936 4.849375000000002  L 6.376874999999927 5.080624999999998  L 4.945625000000064 4.005625000000002  L 4.073750000000018 4.877499999999998  L 5.087500000000091 6.369999999999997  L 4.865000000000009 6.716875000000002  C 4.482751297972072 7.31276074731386  4.207964337869953 7.971064842647195  4.053124999999909 8.661875000000002  L 3.959374999999909 9.083750000000002  L 2.1875 9.335625  L 2.1875 10.568125000000002  L 3.958750000000009 10.90625  L 4.046875 11.309375000000003  C 4.198388963584193 12.000879103122479  4.47000322511758 12.660453298964391  4.849375000000009 13.258125  L 5.080625000000055 13.623125000000002  L 4.005625000000009 15.054375  L 4.877500000000055 15.92625  L 6.369999999999891 14.912500000000001  L 6.716875000000073 15.135000000000002  C 7.31276074731386 15.517248702027885  7.971064842647138 15.792035662130075  8.661875000000009 15.946874999999999  L 9.083750000000009 16.040625  L 9.335624999999936 17.8125  L 10.568125000000009 17.8125  L 10.90625 16.04125  L 11.309375000000045 15.953125  C 12.000879103122543 15.801611036415771  12.660453298964285 15.529996774882413  13.258125000000064 15.150625000000002  L 13.623125000000073 14.919375000000002  L 15.054374999999936 15.994375000000002  L 15.926249999999982 15.122500000000002  L 14.912499999999909 13.629999999999995  L 15.134999999999991 13.283124999999998  C 15.517248702027928 12.68723925268614  15.792035662130047 12.028935157352805  15.946875000000091 11.338124999999998  L 16.04062500000009 10.916249999999998  L 17.8125 10.664375  L 17.8125 9.431249999999999  L 16.04124999999999 9.093125  L 15.953125 8.689999999999998  C 15.801611036415807 7.998495896877522  15.52999677488242 7.338921701035609  15.150624999999991 6.741250000000001  L 14.919374999999945 6.376249999999999  L 15.994374999999991 4.945  L 15.122499999999945 4.073124999999997  L 13.63000000000011 5.086874999999999  L 13.283124999999927 4.8643749999999955  C 12.687215183188528 4.482172208106064  12.028919443671839 4.207388735859226  11.338124999999991 4.052500000000002  L 10.916249999999991 3.958750000000002  Z M 10 6.25  C 12.071067811865532 6.25  13.75 7.9289321881345245  13.75 10  C 13.75 12.071067811865476  12.071067811865532 13.75  10 13.75  C 7.928932188134468 13.75  6.25 12.071067811865476  6.25 10  C 6.25 7.9289321881345245  7.928932188134468 6.25  10 6.25  Z M 10 7.5  C 8.619288125423054 7.5  7.5 8.619288125423019  7.5 10  C 7.5 11.380711874576981  8.619288125423054 12.5  10 12.5  C 11.380711874576946 12.5  12.5 11.380711874576981  12.5 10  C 12.5 8.619288125423019  11.380711874576946 7.5  10 7.5  Z " fill-rule="nonzero" fill="#555555" stroke="none" transform="matrix(1 0 0 1 1960 15 )" />
-  </g>
-</svg>