dashboard-shell-shell 3.0.5-test.6 → 3.0.5-test.61

package/types/shell/index.d.ts

@@ -305,6 +305,8 @@ export namespace NAME {
     export { sort_3 as sort };
     let formatter_3: string;
     export { formatter_3 as formatter };
+    let width_2: number;
+    export { width_2 as width };
     let canBeVariable_1: boolean;
     export { canBeVariable_1 as canBeVariable };
 }
@@ -329,8 +331,8 @@ export namespace SIMPLE_NAME {
     export { value_5 as value };
     let sort_5: string[];
     export { sort_5 as sort };
-    let width_2: number;
-    export { width_2 as width };
+    let width_3: number;
+    export { width_3 as width };
     let canBeVariable_2: boolean;
     export { canBeVariable_2 as canBeVariable };
 }
@@ -535,8 +537,8 @@ export namespace CPU {
     export { value_21 as value };
     let formatter_11: string;
     export { formatter_11 as formatter };
-    let width_3: number;
-    export { width_3 as width };
+    let width_4: number;
+    export { width_4 as width };
 }
 export namespace RAM {
     let name_23: string;
@@ -551,8 +553,8 @@ export namespace RAM {
     export { value_22 as value };
     let formatter_12: string;
     export { formatter_12 as formatter };
-    let width_4: number;
-    export { width_4 as width };
+    let width_5: number;
+    export { width_5 as width };
 }
 export namespace PRINCIPAL {
     let name_24: string;
@@ -579,8 +581,8 @@ export namespace PODS {
     export { value_24 as value };
     let formatter_14: string;
     export { formatter_14 as formatter };
-    let width_5: number;
-    export { width_5 as width };
+    let width_6: number;
+    export { width_6 as width };
 }
 export namespace AGE {
     let name_26: string;
@@ -597,8 +599,8 @@ export namespace AGE {
     export { search_4 as search };
     let formatter_15: string;
     export { formatter_15 as formatter };
-    let width_6: number;
-    export { width_6 as width };
+    let width_7: number;
+    export { width_7 as width };
     let align_1: string;
     export { align_1 as align };
 }
@@ -635,8 +637,8 @@ export namespace DESCRIPTION {
     export { sort_28 as sort };
     let formatter_17: string;
     export { formatter_17 as formatter };
-    let width_7: number;
-    export { width_7 as width };
+    let width_8: number;
+    export { width_8 as width };
 }
 export namespace NS_SNAPSHOT_QUOTA {
     let name_29: string;
@@ -726,8 +728,8 @@ export namespace SCALE {
     export { sort_33 as sort };
     let formatter_23: string;
     export { formatter_23 as formatter };
-    let width_8: number;
-    export { width_8 as width };
+    let width_9: number;
+    export { width_9 as width };
     let align_4: string;
     export { align_4 as align };
 }
@@ -748,8 +750,8 @@ export namespace SUCCESS {
     export { labelKey_36 as labelKey };
     let value_36: string;
     export { value_36 as value };
-    let width_9: number;
-    export { width_9 as width };
+    let width_10: number;
+    export { width_10 as width };
     let align_5: string;
     export { align_5 as align };
 }
@@ -760,8 +762,8 @@ export namespace REQ_RATE {
     export { labelKey_37 as labelKey };
     let value_37: string;
     export { value_37 as value };
-    let width_10: number;
-    export { width_10 as width };
+    let width_11: number;
+    export { width_11 as width };
     let align_6: string;
     export { align_6 as align };
 }
@@ -772,8 +774,8 @@ export namespace P95 {
     export { labelKey_38 as labelKey };
     let value_38: string;
     export { value_38 as value };
-    let width_11: number;
-    export { width_11 as width };
+    let width_12: number;
+    export { width_12 as width };
     let align_7: string;
     export { align_7 as align };
 }
@@ -831,8 +833,8 @@ export namespace TARGET_KIND {
     export { labelKey_43 as labelKey };
     let value_43: string;
     export { value_43 as value };
-    let width_12: number;
-    export { width_12 as width };
+    let width_13: number;
+    export { width_13 as width };
 }
 export namespace TARGET {
     let name_44: string;
@@ -961,8 +963,8 @@ export namespace SIMPLE_TYPE {
     export { value_53 as value };
     let sort_45: string[];
     export { sort_45 as sort };
-    let width_13: number;
-    export { width_13 as width };
+    let width_14: number;
+    export { width_14 as width };
 }
 export namespace IMAGE_SIZE {
     let name_54: string;
@@ -987,8 +989,8 @@ export namespace TYPE {
     export { getValue_11 as getValue };
     let sort_47: string[];
     export { sort_47 as sort };
-    let width_14: number;
-    export { width_14 as width };
+    let width_15: number;
+    export { width_15 as width };
 }
 export namespace SUB_TYPE {
     let name_56: string;
@@ -999,8 +1001,8 @@ export namespace SUB_TYPE {
     export { value_56 as value };
     let sort_48: string[];
     export { sort_48 as sort };
-    let width_15: number;
-    export { width_15 as width };
+    let width_16: number;
+    export { width_16 as width };
 }
 export namespace EVENT_TYPE {
     let name_57: string;
@@ -1021,8 +1023,8 @@ export namespace STATUS {
     export { value_58 as value };
     let sort_50: string[];
     export { sort_50 as sort };
-    let width_16: number;
-    export { width_16 as width };
+    let width_17: number;
+    export { width_17 as width };
 }
 export namespace LAST_SEEN_TIME {
     let name_59: string;
@@ -1050,8 +1052,8 @@ export namespace LAST_HEARTBEAT_TIME {
     export { sort_52 as sort };
     let formatter_31: string;
     export { formatter_31 as formatter };
-    let width_17: number;
-    export { width_17 as width };
+    let width_18: number;
+    export { width_18 as width };
 }
 export namespace REASON {
     let name_61: string;
@@ -1220,8 +1222,8 @@ export namespace INGRESS_DEFAULT_BACKEND {
     export { sort_67 as sort };
     let formatter_37: string;
     export { formatter_37 as formatter };
-    let width_18: number;
-    export { width_18 as width };
+    let width_19: number;
+    export { width_19 as width };
     let align_10: string;
     export { align_10 as align };
 }
@@ -1304,8 +1306,8 @@ export namespace RESOURCES {
     export { value_82 as value };
     let sort_74: string;
     export { sort_74 as sort };
-    let width_19: number;
-    export { width_19 as width };
+    let width_20: number;
+    export { width_20 as width };
 }
 export namespace URL {
     let name_83: string;
@@ -1374,8 +1376,8 @@ export namespace WORKLOAD_HEALTH_SCALE {
     export { formatter_44 as formatter };
     export function getValue_13(): any;
     export { getValue_13 as getValue };
-    let width_20: number;
-    export { width_20 as width };
+    let width_21: number;
+    export { width_21 as width };
     export let skipSelect: boolean;
     let delayLoading_1: boolean;
     export { delayLoading_1 as delayLoading };
@@ -1399,8 +1401,8 @@ export namespace FLEET_SUMMARY {
     export { formatter_45 as formatter };
     let align_11: string;
     export { align_11 as align };
-    let width_21: number;
-    export { width_21 as width };
+    let width_22: number;
+    export { width_22 as width };
 }
 export namespace FLEET_APPLICATION_TYPE {
     let name_89: string;
@@ -1415,8 +1417,8 @@ export namespace FLEET_APPLICATION_TYPE {
     export { search_10 as search };
     let align_12: string;
     export { align_12 as align };
-    let width_22: number;
-    export { width_22 as width };
+    let width_23: number;
+    export { width_23 as width };
 }
 export namespace FLEET_APPLICATION_SOURCE {
     let name_90: string;
@@ -1471,8 +1473,8 @@ export namespace FLEET_APPLICATION_RESOURCES_SUMMARY {
     export { formatter_48 as formatter };
     let align_13: string;
     export { align_13 as align };
-    let width_23: number;
-    export { width_23 as width };
+    let width_24: number;
+    export { width_24 as width };
 }
 export namespace FLEET_REPO_CLUSTER_SUMMARY {
     let name_94: string;
@@ -1489,8 +1491,8 @@ export namespace FLEET_REPO_CLUSTER_SUMMARY {
     export { formatter_49 as formatter };
     let align_14: string;
     export { align_14 as align };
-    let width_24: number;
-    export { width_24 as width };
+    let width_25: number;
+    export { width_25 as width };
 }
 export namespace FLEET_REPO_PER_CLUSTER_STATE {
     let name_95: string;
@@ -1501,8 +1503,8 @@ export namespace FLEET_REPO_PER_CLUSTER_STATE {
     export { tooltip_3 as tooltip };
     let sort_85: string[];
     export { sort_85 as sort };
-    let width_25: number;
-    export { width_25 as width };
+    let width_26: number;
+    export { width_26 as width };
     let _default_2: string;
     export { _default_2 as default };
     let formatter_50: string;
@@ -1527,8 +1529,8 @@ export namespace APP_SUMMARY {
     export { formatter_51 as formatter };
     let align_15: string;
     export { align_15 as align };
-    let width_26: number;
-    export { width_26 as width };
+    let width_27: number;
+    export { width_27 as width };
 }
 export namespace CONSTRAINT_VIOLATION_CONSTRAINT_LINK {
     let name_97: string;
@@ -1685,8 +1687,8 @@ export namespace GROUP_NAME {
     export { search_18 as search };
     let formatter_58: string;
     export { formatter_58 as formatter };
-    let width_27: number;
-    export { width_27 as width };
+    let width_28: number;
+    export { width_28 as width };
 }
 export namespace GROUP_ROLE_NAME {
     let name_107: string;
@@ -1753,8 +1755,8 @@ export namespace ACCESS_KEY {
     export { align_16 as align };
     let sort_101: string[];
     export { sort_101 as sort };
-    let width_28: number;
-    export { width_28 as width };
+    let width_29: number;
+    export { width_29 as width };
 }
 export namespace SCOPE {
     let name_113: string;
@@ -1769,8 +1771,8 @@ export namespace SCOPE {
     export { align_17 as align };
     let sort_102: string[];
     export { sort_102 as sort };
-    let width_29: number;
-    export { width_29 as width };
+    let width_30: number;
+    export { width_30 as width };
 }
 export namespace SCOPE_NORMAN {
     let value_113: string;
@@ -1789,8 +1791,8 @@ export namespace EXPIRES {
     export { align_18 as align };
     let sort_104: string[];
     export { sort_104 as sort };
-    let width_30: number;
-    export { width_30 as width };
+    let width_31: number;
+    export { width_31 as width };
     let formatter_61: string;
     export { formatter_61 as formatter };
 }
@@ -1805,8 +1807,8 @@ export namespace LAST_USED {
     export { align_19 as align };
     let sort_105: string[];
     export { sort_105 as sort };
-    let width_31: number;
-    export { width_31 as width };
+    let width_32: number;
+    export { width_32 as width };
     let formatter_62: string;
     export { formatter_62 as formatter };
     export namespace formatterOpts_14 {
@@ -1825,8 +1827,8 @@ export namespace RESTART {
     export { sort_106 as sort };
     let formatter_63: string;
     export { formatter_63 as formatter };
-    let width_32: number;
-    export { width_32 as width };
+    let width_33: number;
+    export { width_33 as width };
     let align_20: string;
     export { align_20 as align };
 }
@@ -1865,8 +1867,8 @@ export namespace STATE_NORMAN {
     export { sort_108 as sort };
     let value_119: string;
     export { value_119 as value };
-    let width_33: number;
-    export { width_33 as width };
+    let width_34: number;
+    export { width_34 as width };
     let _default_3: string;
     export { _default_3 as default };
     let formatter_65: string;
@@ -3051,37 +3053,24 @@ export default class Resource {
         divider: boolean;
         action?: undefined;
         label?: undefined;
-        icon?: undefined;
         enabled?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         label: any;
-        icon: string;
         enabled: any;
         divider?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
-    } | {
-        action: string;
-        label: any;
-        icon: string;
-        bulkable: boolean;
-        bulkAction: string;
-        enabled: boolean;
-        weight: number;
-        divider?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         altAction: string;
         label: any;
-        icon: string;
         bulkable: boolean;
         enabled: any;
         bulkAction: string;
@@ -3093,37 +3082,24 @@ export default class Resource {
         divider: boolean;
         action?: undefined;
         label?: undefined;
-        icon?: undefined;
         enabled?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         label: any;
-        icon: string;
         enabled: any;
         divider?: undefined;
+        altAction?: undefined;
         bulkable?: undefined;
         bulkAction?: undefined;
         weight?: undefined;
-        altAction?: undefined;
-    } | {
-        action: string;
-        label: any;
-        icon: string;
-        bulkable: boolean;
-        bulkAction: string;
-        enabled: boolean;
-        weight: number;
-        divider?: undefined;
-        altAction?: undefined;
     } | {
         action: string;
         altAction: string;
         label: any;
-        icon: string;
         bulkable: boolean;
         enabled: any;
         bulkAction: string;
@@ -4020,7 +3996,8 @@ export const EMBER_FRAME: "ember-iframe";
 
 declare module '@shell/utils/error' {
 export function stringify(err: any): any;
-export function exceptionToErrorsArray(err: any): any;
+export function exceptionToErrorsArray(err: any): any[];
+export function translateError(error: any): any;
 export class ClusterNotFoundError extends Error {
     static NAME: string;
     constructor(message: any);
@@ -4377,9 +4354,21 @@ export function deferred(name: any): {
 export function setPromiseResult(promise: any, obj: any, key: any, label: any): void;
 }
 
+// @shell/utils/roleFiltering
+
+declare module '@shell/utils/roleFiltering' {
+export function globalRoleFilteringfn(ary: any): any;
+export function clusterRoleFilteringfn(ary: any): any;
+export function projectRoleFilteringfn(ary: any): any;
+}
+
 // @shell/utils/router
 
 declare module '@shell/utils/router' {
+export function harvesterhci2cloud(str: any): any;
+export function cloud2harvesterhci(str: any): any;
+export function harvester2cloud(str: any): any;
+export function cloud2harvester(str: any): any;
 export function queryParamsFor(current: any, qp: any, defaults?: {}): any;
 export function getClusterFromRoute(to: any): any;
 export function getProductFromRoute(to: any): any;
@@ -4395,7 +4384,7 @@ export function routeRequiresInstallRedirect(to: any): boolean;
 
 declare module '@shell/utils/select' {
 export function onClickOption(option: any, e: any): void;
-export function calculatePosition(dropdownList: any, component: any, width: any, placement: any): void;
+export function calculatePosition(dropdownList: any, component: any, width: any, placement: any, type: any, isLabel: any, leftWidth: any): void;
 }
 
 // @shell/utils/selector
@@ -4609,7 +4598,7 @@ export function asciiLike(str: any): boolean;
 export function coerceStringTypeToScalarType(val: any, type: any): any;
 export function matchesSomeRegex(stringRaw: any, regexes?: any[]): boolean;
 export function ensureRegex(strOrRegex: any, exact?: boolean): any;
-export function nlToBr(value: any): string;
+export function nlToBr(value: any): any;
 export function splitObjectPath(path: any): any;
 export function joinObjectPath(ary: any): string;
 export function shortenedImage(image: any): any;

package/utils/error.js

@@ -1,5 +1,8 @@
 import { isArray } from '@shell/utils/array';
 
+import translations from './errorTranslate.json';
+import errorTranslateNew from './errorTranslateNew.json';
+
 export class ClusterNotFoundError extends Error {
   static NAME = 'ClusterNotFoundError'
 
@@ -47,8 +50,8 @@ export class ApiError extends Error {
 }
 
 export function stringify(err) {
+  
   let str;
-
   if ( typeof err === 'string' ) {
     str = err;
   } else if ( err && typeof err === 'object' ) {
@@ -60,7 +63,7 @@ export function stringify(err) {
           const data = JSON.parse(str).data;
 
           if (data) {
-            return data;
+            return translateError(data);
           }
         } catch {}
       }
@@ -84,7 +87,7 @@ export function stringify(err) {
     str = JSON.stringify(err);
   }
 
-  return str;
+  return translateError(str);
 }
 
 export function exceptionToErrorsArray(err) {
@@ -92,16 +95,21 @@ export function exceptionToErrorsArray(err) {
     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,96 @@ export const normalizeError = (err) => {
     statusCode: (err.statusCode || err.status || (err.response && err.response.status) || 500)
   };
 };
+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 '';
+  }).replace('internal error occurred: ', "");
+  console.log('00044', error);
+
+    // 1. 资源配额错误（最高优先级）
+  if (originError.includes('exceeded quota')) {
+    return '资源配额超限：请求的资源超过了命名空间的配额限制';
+  }
+
+  // 2. 权限不足错误
+  const permissionDeniedPatterns = [
+    /"\S+" is forbidden:.*cannot.*(patch|update|create|delete|get|list|watch).*resource/i,
+    /is forbidden:.*user.*cannot.*(patch|update|create|delete|get|list|watch)/i
+  ];
+  
+  if (permissionDeniedPatterns.some(pattern => pattern.test(originError))) {
+    return "权限不足";
+  }
+
+
+  if (error.includes("a lowercase rfc 1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character")) {
+    error =  "无效的名称不符合 RFC 1123 命名规则。名称只能包含小写字母、数字或 '-'，并且必须以字母或数字开头和结尾（例如 'my-name' 或 '123-abc'）。"
+  } else if (error.includes('spec and status of disks on node') && error.includes('are being syncing and please retry later')) {
+    error = error.replace('spec and status of disks on node','').replace('are being syncing and please retry later','')
+    error = '节点' + error + '上的硬盘规格和状态正在同步，请稍后重试'
+  } else if (error.includes('same granularity as schedule') && error.includes('and offset less than')) {
+    error = error.replace('same granularity as schedule','').replace('and offset less than 10m0s','')
+    error = '与' + error + '的时间间隔应大于10分钟'
+  } else if (error.includes('should be greater than or equal to') && error.includes('but got')) {
+    error.replace('should be greater than or equal to','应该大于等于').replace('but got','但是填写的是')
+  }else if(error.includes('e.g')){
+    error = error.replace(/\s*(\(\s*)?e\.g\..*$/, '')
+  } else if(error.includes("because it's still used by vm(s)")) {
+    error = error.replace(/because it's still used by vm\(s\)/i, "因为正在被虚拟机使用：");
+  } else if (
+    error.includes('subnet.kubeovn.io') &&
+    error.includes('metadata.name in body should match') &&
+    error.includes('spec.excludeips[') &&
+    error.includes('in body should match')
+  ) {
+    // 提取子网名与索引
+    const subnetMatch = error.match(/subnet\.kubeovn\.io\s+['"]([^'"]+)['"]/);
+    const ipMatch     = error.match(/spec\.excludeips\[(\d+)\]/);
+
+    const subnetName = subnetMatch ? subnetMatch[1] : '';
+    const idx        = ipMatch     ? ipMatch[1]     : '0';
+
+    error = `子网 '${subnetName}' 配置无效：1) 名称禁止以数字开头；2) 排除IP[${idx}] 不能为空且必须是合法 IPv4/IPv6 地址或地址段`;
+  }
+
+  // error = error.replace(/admission webhook(.*?)denied the request:/g, (match, p1) => {
+  //   return '';
+  // })
+  //   .replace(/cannot unmarshal number into(.*?)of type string/g, (match, p1) => {
+  //     return '不能数字开头和纯数字';
+  //   })
+  // Apply translations from JSON
+  if(error.indexOf('err:') !== -1){
+    const errorIndex = error.indexOf('err:')
+    error =  error.substring(errorIndex + 4);
+  }
+
+  const translationsList = [...errorTranslateNew.translations, ...translations.translations]
+  
+  for (const translation of translationsList) {
+   
+    // if (error.includes(translation.pattern)) { 
+    //   error = error.replace(translation.pattern, translation.replacement);
+    // }
+    const regex = new RegExp(translation.pattern, translation.flags || 'g');
+    // error = error.replace(regex, translation.replacement);
+    const matches = error.match(regex);
+    
+    if (matches) {
+      if (matches.length == 1) {
+        console.log('00045', error);
+        error = error.replace(regex, translation.replacement);
+      } else {
+        error = error.replace(regex, (...args) => translation.replacement.replace(/\$([1-9]\d*)/g, (_, idx) => args[Number(idx)] || ''))
+        console.log('00046', error);
+      }
+    }
+  }
+
+  return error;
+}