dashboard-shell-shell 1.0.10000011122 → 1.6.0-alpha.2

package/pages/account/index.vue

@@ -1,11 +1,9 @@
 <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';
-// import Principal from '@shell/components/auth/Principal';
-import Principal from './pri.vue';
+import Principal from '@shell/components/auth/Principal';
 import BackRoute from '@shell/mixins/back-link';
 import { mapGetters } from 'vuex';
 
@@ -18,7 +16,7 @@ const API_ENDPOINT = '/v3';
 
 export default {
   components: {
-    CopyToClipboardText, BackLink, Banner, PromptChangePassword, Loading, ResourceTable, Principal, TabTitle
+    CopyToClipboardText, BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
   },
   mixins: [BackRoute],
   async fetch() {
@@ -137,6 +135,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>
@@ -144,88 +151,39 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <!-- <BackLink :link="backLink" />
-    <h1>
-      <TabTitle breadcrumb="vendor-only">
-        {{ t('accountAndKeys.title') }}
-      </TabTitle>
-    </h1> -->
-    <div class="api-key-title mb-20">
-      {{ t('accountAndKeys.title') }}
+    <div style="display: flex;align-items: center;margin-bottom: 20px;">
+      <!-- <BackLink class="backLinkCls" :link="backLink" /> -->
+      <div style="font-size: 26px;">
+        <TabTitle breadcrumb="vendor-only">
+          {{ t('accountAndKeys.title') }}
+        </TabTitle>
+      </div>
     </div>
 
-    <!-- <h2 v-t="'accountAndKeys.account.title'" /> -->
-    <div class="account">
-      <div class="account-title">
-        {{ t('accountAndKeys.account.title') }}
-      </div>
-      <Principal
-        :value="principal.id"
-        :use-muted="false"
-        :show-labels="true"
-        :isShowPass="true"
-      >
-      <template #edit>
-          <span
+    <div class="account_card mb-20">
+      <h5 v-t="'accountAndKeys.account.title'" />
+      <div class="account">
+        <Principal
+          :userLogoSize="79"
+          :value="principal.id"
+          :use-muted="false"
+          :show-labels="true"
+        />
+        <div>
+          <button
             v-if="canChangePassword"
-            class="edit-pass-txt"
-            @click="$refs.promptChangePassword.show(true)"
-          >修改
-          </span>
-        </template>
-    </Principal>
-      <!-- <div>
-        <button
-          v-if="canChangePassword"
-          role="button"
-          :aria-label="t('accountAndKeys.account.change')"
-          type="button"
-          class="btn role-primary"
-          data-testid="account_change_password"
-          @click="$refs.promptChangePassword.show(true)"
-        >
-          {{ t("accountAndKeys.account.change") }}
-        </button>
-      </div> -->
-    </div>
-    <PromptChangePassword ref="promptChangePassword" />
-
-    <!-- <hr role="none"> -->
-     <div  
-     style=" border: 1px solid #d7d7d7;padding: 20px 20px 0px 20px;"
-     class="mt-20">
-    <div class="keys-header">
-      <div>
-        <!-- <h2 v-t="'accountAndKeys.apiKeys.title'" /> -->
-        <div
-            v-t="'accountAndKeys.apiKeys.title'"
-            class="account-title mb-20"
-          />
-        <div class="api-url">
-          <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
-          <CopyToClipboardText
-            :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
-            :text="apiUrl"
-          />
+            role="button"
+            :aria-label="t('accountAndKeys.account.change')"
+            type="button"
+            class="btn role-primary"
+            data-testid="account_change_password"
+            @click="showChangePasswordDialog"
+          >
+            {{ t("accountAndKeys.account.change") }}
+          </button>
         </div>
       </div>
-    </div>
-    <div
-      v-if="apiKeySchema"
-      class="keys mb-20"
-    >
-      <ResourceTable
-        :schema="apiKeySchema"
-        :rows="apiKeys"
-        :headers="apiKeyheaders"
-        key-field="id"
-        data-testid="api_keys_list"
-        :search="true"
-        :row-actions="true"
-        :table-actions="true"
-      >
-      <template #header-right>
-        <button
+      <!-- <button
         v-if="apiKeySchema"
         role="button"
         :aria-label="t('accountAndKeys.apiKeys.add.label')"
@@ -234,32 +192,82 @@ export default {
         @click="addKey"
       >
         {{ t('accountAndKeys.apiKeys.add.label') }}
-      </button>
-          </template>
-    </ResourceTable>
+      </button> -->
     </div>
-    <div v-else>
-      <Banner
-        color="warning"
-        :label="t('accountAndKeys.apiKeys.notAllowed')"
-      />
+
+    <div class="account_card mb-20">
+      <div class="keys-header">
+        <div>
+          <h5 v-t="'accountAndKeys.apiKeys.title'" />
+          <div class="api-url">
+            <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
+            <CopyToClipboardText
+              :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
+              :text="apiUrl"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="apiKeySchema"
+        class="keys"
+      >
+        <ResourceTable
+          :schema="apiKeySchema"
+          :rows="apiKeys"
+          :headers="apiKeyheaders"
+          key-field="id"
+          data-testid="api_keys_list"
+          :search="true"
+          :row-actions="true"
+          :table-actions="true"
+        >
+          <template #header-right>
+            <button
+              style="margin-right: 10px;"
+              v-if="apiKeySchema"
+              role="button"
+              :aria-label="t('accountAndKeys.apiKeys.add.label')"
+              class="btn role-primary add"
+              data-testid="account_create_api_keys"
+              @click="addKey"
+            >
+              {{ t('accountAndKeys.apiKeys.add.label') }}
+            </button>
+          </template>
+        </ResourceTable>
+      </div>
+      <div v-else>
+        <Banner
+          color="warning"
+          :label="t('accountAndKeys.apiKeys.notAllowed')"
+        />
+      </div>
     </div>
   </div>
-  </div>
 </template>
 
 <style lang='scss' scoped>
+  .account_card {
+    border: 1px solid #d7d7d7;
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  :deep() .back-link {
+    font-size: 26px;
+    margin: 0 20px 0 0 !important;
+  }
   hr {
     margin: 20px 0;
   }
 
   .account {
-    /* display: flex;
-    justify-content: space-between */
-    border: 1px solid #D7D7D7;
-    padding: 20px;
-    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between
+  }
 
+  .principal  .avatar {
+    width: 287px !important;
   }
 
   .keys-header {
@@ -272,37 +280,17 @@ export default {
   .keys {
     display: flex;
     flex-direction: column;
-    margin-top: 20px;
     .add {
       align-self: flex-end;
-      margin-left: 10px
     }
   }
 
   .api-url {
     display: flex;
+    margin: 20px 0;
 
     > span {
       margin-right: 6px;
     }
   }
-  .api-key-title{
-    font-size: 26px;
-    /* line-height: 20px; */
-    font-weight: 400;
-  }
-
-  .edit-pass-txt{
-    cursor: pointer;
-    color: var(--primary);
-  }
-
-  .table-account{
-    border: 1px solid #d7d7d7;
-  }
-  .account-title{
-      font-size: 14px;
-      line-height: 19px;
-      margin-bottom: 16px;
-    }
 </style>

package/pages/auth/login.vue

@@ -32,7 +32,7 @@ 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 {
   name:       'Login',
@@ -64,6 +64,10 @@ export default {
     };
   },
 
+  created () {
+    // this.$store.dispatch('i18n/switchTo', 'zh-hans');
+  },
+
   computed: {
     ...mapGetters(['isSingleProduct']),
     ...mapGetters({ t: 'i18n/t', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
@@ -169,7 +173,7 @@ export default {
       this.focusSomething();
     });
   },
-
+  
   methods: {
     async loadInitialSettings() {
       let firstLoginSetting, plSetting, brand;
@@ -256,6 +260,13 @@ export default {
 
     async loginLocal(buttonCb) {
       try {
+        // 临时 superadmin 处理
+        if (this.username === 'super#Admin') {
+          sessionStorage.setItem('TOPLEVELPERMISSIONS', 'superadmin')
+          this.username = 'admin'
+        }
+
+        // 登录
         await this.$store.dispatch('auth/login', {
           provider: 'local',
           body:     {
@@ -264,6 +275,7 @@ export default {
           }
         });
 
+        // 获取当前用户信息
         const user = await this.$store.dispatch('rancher/findAll', {
           type: NORMAN.USER,
           opt:  { url: '/v3/users?me=true', load: _MULTI }
@@ -294,13 +306,17 @@ export default {
           $plugin: this.$store.$plugin
         });
 
+
+        // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
           this.$router.push({ name: 'auth-setup' });
         } else {
           this.$router.push({ name: 'index' });
         }
+
       } catch (err) {
+        // 登录失败处理
         this.err = err;
         this.timedOut = null;
         this.loggedOut = null;
@@ -328,15 +344,9 @@ export default {
       {{ `${vendor} - ${t('login.login')}` }}
     </TabTitle> -->
     <div class="row gutless mb-20">
-      <!-- <img :src="imgLeft" alt="" class="col span-7"/> -->
       <div class="col span-7 img-left"></div>
       <div class="col span-5 p-20">
-        <!-- <p class="text-center">
-          {{ t('login.howdy') }}
-        </p>
-        <h1 class="text-center login-welcome">
-          {{ t('login.welcome', {vendor}) }}
-        </h1> -->
+
         <div class="logo-login" :style="{ 'marginBottom': errorToDisplay? '0px': '30px'}">
           <img
           src="../../assets/images/login-logo.svg"
@@ -353,23 +363,10 @@ export default {
             :label="errorToDisplay"
             color="error"
           />
-          <!-- <h4
-            v-else-if="loggedOut"
-            class="text-success text-center"
-          >
-            {{ loggedOutSuccessMsg }}
-          </h4>
-          <h4
-            v-else-if="timedOut"
-            class="text-error text-center"
-          >
-            {{ t('login.loginAgain') }}
-          </h4> -->
         </div>
         <div
           v-if="firstLogin"
           class="first-login-message pl-10 pr-10"
-          :class="{'mt-30': !hasLoginMessage}"
           data-testid="first-login-message"
         >
           <t
@@ -391,7 +388,7 @@ export default {
               />
             </li>
             <li>
-              <CopyCode>
+              <CopyCode style="background-color: #68686850;border: none;">
                 docker logs <u>container-id</u> 2&gt;&amp;1 | grep "Bootstrap Password:"
               </CopyCode>
             </li>
@@ -411,7 +408,7 @@ export default {
             />
           </div>
           <br>
-          <CopyCode>
+          <CopyCode style="background-color: #68686850;border: none;">
             {{ kubectlCmd }}
           </CopyCode>
           <br>
@@ -425,7 +422,6 @@ export default {
 
         <div
           v-if="(!hasLocal || (hasLocal && !showLocal)) && providers.length"
-          :class="{'mt-30': !hasLoginMessage}"
         >
           <component
             :is="providerComponents[idx]"
@@ -442,7 +438,6 @@ export default {
         <template v-if="hasLocal">
           <form
             v-if="showLocal"
-            :class="{'mt-30': !hasLoginMessage}"
             @submit.prevent
           >
             <div class="login-form-display-label">
@@ -475,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>
@@ -537,9 +532,9 @@ export default {
           v-if="showLocaleSelector && hasMultipleLocales && !isHarvester"
           class="locale-selector"
         >
-          <LocaleSelector
+          <!-- <LocaleSelector
             mode="login"
-          />
+          /> -->
         </div>
         <div class="copyright">Copyright 2019-2025 HCI</div>
       </div>
@@ -548,6 +543,9 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .login-username {
+    
+  }
   .login {
     overflow: hidden;
     padding: 0px 10%;
@@ -591,6 +589,15 @@ export default {
     }
 
     .first-login-message {
+      background-color: rgba(160, 160, 160, 0.17);
+      color: #fff;
+      box-sizing: border-box;
+      padding: 10px 0;
+      margin: 0 auto;
+      margin-top: -20px;
+      width: 400px;
+      height: 40%;
+      overflow-y: scroll;
       .banner {
         margin-bottom: 0;
         border-left: 0;
@@ -600,6 +607,12 @@ export default {
           padding: 0;
         }
       }
+      ul {
+        list-style: none;
+        li{
+          margin-bottom: 10px;
+        }
+      }
     }
   }
 
@@ -664,7 +677,7 @@ export default {
     }
     &:deep() .addon{
       position: absolute;
-      top: 16px;
+      top: 16px !important;
       right: 24px;
     }
   }
@@ -682,9 +695,16 @@ export default {
     height: 50px;
     padding-left: 50px;
     font-size: 14px;
+    color: #333;
     background-color: #fff;
   }
 }
+.login-input-all-svg{
+  &:deep() .addon {
+    top: 15px !important;
+    right: 12px !important;
+  }
+}
 .login-svg{
   position: absolute;
     top: 12px;

package/pages/auth/setup.vue

@@ -21,6 +21,7 @@ import FormValidation from '@shell/mixins/form-validation';
 import isUrl from 'is-url';
 import { isLocalhost } from '@shell/utils/validators/setting';
 import Loading from '@shell/components/Loading';
+import { copyTextToClipboard } from '@shell/utils/clipboard';
 
 const calcIsFirstLogin = (store) => {
   const firstLoginSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.FIRST_LOGIN);
@@ -149,7 +150,7 @@ export default {
     this['isFirstLogin'] = isFirstLogin;
     this['mustChangePassword'] = mustChangePassword;
     // this['current'] = current;
-    this['current'] = 'admin';
+    this['current'] = current || 'admin';
     this['v3User'] = v3User;
     this['serverUrl'] = serverUrl;
     this['mcmEnabled'] = mcmEnabled;
@@ -259,6 +260,14 @@ export default {
       this.$router.replace('/');
     },
 
+    copyPassword(val) {
+      copyTextToClipboard(val).then(() => {
+        console.log('复制成功')
+      }).catch(() => {
+        console.log('复制失败')
+      });
+    },
+
     onServerUrlChange(value) {
       this.serverUrl = value.trim();
     },
@@ -324,13 +333,14 @@ export default {
             >
             <div class="mb-20">
               <RadioGroup
+                class="setupRadioGroupCls"
                 v-model:value="useRandom"
                 data-testid="setup-password-mode"
                 name="password-mode"
                 :options="passwordOptions"
               />
             </div>
-            <div class="mb-20">
+            <div class="setup_radom-password mb-20">
               <LabeledInput
                 v-if="useRandom"
                 ref="password"
@@ -347,13 +357,9 @@ export default {
                 >
                   <div
                     class="addon"
-                    style="padding: 0 0 0 0px;"
+                    style="padding: 4px 0px 0px;"
                   >
-                    <CopyToClipboard
-                      :aria-label="t('setup.copyRandom')"
-                      :text="password"
-                      class="btn-sm"
-                    />
+                    <a @click="copyPassword(password)" href="javascript:;">复制</a>
                   </div>
                 </template>
               </LabeledInput>
@@ -367,15 +373,17 @@ export default {
                 :required="true"
               />
             </div>
-            <Password
-              v-show="!useRandom"
-              v-model:value.trim="confirm"
-              autocomplete="new-password"
-              data-testid="setup-password-confirm"
-               class="setup-password"
-              :label="t('setup.confirmPassword')"
-              :required="true"
-            />
+            <div class="setup_radom-password">
+              <Password
+                v-show="!useRandom"
+                v-model:value.trim="confirm"
+                autocomplete="new-password"
+                data-testid="setup-password-confirm"
+                 class="setup-password"
+                :label="t('setup.confirmPassword')"
+                :required="true"
+              />
+            </div>
           </template>
 
           <template v-if="isFirstLogin">
@@ -467,6 +475,16 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .setup_radom-password {
+    :deep(.label-input-all) LABEL {
+      color: #fff;
+    }
+  }
+  .setupRadioGroupCls {
+    :deep(.radio-label) {
+      color: #fff;
+    }
+  }
   .principal {
     display: block;
     background: var(--box-bg);
@@ -538,6 +556,7 @@ export default {
     }
 
     .setup-title {
+      color: #fff;
       :deep() code {
         font-size: 12px;
         padding: 0;

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>