dashboard-shell-shell 3.0.5-test.4 → 3.0.5-test.5

package/components/form/WorkloadPorts.vue

@@ -280,145 +280,163 @@ export default {
         'show-ipam': showIpam,
       }"
     >
-      <div class="service-type">
-        <LabeledSelect
-          v-model:value="row._serviceType"
-          :mode="mode"
-          :label="t('workload.container.ports.createService')"
-          :options="serviceTypes"
-          :disabled="canNotAccessService"
-          :tooltip="serviceTypeTooltip"
-          @update:value="queueUpdate"
-        />
-      </div>
-
-      <div class="portName">
-        <LabeledInput
-          ref="name"
-          v-model:value="row.name"
-          :mode="mode"
-          :label="t('workload.container.ports.name')"
-          @update:value="queueUpdate"
-        />
-      </div>
+    
+      <div class="row mt-20">
+        <div
+          v-if="!row._showHost && row._serviceType !== 'LoadBalancer' && row._serviceType !== 'NodePort'"
+          class="add-host col"
+        >
+          <button
+            :disabled="mode==='view'"
+            type="button"
+            class="btn btn-sm role-tertiary"
+            @click="row._showHost = true"
+          >
+            {{ t('workloadPorts.addHost') }}
+          </button>
+        </div>
 
-      <div class="port">
-        <LabeledInput
-          v-model:value.number="row.containerPort"
-          :mode="mode"
-          type="number"
-          min="1"
-          max="65535"
-          placeholder="e.g. 8080"
-          :label="t('workload.container.ports.containerPort')"
-          :required="row._serviceType === 'LoadBalancer' "
-          @update:value="queueUpdate"
-        />
-      </div>
+        <div
+          v-if="showRemove"
+          class="remove"
+        >
+          <button
+            type="button"
+            class="btn role-link"
+            @click="remove(idx)"
+          >
+            {{ t('workloadPorts.remove') }}
+          </button>
+        </div>
 
-      <div class="protocol col">
-        <LabeledSelect
-          v-model:value="row.protocol"
-          :mode="mode"
-          :options="workloadPortOptions"
-          :multiple="false"
-          :label="t('workload.container.ports.protocol')"
-          @update:value="queueUpdate"
-        />
       </div>
 
-      <div
-        v-if="row._showHost"
-        class="targetPort"
-      >
-        <LabeledInput
-          ref="port"
-          v-model:value.number="row.hostPort"
-          :mode="mode"
-          type="number"
-          min="1"
-          max="65535"
-          placeholder="e.g. 80"
-          :label="t('workload.container.ports.hostPort')"
-          @update:value="queueUpdate"
-        />
+      <div class="row">
+        <div class="service-type col span-6">
+          <LabeledSelect
+            v-model:value="row._serviceType"
+            :mode="mode"
+            :label="t('workload.container.ports.createService')"
+            :options="serviceTypes"
+            :disabled="canNotAccessService"
+            :tooltip="serviceTypeTooltip"
+            @update:value="queueUpdate"
+          />
+        </div>
+    
+        <div class="portName col span-6">
+          <LabeledInput
+            ref="name"
+            v-model:value="row.name"
+            :mode="mode"
+            :label="t('workload.container.ports.name')"
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
 
-      <div
-        v-if="row._showHost"
-        class="hostip"
-      >
-        <LabeledInput
-          ref="port"
-          v-model:value="row.hostIP"
-          :mode="mode"
-          placeholder="e.g. 1.1.1.1"
-          :label="t('workload.container.ports.hostIP')"
-          @update:value="queueUpdate"
-        />
+      <div class="row">
+        <div class="port col span-6">
+          <LabeledInput
+            v-model:value.number="row.containerPort"
+            :mode="mode"
+            type="number"
+            min="1"
+            max="65535"
+            placeholder="e.g. 8080"
+            :label="t('workload.container.ports.containerPort')"
+            :required="row._serviceType === 'LoadBalancer' "
+            @update:value="queueUpdate"
+          />
+        </div>
+    
+        <div class="protocol col span-6">
+          <LabeledSelect
+            v-model:value="row.protocol"
+            :mode="mode"
+            :options="workloadPortOptions"
+            :multiple="false"
+            :label="t('workload.container.ports.protocol')"
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
 
