dashboard-shell-shell 1.0.112 → 1.0.114

package/package.json

@@ -5,7 +5,7 @@
   "license": "Apache-2.0",
   "author": "SUSE",
   "private": false,
-  "version": "1.0.00000000112",
+  "version": "1.0.00000000114",
   "engines": {
     "node": ">=20.0.0"
   },

package/store/type-map.js

@@ -107,6 +107,7 @@
 //                               graphConfig: undefined   -- Use this to pass along the graph configuration
 //                               notFilterNamespace:  undefined -- Define namespaces that do not need to be filtered
 //                               localOnly: False -- Hide this type from the nav/search bar on downstream clusters
+//                               custom: any - Custom options for a given type
 //                           }
 // )
 // ignoreGroup(group):        Never show group or any types in it
@@ -508,6 +509,12 @@ export const getters = {
       return state.basicTypes?.[product]?.[schemaId];
     };
   },
+  
+  groupsForVirTypes(state) {
+    return (product, name) => {
+      return state.virtualTypes?.[product].find(item => item.name === name)?.icon;
+    };
+  },
 
   optionsFor(state, getters, rootState, rootGetters) {
     const def = {
@@ -524,6 +531,7 @@ export const getters = {
       depaginate:             false,
       customRoute:            undefined,
       resourceEditMasthead:   true,
+      custom:                 {},
     };
 
     return (schemaOrType, pagination) => {
@@ -657,7 +665,18 @@ export const getters = {
 
         const label = typeObj.labelKey ? rootGetters['i18n/t'](typeObj.labelKey) || typeObj.label : typeObj.label;
 
-        const labelDisplay = highlightLabel(label, count, typeObj.schema);
+        const virtual = !!typeObj.virtual;
+        let icon = typeObj.icon;
+
+        if ( (!virtual || typeObj.isSpoofed ) && !icon ) {
+          if ( namespaced ) {
+            icon = 'folder';
+          } else {
+            icon = 'globe';
+          }
+        }
+
+        const labelDisplay = highlightLabel(label,icon, count, typeObj.schema);
 
         if ( !labelDisplay ) {
           // Search happens in highlight and returns null if not found
@@ -765,7 +784,7 @@ export const getters = {
         return group;
       }
 
-      function highlightLabel(original, count, schema) {
+      function highlightLabel(original, icon, count, schema) {
         let label = escapeHtml(original);
 
         if ( searchRegex ) {
@@ -789,6 +808,12 @@ export const getters = {
           }
         }
 
+        if ( icon ) {
+          console.log(icon)
+          label = `<i class="icon icon-fw icon-${ icon }"></i>${ label }`;
+          console.log(label)
+        }
+
         return label;
       }
     };
@@ -1729,6 +1754,8 @@ export const mutations = {
     let obj = { ...options, match };
 
     if ( idx >= 0 ) {
+      // Merge the custom data object - multiple configures will update existing rather than overwrite
+      obj.custom = Object.assign(state.typeOptions[idx].custom || {}, obj.custom || {});
       obj = Object.assign(state.typeOptions[idx], obj);
       state.typeOptions.splice(idx, 1, obj);
     } else {

package/utils/error.js

@@ -1,5 +1,7 @@
 import { isArray } from '@shell/utils/array';
 
+import translations from './errorTranslate.json';
+
 export class ClusterNotFoundError extends Error {
   static NAME = 'ClusterNotFoundError'
 
@@ -48,7 +50,7 @@ export class ApiError extends Error {
 
 export function stringify(err) {
   let str;
-
+  console.log('00043', err);
   if ( typeof err === 'string' ) {
     str = err;
   } else if ( err && typeof err === 'object' ) {
@@ -60,7 +62,7 @@ export function stringify(err) {
           const data = JSON.parse(str).data;
 
           if (data) {
-            return data;
+            return translateError(data);
           }
         } catch {}
       }
@@ -84,24 +86,30 @@ export function stringify(err) {
     str = JSON.stringify(err);
   }
 
-  return str;
+  return translateError(str);
 }
 
 export function exceptionToErrorsArray(err) {
+  console.log('00055', err);
   if ( err?.response?.data ) {
     const body = err.response.data;
 
     if ( body && body.message ) {
-      return [body.message];
+      return [translateError(body.message)];
     } else {
-      return [err];
+      return [translateError(err)];
     }
   } else if (err.status && err.message) {
-    return [err.message];
+    return [translateError(err.message)];
   } else if ( isArray(err) ) {
-    return err;
+    let arr = []
+    for (let index = 0; index < err.length; index++) {
+      arr[index] = translateError(err[index])
+    }
+
+    return [...new Set(arr)];
   } else {
-    return [err];
+    return [translateError(err)];
   }
 }
 
@@ -129,3 +137,17 @@ export const normalizeError = (err) => {
     statusCode: (err.statusCode || err.status || (err.response && err.response.status) || 500)
   };
 };
+export function translateError(error) {
+  const originError = error;
+  error = error.toLowerCase();
+  console.log('00044', error);
+
+  // Apply translations from JSON
+  for (const translation of translations.translations) {
+    if (error.includes(translation.pattern)) {
+      error = error.replace(new RegExp(translation.pattern, 'g'), translation.replacement);
+    }
+  }
+
+  return error;
+}