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

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/ResourceTable.vue

@@ -698,6 +698,12 @@ export default {
       />
     </template>
 
+    <template #banner>
+      <slot
+        name="banner"
+      />
+    </template>
+
 
     <template
       v-if="externalPaginationEnabled"

package/components/form/Members/MembershipEditor.vue

@@ -170,7 +170,7 @@ export default {
   >
     <template #column-headers>
       <div class="box mb-0">
-        <div class="column-headers row" style="width: calc(100% - 100px);">
+        <div class="column-headers row" :style="{ width: (isCreate && i === 0) || isView ? '100%' : 'calc(100% - 100px)' }">
           <div class="col span-6">
             <label class="text-label">{{ t('membershipEditor.user') }}</label>
           </div>

package/components/form/Members/ProjectMembershipEditor.vue

@@ -58,6 +58,6 @@ export default {
     :type="NORMAN.PROJECT_ROLE_TEMPLATE_BINDING"
     :mode="mode"
     parent-key="projectId"
-    :parent-id="parentId"
+    :parent-id="parentId"
   />
 </template>

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/list/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue

@@ -37,15 +37,17 @@ export default {
 
 <template>
   <div>
-    <Banner
-      color="info"
-      :label="t('podSecurityAdmission.banner.modifications')"
-    />
-
     <ResourceTable
       :loading="loading"
       :schema="schema"
       :rows="rows"
-    />
+    >
+      <template #banner>
+        <Banner
+          color="info"
+          :label="t('podSecurityAdmission.banner.modifications')"
+        />
+      </template>
+    </ResourceTable>
   </div>
 </template>

package/mixins/create-edit-view/impl.js

@@ -170,6 +170,16 @@ export default {
       } catch (err) {
         // This exception handles errors from the `request` action when it receives a failed http request. The `err` object could be from the action's error handler (raw http response object containing `status`) or thrown later on given the response of the action (a massaged object containing `_status`). TBD why one 409 triggers the error handler and another does not.
         const IS_ERR_409 = err.status === 409 || err._status === 409;
+        
+        const IS_ERR_403 = err.status === 403 || err._status === 403;
+
+        if (err.message === '' && err.fieldName && err.code) {
+          err.message = err.code + ' ' + err.fieldName
+        }
+        
+        if (IS_ERR_403) {
+          err.message = '权限不足'
+        }
 
         // Conflict, the resource being edited has changed since starting editing
         if (IS_ERR_409 && depth === 0 && this.isEdit) {

package/package.json

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

package/rancher-components/Banner/Banner.vue

@@ -78,7 +78,16 @@ 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可用'
+      } else if (labelStr === 'Cluster agent is not connected') {
+        labelStr = '集群agent未连接'
+      }
+
+      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.42 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail
 

package/utils/error.js

@@ -1,6 +1,7 @@
 import { isArray } from '@shell/utils/array';
 
 import translations from './errorTranslate.json';
+import errorTranslateNew from './errorTranslateNew.json';
 
 export class ClusterNotFoundError extends Error {
   static NAME = 'ClusterNotFoundError'
@@ -49,6 +50,9 @@ export class ApiError extends Error {
 }
 
 export function stringify(err) {
+  
+  console.log(err, ' err-------------------------------------------------1')
+
   let str;
   if ( typeof err === 'string' ) {
     str = err;
@@ -92,6 +96,8 @@ export function exceptionToErrorsArray(err) {
   if ( err?.response?.data ) {
     const body = err.response.data;
 
+    console.log(err, ' err-------------------------------------------------1')
+
     if ( body && body.message ) {
       return [translateError(body.message)];
     } else {
@@ -147,7 +153,9 @@ export function translateError(error) {
   console.log('00044', error);
 
 
-  if (error.includes('spec and status of disks on node') && error.includes('are being syncing and please retry later')) {
+  if (error.includes("a lowercase rfc 1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character")) {
+    error =  "无效的名称不符合 RFC 1123 命名规则。名称只能包含小写字母、数字或 '-'，并且必须以字母或数字开头和结尾（例如 'my-name' 或 '123-abc'）。"
+  } else 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')) {
@@ -174,7 +182,7 @@ export function translateError(error) {
 
     error = `子网 '${subnetName}' 配置无效：1) 名称禁止以数字开头；2) 排除IP[${idx}] 不能为空且必须是合法 IPv4/IPv6 地址或地址段`;
   }
-  
+
   // error = error.replace(/admission webhook(.*?)denied the request:/g, (match, p1) => {
   //   return '';
   // })
@@ -187,8 +195,9 @@ export function translateError(error) {
     error =  error.substring(errorIndex + 4);
   }
 
+  const translationsList = [...errorTranslateNew.translations, ...translations.translations]
   
-  for (const translation of translations.translations) {
+  for (const translation of translationsList) {
    
     // if (error.includes(translation.pattern)) { 
     //   error = error.replace(translation.pattern, translation.replacement);

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存储不支持备份",
@@ -1532,6 +1582,10 @@
       "pattern": "could not",
       "replacement": "无法"
     },
+    {
+      "pattern": "MissingRequired",
+      "replacement": "缺少"
+    },
     {
       "pattern": "cannot",
       "replacement": "不能"
@@ -1692,6 +1746,14 @@
       "pattern": "replicaset",
       "replacement": "副本集"
     },
+    {
+      "pattern": "Cluster",
+      "replacement": "名称"
+    },
+    {
+      "pattern": "name",
+      "replacement": "名称"
+    },
     {
       "pattern": "%",
        "replacement": ""

package/utils/errorTranslateNew.json

@@ -0,0 +1,34 @@
+{
+  "translations": [
+    {
+      "pattern": "Cluster agent is not connected",
+      "replacement": "集群agent未连接",
+      "flags": "gi"
+    },
+    {
+      "pattern": "waiting for api to be available",
+      "replacement": "等待api可用",
+      "flags": "gi"
+    },
+    {
+      "pattern": "MissingRequired Cluster name",
+      "replacement": "缺少集群名称",
+      "flags": "gi"
+    },
+    {
+      "pattern": "users\\.management\\.cattle\\.io.*forbidden.*user.*cannot update resource.*users.*management\\.cattle\\.io.*cluster scope",
+      "replacement": "权限不足：当前用户无权修改用户资源。",
+      "flags": "gi"
+    },
+    {
+      "pattern": "Cluster agent is not connected",
+      "replacement": "集群agent未连接",
+      "flags": "gi"
+    },
+    {
+      "pattern": "waiting for api to be available",
+      "replacement": "等待api可用",
+      "flags": "gi"
+    }
+  ]
+}