dashboard-shell-shell 3.0.2-rc.105 → 3.0.5-test.1

package/pages/account/index.vue

@@ -1,6 +1,5 @@
 <script>
 import BackLink from '@shell/components/BackLink';
-import PromptChangePassword from '@shell/components/PromptChangePassword';
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import Loading from '@shell/components/Loading';
@@ -137,6 +136,15 @@ export default {
 
       return false;
     },
+    showChangePasswordDialog() {
+      this.$store.dispatch('management/promptModal', {
+        component:   'ChangePasswordDialog',
+        testId:      'change-password__modal',
+        customClass: 'change-password-modal',
+        modalWidth:  '500',
+        height:      '465'
+      });
+    }
   }
 };
 </script>

package/pages/auth/login.vue

@@ -32,7 +32,6 @@ import loadPlugins from '@shell/plugins/plugin';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import TabTitle from '@shell/components/TabTitle.vue';
-import { harvester2cloud } from '@shell/utils/router'
 import { AFTER_LOGIN_ROUTE } from '@shell/store/prefs';
 
 export default {
@@ -66,7 +65,7 @@ export default {
   },
 
   created () {
-    this.$store.dispatch('i18n/switchTo', 'zh-hans');
+    // this.$store.dispatch('i18n/switchTo', 'zh-hans');
   },
 
   computed: {
@@ -307,47 +306,13 @@ export default {
           $plugin: this.$store.$plugin
         });
 
-        // 等待集群列表加载完成，确保 defaultClusterId 可用
-        await this.$store.dispatch('loadManagement'); // 确保管理模块初始化
-        const clusterId = this.$store.getters['defaultClusterId'];
-
-        let userRoute = {
-          name: 'c-cluster-product-resource',
-          params: {
-            cluster: '_',
-            product: 'auth',
-            resource: 'management.cattle.io.user',
-          }
-        }
-        
-        // 构造 Harvester 路由
-        let harvesterRoute = null;
-
-        if (clusterId) {
-          harvesterRoute = {
-            name: 'c-cluster-product-resource',
-            params: {
-              cluster: clusterId,
-              product: 'harvesterManager',
-              resource: 'harvesterhci.io.management.cluster'
-            }
-          };
-    
-          // 写入 AFTER_LOGIN_ROUTE（复用页面设置登录首页逻辑）
-          await this.$store.dispatch('prefs/set', {
-            key: AFTER_LOGIN_ROUTE,
-            value: harvesterRoute || userRoute
-          });
-        
-        } 
-
 
         // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
           this.$router.push({ name: 'auth-setup' });
         } else {
-          this.$router.push(harvesterRoute || userRoute);
+          this.$router.push({ name: 'index' });
         }
 
       } catch (err) {
@@ -505,7 +470,7 @@ export default {
                   v-model:value="password"
                   data-testid="local-login-password"
                   :label="t('login.password')"
-                  autocomplete="password"
+                  autocomplete="current-password"
                 />
               </div>
             </div>

package/pages/auth/verify.vue

@@ -6,6 +6,7 @@ import { get } from '@shell/utils/object';
 import { base64Decode } from '@shell/utils/crypto';
 import loadPlugins from '@shell/plugins/plugin';
 import { LOGIN_ERRORS } from '@shell/store/auth';
+import { AUTH_BROADCAST_CHANNEL_NAME } from '@shell/utils/auth';
 
 const samlProviders = ['ping', 'adfs', 'keycloak', 'okta', 'shibboleth'];
 
@@ -13,11 +14,22 @@ const oauthProviders = ['github', 'googleoauth', 'azuread'];
 
 function reply(err, code) {
   try {
-    window.opener.window.onAuthTest(err, code);
+    // If we have access to the opener, then use the `onAuthTest` callback
+    if (window.opener) {
+      window.opener.window.onAuthTest(err, code);
+    } else {
+      // Otherwise, use a broadcast channel
+      const bc = new BroadcastChannel(AUTH_BROADCAST_CHANNEL_NAME);
+      const msg = { err, code };
+
+      bc.postMessage(JSON.stringify(msg));
+      bc.close();
+    }
     setTimeout(() => {
       window.close();
     }, 250);
   } catch (e) {
+    console.error('Error replying to authentication verification', e); // eslint-disable-line no-console
     window.close();
   }
 }

package/pages/c/_cluster/apps/charts/AddRepoLink.vue

@@ -0,0 +1,36 @@
+<script setup lang="ts">
+
+defineProps<{
+  clusterId: string;
+}>();
+
+</script>
+
+<template>
+  <router-link
+    :to="`/c/${clusterId}/apps/catalog.cattle.io.clusterrepo/create`"
+    class="add-repo-link"
+    tabindex="0"
+    :aria-label="t('catalog.charts.addNewRepo.ariaLabel')"
+  >
+    <span class="sr-only">{{ t('generic.opensInNewTab') }}</span>
+    + <span class="secondary-text-link">{{ t('catalog.charts.addNewRepo.label') }}</span>
+  </router-link>
+</template>
+
+<style scoped lang="scss">
+.add-repo-link {
+  all: unset;
+  cursor: pointer;
+  color: var(--link-text-secondary);
+  margin-left: 4px;
+
+  &:focus-visible, &:focus {
+    @include focus-outline;
+  }
+
+  span {
+    margin-left: 4px;
+  }
+}
+</style>

package/pages/c/_cluster/apps/charts/AppChartCardFooter.vue

@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import { RcItemCardAction } from '@components/RcItemCard';
+
+interface FooterItem {
+  icon?: string;
+  iconTooltip?: Record<{key?: string, text?: string}>;
+  labels: string[];
+}
+
+const emit = defineEmits<{(e: 'click:item', type: string, label: string): void; }>();
+
+defineProps<{
+  items: FooterItem[];
+}>();
+
+function onClickItem(type: string, label: string) {
+  emit('click:item', type, label);
+}
+
+</script>
+
+<template>
+  <div class="app-chart-card-footer">
+    <div
+      v-for="(footerItem, i) in items"
+      :key="i"
+      class="app-chart-card-footer-item"
+      data-testid="app-chart-card-footer-item"
+    >
+      <i
+        v-if="footerItem.icon"
+        v-clean-tooltip="t(footerItem.iconTooltip?.key)"
+        :class="['icon', 'app-chart-card-footer-item-icon', footerItem.icon]"
+      />
+      <rc-item-card-action
+        v-for="(label, j) in footerItem.labels"
+        :key="j"
+        class="app-chart-card-footer-item-text secondary-text-link"
+        data-testid="app-chart-card-footer-item-text"
+        tabindex="0"
+        :aria-label="t('catalog.charts.appChartCard.footerItem.ariaLabel')"
+        @click="onClickItem(footerItem.type, label)"
+        @keydown.enter="onClickItem(footerItem.type, label)"
+        @keydown.space.prevent="onClickItem(footerItem.type, label)"
+      >
+        {{ label }}<span v-if="footerItem.labels.length > 1 && j !== footerItem.labels.length - 1">, </span>
+      </rc-item-card-action>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.app-chart-card-footer {
+  display: flex;
+  flex-wrap: wrap;
+
+  &-item {
+    display: flex;
+    align-items: center;
+    color: var(--link-text-secondary);
+    margin-top: 8px;
+    margin-right: 8px;
+
+    &-text {
+      text-transform: capitalize;
+      margin-right: 8px;
+    }
+
+    &-icon {
+      width: 20px;
+      height: 20px;
+      display: flex;
+      font-size: 19px;
+      align-items: center;
+      justify-content: center;
+      margin-right: 8px;
+    }
+  }
+}
+</style>

package/pages/c/_cluster/apps/charts/AppChartCardSubHeader.vue

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+
+interface SubHeaderItem {
+  icon: string;
+  iconTooltip?: Record<{key?: string, text?: string}>;
+  label: string;
+  labelTooltip?: string;
+}
+
+defineProps<{
+  items: SubHeaderItem[];
+}>();
+
+</script>
+
+<template>
+  <div class="app-chart-card-sub-header">
+    <div
+      v-for="(subHeaderItem, i) in items"
+      :key="i"
+      class="app-chart-card-sub-header-item"
+      data-testid="app-chart-card-version"
+    >
+      <i
+        v-clean-tooltip="t(subHeaderItem.iconTooltip.key)"
+        :class="['icon', 'app-chart-card-sub-header-item-icon', subHeaderItem.icon]"
+      />
+      <p v-clean-tooltip="subHeaderItem.labelTooltip">
+        {{ subHeaderItem.label }}
+      </p>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.app-chart-card-sub-header {
+  display: flex;
+  gap: var(--gap-md);
+  color: var(--link-text-secondary);
+  margin-bottom: 8px;
+
+  &-item {
+    display: flex;
+    align-items: center;
+  }
+
+  &-item-icon {
+    width: 20px;
+    height: 20px;
+    display: flex;
+    font-size: 19px;
+    align-items: center;
+    justify-content: center;
+    margin-right: 8px;
+  }
+}
+</style>

package/pages/c/_cluster/apps/charts/StatusLabel.vue

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+
+defineProps<{
+  label: string;
+  icon: string;
+  iconColor?: string;
+  tooltip?: string;
+}>();
+
+</script>
+
+<template>
+  <div class="status-label">
+    {{ label }}
+    <i
+      v-clean-tooltip.right="tooltip"
+      :class="['icon', icon, iconColor]"
+    />
+  </div>
+</template>
+
+<style scoped lang="scss">
+.status-label {
+  display: flex;
+  align-items: flex-end;
+  gap: var(--gap);
+  margin-left: 4px;
+
+  .icon {
+    &.warning  { color: var(--warning); }
+  }
+}
+</style>