-      <div
-        v-if="!row._showHost && row._serviceType !== 'LoadBalancer' && row._serviceType !== 'NodePort'"
-        class="add-host"
-      >
-        <button
-          :disabled="mode==='view'"
-          type="button"
-          class="btn btn-sm role-tertiary"
-          @click="row._showHost = true"
+      <div class="row">
+        <div
+          v-if="row._showHost"
+          class="targetPort col span-6"
         >
-          {{ t('workloadPorts.addHost') }}
-        </button>
-      </div>
-
-      <div v-if="row._serviceType === 'LoadBalancer' || row._serviceType === 'NodePort'">
-        <LabeledInput
-          ref="port"
-          v-model:value.number="row._listeningPort"
-          type="number"
-          :mode="mode"
-          :label="t('workload.container.ports.listeningPort')"
-          :required="row._serviceType === 'LoadBalancer' "
-          @update:value="queueUpdate"
-        />
-      </div>
-
-      <div v-if="showIpam && row._serviceType === 'LoadBalancer' && row.protocol === 'TCP'">
-        <div v-if="idx === ipamIndex">
-          <LabeledSelect
-            v-model:value="row._ipam"
+          <LabeledInput
+            ref="port"
+            v-model:value.number="row.hostPort"
             :mode="mode"
-            :options="ipamOptions"
-            :label="t('servicesPage.harvester.ipam.label')"
-            :disabled="mode === 'edit'"
+            type="number"
+            min="1"
+            max="65535"
+            placeholder="e.g. 80"
+            :label="t('workload.container.ports.hostPort')"
             @update:value="queueUpdate"
           />
         </div>
-        <div v-else>
-          <LabeledSelect
-            v-model:value="rows[ipamIndex]._ipam"
+    
+        <div
+          v-if="row._showHost"
+          class="hostip col span-6"
+        >
+          <LabeledInput
+            ref="port"
+            v-model:value="row.hostIP"
             :mode="mode"
-            :options="ipamOptions"
-            :label="t('servicesPage.harvester.ipam.label')"
-            :disabled="true"
+            placeholder="e.g. 1.1.1.1"
+            :label="t('workload.container.ports.hostIP')"
             @update:value="queueUpdate"
           />
         </div>
       </div>
 
-      <div
-        v-if="showRemove"
-        class="remove"
-      >
-        <button
-          type="button"
-          class="btn role-link"
-          @click="remove(idx)"
+      <div class="row">
+        <div
+          v-if="row._serviceType === 'LoadBalancer' || row._serviceType === 'NodePort'"
+          class="col"
         >
-          {{ t('workloadPorts.remove') }}
-        </button>
+          <LabeledInput
+            ref="port"
+            v-model:value.number="row._listeningPort"
+            type="number"
+            :mode="mode"
+            :label="t('workload.container.ports.listeningPort')"
+            :required="row._serviceType === 'LoadBalancer' "
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
+
+      <div class="row">
+        <div v-if="showIpam && row._serviceType === 'LoadBalancer' && row.protocol === 'TCP'">
+          <div v-if="idx === ipamIndex">
+            <LabeledSelect
+              v-model:value="row._ipam"
+              :mode="mode"
+              :options="ipamOptions"
+              :label="t('servicesPage.harvester.ipam.label')"
+              :disabled="mode === 'edit'"
+              @update:value="queueUpdate"
+            />
+          </div>
+          <div v-else>
+            <LabeledSelect
+              v-model:value="rows[ipamIndex]._ipam"
+              :mode="mode"
+              :options="ipamOptions"
+              :label="t('servicesPage.harvester.ipam.label')"
+              :disabled="true"
+              @update:value="queueUpdate"
+            />
+          </div>
+        </div>
+      </div>
+
     </div>
     <div
       v-if="showAdd"
