dashboard-shell-shell 3.0.5-test.40 → 3.0.5-test.41

package/assets/translations/zh-hans.yaml

@@ -595,6 +595,7 @@ assignTo:
   workspace: 工作空间
 
 stateLabel:
+  Waiting: 等待中
   Images preloading: 图像预加载中
   Images preloaded: 图像已预加载
   Waiting Reboot: 等待重启
@@ -4563,6 +4564,12 @@ promptRemove:
 promptRemoveApp:
   removeCrd: "删除与此应用关联的 CRD"
 
+promptRemoveText:
+  globalrole: "角色"
+  globalroles: "角色"
+  roletemplate: "角色"
+  roletemplates: "角色"
+
 promptRestore:
   title: 还原快照
   name: 名称

package/components/PromptRemove.vue

@@ -83,6 +83,22 @@ export default {
       return this.$store.getters['type-map/labelFor'](schema, this.toRemove.length);
     },
 
+   typeZh() {
+    const typeLabel = this.type
+
+    const lowerKey = typeLabel.toLowerCase();
+    const i18nKey = `promptRemoveText.${lowerKey}`;
+
+    console.log(i18nKey, ' i18nKey-------------------------');
+    
+
+    if (this.t(i18nKey)) {
+      return this.t(i18nKey);
+    }
+
+    return typeLabel;
+  },
+
     selfLinks() {
       return this.toRemove.map((resource) => {
         return get(resource, 'links.self');
@@ -380,7 +396,7 @@ export default {
             :needs-confirm="needsConfirm"
             :value="toRemove"
             :names="names"
-            :type="type"
+            :type="typeZh"
             :done-location="doneLocation"
             @errors="e => error = e"
             @done="done"

package/components/form/Select.vue

@@ -391,7 +391,7 @@ export default {
 <style lang="scss" scoped>
   .unlabeled-select {
     position: relative;
-    width: 100%;
+    width: 400px;
 
     :deep() .vs__actions:after {
       // padding-top: 2px;

package/config/product/manager.js

@@ -13,6 +13,7 @@ import { DSL } from '@shell/store/type-map';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export const NAME = 'manager';
+const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
 
 export function init(store) {
   const {
@@ -60,11 +61,17 @@ export function init(store) {
     route:      { name: 'c-cluster-manager-cloudCredential' },
   });
 
-  basicType([
-    CAPI.RANCHER_CLUSTER,
-    'cloud-credentials',
-    'drivers',
-  ]);
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      CAPI.RANCHER_CLUSTER,
+      'cloud-credentials',
+      'drivers',
+    ]);
+  } else {
+    basicType([
+      CAPI.RANCHER_CLUSTER,
+    ]);
+  }
 
   configureType(SNAPSHOT, { depaginate: true });
 
@@ -111,10 +118,12 @@ export function init(store) {
     exact:      true
   });
 
-  basicType([
-    'rke-kontainer-drivers',
-    'rke-node-drivers',
-  ], 'drivers');
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'rke-kontainer-drivers',
+      'rke-node-drivers',
+    ], 'drivers');
+  }
 
   weightType(CAPI.MACHINE_DEPLOYMENT, 4, true);
   weightType(CAPI.MACHINE_SET, 3, true);
@@ -123,14 +132,16 @@ export function init(store) {
   weightType(MANAGEMENT.PSA, 5, true);
   weightType(VIRTUAL_TYPES.JWT_AUTHENTICATION, 0, true);
 
-  basicType([
-    CAPI.MACHINE_DEPLOYMENT,
-    CAPI.MACHINE_SET,
-    CAPI.MACHINE,
-    CATALOG.CLUSTER_REPO,
-    MANAGEMENT.PSA,
-    VIRTUAL_TYPES.JWT_AUTHENTICATION
-  ], 'advanced');
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      CAPI.MACHINE_DEPLOYMENT,
+      CAPI.MACHINE_SET,
+      CAPI.MACHINE,
+      CATALOG.CLUSTER_REPO,
+      MANAGEMENT.PSA,
+      VIRTUAL_TYPES.JWT_AUTHENTICATION
+    ], 'advanced');
+  }
 
   weightGroup('advanced', -1, true);
 

package/package.json

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

package/rancher-components/Banner/Banner.vue

@@ -78,7 +78,14 @@ export default defineComponent({
      * Return message text as label.
      */
     messageLabel(): string | void {
-      return !(typeof this.label === 'string') ? stringify(this.label) : undefined;
+
+      let labelStr = this.label
+
+      if (labelStr === 'waiting for api to be available') {
+        labelStr = '等待api可用'
+      }
+
+      return !(typeof labelStr === 'string') ? stringify(labelStr) : undefined;
     },
   },
   methods: { nlToBr }

package/scripts/publish-shell.sh

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

package/utils/errorTranslate.json

@@ -1,5 +1,55 @@
 {
   "translations": [
+    {
+      "pattern": "storageclasses.storage.k8sio \"(\\S+)\" is forbidden: User \"(\\S+)\" cannot patch resource \"(\\S+)\" in APl group \"(\\S+)\" at the cluster scope",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "virtualmachineimages.harvesterhciio \"(\\S+)\" is forbidden: User \"(\\S+)\" cannot patch resource \"(\\S+)\" in Apl group \"(\\S+)\" in the namespace \"(\\S+)\"",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Method POST not supported",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Method GET not supported",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Method CREATE not supported",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Method GET not supported",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Method DELETE not supported",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Method PUT not supported",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "failure while starting vmi:  arm64 not support this disk bus type, please use virtio or scsi",
+      "replacement": "启动虚拟机实例失败：ARM64 架构不支持此磁盘总线类型，请使用 virtio 或 scsi",
+      "flags": "gi"
+    },
+    {
+      "pattern": "the server could not find the requested resource",
+      "replacement": "服务器无法找到请求的资源",
+      "flags": "gi"
+    },
     {
       "pattern": "failed to create vm backup, error:  provisioner nfs.csi.k8s.io is not supported for type backup",
       "replacement": "创建虚拟机备份失败, 错误：nfs存储不支持备份",