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

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/list/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue

@@ -37,15 +37,17 @@ export default {
 
 <template>
   <div>
-    <Banner
-      color="info"
-      :label="t('podSecurityAdmission.banner.modifications')"
-    />
-
     <ResourceTable
       :loading="loading"
       :schema="schema"
       :rows="rows"
-    />
+    >
+      <template #banner>
+        <Banner
+          color="info"
+          :label="t('podSecurityAdmission.banner.modifications')"
+        />
+      </template>
+    </ResourceTable>
   </div>
 </template>

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

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

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

@@ -142,9 +142,10 @@ 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>
@@ -171,8 +172,11 @@ export default {
 
 <style lang="scss">
   .btn-user-retention {
-    display: flex;
+    display: block;
     gap: 0.25rem;
     padding: 0;
   }
+  .btn-user-retention:hover {
+    color: #333 !important;
+  }
 </style>

package/list/namespace.vue

@@ -42,6 +42,9 @@ 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,19 +307,18 @@ 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}}"
         >
-          {{ t('cluster.explore') }}
+          <a href="javascript:;">
+            {{ t('cluster.explore') }}
+          </a>
         </router-link>
-        <button
-          v-else
+        <span
           data-testid="cluster-manager-list-explore"
-          :disabled="true"
-          class="btn btn-sm role-secondary"
+          v-else
         >
           {{ t('cluster.explore') }}
-        </button>
+        </span>
       </template>
     </ResourceTable>
   </div>

package/mixins/brand.js

@@ -175,7 +175,24 @@ 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/mixins/create-edit-view/impl.js

@@ -170,6 +170,16 @@ export default {
       } catch (err) {
         // This exception handles errors from the `request` action when it receives a failed http request. The `err` object could be from the action's error handler (raw http response object containing `status`) or thrown later on given the response of the action (a massaged object containing `_status`). TBD why one 409 triggers the error handler and another does not.
         const IS_ERR_409 = err.status === 409 || err._status === 409;
+        
+        const IS_ERR_403 = err.status === 403 || err._status === 403;
+
+        if (err.message === '' && err.fieldName && err.code) {
+          err.message = err.code + ' ' + err.fieldName
+        }
+        
+        if (IS_ERR_403) {
+          err.message = '权限不足'
+        }
 
         // Conflict, the resource being edited has changed since starting editing
         if (IS_ERR_409 && depth === 0 && this.isEdit) {

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/models/workload.js

@@ -199,8 +199,8 @@ export default class Workload extends WorkloadService {
     }
 
     this.$dispatch('growl/error', {
-      title:   'Unavailable',
-      message: 'There are no running pods to execute a shell in.'
+      title:   '不可用',
+      message: '没有正在运行的 Pod 可用来执行 Shell。'
     }, { root: true });
   }
 

package/package.json

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

package/pages/account/index.vue

@@ -151,48 +151,40 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <BackLink :link="backLink" />
-    <h1>
-      <TabTitle breadcrumb="vendor-only">
-        {{ t('accountAndKeys.title') }}
-      </TabTitle>
-    </h1>
-
-    <h2 v-t="'accountAndKeys.account.title'" />
-    <div class="account">
-      <Principal
-        :value="principal.id"
-        :use-muted="false"
-        :show-labels="true"
-      />
-      <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="showChangePasswordDialog"
-        >
-          {{ t("accountAndKeys.account.change") }}
-        </button>
+    <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>
 
-    <hr role="none">
-    <div class="keys-header">
-      <div>
-        <h2 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 class="account_card mb-20">
+      <h5 v-t="'accountAndKeys.account.title'" />
+      <div class="account">
+        <Principal
+          :userLogo="true"
+          :userLogoSize="79"
+          :value="principal.id"
+          :use-muted="false"
+          :show-labels="true"
+        />
+        <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="showChangePasswordDialog"
+          >
+            {{ t("accountAndKeys.account.change") }}
+          </button>
         </div>
       </div>
-      <button
+      <!-- <button
         v-if="apiKeySchema"
         role="button"
         :aria-label="t('accountAndKeys.apiKeys.add.label')"
@@ -201,33 +193,71 @@ export default {
         @click="addKey"
       >
         {{ t('accountAndKeys.apiKeys.add.label') }}
-      </button>
-    </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"
-      />
+      </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>
 </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;
   }
@@ -237,6 +267,10 @@ export default {
     justify-content: space-between
   }
 
+  .principal  .avatar {
+    width: 287px !important;
+  }
+
   .keys-header {
     display: flex;
     div {
@@ -254,6 +288,7 @@ export default {
 
   .api-url {
     display: flex;
+    margin: 20px 0;
 
     > span {
       margin-right: 6px;