@@ -447,11 +465,11 @@ $checkbox: 75;
   }
 }
 .ports-headers, .ports-row{
-  display: grid;
-  grid-template-columns: 28% 28% 15% 10% 75px 0.5fr;
-  grid-column-gap: $column-gutter;
-  margin-bottom: 10px;
-  align-items: center;
+  // display: grid;
+  // grid-template-columns: 28% 28% 15% 10% 75px 0.5fr;
+  // grid-column-gap: $column-gutter;
+  // margin-bottom: 20px;
+  // align-items: center;
   & .port{
     display: flex;
     justify-content: space-between;
@@ -475,6 +493,7 @@ $checkbox: 75;
 }
 
 .add-host {
+  margin-right: 20px;
   justify-self: center;
 }
 
@@ -492,6 +511,7 @@ $checkbox: 75;
 
 .remove BUTTON {
   padding: 0px;
+  min-width: auto;
 }
 
 .ports-row INPUT {

package/edit/workload/index.vue

@@ -108,7 +108,7 @@ export default {
       >
         <div
           v-if="isCronJob"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledInput
             v-model:value="spec.schedule"
@@ -122,7 +122,7 @@ export default {
         </div>
         <div
           v-if="isReplicable"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledInput
             v-model:value.number="spec.replicas"
@@ -135,7 +135,7 @@ export default {
         </div>
         <div
           v-if="isStatefulSet"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledSelect
             v-model:value="spec.serviceName"

package/package.json

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

package/pages/account/index.vue

@@ -3,7 +3,8 @@ 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 '@shell/components/auth/Principal';
+import Principal from './pri.vue';
 import BackRoute from '@shell/mixins/back-link';
 import { mapGetters } from 'vuex';
 
@@ -16,7 +17,7 @@ const API_ENDPOINT = '/v3';
 
 export default {
   components: {
-    CopyToClipboardText, BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
+    CopyToClipboardText, BackLink, Banner, PromptChangePassword, Loading, ResourceTable, Principal, TabTitle
   },
   mixins: [BackRoute],
   async fetch() {
@@ -189,12 +190,13 @@ export default {
           type="button"
           class="btn role-primary"
           data-testid="account_change_password"
-          @click="showChangePasswordDialog"
+          @click="$refs.promptChangePassword.show(true)"
         >
           {{ t("accountAndKeys.account.change") }}
         </button>
       </div> -->
     </div>
+    <PromptChangePassword ref="promptChangePassword" />
 
     <!-- <hr role="none"> -->
      <div  
@@ -215,16 +217,6 @@ export default {
           />
         </div>
       </div>
-      <button
-        v-if="apiKeySchema"
-        role="button"
-        :aria-label="t('accountAndKeys.apiKeys.add.label')"
-        class="btn role-primary add mb-20"
-        data-testid="account_create_api_keys"
-        @click="addKey"
-      >
-        {{ t('accountAndKeys.apiKeys.add.label') }}
-      </button>
     </div>
     <div
       v-if="apiKeySchema"

package/pages/account/pri.vue

@@ -0,0 +1,229 @@
+<script>
+import { NORMAN } from '@shell/config/types';
+
+export default {
+  props: {
+    value: {
+      type:     String,
+      required: true,
+    },
+
+    useMuted: {
+      type:    Boolean,
+      default: true,
+    },
+
+    showLabels: {
+      type:    Boolean,
+      default: false,
+    },
+    isShowPass: {
+      type:    Boolean,
+      default: false,
+    }
+  },
+
+  async fetch() {
+    this.principal = this.$store.getters['rancher/byId'](NORMAN.PRINCIPAL, this.value);
+
+    if ( this.principal ) {
+      return;
+    }
+
+    const principalId = escape(this.value).replace(/\//g, '%2F');
+
+    try {
+      this.principal = await this.$store.dispatch('rancher/find', {
+        type: NORMAN.PRINCIPAL,
+        id:   this.value,
+        opt:  { url: `/v3/principals/${ principalId }` }
+      });
+    } catch (e) {
+      console.error('Failed to fetch principal', this.value, principalId); // eslint-disable-line no-console
+    }
+  },
+
+  data() {
+    // Load from cache immediately if possible
+    return { principal: null };
+  },
+
+  computed: {
+    showBoth() {
+      const p = this.principal;
+
+      return p.name && p.loginName && p.name.trim().toLowerCase() !== p.loginName.trim().toLowerCase();
+    }
+  },
+};
+</script>
+
+<template>
+  <div
+    class="principal"
+    :class="{'showLabels': showLabels}"
+  >
+    <template v-if="!principal && $fetchState.pending">
+      <div class="avatar">
+        <div class="empty">
+          <i class="icon icon-spinner icon-lg" />
+        </div>
+      </div>
+      <div
+        v-clean-html="t('principal.loading', null, true)"
+        class="name"
+        :class="{'text-muted': useMuted}"
+      />
+      <div class="description" />
+    </template>
+
+    <template v-else-if="principal">
+      <div class="avatar">
+        <img
+          src="@shell/assets/images/user.png"
+        >
+      </div>
+      <div
+        v-if="showLabels"
+        class="name"
+      >
+        <table>
+          <tr class="mb-10">
+            <td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td>
+          </tr>
+          <tr class="mb-10">
+            <td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td>
+          </tr>
+          <tr
+            v-if="isShowPass"
+            class="mb-10"
+          >
+            <td>修改密码: </td><td>****** <slot name="edit" /></td>
+          </tr>
+          <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+        </table>
+      </div>
+      <template v-else>
+        <div class="name">
+          <template v-if="showBoth">
+            {{ principal.name }}
+            <span
+              v-if="principal.loginName"
+              :class="{'text-muted': useMuted}"
+            >({{ principal.loginName }})</span>
+          </template>
+          <template v-else-if="principal.name">
+            {{ principal.name }}
+          </template>
+          <template v-else>
+            {{ principal.loginName }}
+          </template>
+        </div>
+        <div
+          class="description"
+          :class="{'text-muted': useMuted}"
+        >
+          {{ principal.displayType }}
+        </div>
+      </template>
+    </template>
+
+    <template v-else>
+      <div class="avatar">
+        <div
+          class="empty"
+          :class="{'text-muted': useMuted}"
+        >
+          <i class="icon icon-warning icon-lg" />
+        </div>
+      </div>
+      <div
+        v-t="'principal.error'"
+        class="name text-error"
+      />
+      <div
+        class="description"
+        :class="{'text-muted': useMuted}"
+      >
+        {{ value }}
+      </div>
+    </template>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  $size: 79px;
+
+  .principal {
+    display: grid;
+    grid-template-areas:
+      "avatar name"
+      "avatar description";
+    grid-template-columns: $size auto;
+    grid-template-rows: auto math.div($size, 2);
+    column-gap: 10px;
+
+    th {
+      text-align: left;
+      font-weight: normal;
+      padding-right: 10px;
+    }
+
+    &.showLabels {
+      /* grid-template-areas:
+        "avatar name";
+      grid-template-columns: 60px auto;
+      grid-template-rows: 60px;
+      column-gap: 0; */
+      display: flex;
+      column-gap:0;
+      .name {
+        display: flex;
+        line-height: unset;
+      }
+      table tr {
+        display: block;
+      }
+      table tr td:not(:first-of-type) {
+        padding-left: 10px;
+      }
+      table tr td:not(:last-of-type) {
+        width: 100px;
+      }
+    }
+
+    .avatar {
+      /* grid-area: avatar;
+      text-align: center; */
+      width: 287px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      DIV.empty {
+        border: 1px solid var(--border);
+        line-height: $size;
+      }
+
+      IMG {
+        width: $size;
+        height: $size;
+      }
+
+      DIV.round, IMG.round {
+        border-radius: 50%;
+      }
+    }
+
+    .name {
+      grid-area: name;
+      line-height: math.div($size, 2);
+      overflow-wrap: anywhere;
+    }
+
+    .description {
+      grid-area: description;
+      line-height: math.div($size, 2);
+    }
+  }
+</style>

package/pages/auth/login.vue

@@ -32,6 +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 { AFTER_LOGIN_ROUTE } from '@shell/store/prefs';
 
 export default {
   name:       'Login',
@@ -63,6 +64,10 @@ export default {
     };
   },
 
+  created () {
+    // this.$store.dispatch('i18n/switchTo', 'zh-hans');
+  },
+
   computed: {
     ...mapGetters(['isSingleProduct']),
     ...mapGetters({ t: 'i18n/t', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
@@ -168,7 +173,7 @@ export default {
       this.focusSomething();
     });
   },
-
+  
   methods: {
     async loadInitialSettings() {
       let firstLoginSetting, plSetting, brand;

package/pages/c/_cluster/_product/namespaces.vue

@@ -29,8 +29,8 @@ export default {
   computed: {
     headers() {
       return [
-        STATE,
         NAME,
+        STATE,
         AGE
       ];
     },