dashboard-shell-shell 1.0.1000000119 → 3.0.2-rc.105

package/components/SortableTable/index.vue

@@ -417,7 +417,7 @@ export default {
     const isLoading = this.loading || false;
 
     let isCreatable = false;
-    const lastPath = this.$route?.path.split('/').pop();
+    const lastPath = this.$route.path.split('/').pop();
 
     if (lastPath.includes('.')) {
       isCreatable = this.$store.getters['type-map/optionsFor'](lastPath).isCreatable;
@@ -1753,11 +1753,10 @@ export default {
                 @mouseover="setBulkActionOfInterest(act)"
                 @mouseleave="setBulkActionOfInterest(null)"
               >
-                <!-- <i
+                <i
                   v-if="act.icon"
                   :class="act.icon"
-                  style="line-height: 12px;height: 12px;font-size: 12px;"
-                /> -->
+                />
                 <span v-clean-html="act.label" />
               </button>
               <template v-if="featureDropdownMenu">

package/components/form/KeyValue.vue

@@ -388,6 +388,17 @@ export default {
         });
       }
 
+      rows = rows.map((item) => {
+        if (item.key && item.key.includes('harvester')) {
+          item.key = item.key.replace('harvester', 'cloud');
+        }
+        if (item.key && item.value.includes('harvester')) {
+          item.value = item.value.replace('harvester', 'cloud');
+        }
+
+        return item;
+      });
+
       return rows;
     },
 
@@ -398,6 +409,8 @@ export default {
         [this.valueName]: value,
       };
 
+      obj.key = obj.key?.replace('harvester', 'cloud');
+      obj.value = obj.value?.replace('harvester', 'cloud');
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -479,8 +492,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName] || '').trim();
-          let value = (row[valueName] || '').trim();
+          const key = (row[keyName].replace('cloud', 'harvester') || '').trim();
+          let value = (row[valueName].replace('cloud', 'harvester') || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));

package/components/form/MatchExpressions.vue

@@ -289,7 +289,7 @@ export default {
         :data-testid="`input-match-type-field-${index}`"
       >
         <div v-if="isView">
-          {{ row.matching }}
+          {{ row.matching.replace('harvester', 'cloud') }}
           <!-- {{ row.matching }} -->
         </div>
         <LabeledSelect
@@ -305,7 +305,7 @@ export default {
         :data-testid="`input-match-expression-key-${index}`"
       >
         <div v-if="isView" class="view-item-value">
-          {{ row.key }}
+          {{ row.key.replace('harvester', 'cloud') }}
         </div>
         <input
           v-else-if="!hasKeySelectOptions"

package/components/form/NameNsDescription.vue

@@ -252,7 +252,7 @@ export default {
       const options = namespaces
         .map((namespace) => ({ nameDisplay: namespace, id: namespace }))
         .map(props.namespaceMapper || ((obj) => ({
-          label: obj.nameDisplay,
+          label: obj.nameDisplay.replace('harvester', 'cloud'),
           value: obj.id,
         })));
 

package/components/nav/NamespaceFilter.vue

@@ -753,7 +753,7 @@ export default {
           :data-testid="`namespaces-value-${j}`"
           class="ns-value"
         >
-          <div>{{ ns.label }}</div>
+          <div>{{ ns.label.replace('harvester', 'cloud') }}</div>
           <!-- block user from removing the last selection if ns forced filtering is on -->
           <i
             v-if="!namespaceFilterMode || value.length > 1"
@@ -864,7 +864,7 @@ export default {
               v-if="opt.kind === NAMESPACE_FILTER_KINDS.NAMESPACE"
               class="icon icon-folder"
             />
-            <div>{{ opt.label }}</div>
+            <div>{{ opt.label.replace('harvester', 'cloud') }}</div>
             <i
               v-if="opt.selected"
               class="icon icon-checkmark"

package/config/router/navigation-guards/index.js

@@ -22,17 +22,17 @@ export function installNavigationGuards(router, context) {
     let changed = false;
     const params = { ...to.params };
 
-    if (params?.product?.includes('cloud')) {
+    if (params.product?.includes('cloud')) {
       params.product = params.product.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params?.cluster?.includes('cloud')) {
+    if (params.cluster?.includes('cloud')) {
       params.cluster = params.cluster.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params?.resource?.includes('cloud')) {
+    if (params.resource?.includes('cloud')) {
       params.resource = params.resource.replace(/cloud/g, 'harvester');
       changed = true;
     }

package/config/table-headers.js

@@ -162,7 +162,7 @@ export const NAMESPACE = {
   name:        'namespace',
   labelKey:    'tableHeaders.namespace',
   value:       'namespace',
-  getValue:    row => row && row.namespace && row.namespace,
+  getValue:    row => row && row.namespace && row.namespace.replace('harvester', 'cloud'),
   sort:        'namespace',
   dashIfEmpty: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000119",
+  "version": "3.0.2-rc.105",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

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', 'cloud')
+  return str?.replace(/harvester/g, 'cloud');
 }
 
 export function cloud2harvester(str) {
-    return str?.replace('cloud', 'harvester')
+  return str?.replace(/cloud/g, 'harvester');
 }
 
 export function queryParamsFor(current, qp, defaults = {}) {
@@ -89,7 +89,7 @@ export const getPackageFromRoute = (route) => {
 };
 
 export const getResourceFromRoute = (to) => {
-  let resource = to.params?.resource;
+  let resource = cloud2harvesterhci(to.params?.resource);
 
   if (!resource) {
     resource = findMeta(to, 'resource');