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

package/utils/error.js

@@ -1,7 +1,5 @@
 import { isArray } from '@shell/utils/array';
 
-import translations from './errorTranslate.json';
-
 export class ClusterNotFoundError extends Error {
   static NAME = 'ClusterNotFoundError'
 
@@ -50,6 +48,7 @@ export class ApiError extends Error {
 
 export function stringify(err) {
   let str;
+
   if ( typeof err === 'string' ) {
     str = err;
   } else if ( err && typeof err === 'object' ) {
@@ -61,7 +60,7 @@ export function stringify(err) {
           const data = JSON.parse(str).data;
 
           if (data) {
-            return translateError(data);
+            return data;
           }
         } catch {}
       }
@@ -85,7 +84,7 @@ export function stringify(err) {
     str = JSON.stringify(err);
   }
 
-  return translateError(str);
+  return str;
 }
 
 export function exceptionToErrorsArray(err) {
@@ -93,21 +92,16 @@ export function exceptionToErrorsArray(err) {
     const body = err.response.data;
 
     if ( body && body.message ) {
-      return [translateError(body.message)];
+      return [body.message];
     } else {
-      return [translateError(err)];
+      return [err];
     }
   } else if (err.status && err.message) {
-    return [translateError(err.message)];
+    return [err.message];
   } else if ( isArray(err) ) {
-    let arr = []
-    for (let index = 0; index < err.length; index++) {
-      arr[index] = translateError(err[index])
-    }
-
-    return [...new Set(arr)];
+    return err;
   } else {
-    return [translateError(err)];
+    return [err];
   }
 }
 
@@ -135,76 +129,3 @@ 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);
-
-
-  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);
-  }
-
-  
-  for (const translation of translations.translations) {
-   
-    // 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) {
-        error = error.replace(regex, translation.replacement);
-      } else {
-        error = translation.pattern.replace(/\$(.+)/g, (_, index) => matches[parseInt(index)]);
-      }
-    }
-  }
-
-  return error;
-}

package/utils/router.js

@@ -1,26 +1,5 @@
 import { INSTALL_REDIRECT_META_KEY } from '@shell/config/router/navigation-guards/install-redirect';
 
-export function harvesterhci2cloud(str) {
-    return str?.replace('harvesterhci.io', 'cloudhci.io')
-}
-
-export function cloud2harvesterhci(str) {
-  // console.log('00099', str)
-  // const regex = /[a-z]+cloud.io.(.+)/;
-  // if (str?.match(regex)) {
-  //   return str;
-  // }
-  return str?.replace('cloudhci.io', 'harvesterhci.io')
-}
-
-export function harvester2cloud(str) {
-    return str?.replace('harvester', 'cloud')
-}
-
-export function cloud2harvester(str) {
-    return str?.replace('cloud', 'harvester')
-}
-
 export function queryParamsFor(current, qp, defaults = {}) {
   const query = Object.assign({}, current || {});
 

package/utils/select.js

@@ -26,19 +26,8 @@ export function onClickOption(option, e) {
 // This is a simpler positionner for the dropdown for a select control
 // We used to use popper for these, but it does not suppotr fractional pixel placements which
 // means the dropdown does not appear aligned to the control when placed in a column-based layout
-export function calculatePosition(dropdownList, component, width, placement, type, isLabel,leftWidth) {
+export function calculatePosition(dropdownList, component, width, placement) {
   const selectEl = component.$parent.$el;
- 
-  const labeledContainer = selectEl.querySelector('.labeled-container');
-  let labelWidth=0
-  if (labeledContainer) {
-    labelWidth= labeledContainer.offsetWidth;
-  } else {
-    console.warn("未找到类名为 labeled-container 的元素");
-  }
-
-
-  
   const r = selectEl.getBoundingClientRect();
   const p = placement || 'bottom-start';
   const docHeight = document.body.offsetHeight;
@@ -70,19 +59,7 @@ export function calculatePosition(dropdownList, component, width, placement, typ
     selectEl.classList.remove('vs__dropdown-up');
   }
 
-  // dropdownList.style.left = `${ r.x }px`;
+  dropdownList.style.left = `${ r.x }px`;
   dropdownList.style.width = 'min-content';
-  // const s  = type === 'label'?   `${ r.x }px` :`${ r.x + Number(type.split("px")[0]) }px`
-  dropdownList.style.left = ((type === 'label') && (!isLabel)) ? `${ (r.x) + labelWidth }px` : `${ r.x + (typeof type === 'string' ? parseFloat(type) : 0) }px`;
-  // dropdownList.style.minWidth = type === 'label' ? `${ (r.width) - 160 }px` : `${ r.width }px`;
-  console.log(type);
-  console.log( r.width);
-  if(leftWidth!=='') {
-    dropdownList.style.left = leftWidth
-  }
-  const SelectContainer = selectEl.querySelector('.labeled-select');
-  
-  
-  // dropdownList.style.width = type === 'label' ? '400px' : `${ r.width }px`;
-  dropdownList.style.width = type === 'label' ? `${SelectContainer.offsetWidth}px` : `${ r.width- (typeof type === 'string' ? parseFloat(type) : 0) }px`;
+  dropdownList.style.minWidth = `${ r.width }px`;
 }

package/utils/string.js

@@ -1,5 +1,3 @@
-import { translateError } from "@shell/utils/error";
-
 export function camelToTitle(str) {
   return dasherize((str || '')).split('-').map((str) => {
     return ucFirst(str);
@@ -163,19 +161,19 @@ export function resourceNames(names, plusMore, t, endString) {
 
   // endString default value
   if (!endString) {
-    endString = endString === false ? ' ' : '？';
+    endString = endString === false ? ' ' : '.';
   }
 
   return names.reduce((res, name, i) => {
     if (i < MAX_NAMES_COUNT) {
-      res += `<span>${ escapeHtml( name ) }</span>`;
+      res += `<b>${ escapeHtml( name ) }</b>`;
 
       if (i === names.length - 1) {
         res += endString;
       } else if (i === names.length - 2) {
-        res += names.length <= 5 ? ' 和 ' : '';
+        res += names.length <= 5 ? t('generic.and') : '';
       } else {
-        res += i < MAX_NAMES_COUNT - 1 ? ' , ' : '';
+        res += i < MAX_NAMES_COUNT - 1 ? t('generic.comma') : '';
       }
     }
 
@@ -284,8 +282,7 @@ export function ensureRegex(strOrRegex, exact = true) {
 }
 
 export function nlToBr(value) {
-  
-  return translateError(escapeHtml(value || '').replace(/(\r\n|\r|\n)/g, '<br/>\n'));
+  return escapeHtml(value || '').replace(/(\r\n|\r|\n)/g, '<br/>\n');
 }
 
 const quotedMatch = /[^."']+|"([^"]*)"|'([^']*)'/g;

package/utils/title.ts

@@ -1,3 +1,3 @@
 export function updatePageTitle(...breadcrumb: (string | null | undefined | false)[]): void {
-  document.title = breadcrumb.filter((s) => s).join(' - ').replace(/<i[^>]*>|<\/i>/g, '').replace('Harvester', 'HCI');
+  document.title = breadcrumb.filter((s) => s).join(' - ');
 }