dashboard-shell-shell 3.0.5-test.14 → 3.0.5-test.17

package/assets/translations/zh-hans.yaml

@@ -671,7 +671,7 @@ buttonLabel:
 Errors:
   changePassword:
     Password must be at least 12 characters: 密码至少为12个字符
-    invalid current password: 当前的密码输入错误
+    "invalid current password": 当前的密码输入错误
 
 
 asyncButton:

package/components/Drawer/ResourceDetailDrawer/index.vue

@@ -3,7 +3,7 @@ import Drawer from '@shell/components/Drawer/Chrome.vue';
 import { useI18n } from '@shell/composables/useI18n';
 import { useStore } from 'vuex';
 import Tabbed from '@shell/components/Tabbed/index.vue';
-import YamlTab, { Props as YamlProps } from '@shell/components/Drawer/ResourceDetailDrawer/YamlTab.vue';
+// import YamlTab, { Props as YamlProps } from '@shell/components/Drawer/ResourceDetailDrawer/YamlTab.vue';
 import { useDefaultConfigTabProps, useDefaultYamlTabProps } from '@shell/components/Drawer/ResourceDetailDrawer/composables';
 import ConfigTab from '@shell/components/Drawer/ResourceDetailDrawer/ConfigTab.vue';
 import { computed, ref } from 'vue';
