dashboard-shell-shell 3.0.5-test.17 → 3.0.5-test.18

package/assets/translations/zh-hans.yaml

@@ -593,6 +593,7 @@ assignTo:
   workspace: 工作空间
 
 stateLabel:
+  Locked: 锁定
   Bound: 已绑定
   Running: 运行中
   Off: 关闭

package/components/Resource/Detail/TitleBar/composables.ts

@@ -14,7 +14,22 @@ export const useDefaultTitleBarProps = (resource: any, resourceSubtype?: Ref<str
     const resourceSubtypeValue = toValue(resourceSubtype);
     const currentStore = store.getters['currentStore'](resourceValue.type);
     const schema = store.getters[`${ currentStore }/schemaFor`](resourceValue.type);
-    const resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+    let resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+
+    // 转换为中文
+    const displayName_zh_hans: Record<string, string> = {
+      'GlobalRole': '全局角色',
+      'RoleTemplate': '集群角色',
+    }
+
+    if (displayName_zh_hans[resourceTypeLabel]) {
+      resourceTypeLabel = displayName_zh_hans[resourceTypeLabel]
+    }
+    
+    if (resourceTypeLabel == '集群角色' && (route.query?.roleContext == 'NAMESPACE' || resource?.parentLocationOverride?.hash == '#NAMESPACE')) {
+      resourceTypeLabel = '项目或资源组角色'
+    }
+    
     const resourceName = resourceSubtypeValue ? `${ resourceSubtypeValue } - ${ resourceValue.nameDisplay }` : resourceValue.nameDisplay;
     const resourceTo = resourceValue.listLocation || {
       name:   'c-cluster-product-resource',

package/components/Resource/Detail/TitleBar/index.vue

@@ -119,7 +119,7 @@ watch(
 
 <template>
   <div class="title-bar">
-    <breadcrumb :resource="resource"/>
+    <breadcrumb :resourceTypeLabel="resourceTypeLabel" :resource="resource"/>
     <Top>
       <Title class="title">
         <span class="detailIcon-span">

package/components/breadcrumb/index.vue

@@ -1,54 +1,18 @@
 <script>
-import { Banner } from '@components/Banner';
 import { get } from '@shell/utils/object';;
-import {
-  AS, _DETAIL, _CONFIG, _YAML, MODE, _CREATE, _EDIT, _VIEW, _UNFLAG, _GRAPH
-} from '@shell/config/query-params';
-import { ExtensionPoint, PanelLocation } from '@shell/core/types';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
 
-// i18n-uses resourceDetail.header.*
-
-/**
- * Resource Detail Masthead component.
- *
- * ToDo: this component seem to be picking up a lot of logic from special cases, could be simplified down to parameters and then customized per use-case via wrapper component
- */
 export default {
 
-  name: 'MastheadResourceDetail',
+  name: 'MastheadBreadcrumb',
 
   components: {
-    // BadgeState,
-    Banner,
   },
   props: {
-    value: {
-      type:    Object,
-      default: () => {
-        return {};
-      }
-    },
-
-    mode: {
-      type:    String,
-      default: 'view'
-    },
-
-    realMode: {
-      type:    String,
-      default: 'view'
-    },
-
-    as: {
+    resourceTypeLabel: {
       type:    String,
-      default: _YAML,
-    },
-
-    storeOverride: {
-      type:    String,
-      default: null,
+      default: ''
     },
 
     resource: {
@@ -56,15 +20,10 @@ export default {
       default: null,
     },
 
-    resourceSubtype: {
-      type:    String,
-      default: null,
-    },
-
-    parentRouteOverride: {
+    realMode: {
       type:    String,
-      default: null,
-    },
+      default: 'view',
+    }
 
   },
 
@@ -77,82 +36,10 @@ export default {
 
   data() {
     return {
-      DETAIL_VIEW:       _DETAIL,
-      extensionType:     ExtensionPoint.PANEL,
-      extensionLocation: PanelLocation.DETAILS_MASTHEAD,
-      Svg:               require('~shell/assets/images/API.svg')
     };
   },
 
   computed: {
-    dev() {
-      return this.$store.getters['prefs/dev'];
-    },
-
-    schema() {
-      const inStore = this.storeOverride || this.$store.getters['currentStore'](this.resource);
-
-      return this.$store.getters[`${ inStore }/schemaFor`]( this.resource );
-    },
-
-    isProjectHelmChart() {
-      return this.schema?.id === HELM.PROJECTHELMCHART;
-    },
-
-    shouldHifenize() {
-      return (this.mode === 'view' || this.mode === 'edit') && this.resourceSubtype?.length && this.value?.nameDisplay?.length;
-    },
-
-    parent() {
-      const displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
-      const product = this.$store.getters['currentProduct'].name;
-
-      const defaultLocation = {
-        name:   'c-cluster-product-resource',
-        params: {
-          resource: this.resource,
-          product,
-        }
-      };
-
-      const location = this.value?.parentLocationOverride || defaultLocation;
-
-      if (this.parentRouteOverride) {
-        location.name = this.parentRouteOverride;
-      }
-
-      const typeOptions = this.$store.getters[`type-map/optionsFor`]( this.resource );
-
-      // 转换为中文
-      const displayName_zh_hans = {
-        'GlobalRole': '全局角色',
-        'RoleTemplate': '集群角色',
-      }
-      if (displayName_zh_hans[displayName]) {
-        displayName = displayName_zh_hans[displayName]
-      }
-      
-      if (displayName == '集群角色' && (this.$route.query?.roleContext == 'NAMESPACE' || location.hash == '#NAMESPACE')) {
-        displayName = '项目或资源组角色'
-      }
-
-      const out = {
-        displayName, location, ...typeOptions
-      };
-
-      return out;
-    },
-
-
-    displayName() {
-      let displayName = this.value.nameDisplay;
-
-      if (this.isProjectHelmChart) {
-        displayName = this.value.projectDisplayName;
-      }
-
-      return this.shouldHifenize ? ` - ${ displayName }` : displayName;
-    },
 
     demoDisplay() {
 
@@ -177,12 +64,6 @@ export default {
       return partsEn;
     },
 
-    location() {
-      const { parent } = this;
-
-      return parent?.location;
-    },
-
   },
 
   methods: {
@@ -206,7 +87,7 @@ export default {
           <span>/</span>
         </span>
         <span class="excram-last-name">
-          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + resourceTypeLabel }}
         </span>
       </div>
     </div>
@@ -215,71 +96,6 @@ export default {
 
 <style lang='scss' scoped>
 
-  HEADER {
-    margin: 0;
-  }
-
-  .primaryheader {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    font-size:14px;
-    height: 50px;
-
-    h1 {
-      margin: 0;
-    }
-  }
-
-  .subheader{
-    display: flex;
-    flex-direction: row;
-    color: var(--input-label);
-    & > * {
-      margin: 5px 20px 5px 0px;
-    }
-
-    .live-data {
-      color: var(--body-text)
-    }
-  }
-
-  .state-banner {
-    margin: 3px 0 0 0;
-  }
-
-  .masthead-state {
-    font-size: initial;
-    display: inline-block;
-    position: relative;
-    /* top: -2px; */
-    font-size: 12px;
-    margin-left: 5px;
-  }
-
-  .masthead-istio {
-    .icon {
-      vertical-align: middle;
-      color: var(--primary);
-    }
-  }
-
-  .left-right-split {
-    display: grid;
-    align-items: center;
-
-    .left-half {
-      grid-column: 1;
-    }
-
-    .right-half {
-      grid-column: 2;
-    }
-  }
-
-  .resource-external {
-    font-size: 18px;
-  }
   .excram-list{
     font-size: 14px;
     margin-bottom: 20px;
@@ -287,10 +103,7 @@ export default {
   .excram-last-name{
     color: var(--link);
   }
-  .valid{
-    color: #d7d7d7;
-    margin: 0px 10px;
-  }
+
   .detailIcon-span{
     width: 24px;
     height: 24px;
@@ -306,11 +119,5 @@ export default {
     left: 4px;
     top: -2px;
   }
-  .primary-title{
-    display: flex;
-    align-items: center;
-  }
-  .detailIcon-span-title{
-    font-weight: bold;
-  }
+
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-test.17",
+  "version": "3.0.5-test.18",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/scripts/publish-shell.sh

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

package/utils/errorTranslate.json

@@ -1,5 +1,98 @@
 {
   "translations": [
+    {
+      "pattern": "role is locked and cannot be assigned",
+      "replacement": "角色已被锁定，不能再分配"
+    },
+    {
+      "pattern": "invalid current password",
+      "replacement": "重复密码无效"
+    },
+    {
+      "pattern": "spec\\.template\\.spec\\.podaffinity\\.requiredduringschedulingignoredduringexecution\\[(\\d+)\\]\\.topologykey: required value: can not be empty[\\s\\S]*?regex used for validation is '([^']+)'",
+      "replacement": "拓扑键不能为空",
+      "flags": "gi"
+    },
+    {
+      "pattern": "pcidevice ([^\\s]+) has no iommugroup available",
+      "replacement": "PCI 设备 '$1' 没有可用的 IOMMU 组",
+      "flags": "gi"
+    },
+    {
+    "pattern": "invalidbodycontent 422: failed to parse totalsnapshotsizequota: quantities must match the regular expression '\\^\\(\\[\\+\\-\\]\\?\\[0-9\\.\\]\\+\\)\\(\\[eeinumkkmgtp\\]\\*\\[\\-\\+\\]\\?\\[0-9\\]\\*\\)\\$'",
+    "replacement": "快照配额不能为空",
+    "flags": "gi"
+    },
+    {
+      "pattern": "secrets \"([^\"]+)\" already exists",
+      "replacement": "密钥 \"$1\" 已存在",
+      "flags": "gi"
+    },
+    {
+      "pattern": "backup target is invalid",
+      "replacement": "备份目标无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failed to list objects with param:[\\s\\S]*?server gave http response to https client",
+      "replacement": "列举对象失败：服务器返回 HTTP 响应，但客户端使用 HTTPS，请检查协议配置",
+      "flags": "gi"
+    },
+    {
+      "pattern": "clusternetwork\\.network\\.harvesterhci\\.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",
+      "replacement": "集群网络名称 '$1' 无效：须符合 RFC 1123 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且以字母或数字开头和结尾",
+      "flags": "gi"
+    },
+    {
+      "pattern": "loadbalancer\\.loadbalancer\\.harvesterhci\\.io \"([^\"]+)\" is invalid: \\[spec\\.listeners\\[(\\d+)\\]\\.(backendport|port): required value[^\\]]*\\]",
+      "replacement": "负载均衡器 '$1' 配置无效：第 $2 个监听器的 $3 为必填项",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete cluster network (\\S+) because vlanconfig\\(s\\) \\[(.*?)\\] under this clusternetwork are still existing",
+      "replacement": "无法删除集群网络 '$1'，因其下仍存在 VLAN 配置 [$2]",
+      "flags": "gi"
+    },
+    {
+      "pattern": "value: (\\d+) must be in range \\[1 \\.\\. (\\d+)\\]",
+      "replacement": "值 $1 超出范围，必须在 1–$2 之间",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't delete vlanconfig (\\S+) because it is blocked by vm\\(s\\) ([^/]+)/(\\S+) which must be stopped at first",
+      "replacement": "无法删除 VLAN 配置 '$1'：需先停止虚拟机 '$2/$3'",
+      "flags": "gi"
+    },
+    {
+      "pattern": "cannot find nfs path",
+      "replacement": "无法找到 NFS 路径",
+      "flags": "gi"
+    },
+    {
+      "pattern": "get \"([^\"]+)\": unsupported protocol scheme \"\"",
+      "replacement": "url 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "cannot mount nfs ([^\\s]+)[\\s\\S]*?no such file or directory[\\s\\S]*?cannot mount using nfsv4",
+      "replacement": "备份存储的端点无法访问",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't create nad ([^/]+)/([^\\s]+) because the gateway ([^\\s]+) is invalid",
+      "replacement": "无法创建虚拟网络 '$1/$2'，因为网关 '$3' 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "can't create nad ([^/]+)/([^\\s]+) because the cidr ([^\\s]+) is invalid",
+      "replacement": "无法创建虚拟网络 '$1/$2'，因为 CIDR '$3' 无效",
+      "flags": "gi"
+    },
+    {
+      "pattern": "no matching backup found for url ([^\\s]+) and backing image ([^\\s]+)",
+      "replacement": "未找到与 URL $1 和镜像 $2 匹配的备份",
+      "flags": "gi"
+    },
     {
       "pattern": "take virtual machine snapshot ([^\\s]+) successfully\\.",
       "replacement": "虚拟机快照 '$1' 创建成功。",
@@ -87,7 +180,7 @@
     },
     {
       "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 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且必须以字母/数字开头和结尾",
+      "replacement": "校验失败：VPC 名称 \"$1\" 不符合 RFC 1123 子域名规则，只能使用小写字母、数字、'-' 或 '.'，且必须以字母/数字开头和结尾",
       "flags": "gi"
     },
     {