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

package/assets/translations/en-us.yaml

@@ -6464,6 +6464,7 @@ storageClass:
       tooltip: By default the default storage class on the host Harvester cluster is used.
 
 tableHeaders:
+  claimedby: claimedby
   pod: pod
   volumeattributesclass: volumeattributesclass
   assuredConcurrencyShares: Assured Concurrency Shares

package/assets/translations/zh-hans.yaml

@@ -796,6 +796,10 @@ asyncButton:
     action: 恢复编排
     success: 已恢复编排
     waiting: 正在恢复编排
+  redeploy:
+    action: 重新部署
+    success: 重新部署成功
+    waiting: 正在重新部署工作负载
   rollback:
     action: 回滚
     success: 已回滚
@@ -4592,6 +4596,10 @@ promptRollback:
   multipleWorkloadError: "一次只能回滚一个工作负载。"
   singleRevisionBanner: 没有可用于回滚的修订版本。
 
+promptRedeploy:
+  title: 重新部署 {type}？
+  attemptingToRedeploy: "您正在尝试重新部署 {type} {names} 重新部署将重启所选工作负载，可能导致暂时性服务中断。"
+
 promptSaveAsRKETemplate:
   title: 将 {cluster} 转换为新的 RKE 模板
   name: 集群模板名称
@@ -5442,6 +5450,7 @@ storageClass:
       tooltip: 默认使用主机 Cloud 集群上的默认存储类。
 
 tableHeaders:
+  claimedby: 占用者
   pod: pod
   ip: ip
   volumeattributesclass: 卷属性类

package/components/CruResource.vue

@@ -623,13 +623,14 @@ export default {
                       />
                       <span v-else>{{ subtype.label }}</span>
                     </h5>
-                    <a
+                    <!-- 禅道 3541 隐藏 更多信息 -->
+                    <!-- <a
                       v-if="subtype.docLink"
                       :href="subtype.docLink"
                       target="_blank"
                       rel="noopener nofollow"
                       class="flex-right"
-                    >{{ t('generic.moreInfo') }} <i class="icon icon-external-link" /></a>
+                    >{{ t('generic.moreInfo') }} <i class="icon icon-external-link" /></a> -->
                   </div>
                   <hr
                     v-if="subtype.description"

package/components/ResourceTable.vue

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

package/components/SingleClusterInfo.vue

@@ -148,7 +148,8 @@ export default {
           :to="clusterToolsLink"
           class="cluster-link"
         >
-          {{ t('nav.clusterTools') }}
+          <!-- 禅道 3539 隐藏集群工具 -->
+          <!-- {{ t('nav.clusterTools') }} -->
         </router-link>
       </div>
     </div>

package/components/auth/Principal.vue

@@ -97,7 +97,7 @@ export default {
       <div :style="userLogoSize === 79 ? { width: '287px' } : {}" class="avatar">
         <img
           :style="{ width: userLogoSize + 'px', height: userLogoSize + 'px' }"
-          src="@shell/assets/images/user.png"
+          :src="require('@shell/assets/images/user.png')"
           :class="{'round': principal.roundAvatar}"
           :alt="t('principal.alt.avatar')"
         >

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/config/product/explorer.js

@@ -655,7 +655,7 @@ export function init(store) {
   virtualType({
     label:            store.getters['i18n/t'](`typeLabel.${ VIRTUAL_TYPES.PROJECT_SECRETS }`, { count: 2 }),
     group:            'storage',
-    icon:             'globe',
+    icon:             'default',
     namespaced:       false,
     ifRancherCluster: true,
     name:             VIRTUAL_TYPES.PROJECT_SECRETS,

package/dialog/RollbackWorkloadDialog.vue

@@ -204,7 +204,7 @@ export default {
   >
     <template #title>
       <h4 class="text-default-text">
-        {{ t('promptRollback.modalTitle', { workloadName }, true) }}
+        {{ t('promptRollback.modalTitle', { workloadName }) }}
       </h4>
     </template>
     <template #body>

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.41",
+  "version": "3.0.5-test.43",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/c/_cluster/explorer/index.vue

@@ -694,7 +694,8 @@ export default {
           role="link"
           :aria-label="t('nav.clusterTools')"
         >
-          <span>{{ t('nav.clusterTools') }}</span>
+          <!-- 禅道 3539 隐藏集群工具 -->
+          <!-- <span>{{ t('nav.clusterTools') }}</span> -->
         </router-link>
       </div>
       <ConfigBadge

package/plugins/dashboard-store/actions.js

@@ -41,6 +41,26 @@ export async function handleSpoofedRequest(rootGetters, schemaStore, opt, produc
   }
 }
 
+export function normalizeSchemaMethods(schema) {
+  if (!schema) return schema;
+  
+  const HTTP_METHODS = ["get", "post", "put", "patch", "delete"];
+
+  if (Array.isArray(schema.resourceMethods)) {
+    schema.resourceMethods = schema.resourceMethods.map(m =>
+      HTTP_METHODS.includes(m.toLowerCase()) ? m.toUpperCase() : m
+    );
+  }
+
+  if (Array.isArray(schema.collectionMethods)) {
+    schema.collectionMethods = schema.collectionMethods.map(m =>
+      HTTP_METHODS.includes(m.toLowerCase()) ? m.toUpperCase() : m
+    );
+  }
+
+  return schema;
+}
+
 export async function loadSchemas(ctx, watch = true) {
   const {
     getters, dispatch, commit, rootGetters
@@ -55,6 +75,9 @@ export async function loadSchemas(ctx, watch = true) {
   }
 
   res.data.forEach(addSchemaIndexFields);
+  
+  // ✅ 统一处理 HTTP 方法
+  res.data.forEach(normalizeSchemaMethods);
 
   commit('loadAll', {
     ctx,

package/rancher-components/Banner/Banner.vue

@@ -83,6 +83,8 @@ export default defineComponent({
 
       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;

package/scripts/publish-shell.sh

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

package/types/shell/index.d.ts

@@ -2687,6 +2687,7 @@ export default class Ingress {
 
 declare module '@shell/plugins/dashboard-store/actions' {
 export function handleSpoofedRequest(rootGetters: any, schemaStore: any, opt: any, product: any): Promise<any>;
+export function normalizeSchemaMethods(schema: any): any;
 export function loadSchemas(ctx: any, watch?: boolean): Promise<any>;
 export const _ALL: "all";
 export const _MERGE: "merge";

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

@@ -1582,6 +1582,10 @@
       "pattern": "could not",
       "replacement": "无法"
     },
+    {
+      "pattern": "MissingRequired",
+      "replacement": "缺少"
+    },
     {
       "pattern": "cannot",
       "replacement": "不能"
@@ -1742,6 +1746,14 @@
       "pattern": "replicaset",
       "replacement": "副本集"
     },
+    {
+      "pattern": "Cluster",
+      "replacement": "名称"
+    },
+    {
+      "pattern": "name",
+      "replacement": "名称"
+    },
     {
       "pattern": "%",
        "replacement": ""

package/utils/errorTranslateNew.json

@@ -0,0 +1,44 @@
+{
+  "translations": [
+    {
+      "pattern": "virtualmachineimages\\.harvesterhci\\.io.*forbidden.*user.*cannot.*(patch|update|create|delete).*resource.*virtualmachineimages.*harvesterhci\\.io.*namespace",
+      "replacement": "权限不足",
+      "flags": "gi"
+    },
+    {
+      "pattern": "storageclasses\\.storage\\.k8s\\.io.*forbidden.*user.*cannot.*(patch|update|create|delete).*resource.*storageclasses.*storage\\.k8s\\.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"
+    },
+    {
+      "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"
+    }
+  ]
+}