@@ -87,10 +87,10 @@ const canEdit = computed(() => {
           v-if="configTabProps"
           v-bind="configTabProps"
         />
-        <YamlTab
+        <!-- <YamlTab
           v-if="yamlTabProps"
           v-bind="yamlTabProps"
-        />
+        /> -->
       </Tabbed>
     </template>
     <template #additional-actions>

package/components/GlobalRoleBindings.vue

@@ -108,12 +108,7 @@ export default {
     } catch (e) { }
   },
   data() {
-
-    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
-
     return {
-      topLevelPermissions,
-
       // This not only identifies global roles but the order here is the order we want to display them in the UI
       globalPermissions: [
         'admin',
@@ -333,62 +328,60 @@ export default {
 
   <div v-else>
     <form v-if="selectedRoles">
-      <template>
-        <div
-          v-for="(sortedRole, roleType) in sortedRoles"
-          :key="roleType"
-          class="role-group mb-10"
+      <div
+        v-for="(sortedRole, roleType) in sortedRoles"
+        :key="roleType"
+        class="role-group mb-10"
+      >
+        <Card
+          v-if="Object.keys(sortedRole).length"
+          :show-highlight-border="false"
+          :show-actions="false"
         >
-          <Card
-            v-if="Object.keys(sortedRole).length"
-            :show-highlight-border="false"
-            :show-actions="false"
-          >
-            <template v-slot:title>
-              <div class="type-title">
-                <h3>{{ t(`rbac.globalRoles.types.${roleType}.label`) }}</h3>
-                <div class="type-description">
-                  {{ t(`rbac.globalRoles.types.${roleType}.description`, { isUser }) }}
-                </div>
+          <template v-slot:title>
+            <div class="type-title">
+              <h3>{{ t(`rbac.globalRoles.types.${roleType}.label`) }}</h3>
+              <div class="type-description">
+                {{ t(`rbac.globalRoles.types.${roleType}.description`, { isUser }) }}
               </div>
-            </template>
-            <template v-slot:body>
+            </div>
+          </template>
+          <template v-slot:body>
+            <div
+              class="checkbox-section"
+              :class="'checkbox-section--' + roleType"
+            >
               <div
-                class="checkbox-section"
-                :class="'checkbox-section--' + roleType"
+                v-for="(role, i) in sortedRoles[roleType]"
+                :key="i"
+                class="checkbox mb-10 mr-10"
               >
-                <div
-                  v-for="(role, i) in sortedRoles[roleType]"
-                  :key="i"
-                  class="checkbox mb-10 mr-10"
+                <Checkbox
+                  v-model:value="selectedRoles"
+                  :value-when-true="role.id"
+                  :disabled="!!assignOnlyRoles[role.id]"
+                  :label="role.nameDisplay"
+                  :description="role.descriptionDisplay"
+                  :mode="mode"
+                  :data-testId="'grb-checkbox-' + role.id"
+                  @update:value="checkboxChanged"
                 >
-                  <Checkbox
-                    v-model:value="selectedRoles"
-                    :value-when-true="role.id"
-                    :disabled="!!assignOnlyRoles[role.id]"
-                    :label="role.nameDisplay"
-                    :description="role.descriptionDisplay"
-                    :mode="mode"
-                    :data-testId="'grb-checkbox-' + role.id"
-                    @update:value="checkboxChanged"
-                  >
-                    <template #label>
-                      <div class="checkbox-label-slot">
-                        <span class="checkbox-label">{{ role.nameDisplay }}</span>
-                        <i
-                          v-if="!!assignOnlyRoles[role.id]"
-                          v-clean-tooltip="t('rbac.globalRoles.assignOnlyRole')"
-                          class="checkbox-info icon icon-info icon-lg"
-                        />
-                      </div>
-                    </template>
-                  </Checkbox>
-                </div>
+                  <template #label>
+                    <div class="checkbox-label-slot">
+                      <span class="checkbox-label">{{ role.nameDisplay }}</span>
+                      <i
+                        v-if="!!assignOnlyRoles[role.id]"
+                        v-clean-tooltip="t('rbac.globalRoles.assignOnlyRole')"
+                        class="checkbox-info icon icon-info icon-lg"
+                      />
+                    </div>
+                  </template>
+                </Checkbox>
               </div>
-            </template>
-          </Card>
-        </div>
-      </template>
+            </div>
+          </template>
+        </Card>
+      </div>
     </form>
   </div>
 </template>

package/components/form/ArrayList.vue

@@ -265,7 +265,7 @@ export default {
   >
 
     <div class="row">
-      <div class="col">
+      <div style="width: 100%;" class="col">
         <div
           v-if="title"
           class="clearfix"
@@ -289,7 +289,7 @@ export default {
           </slot>
         </div>
       </div>
-      <div class="col">
+      <div style="width: 100%;" class="col">
         <div>
           <template v-if="rows.length">
             <div

package/components/form/ChangePassword.vue

@@ -432,7 +432,7 @@ export default {
     }
 
     &.create, &.edit {
-      height: 185px;
+      height: 160px;
       .form {
         .fields {
           display: flex;

package/components/form/KeyValue.vue

@@ -392,10 +392,10 @@ export default {
 
       rows = rows.map((item) => {
         if (item.key.includes('harvester')) {
-          item.key = item.key.replace('harvester', 'cloud');
+          item.key = item.key?.replace('harvester', 'cloud');
         }
         if (item.value.includes('harvester')) {
-          item.value = item.value.replace('harvester', 'cloud');
+          item.value = item.value?.replace('harvester', 'cloud');
         }
 
         return item;
@@ -411,8 +411,8 @@ export default {
         [this.valueName]: value,
       };
 
-      obj.key = obj.key.replace('harvester', 'cloud');
-      obj.value = obj.value.replace('harvester', 'cloud');
+      obj.key = obj.key?.replace('harvester', 'cloud');
+      obj.value = obj.value?.replace('harvester', 'cloud');
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -494,8 +494,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName].replace('cloud', 'harvester') || '').trim();
-          let value = (row[valueName].replace('cloud', 'harvester') || '').trim();
+          const key = (row[keyName]?.replace('cloud', 'harvester') || '').trim();
+          let value = (row[valueName]?.replace('cloud', 'harvester') || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));

package/components/form/Members/ClusterMembershipEditor.vue

@@ -56,6 +56,6 @@ export default {
     :type="NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING"
     :mode="mode"
     parent-key="clusterId"
-    :parent-id="parentId"
+    :parent-id="parentId"
   />
 </template>

package/components/form/Members/ClusterPermissionsEditor.vue

@@ -161,11 +161,11 @@ export default {
           value:       'member'
         },
         ...customRoles,
-        {
-          label:       this.t('members.clusterPermissions.custom.label'),
-          description: this.t('members.clusterPermissions.custom.description'),
-          value:       'custom'
-        }
+        // {
+        //   label:       this.t('members.clusterPermissions.custom.label'),
+        //   description: this.t('members.clusterPermissions.custom.description'),
+        //   value:       'custom'
+        // }
       ];
     },
     principal() {

package/components/form/Members/MembershipEditor.vue

@@ -170,7 +170,7 @@ export default {
   >
     <template #column-headers>
       <div class="box mb-0">
-        <div class="column-headers row" style="width: 95%;">
+        <div class="column-headers row" style="width: calc(100% - 100px);">
           <div class="col span-6">
             <label class="text-label">{{ t('membershipEditor.user') }}</label>
           </div>
@@ -181,7 +181,7 @@ export default {
       </div>
     </template>
     <template #columns="{row, i}">
-      <div class="columns row">
+      <div style="width: 100%;" class="columns row">
         <div class="col span-6">
           <Principal
             :value="row.value.principalId"

package/components/form/ResourceQuota/Namespace.vue

@@ -72,13 +72,13 @@ export default {
 <template>
   <div>
     <div class="headers mb-10">
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.resourceType') }}</label>
       </div>
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.projectResourceAvailability') }}</label>
       </div>
-      <div style="width: 500px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.limit') }}</label>
       </div>
     </div>
@@ -101,7 +101,7 @@ export default {
 .headers {
     display: flex;
     flex-direction: row;
-    justify-content: space-between;
+    justify-content: left;
     align-items: center;
     border-bottom: 1px solid var(--border);
     height: 30px;

package/components/form/ResourceQuota/NamespaceRow.vue

@@ -175,13 +175,15 @@ export default {
     v-if="typeOption"
     class="rowNew"
   >
-    <Select
-      :mode="mode"
-      :value="type"
-      :disabled="true"
-      :options="types"
-    />
-    <div class="resource-availability">
+    <div style="width: 450px;">
+      <Select
+        :mode="mode"
+        :value="type"
+        :disabled="true"
+        :options="types"
+      />
+    </div>
+    <div style="width: 450px;" class="resource-availability">
       <PercentageBar
         v-clean-tooltip="tooltip"
         class="percentage-bar"
@@ -190,7 +192,7 @@ export default {
         :color-stops="{'100': '--primary'}"
       />
     </div>
-    <div style="width: 500px;">
+    <div style="width: 450px;">
       <UnitInput
         :value="value.limit[type]"
         :mode="mode"
@@ -212,7 +214,7 @@ export default {
   .rowNew {
     margin-bottom: 10px;
     display: flex;
-    justify-content: space-between !important;
+    justify-content: left;
 
     & > * {
       width: 400px;

package/components/form/ResourceQuota/Project.vue

@@ -57,14 +57,14 @@ export default {
 </script>
 <template>
   <div>
-    <div style="justify-content: space-between;" class="headers mb-10">
-      <div style="width: 400px;">
+    <div style="justify-content: left;" class="headers mb-10">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.resourceType') }}</label>
       </div>
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.projectLimit') }}</label>
       </div>
-      <div style="width: 400px;">
+      <div style="width: 450px;">
         <label>{{ t('resourceQuota.headers.namespaceDefaultLimit') }}</label>
       </div>
     </div>

package/components/form/ResourceQuota/ProjectRow.vue

@@ -72,41 +72,47 @@ export default {
     v-if="typeOption"
     class="rowNew"
   >
-    <Select
-      :value="type"
-      :mode="mode"
-      :options="types"
-      data-testid="projectrow-type-input"
-      @update:value="updateType($event)"
-    />
-    <UnitInput
-      :value="resourceQuotaLimit[type]"
-      :mode="mode"
-      :placeholder="typeOption.placeholder"
-      :increment="typeOption.increment"
-      :input-exponent="typeOption.inputExponent"
-      :base-unit="typeOption.baseUnit"
-      :output-modifier="true"
-      data-testid="projectrow-project-quota-input"
-      @update:value="updateQuotaLimit('resourceQuota', type, $event)"
-    />
-    <UnitInput
-      :value="namespaceDefaultResourceQuotaLimit[type]"
-      :mode="mode"
-      :placeholder="typeOption.placeholder"
-      :increment="typeOption.increment"
-      :input-exponent="typeOption.inputExponent"
-      :base-unit="typeOption.baseUnit"
-      :output-modifier="true"
-      data-testid="projectrow-namespace-quota-input"
-      @update:value="updateQuotaLimit('namespaceDefaultResourceQuota', type, $event)"
-    />
+    <div style="width: 450px;">
+      <Select
+        :value="type"
+        :mode="mode"
+        :options="types"
+        data-testid="projectrow-type-input"
+        @update:value="updateType($event)"
+      />
+    </div>
+    <div style="width: 450px;">
+      <UnitInput
+        :value="resourceQuotaLimit[type]"
+        :mode="mode"
+        :placeholder="typeOption.placeholder"
+        :increment="typeOption.increment"
+        :input-exponent="typeOption.inputExponent"
+        :base-unit="typeOption.baseUnit"
+        :output-modifier="true"
+        data-testid="projectrow-project-quota-input"
+        @update:value="updateQuotaLimit('resourceQuota', type, $event)"
+      />
+    </div>
+    <div style="width: 450px;">
+      <UnitInput
+        :value="namespaceDefaultResourceQuotaLimit[type]"
+        :mode="mode"
+        :placeholder="typeOption.placeholder"
+        :increment="typeOption.increment"
+        :input-exponent="typeOption.inputExponent"
+        :base-unit="typeOption.baseUnit"
+        :output-modifier="true"
+        data-testid="projectrow-namespace-quota-input"
+        @update:value="updateQuotaLimit('namespaceDefaultResourceQuota', type, $event)"
+      />
+    </div>
   </div>
 </template>
 
 <style lang='scss' scoped>
   .rowNew {
     display: flex;
-    justify-content: space-between !important;
+    justify-content: left;
   }
 </style>

package/components/nav/TopLevelMenu.vue

@@ -867,6 +867,7 @@ export default {
                 @click="hide()"
               >
                 <router-link
+                  v-if="a.value !== 'fleet'"
                   class="option"
                   :class="{'active-menu-link': a.isMenuActive }"
                   :to="a.to"
@@ -923,7 +924,7 @@ export default {
         <div
           class="footer"
         >
-          <div
+          <!-- <div
             v-if="canEditSettings"
             class="support"
             @click="hide()"
@@ -948,7 +949,7 @@ export default {
             >
               {{ aboutText }}
             </router-link>
-          </div>
+          </div> -->
         </div>
       </div>
     </transition>

package/components/nav/Type.vue

@@ -141,7 +141,7 @@ export default {
       <a
         role="link"
         :aria-label="type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label)"
-        :href="href"
+        :href="href.replace(/harvester/g, 'cloud')"
         class="type-link"
         :aria-current="isActive ? 'page' : undefined"
         @click="selectType(); navigate($event);"
@@ -158,7 +158,7 @@ export default {
          <div v-else style="display: flex; align-items: center;" class="labelKey_menu">
           <i v-if="!type.labelDisplay || (type.labelDisplay && type.labelDisplay.indexOf('</i>') === -1)" class="icon icon-fw icon-globe" style="color: var(--muted);width: 32px;text-align: left;"></i>
            <span
-             v-clean-html="type.labelDisplay.replace('设置', '基础设置') || type.label"
+             v-clean-html="type.labelDisplay || type.label"
              class="label"
              :class="{'no-icon': !type.icon}"
            />
@@ -199,7 +199,7 @@ export default {
   >
     <a
       role="link"
-      :href="type.link"
+      :href="type.link.replace(/harvester/g, 'cloud')"
       :target="type.target"
       rel="noopener noreferrer nofollow"
       :aria-label="type.label"

package/package.json

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

package/pages/account/index.vue

@@ -183,7 +183,7 @@ export default {
           </button>
         </div>
       </div>
-      <button
+      <!-- <button
         v-if="apiKeySchema"
         role="button"
         :aria-label="t('accountAndKeys.apiKeys.add.label')"
@@ -192,7 +192,7 @@ export default {
         @click="addKey"
       >
         {{ t('accountAndKeys.apiKeys.add.label') }}
-      </button>
+      </button> -->
     </div>
 
     <div class="account_card mb-20">

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);
@@ -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/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.5-test.8 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.17 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail