dashboard-shell-shell 3.0.5-test.1 → 3.0.5-test.10

package/pkg/tsconfig.json

@@ -27,25 +27,25 @@
     ],
     "paths": {
       "@shell/core/*": [
-        "../../node_modules/@rancher/shell/core/*"
+        "../../node_modules/dashboard-shell-shell/core/*"
       ],
       "@shell/config/*": [
-        "../../node_modules/@rancher/shell/config/*"
+        "../../node_modules/dashboard-shell-shell/config/*"
       ],
       "@shell/store/*": [
-        "../../node_modules/@rancher/shell/store/*"
+        "../../node_modules/dashboard-shell-shell/store/*"
       ],
       "@shell/plugins/*": [
-        "../../node_modules/@rancher/shell/plugins/*"
+        "../../node_modules/dashboard-shell-shell/plugins/*"
       ],
       "@shell/utils/*": [
-        "../../node_modules/@rancher/shell/utils/*"
+        "../../node_modules/dashboard-shell-shell/utils/*"
       ],
       "@shell/models/*": [
-        "../../node_modules/@rancher/shell/models/*"
+        "../../node_modules/dashboard-shell-shell/models/*"
       ],
       "@shell/mixins/*": [
-        "../../node_modules/@rancher/shell/mixins/*"
+        "../../node_modules/dashboard-shell-shell/mixins/*"
       ],
       "@pkg/*": [
         "./*"
@@ -56,8 +56,8 @@
     "**/*.ts",
     "**/*.tsx",
     "**/*.vue",
-    "../../node_modules/@rancher/shell/types/*.d.ts",
-    "../../node_modules/@rancher/shell/core/types.ts"
+    "../../node_modules/dashboard-shell-shell/types/*.d.ts",
+    "../../node_modules/dashboard-shell-shell/core/types.ts"
   ],
   "exclude": [
     "node_modules"

package/pkg/vue.config.js

@@ -73,7 +73,7 @@ module.exports = function(dir) {
       });
 
       // Auto-generate module to import the types (model, detail, edit etc)
-      const autoImportPlugin = new VirtualModulesPlugin({ 'node_modules/@rancher/auto-import': generateTypeImport('@pkg', dir) });
+      const autoImportPlugin = new VirtualModulesPlugin({ 'node_modules/dashboard-shell-shell/auto-import': generateTypeImport('@pkg', dir) });
 
       config.plugins.unshift(dynamicImporterOverride);
       config.plugins.unshift(modelLoaderImporterOverride);
@@ -117,7 +117,7 @@ module.exports = function(dir) {
         if (p.use) {
           p.use.forEach((u) => {
             if (u.loader.includes('babel-loader')) {
-              p.exclude = /node_modules\/(?!@rancher\/shell\/).*/;
+              p.exclude = /node_modules\/(?!dashboard-shell-shell\/).*/;
             }
           });
         }

package/plugins/dashboard-store/resource-class.js

@@ -913,42 +913,42 @@ export default class Resource {
       {
         action:  this.canUpdate ? 'goToEdit' : 'goToViewConfig',
         label:   this.t(this.canUpdate ? 'action.edit' : 'action.view'),
-        icon:    'icon icon-edit',
+        // icon:    'icon icon-edit',
         enabled: this.canCustomEdit,
       },
-      {
-        action:  this.canEditYaml ? 'goToEditYaml' : 'goToViewYaml',
-        label:   this.t(this.canEditYaml ? 'action.editYaml' : 'action.viewYaml'),
-        icon:    'icon icon-file',
-        enabled: this.canYaml,
-      },
+      // {
+      //   action:  this.canEditYaml ? 'goToEditYaml' : 'goToViewYaml',
+      //   label:   this.t(this.canEditYaml ? 'action.editYaml' : 'action.viewYaml'),
+      //   icon:    'icon icon-file',
+      //   enabled: this.canYaml,
+      // },
       {
         action:  (this.canCustomEdit ? 'goToClone' : 'cloneYaml'),
         label:   this.t('action.clone'),
-        icon:    'icon icon-copy',
-        enabled: this.canClone && this.canCreate && (this.canCustomEdit || this.canYaml),
-      },
-      { divider: true },
-      {
-        action:     'download',
-        label:      this.t('action.download'),
-        icon:       'icon icon-download',
-        bulkable:   true,
-        bulkAction: 'downloadBulk',
-        enabled:    this.canYaml,
-        weight:     -9,
-      },
-      {
-        action:  'viewInApi',
-        label:   this.t('action.viewInApi'),
-        icon:    'icon icon-external-link',
-        enabled: this.canViewInApi,
+        // icon:    'icon icon-copy',
+        enabled: this.canClone && this.canCreate && (this.canCustomEdit || this.canYaml)&& this.schema.id!=='event',
       },
+      // { divider: true },
+      // {
+      //   action:     'download',
+      //   label:      this.t('action.download'),
+      //   icon:       'icon icon-download',
+      //   bulkable:   true,
+      //   bulkAction: 'downloadBulk',
+      //   enabled:    this.canYaml,
+      //   weight:     -9,
+      // },
+      // {
+      //   action:  'viewInApi',
+      //   label:   this.t('action.viewInApi'),
+      //   icon:    'icon icon-external-link',
+      //   enabled: this.canViewInApi,
+      // },
       {
         action:     'promptRemove',
         altAction:  'remove',
         label:      this.t('action.remove'),
-        icon:       'icon icon-trash',
+        // icon:       'icon icon-trash',
         bulkable:   true,
         enabled:    this.canDelete,
         bulkAction: 'promptRemove',
@@ -1322,7 +1322,8 @@ export default class Resource {
   }
 
   get detailLocation() {
-    return this._detailLocation;
+    let location = this._detailLocation;
+    return location;
   }
 
   goToDetail() {

package/rancher-components/BadgeState/BadgeState.vue

@@ -63,60 +63,41 @@ export default defineComponent({
 </script>
 
 <template>
-  <span :class="['badge-state', bg]">
-    <i
-      v-if="icon"
-      class="icon"
-      :class="{[icon]: true, 'mr-5': !!msg}"
-    />{{ msg }}
-  </span>
+  <div style="display: flex;flex-direction: row;align-items: center;font-size: 12px;">
+    <div :class="{ [bg]: true }"></div>
+    <span style="margin-left: 5px;">{{ msg }}</span>
+    
+  </div>
 </template>
-
 <style lang="scss" scoped>
-  .badge-state {
-    align-items: center;
-    display: inline-flex;
-    padding: 2px 10px;
-    border: 1px solid transparent;
-    border-radius: 20px;
-
-    &.bg-info {
-      border-color: var(--info);
-    }
-
-    &.bg-error {
-      border-color: var(--error);
-    }
-
-    &.bg-warning {
-      border-color: var(--warning);
-    }
-
-    // Successful states are de-emphasized by using [text-]color instead of background-color
-    &.bg-success {
-      color: var(--success);
-      background: transparent;
-      border-color: var(--success);
-    }
-
-    // Added badge-disabled instead of bg-disabled since bg-disabled is used in other places with !important styling, an investigation is needed to make the naming consistent
-    &.badge-disabled {
-      color: var(--badge-state-disabled-text);
-      background-color: var( --badge-state-disabled-bg);
-      border: 1px solid var(--badge-state-disabled-border);
-    }
+  .bg-error {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DD0C17; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
   }
-</style>
-<style lang="scss">
-  // TODO: #6005
-  // Investigate why this is here.. I don't think that styles for sortable table should belong here
-  .sortable-table TD .badge-state {
-    @include clip;
-    display: inline-block;
-    max-width: 100%;
-    position: relative;
-    max-width: 110px;
-    font-size: .85em;
-    vertical-align: middle;
+  .bg-darker {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DD0C17; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-success {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #95F204 !important; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-warning {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DAC342; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-info {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #1890FF; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
   }
 </style>

package/rancher-components/Banner/Banner.vue

@@ -227,8 +227,8 @@ $icon-size: 24px;
     }
 
     .info & {
-      background: var(--info-banner-bg);
-      // background: #f2f2f2;
+      // background: var(--info-banner-bg);
+      background: #f2f2f2;
       border-color: var(--info);
     }
 

package/rancher-components/RcDropdown/RcDropdownMenu.vue

@@ -33,10 +33,10 @@ const hasOptions = (options: DropdownOption[]) => {
       :data-testid="dataTestid"
       :aria-label="buttonAriaLabel"
     >
-      <div v-if="showIcon">
-        <i class="icon icon-actions" />
-      </div>
-      <a v-else href="javascript:;">操作</a>
+    <div v-if="showIcon">
+      <i data-v-5db2c2c7="" class="icon icon-actions" alt="More actions icon"></i>
+    </div>
+    <a v-else href="javascript:;">操作</a>
     </rc-dropdown-trigger>
     <template #dropdownCollection>
       <template
@@ -58,15 +58,16 @@ const hasOptions = (options: DropdownOption[]) => {
           </template> -->
           {{ a.label }}
         </rc-dropdown-item>
-        <rc-dropdown-separator
+        <!-- <rc-dropdown-separator
           v-else
-        />
+        /> -->
       </template>
       <rc-dropdown-item
         v-if="!hasOptions(options)"
         disabled
       >
-        暂无可执行的操作。
+        <!-- No actions available -->
+         暂无可执行的操作。
       </rc-dropdown-item>
     </template>
   </rc-dropdown>

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.2-rc.105 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.8 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail
 

package/store/i18n.js

@@ -231,6 +231,9 @@ export const actions = {
     if ( !selected || !exists) {
       selected = 'zh-hans';
     }
+    
+    // selected = 'none'
+    selected = 'zh-hans'
 
     return dispatch('switchTo', selected);
   },

package/store/type-map.js

@@ -515,7 +515,7 @@ export const getters = {
   
   groupsForVirTypes(state) {
     return (product, name) => {
-      return state.virtualTypes?.[product].find(item => item.name === name)?.icon;
+      return state?.virtualTypes?.[product]?.find(item => item.name === name)?.icon;
     };
   },
 

package/types/shell/index.d.ts

@@ -3053,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;
@@ -3095,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;

package/utils/error.js

@@ -199,9 +199,11 @@ export function translateError(error) {
     
     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)]);
+        error = error.replace(regex, (...args) => translation.replacement.replace(/\$([1-9]\d*)/g, (_, idx) => args[Number(idx)] || ''))
+        console.log('00046', error);
       }
     }
   }

package/utils/errorTranslate.json

@@ -1,5 +1,20 @@
 {
   "translations": [
+    {
+      "pattern": "subnet ([^\\s]+) cidr ([^\\s]+) is invalid, due to invalid cidr address: ([^\\s]+)",
+      "replacement": "子网 '$1' 的 CIDR 地址 '$2' 无效：不是合法的 CIDR 格式",
+      "flags": "gi"
+    },
+    {
+      "pattern": "validation failed in api: vpc.kubeovn.io \"([^\"]*)\" is invalid: metadata\\.name: invalid value: \"([^\"]*)\": a lowercase rfc 1123 subdomain must consist of lower case alphanumeric characters, '-' or '\\.', and must start and end with an alphanumeric character \\(e\\.g\\..*?\\)",
+      "replacement": "API 校验失败：VPC 名称 \"$1\" 不符合 RFC 1123 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且必须以字母/数字开头和结尾",
+      "flags": "gi"
+    },
+    {
+      "pattern": "validation 失败 in api",
+      "replacement": "API 校验失败",
+      "flags": "gi"
+    },
     {
      "pattern": "can't connect to backup target[\\s\\S]*no route to host",
     "replacement": "无法连接到备份目标：网络不可达，请检查备份服务器地址与路由",

package/vue.config.js

@@ -157,7 +157,7 @@ const getLoaders = (SHELL_ABS) => [
     test:    /\.m?[tj]sx?$/,
     // This excludes no modules except for node_modules/@rancher/... so that plugins can properly compile
     // when referencing @rancher/shell
-    exclude: /node_modules\/(?!(@rancher)\/).*/,
+    exclude: /node_modules\/(?!(dashboard-shell-shell)\/).*/,
     use:     [
       {
         loader:  'cache-loader',
@@ -332,14 +332,14 @@ const getVirtualModules = (dir, includePkg) => {
     reqs += `$plugin.loadAsync('${ i }', '/pkg/${ i }/${ librariesIndex[i] }');`;
   });
 
-  return new VirtualModulesPlugin({ 'node_modules/@rancher/dynamic.js': `export default function ($plugin) { ${ reqs } };` });
+  return new VirtualModulesPlugin({ 'node_modules/dashboard-shell-shell/dynamic.js': `export default function ($plugin) { ${ reqs } };` });
 };
 
-const getAutoImport = () => new webpack.NormalModuleReplacementPlugin(/^@rancher\/auto-import$/, (resource) => {
+const getAutoImport = () => new webpack.NormalModuleReplacementPlugin(/^dashboard-shell-shell\/auto-import$/, (resource) => {
   const ctx = resource.context.split('/');
   const pkg = ctx[ctx.length - 1];
 
-  resource.request = `@rancher/auto-import/${ pkg }`;
+  resource.request = `dashboard-shell-shell/auto-import/${ pkg }`;
 });
 
 /**
@@ -356,7 +356,7 @@ const getVirtualModulesAutoImport = (dir) => {
     fs.readdirSync(pkgFolder)
       .filter((name) => !name.startsWith('.')) // Ignore hidden folders
       .forEach((name) => {
-        autoImportTypes[`node_modules/@rancher/auto-import/${ name }`] = generateDynamicTypeImport(`@pkg/${ name }`, path.join(dir, `pkg/${ name }`));
+        autoImportTypes[`node_modules/dashboard-shell-shell/auto-import/${ name }`] = generateDynamicTypeImport(`@pkg/${ name }`, path.join(dir, `pkg/${ name }`));
       });
   }