dashboard-shell-shell 3.0.5-test.3 → 3.0.5-test.30

package/edit/workload/storage/gcePersistentDisk.vue

@@ -26,8 +26,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col mr-10">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,7 +35,7 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col" style="display: flex;align-items: center;">
         <Checkbox
           v-model:value="value.gcePersistentDisk.readOnly"
           :mode="mode"
@@ -43,8 +43,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.gcePersistentDisk.pdName"
           :mode="mode"
@@ -52,7 +52,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.gcePersistentDisk.partition"
           :mode="mode"
@@ -61,7 +63,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.gcePersistentDisk.fsType"
           :mode="mode"

package/edit/workload/storage/hostPath.vue

@@ -82,8 +82,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -92,8 +92,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.hostPath.path"
             :required="true"
@@ -101,7 +101,9 @@ export default {
             :label="t('workload.storage.nodePath')"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-model:value="value.hostPath.type"
             :mode="mode"

package/edit/workload/storage/nfs.vue

@@ -38,8 +38,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -47,7 +47,7 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
           <Checkbox
             v-model:value="value.nfs.readOnly"
             :mode="mode"
@@ -55,8 +55,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.nfs.path"
             :required="true"
@@ -64,7 +64,9 @@ export default {
             :label="t('workload.storage.path')"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.nfs.server"
             :required="true"

package/edit/workload/storage/persistentVolumeClaim/index.vue

@@ -121,8 +121,8 @@ export default {
           @removePvcForm="removePvcForm"
         />
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -130,7 +130,16 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
+          <Checkbox
+            v-model:value="value.persistentVolumeClaim.readOnly"
+            :mode="mode"
+            :label="t('workload.storage.readOnly')"
+          />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-if="!createNew"
             v-model:value="value.persistentVolumeClaim.claimName"
@@ -142,13 +151,6 @@ export default {
           />
         </div>
       </div>
-      <div class="row">
-        <Checkbox
-          v-model:value="value.persistentVolumeClaim.readOnly"
-          :mode="mode"
-          :label="t('workload.storage.readOnly')"
-        />
-      </div>
     </div>
   </div>
 </template>

package/edit/workload/storage/persistentVolumeClaim/persistentvolumeclaim.vue

@@ -156,8 +156,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.metadata.name"
           :mode="mode"
@@ -167,8 +167,9 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div style="width: 160px;"></div>
+      <div class="col">
         <RadioGroup
           v-model:value="isCreatePV"
           name="isCreatePV"
@@ -177,7 +178,9 @@ export default {
           :mode="mode"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-if="isCreatePV"
           v-model:value="spec.storageClassName"
@@ -200,16 +203,16 @@ export default {
       </div>
     </div>
 
-    <div class="row mb-10">
-      <div class="col span-6">
-        <div class="access-modes">
-          <t
-            class="text-label"
-            k="persistentVolumeClaim.accessModes"
-          />
-          <span class="text-error">*</span>
-        </div>
+    <div class="row">
+      <div class="col">
         <div class="access-modes">
+          <div style="width: 160px;">
+            <t
+              class="text-label"
+              k="persistentVolumeClaim.accessModes"
+            />
+            <span class="text-error">*</span>
+          </div>
           <Checkbox
             :mode="mode"
             :value="value.spec.accessModes.includes('ReadWriteOnce')"
@@ -230,9 +233,11 @@ export default {
           />
         </div>
       </div>
+    </div>
+    <div class="row">
       <div
         v-if="isCreatePV"
-        class="col span-6"
+        class="col"
       >
         <UnitInput
           v-model:value="spec.resources.requests.storage"

package/edit/workload/storage/secret.vue

@@ -130,8 +130,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -139,8 +139,9 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="defaultMode"
             :mode="mode"
@@ -149,7 +150,7 @@ export default {
         </div>
       </div>
       <div class="row">
-        <div class="col span-6">
+        <div class="col">
           <LabeledSelect
             v-if="type==='secret'"
             v-model:value="value[type].secretName"
@@ -169,7 +170,9 @@ export default {
             :loading="loading"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <RadioGroup
             v-model:value="optional"
             :mode="mode"

package/edit/workload/storage/vsphereVolume.vue

@@ -25,8 +25,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,8 +35,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.storagePolicyID"
           :mode="mode"
@@ -44,7 +44,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.vsphereVolume.storagePolicyName"
           :mode="mode"
@@ -53,7 +55,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.volumePath"
           :mode="mode"
@@ -61,7 +63,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.fsType"
           :mode="mode"

package/initialize/app-extended.js

@@ -55,7 +55,13 @@ async function extendApp(vueApp) {
   const next = (location) => appPartials.router.push(location);
   // Resolve route
 
-  const path = getLocation(router.options.base, router.options.mode);
+  let path = getLocation(router.options.base, router.options.mode);
+
+  // 🔹 增加 rewrite，不改变原逻辑
+  if (path.includes('/cloud/')) {
+    path = path.replace(/cloud/g, 'harvester');
+  }
+
   const route = router.resolve(path);
 
   // Set context to app.context

package/models/provisioning.cattle.io.cluster.js

@@ -115,25 +115,26 @@ export default class ProvCluster extends SteveModel {
     const actions = [
       // Note: Actions are not supported in the Steve API, so we check
       // available actions for RKE1 clusters, but not RKE2 clusters.
+      // {
+      //   action:  'openShell',
+      //   label:   this.$rootGetters['i18n/t']('nav.shell'),
+      //   icon:    'icon icon-terminal',
+      //   enabled: !!this.mgmt?.links.shell && ready,
+      // }, {
+      //   action:     'downloadKubeConfig',
+      //   bulkAction: 'downloadKubeConfigBulk',
+      //   label:      this.$rootGetters['i18n/t']('nav.kubeconfig.download'),
+      //   icon:       'icon icon-download',
+      //   bulkable:   true,
+      //   enabled:    this.mgmt?.hasAction('generateKubeconfig'),
+      // }, {
+      //   action:   'copyKubeConfig',
+      //   label:    this.t('cluster.copyConfig'),
+      //   bulkable: false,
+      //   enabled:  this.mgmt?.hasAction('generateKubeconfig'),
+      //   icon:     'icon icon-copy',
+      // },
       {
-        action:  'openShell',
-        label:   this.$rootGetters['i18n/t']('nav.shell'),
-        icon:    'icon icon-terminal',
-        enabled: !!this.mgmt?.links.shell && ready,
-      }, {
-        action:     'downloadKubeConfig',
-        bulkAction: 'downloadKubeConfigBulk',
-        label:      this.$rootGetters['i18n/t']('nav.kubeconfig.download'),
-        icon:       'icon icon-download',
-        bulkable:   true,
-        enabled:    this.mgmt?.hasAction('generateKubeconfig'),
-      }, {
-        action:   'copyKubeConfig',
-        label:    this.t('cluster.copyConfig'),
-        bulkable: false,
-        enabled:  this.mgmt?.hasAction('generateKubeconfig'),
-        icon:     'icon icon-copy',
-      }, {
         action:     'snapshotAction',
         label:      this.$rootGetters['i18n/t']('nav.takeSnapshot'),
         icon:       'icon icon-snapshot',

package/package.json

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

package/pages/account/index.vue

@@ -3,8 +3,7 @@ import BackLink from '@shell/components/BackLink';
 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';
 
@@ -17,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() {
@@ -152,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')"
@@ -242,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 {
@@ -280,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>