dashboard-shell-shell 1.0.122 → 1.0.1000000081

package/utils/banners.js

@@ -5,7 +5,6 @@
  */
 
 import { MANAGEMENT } from '@shell/config/types';
-import { SETTING } from '@shell/config/settings';
 
 const BANNER_HEADER = 'bannerHeader';
 const BANNER_FOOTER = 'bannerFooter';
@@ -57,47 +56,3 @@ export function overlayIndividualBanners(parsedBanner, banners) {
     } catch {}
   });
 }
-
-/**
- * Converts a pixel value to an em value based on the default font size.
- * @param {number} elementFontSize - The font size of the element in pixels.
- * @param {number} [defaultFontSize=14] - The default font size in pixels.
- * @returns {string} The converted value in em units.
- */
-function pxToEm(elementFontSize, defaultFontSize = 14) {
-  const lineHeightInPx = 2 * parseInt(elementFontSize);
-  const lineHeightInEm = lineHeightInPx / defaultFontSize;
-
-  return `${ lineHeightInEm }em`;
-}
-
-/**
- * Get banner font sizes - used to add margins when header and footer banners are present
- **/
-export function getGlobalBannerFontSizes(store) {
-  const settings = store.getters['management/all'](MANAGEMENT.SETTING);
-  const bannerSettings = settings?.find((s) => s.id === SETTING.BANNERS);
-  const individualBannerSettings = getIndividualBanners(store);
-
-  if (bannerSettings) {
-    const parsed = JSON.parse(bannerSettings.value);
-
-    overlayIndividualBanners(parsed, individualBannerSettings);
-
-    const {
-      showFooter, showHeader, bannerFooter, bannerHeader, banner
-    } = parsed;
-
-    // add defaults to accommodate older JSON structures for banner definitions without breaking the UI
-    // https://github.com/rancher/dashboard/issues/10140
-    const bannerHeaderFontSize = bannerHeader?.fontSize || banner?.fontSize || '14px';
-    const bannerFooterFontSize = bannerFooter?.fontSize || banner?.fontSize || '14px';
-
-    return {
-      headerFont: showHeader === 'true' ? pxToEm(bannerHeaderFontSize) : '0px',
-      footerFont: showFooter === 'true' ? pxToEm(bannerFooterFontSize) : '0px'
-    };
-  }
-
-  return undefined;
-}

package/utils/cluster.js

@@ -6,6 +6,10 @@ import { SETTING } from '@shell/config/settings';
 import { PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
 import { compare, sortable } from '@shell/utils/version';
 import { sortBy } from '@shell/utils/sort';
+import { SCHEDULING_CUSTOMIZATION } from '@shell/store/features';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
+import isEmpty from 'lodash/isEmpty';
+import { set } from '@shell/utils/object';
 
 /**
  * Combination of paginationFilterHiddenLocalCluster and paginationFilterOnlyKubernetesClusters
@@ -296,3 +300,34 @@ export function getAllOptionsAfterCurrentVersion(store, versions, currentVersion
 
   return sortedWithDeprecatedLabel;
 }
+
+export async function initSchedulingCustomization(value, features, store, mode) {
+  const schedulingCustomizationFeatureEnabled = features(SCHEDULING_CUSTOMIZATION);
+  let clusterAgentDefaultPC = null;
+  let clusterAgentDefaultPDB = null;
+  let schedulingCustomizationOriginallyEnabled = false;
+  const errors = [];
+
+  try {
+    clusterAgentDefaultPC = JSON.parse((await store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS })).value) || null;
+  } catch (e) {
+    errors.push(e);
+  }
+  try {
+    clusterAgentDefaultPDB = JSON.parse((await store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET })).value) || null;
+  } catch (e) {
+    errors.push(e);
+  }
+
+  if (schedulingCustomizationFeatureEnabled && mode === _CREATE && isEmpty(value?.clusterAgentDeploymentCustomization?.schedulingCustomization)) {
+    set(value, 'clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: clusterAgentDefaultPC, podDisruptionBudget: clusterAgentDefaultPDB });
+  }
+
+  if (mode === _EDIT && !!value?.clusterAgentDeploymentCustomization?.schedulingCustomization) {
+    schedulingCustomizationOriginallyEnabled = true;
+  }
+
+  return {
+    clusterAgentDefaultPC, clusterAgentDefaultPDB, schedulingCustomizationFeatureEnabled, schedulingCustomizationOriginallyEnabled, errors
+  };
+}

package/utils/color.js

@@ -19,14 +19,15 @@ export function createCssVars(color, theme = 'light', name = 'primary') {
   const contrastOpts = theme === 'light' ? LIGHT_CONTRAST_COLORS : DARK_CONTRAST_COLORS;
 
   return {
-    [`--${ name }`]:             color,
-    [`--${ name }-text `]:       contrastColor(color, contrastOpts),
-    [`--${ name }-hover-bg`]:    lighten(color, -10),
-    [`--${ name }-active-bg`]:   lighten(color, -25),
-    [`--${ name }-active-text`]: contrastColor(lighten(color, -25), contrastOpts),
-    [`--${ name }-border`]:      color,
-    [`--${ name }-banner-bg`]:   opacity(color, 0.15),
-    [`--${ name }-light-bg`]:    opacity(color, 0.05),
+    [`--${ name }`]:                color,
+    [`--${ name }-text `]:          contrastColor(color, contrastOpts),
+    [`--${ name }-hover-bg`]:       lighten(color, -10),
+    [`--${ name }-active-bg`]:      lighten(color, -25),
+    [`--${ name }-active-text`]:    contrastColor(lighten(color, -25), contrastOpts),
+    [`--${ name }-border`]:         color,
+    [`--${ name }-banner-bg`]:      opacity(color, 0.15),
+    [`--${ name }-light-bg`]:       opacity(color, 0.05),
+    [`--${ name }-keyboard-focus`]: lighten(color, -10),
   };
 }
 

package/utils/error.js

@@ -139,13 +139,71 @@ export const normalizeError = (err) => {
 };
 export function translateError(error) {
   const originError = error;
-  error = error.toLowerCase();
+  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(new RegExp(translation.pattern, 'g'), translation.replacement);
+   
+    // 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 = translation.pattern.replace(/\$(.+)/g, (_, index) => matches[parseInt(index)]);
+
+         console.log('00046', error);
+      }
     }
   }