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

package/list/management.cattle.io.setting.vue

@@ -1,6 +1,6 @@
 <script>
 import { MANAGEMENT } from '@shell/config/types';
-import { ALLOWED_SETTINGS_NEW, ALLOWED_SETTINGS, PROVISIONING_SETTINGS } from '@shell/config/settings';
+import { ALLOWED_SETTINGS, PROVISIONING_SETTINGS } from '@shell/config/settings';
 import { Banner } from '@components/Banner';
 import Loading from '@shell/components/Loading';
 import { VIEW_IN_API } from '@shell/store/prefs';
@@ -26,12 +26,8 @@ export default {
     const settings = [];
     const provisioningSettings = [];
 
-    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
-
-    const allowedSettings = topLevelPermissions && topLevelPermissions === 'superadmin' ? ALLOWED_SETTINGS : ALLOWED_SETTINGS_NEW
-
     // Combine the allowed settings with the data from the API
-    for ( const id in allowedSettings ) {
+    for ( const id in ALLOWED_SETTINGS ) {
       const setting = settingsMap[id];
 
       if ( !setting ) {
@@ -73,10 +69,7 @@ export default {
   },
 
   data() {
-
-    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
-
-    return { topLevelPermissions, settings: null, provisioningSettings: null };
+    return { settings: null, provisioningSettings: null };
   },
   computed: { ...mapGetters({ t: 'i18n/t' }) }
 };
@@ -103,18 +96,16 @@ export default {
       />
     </div>
 
-    <div v-if="topLevelPermissions && topLevelPermissions === 'superadmin'">
-      <h2>
-        {{ t('advancedSettings.provisioning.header') }}
-      </h2>
-      <div
-        v-for="(setting) in provisioningSettings"
-        :key="setting.id"
-      >
-        <Setting
-          :value="setting"
-        />
-      </div>
+    <h2>
+      {{ t('advancedSettings.provisioning.header') }}
+    </h2>
+    <div
+      v-for="(setting) in provisioningSettings"
+      :key="setting.id"
+    >
+      <Setting
+        :value="setting"
+      />
     </div>
   </div>
 </template>

package/list/management.cattle.io.user.vue

@@ -142,10 +142,9 @@ export default {
           :to="{ name: 'c-cluster-auth-user.retention'}"
           class="btn role-link btn-sm btn-user-retention"
           data-testid="router-link-user-retention"
-          style="text-align: left;min-width: auto !important;width: auto;"
         >
-          <!-- <i class="icon icon-gear" />
-          {{ t('user.retention.button.label') }} -->
+          <i class="icon icon-gear" />
+          {{ t('user.retention.button.label') }}
         </router-link>
       </template>
     </Masthead>
@@ -172,11 +171,8 @@ export default {
 
 <style lang="scss">
   .btn-user-retention {
-    display: block;
+    display: flex;
     gap: 0.25rem;
     padding: 0;
   }
-  .btn-user-retention:hover {
-    color: #333 !important;
-  }
 </style>

package/list/namespace.vue

@@ -42,9 +42,6 @@ export default {
     headers() {
       const headersFromSchema = this.$store.getters['type-map/headersFor'](this.schema);
 
-      [headersFromSchema[0], headersFromSchema[1]] = [headersFromSchema[1], headersFromSchema[0]];
-      headersFromSchema[0].width = '200px';
-      headersFromSchema[1].width = '100px';
       // harvester is reusing this namespace.js to render ns page, we need to make sure harvester backend support quota schema to show this column.
       if (this.hasHarvesterResourceQuotaSchema && Array.isArray(headersFromSchema) && headersFromSchema.length > 1) {
         const columnIdx = headersFromSchema.length - 1;

package/list/provisioning.cattle.io.cluster.vue

@@ -307,18 +307,19 @@ export default {
         <router-link
           v-if="row.mgmt && row.mgmt.isReady && !row.hasError"
           data-testid="cluster-manager-list-explore-management"
+          class="btn btn-sm role-secondary"
           :to="{name: 'c-cluster', params: {cluster: row.mgmt.id}}"
         >
-          <a href="javascript:;">
-            {{ t('cluster.explore') }}
-          </a>
+          {{ t('cluster.explore') }}
         </router-link>
-        <span
-          data-testid="cluster-manager-list-explore"
+        <button
           v-else
+          data-testid="cluster-manager-list-explore"
+          :disabled="true"
+          class="btn btn-sm role-secondary"
         >
           {{ t('cluster.explore') }}
-        </span>
+        </button>
       </template>
     </ResourceTable>
   </div>

package/mixins/brand.js

@@ -175,24 +175,7 @@ export default {
       const vars = createCssVars(color, this.theme, name);
 
       for (const prop in vars) {
-
         document.body.style.setProperty(prop, vars[prop]);
-
-        // 主色调hover值动态
-        if (prop === '--primary-hover-bg') {
-          // 如果是你要设置透明度的变量，比如 hover
-          let value = '#E8F4FF';
-          if (vars[prop]) {
-            const match = vars[prop].match(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/);
-            if (match) {
-              const [_, r, g, b] = match;
-              value = `rgba(${r}, ${g}, ${b}, 0.15)`;
-            }
-          }
-
-          document.body.style.setProperty('--nav-hover-color', vars[prop]);
-          document.body.style.setProperty('--nav-active', value);
-        }
       }
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-test.5",
+  "version": "3.0.5-test.6",
   "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,37 +151,21 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <!-- <BackLink :link="backLink" />
+    <BackLink :link="backLink" />
     <h1>
       <TabTitle breadcrumb="vendor-only">
         {{ t('accountAndKeys.title') }}
       </TabTitle>
-    </h1> -->
-    <div class="api-key-title mb-20">
-      {{ t('accountAndKeys.title') }}
-    </div>
+    </h1>
 
-    <!-- <h2 v-t="'accountAndKeys.account.title'" /> -->
+    <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
-            v-if="canChangePassword"
-            class="edit-pass-txt"
-            @click="$refs.promptChangePassword.show(true)"
-          >修改
-          </span>
-        </template>
-    </Principal>
-      <!-- <div>
+      />
+      <div>
         <button
           v-if="canChangePassword"
           role="button"
@@ -190,25 +173,17 @@ export default {
           type="button"
           class="btn role-primary"
           data-testid="account_change_password"
-          @click="$refs.promptChangePassword.show(true)"
+          @click="showChangePasswordDialog"
         >
           {{ t("accountAndKeys.account.change") }}
         </button>
-      </div> -->
+      </div>
     </div>
-    <PromptChangePassword ref="promptChangePassword" />
 
-    <!-- <hr role="none"> -->
-     <div  
-     style=" border: 1px solid #d7d7d7;padding: 20px 20px 0px 20px;"
-     class="mt-20">
+    <hr role="none">
     <div class="keys-header">
       <div>
-        <!-- <h2 v-t="'accountAndKeys.apiKeys.title'" /> -->
-        <div
-            v-t="'accountAndKeys.apiKeys.title'"
-            class="account-title mb-20"
-          />
+        <h2 v-t="'accountAndKeys.apiKeys.title'" />
         <div class="api-url">
           <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
           <CopyToClipboardText
@@ -217,10 +192,20 @@ 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"
-      class="keys mb-20"
+      class="keys"
     >
       <ResourceTable
         :schema="apiKeySchema"
@@ -231,20 +216,7 @@ export default {
         :search="true"
         :row-actions="true"
         :table-actions="true"
-      >
-      <template #header-right>
-        <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>
-          </template>
-    </ResourceTable>
+      />
     </div>
     <div v-else>
       <Banner
@@ -253,7 +225,6 @@ export default {
       />
     </div>
   </div>
-  </div>
 </template>
 
 <style lang='scss' scoped>
@@ -262,12 +233,8 @@ export default {
   }
 
   .account {
-    /* display: flex;
-    justify-content: space-between */
-    border: 1px solid #D7D7D7;
-    padding: 20px;
-    box-sizing: border-box;
-
+    display: flex;
+    justify-content: space-between
   }
 
   .keys-header {
@@ -280,10 +247,8 @@ export default {
   .keys {
     display: flex;
     flex-direction: column;
-    margin-top: 20px;
     .add {
       align-self: flex-end;
-      margin-left: 10px
     }
   }
 
@@ -294,23 +259,4 @@ export default {
       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>