dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-test.2

package/assets/translations/zh-hans.yaml

@@ -112,6 +112,10 @@ generic:
           other {匹配 {total, number} 中的 {matched, number} 个，包括 "{sample}"}
         }
 
+graph:
+  loading: 正在加载 Chart 数据...
+  rendering: 正在渲染 Chart...
+
 locale:
   en-us: English
   zh-hans: 简体中文
@@ -1125,7 +1129,7 @@ chartHeading:
   overview: 概述
   poweredBy: "Powered by:"
 
-cis:
+compliance:
   addTest: 添加测试 ID
   alertNeeded: |-
     必须在 CIS Chart values.yaml 中开启告警。
@@ -2177,7 +2181,7 @@ fleet:
     gitOpsScale: 大规模 GitOps。
     learnMore: 了解更多。
     learnMoreLink: https://fleet.rancher.io
-    noRepo: "工作区中没有任何 Git 仓库"
+    noApplications: "工作区中没有任何 Git 仓库"
     getStarted: 开始使用
     thereIsMore: |-
       {count, plural,
@@ -2209,7 +2213,9 @@ fleet:
       other {# 个 Bundle 未显示，因为它属于不能与持续交付一起使用的 Cloud 集群。}
       }
   fleetSummary:
-    noClustersGitRepo: 这个 Git 仓库不针对任何集群
+    noClusters:
+      gitRepo: 这个 Git 仓库不针对任何集群
+      helmOp: ''
     state:
       ready: '就绪'
       info: '转换中'
@@ -3529,6 +3535,7 @@ nameNsDescription:
     placeholder: 输入可以描述该资源的文本
 
 namespace:
+  cancelCreateAriaLabel: 取消创建命名空间
   containerResourceLimit: 容器资源限制
   resourceQuotas: 资源配额
   project:
@@ -6499,6 +6506,9 @@ typeDescription:
   kubeovn.io.subnet: 子网是虚拟私有云（VPC）中的一个逻辑分区，用于将网络划分为更小的、可管理的部分。每个子网都有自己的 IP 地址范围和网络配置，允许用户在 VPC 内创建隔离的网络环境，以满足不同应用或服务的需求。
   kubeovn.io.providernetwork: 物理网络（Provider Network）是指在虚拟私有云（VPC）中，由云服务提供商管理的网络资源。它通常用于连接 VPC 内的虚拟机、容器和其他资源，并提供对外部网络的访问。提供者网络可以包括物理网络设备、虚拟交换机、路由器等，以实现高效、安全的网络通信。
   kubeovn.io.vlan: VLAN（Virtual Local Area Network，虚拟局域网）是一种网络技术，用于在物理网络中创建逻辑隔离的子网络。VLAN 允许用户将不同的设备和服务分组到同一虚拟网络中，从而提高网络的安全性、灵活性和可管理性。每个 VLAN 都有一个唯一的标识符（VLAN ID），用于区分不同的虚拟网络。
+  management.cattle.io.setting: 统一配置平台基础选项与全局设置，支持CA证书、密码规则、域名、Token时效等核心配置。
+  management.cattle.io.user: 用于管理用户账号，支持创建、维护用户信息，可设置用户权限、管理密码等，保障系统资源仅由授权用户访问，提升系统安全性。
+  harvesterhci.io.management.cluster: 提供虚拟化集群的实时健康状态监控、版本号管理及资源负载管理，支持批量导入/删除集群、配置调优与权限分级功能，实现高效运维管控。
 typeLabel:
   management.cattle.io.token: |-
     {count, plural,

package/chart/__tests__/S3.test.ts

@@ -11,7 +11,8 @@ describe('rancher-backup: S3', () => {
       'i18n/t':                    (text: string) => text,
       t:                           (text: string) => text,
       'cluster/all':               () => [],
-      'cluster/paginationEnabled': () => false
+      'cluster/paginationEnabled': () => false,
+      currentStore:                () => 'cluster'
     }
   };
   const wrapper = mount(S3, {

package/chart/monitoring/index.vue

@@ -55,7 +55,7 @@ export default {
   async fetch() {
     const { $store } = this;
 
-    // Fetch all the resources required for all the tabs asyncronously up front
+    // Fetch all the resources required for all the tabs asynchronously up front
     const hashPromises = {
       namespaces:        $store.getters['namespaces'](),
       pvcs:              $store.dispatch('cluster/findAll', { type: PVC }),

package/cloud-credential/gcp.vue

@@ -75,8 +75,16 @@ export default {
       @selected="onFileSelected"
     />
     <p
-      v-clean-html="t('cluster.credential.gcp.authEncodedJson.help', {}, true)"
+      v-clean-html="t('cluster.credential.gcp.authEncodedJson.help.shared', {}, true)"
       class="text-muted"
     />
+    <p
+      v-clean-html="t('cluster.credential.gcp.authEncodedJson.help.gke', {}, true)"
+      class="text-muted mt-20"
+    />
+    <p
+      v-clean-html="t('cluster.credential.gcp.authEncodedJson.help.gce', {}, true)"
+      class="text-muted mt-20"
+    />
   </div>
 </template>

package/components/ActionMenuShell.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted } from 'vue';
+import { computed } from 'vue';
 import { useStore } from 'vuex';
 import { useRoute } from 'vue-router';
 
@@ -18,6 +18,7 @@ type RcDropdownMenuComponentProps = {
   dataTestid?: string;
   resource: Object;
   customActions?: DropdownOption[];
+  showIcon: Boolean;
 }
 
 const props = defineProps <RcDropdownMenuComponentProps>();
@@ -83,17 +84,12 @@ const execute = (action: any, event: MouseEvent, args?: any) => {
 const options = computed(() => store.getters['action-menu/optionsArray']);
 
 const menuOptions = () => {
-
   if (props.customActions && props.customActions.length > 0) {
     return props.customActions;
   }
 
   return options.value;
 };
-
-onMounted(() => {
-})
-
 </script>
 
 <template>
@@ -106,6 +102,6 @@ onMounted(() => {
     :data-testid="dataTestid"
     @update:open="openChanged"
     @select="(e: MouseEvent, option: object) => execute(option, e)"
-    :showIcon="false"
+    :showIcon="showIcon"
   />
 </template>

package/components/AppModal.vue

@@ -1,8 +1,7 @@
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, ref } from 'vue';
 import {
   DEFAULT_FOCUS_TRAP_OPTS,
-  useBasicSetupFocusTrap,
   getFirstFocusableElement,
   useWatcherBasedSetupFocusTrapWithDestroyIncluded
 } from '@shell/composables/focusTrap';
@@ -86,20 +85,13 @@ export default defineComponent({
       type:    String,
       default: DEFAULT_ITERABLE_NODE_SELECTOR,
     },
-    /**
-     * trigger focus trap - but watcher based
-     */
-    triggerFocusTrapWatcherBased: {
-      type:    Boolean,
-      default: false,
-    },
     /**
      * watcher-based focus trap variable to watch
      */
     focusTrapWatcherBasedVariable: {
       type:    Boolean,
-      default: false,
-    },
+      default: undefined,
+    }
   },
   computed: {
     modalWidth(): string {
@@ -126,7 +118,7 @@ export default defineComponent({
         width: this.modalWidth,
         ...this.stylesPropToObj,
       };
-    },
+    }
   },
   setup(props) {
     if (props.triggerFocusTrap) {
@@ -150,19 +142,10 @@ export default defineComponent({
         };
       }
 
-      if (!props.triggerFocusTrapWatcherBased) {
-        useBasicSetupFocusTrap('#modal-container-element', opts);
-      }
-    }
-  },
-  created() {
-    // This usecase is to cover the PromptModal scenario where it's renders a generic component inside.
-    // Due to the architecture of the PromptModal it needs to be handled with a watcher based focus trap
-    // but with a dedicated unmount hook
-    if (this.triggerFocusTrapWatcherBased) {
-      const opts:any = DEFAULT_FOCUS_TRAP_OPTS;
+      // prop used to immediately trigger the focus trap when a proper watch variable is not required
+      const autoTriggerFocusTrapWatcher = ref(true);
 
-      useWatcherBasedSetupFocusTrapWithDestroyIncluded(() => this.focusTrapWatcherBasedVariable, '#modal-container-element', opts, true);
+      useWatcherBasedSetupFocusTrapWithDestroyIncluded(() => props.focusTrapWatcherBasedVariable ?? autoTriggerFocusTrapWatcher, '#modal-container-element', opts, true);
     }
   },
   mounted() {
@@ -182,13 +165,9 @@ export default defineComponent({
       }
     },
     close(event: MouseEvent) {
-      console.log('close');
-      
       if (
         this.$refs.modalRef
       ) {
-        console.log('clickcolse');
-        
         this.$emit('close');
       }
       // this.$emit('close');
@@ -231,6 +210,8 @@ export default defineComponent({
           :class="customClass"
           class="modal-container"
           :style="modalStyles"
+          role="dialog"
+          aria-modal="true"
           @click.stop
         >
         <div

package/components/AsyncButton.vue

@@ -314,11 +314,13 @@ export default defineComponent({
       v-if="displayIcon"
       v-clean-tooltip="tooltip"
       :class="{icon: true, 'icon-lg': true, [displayIcon]: true, 'mr-0': isManualRefresh}"
+      :alt="t('asyncButton.alt.iconAlt')"
     />
     <span
       v-if="labelAs === 'text' && displayLabel"
       v-clean-tooltip="tooltip"
       v-clean-html="displayLabel"
+      data-testid="async-btn-display-label"
     />
   </button>
 </template>

package/components/BrandImage.vue

@@ -79,56 +79,37 @@ export default {
     },
 
     pathToBrandedImage() {
-
-      console.log(this.fileName, ' this.fileName;')
-
       if (this.fileName === 'rancher-logo.svg' || this.supportCustomLogo) {
         if (this.theme === 'dark' && this.uiLogoDark) {
-
-          console.log(this.uiLogoDark, ' this.uiLogoDark;')
-          
           return this.uiLogoDark;
         }
 
         if (this.uiLogoLight) {
-          console.log(this.uiLogoLight, ' this.uiLogoLight;')
-
           return this.uiLogoLight;
         }
       }
 
       if (this.fileName === 'banner.svg') {
         if (this.theme === 'dark' && this.uiBannerDark) {
-          console.log(this.uiBannerDark, ' this.uiBannerDark;')
-
           return this.uiBannerDark;
         }
 
         if (this.uiBannerLight) {
-          console.log(this.uiBannerLight, ' this.uiBannerLight;')
-
           return this.uiBannerLight;
         }
       }
 
       if (this.fileName === 'login-landscape.svg') {
         if (this.theme === 'dark' && this.uiLoginBackgroundDark) {
-          console.log(this.uiLoginBackgroundDark, ' this.uiLoginBackgroundDark;')
-
           return this.uiLoginBackgroundDark;
         }
 
         if (this.uiLoginBackgroundLight) {
-          console.log(this.uiLoginBackgroundLight, ' this.uiLoginBackgroundLight;')
-
           return this.uiLoginBackgroundLight;
         }
       }
 
       if (!this.brand) {
-
-        console.log(this.defaultPathToBrandedImage, ' this.defaultPathToBrandedImage;')
-
         return this.defaultPathToBrandedImage;
       } else {
         if (this.theme === 'dark' || this.dark) {
@@ -140,8 +121,6 @@ export default {
           return require(`~shell/assets/brand/${ this.brand }/${ this.fileName }`);
         } catch {}
 
-        console.log(this.defaultPathToBrandedImage, ' this.defaultPathToBrandedImage;')
-
         return this.defaultPathToBrandedImage;
       }
     },

package/components/Certificates.vue

@@ -139,6 +139,10 @@ export default defineComponent({
       color="error"
       :label="expiredData.expired"
     />
+    <!--
+     It would be nicer if this used PaginatedResourceTable and server-side pagination, however...
+     a big sell it sorting by expiration time which is not a server-side property
+    -->
     <ResourceTable
       :loading="$fetchState.pending"
       :schema="schema"
@@ -147,6 +151,7 @@ export default defineComponent({
       :paging-label="'secret.certificate.paging'"
       :paging-params="pagingParams"
       :ignore-filter="true"
+      :hide-manual-refresh-button="true"
     >
       <template #col:certState="{row}">
         <td>

package/components/CodeMirror.vue

@@ -88,7 +88,7 @@ export default {
 
       // fixes https://github.com/rancher/dashboard/issues/13653
       // we can't use the inert HTML prop on the parent because it disables all interaction
-      out.readOnly = this.isDisabled ? 'nocursor' : false;
+      out.readOnly = !!this.isDisabled;
 
       return out;
     },
@@ -228,7 +228,7 @@ export default {
 
     onFocus() {
       this.isCodeMirrorFocused = true;
-      this.$emit('onFocus', true);
+      this.$emit('onFocus', this.isCodeMirrorFocused);
     },
 
     onBlur() {
@@ -458,7 +458,7 @@ export default {
         justify-content: center;
         border: 1px solid transparent;
         color: var(--darker);
-        background-color: var(--overlay-bg);
+        background-color: var(--subtle-overlay-bg);
         font-size: 12px;
 
         .close-indicator {

package/components/CommunityLinks.vue

@@ -1,6 +1,5 @@
 <script>
 import SimpleBox from '@shell/components/SimpleBox';
-import AppModal from '@shell/components/AppModal.vue';
 import Closeable from '@shell/mixins/closeable';
 import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
@@ -9,11 +8,11 @@ import { isRancherPrime } from '@shell/config/version';
 import { fetchLinks } from '@shell/config/home-links';
 import { processLink } from '@shell/plugins/clean-html';
 
-// i18n-ignore footer.wechat.title, footer.wechat.modalText, footer.wechat.modalText2
+// i18n-ignore footer.wechat.title
 export default {
   name: 'CommunityLinks',
 
-  components: { SimpleBox, AppModal },
+  components: { SimpleBox },
 
   props: {
     linkOptions: {
@@ -87,10 +86,7 @@ export default {
   },
   methods: {
     show() {
-      this.showWeChatModal = true;
-    },
-    close() {
-      this.showWeChatModal = false;
+      this.$store.dispatch('management/promptModal', { component: 'WechatDialog' });
     }
   },
 };
@@ -146,32 +142,6 @@ export default {
         </a>
       </div>
     </SimpleBox>
-    <app-modal
-      v-if="showWeChatModal"
-      name="wechat-modal"
-      height="auto"
-      :width="640"
-      :trigger-focus-trap="true"
-      @close="close"
-    >
-      <div class="wechat-modal">
-        <h1>{{ t('footer.wechat.modalText') }}</h1>
-        <h1>{{ t('footer.wechat.modalText2') }}</h1>
-        <div class="qr-img" />
-        <div>
-          <button
-            class="btn role-primary"
-            tabindex="0"
-            :aria-label="t('generic.close')"
-            role="button"
-            @click="close"
-            @keydown.enter.stop
-          >
-            {{ t('generic.close') }}
-          </button>
-        </div>
-      </div>
-    </app-modal>
   </div>
 </template>
 
@@ -188,29 +158,4 @@ export default {
   .support-link:not(:last-child) {
     margin-bottom: 15px;
   }
-
-  .wechat-modal {
-    margin: 60px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  .link {
-    cursor: pointer;
-  }
-
-  .btn {
-    margin: 20px auto 0;
-  }
-
-  .qr-img {
-    background-image: url('../assets/images/wechat-qr-code.jpg');
-    background-repeat: no-repeat;
-    background-size: cover;
-    background-position: center center;
-    height: 128px;
-    width: 128px;
-    margin: 15px auto 10px;
-  }
 </style>