dashboard-shell-shell 1.0.1000000117 → 1.0.1000000118

package/components/rancherSortableTable/sorting.js

@@ -0,0 +1,129 @@
+import { sortBy } from '@shell/utils/sort';
+import { uniq } from '@shell/utils/array';
+
+/**
+ * Always sort by something, this is the best guess on properties
+ *
+ * Can be overriden
+ */
+const DEFAULT_MANDATORY_SORT = ['nameSort', 'id'];
+
+export default {
+  computed: {
+    sortFields() {
+      let fromGroup = ( this.groupBy ? this.groupSort || this.groupBy : null) || [];
+      let fromColumn = [];
+
+      const column = (this.columns || this.headers).find((x) => x && x.name && x.name.toLowerCase() === this.sortBy.toLowerCase());
+
+      if ( this.sortBy && column && column.sort ) {
+        fromColumn = column.sort;
+      }
+
+      if ( !Array.isArray(fromGroup) ) {
+        fromGroup = [fromGroup];
+      }
+
+      if ( !Array.isArray(fromColumn) ) {
+        fromColumn = [fromColumn];
+      }
+
+      // return the sorting based on grouping, user selection and fallback
+      return uniq([...fromGroup, ...fromColumn].concat(...(this.mandatorySort || DEFAULT_MANDATORY_SORT)));
+    },
+
+    arrangedRows() {
+      if (this.externalPaginationEnabled) {
+        return;
+      }
+
+      let key;
+
+      // Why is sortGeneration needed when we have sortGenerationFn?
+      // 1. sortGenerationFn is called when this fn is kicked off and returns latest and greatest string (given things like namespace)
+      // 2. it can be kicked off with stale rows... which is then stored against latest string
+      // 3. when updates rows comes through... sortGenerationFn returns same string
+      // 4. we therefor think nothing has changed and return old, stale rows
+      // This is avoided by outside storage of sortGeneration against rows
+      // (it would be nice to have that hash on the rows object itself, but it gets messy)
+      const sortGenerationKey = this.sortGeneration || this.sortGenerationFn?.apply(this);
+
+      if ( sortGenerationKey) {
+        key = `${ sortGenerationKey }/${ this.rows.length }/${ this.descending }/${ this.sortFields.join(',') }`;
+        if ( this.cacheKey === key ) {
+          return this.cachedRows;
+        }
+      }
+
+      const out = sortBy(this.rows, this.sortFields, this.descending);
+
+      if ( key ) {
+        this.cacheKey = key;
+        this.cachedRows = out;
+      }
+
+      return out;
+    },
+  },
+
+  data() {
+    let sortBy = null;
+
+    this._defaultSortBy = this.defaultSortBy;
+
+    // Try to find a reasonable default sort
+    if ( !this._defaultSortBy ) {
+      const markedColumn = this.headers.find((x) => !!x.defaultSort);
+      const nameColumn = this.headers.find( (x) => x.name === 'name');
+
+      if ( markedColumn ) {
+        this._defaultSortBy = markedColumn.name;
+      } else if ( nameColumn ) {
+        // Use the name column if there is one
+        this._defaultSortBy = nameColumn.name;
+      } else {
+        // The first column that isn't state
+        const first = this.headers.filter( (x) => x.name !== 'state' )[0];
+
+        if ( first ) {
+          this._defaultSortBy = first.name;
+        } else {
+          // I give up
+          this._defaultSortBy = 'id';
+        }
+      }
+    }
+
+    // If the sort column doesn't exist or isn't specified, use default
+    if ( !sortBy || !this.headers.find((x) => x.name === sortBy ) ) {
+      sortBy = this._defaultSortBy;
+    }
+
+    return {
+      sortBy,
+      descending: false,
+      cachedRows: null,
+      cacheKey:   null,
+    };
+  },
+
+  methods: {
+    changeSort(sort, desc) {
+      this.sortBy = sort;
+      this.descending = desc;
+
+      // Always go back to the first page when the sort is changed
+      this.setPage(1);
+    },
+  },
+
+  watch: {
+    sortFields() {
+      this.debouncedPaginationChanged();
+    },
+
+    descending() {
+      this.debouncedPaginationChanged();
+    }
+  }
+};

package/composables/useClickOutside.ts

@@ -76,6 +76,6 @@ export const useClickOutside = <T extends OnClickOutsideOptions>(
 
   onBeforeUnmount(() => {
     window.removeEventListener('click', listener as any);
-    window.removeEventListener('pointerdown', setShouldListen);
+    window.removeEventListener('pointerDown', setShouldListen);
   });
 };

package/config/product/auth.js

@@ -28,7 +28,7 @@ export function init(store) {
   product({
     ifHaveType:          new RegExp(`${ MANAGEMENT.USER }|${ MANAGEMENT.AUTH_CONFIG }`, 'i'),
     ifHaveVerb:          'GET',
-    // ifFeature:           MULTI_CLUSTER,
+    ifFeature:           MULTI_CLUSTER,
     inStore:             'management',
     icon:                'user',
     removable:           false,
@@ -176,21 +176,12 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloakoidc`, 'auth/oidc');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
 
-  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
-
-  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
-    basicType([
-      'config',
-      USERS_VIRTUAL_TYPE,
-      NORMAN.SPOOFED.GROUP_PRINCIPAL,
-      ROLES_VIRTUAL_TYPE
-    ]);
-  } else {
-    basicType([
-      USERS_VIRTUAL_TYPE,
-      ROLES_VIRTUAL_TYPE
-    ]);
-  }
+  basicType([
+    'config',
+    USERS_VIRTUAL_TYPE,
+    NORMAN.SPOOFED.GROUP_PRINCIPAL,
+    ROLES_VIRTUAL_TYPE
+  ]);
 
   headers(NORMAN.SPOOFED.GROUP_PRINCIPAL, [
     GROUP_NAME,

package/config/product/explorer.js

@@ -64,7 +64,7 @@ export function init(store) {
       [NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING]:     'rancher',
       [NORMAN.PROJECT_ROLE_TEMPLATE_BINDING]:     'rancher',
       [CAPI.RANCHER_CLUSTER]:                     'management',
-    },
+    }
   });
 
   basicType(['cluster-dashboard', 'cluster-tools']);

package/config/product/settings.js

@@ -102,23 +102,14 @@ export function init(store) {
     route:      { name: 'c-cluster-settings-links' }
   });
 
-  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
-
-  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
-    basicType([
-      'settings',
-      'features',
-      'brand',
-      'banners',
-      'performance',
-      'links'
-    ]);
-  } else {
-    basicType([
-      'settings',
-      'brand',
-    ]);
-  }
+  basicType([
+    'settings',
+    'features',
+    'brand',
+    'banners',
+    'performance',
+    'links'
+  ]);
 
   configureType(MANAGEMENT.SETTING, {
     isCreatable: false,

package/config/settings.ts

@@ -113,34 +113,6 @@ export const SETTING = {
   CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET: 'cluster-agent-default-pod-disruption-budget'
 } as const;
 
-export const ALLOWED_SETTINGS_NEW: GlobalSetting = {
-  [SETTING.CA_CERTS]:            { kind: 'multiline', readOnly: true },
-  [SETTING.PASSWORD_MIN_LENGTH]: {
-    kind:    'integer',
-    ruleSet: [
-      {
-        name:       'betweenValues',
-        key:        'Password',
-        factoryArg: [2, 256]
-      },
-      {
-        name: 'isInteger',
-        key:  'Password',
-      },
-      {
-        name: 'isPositive',
-        key:  'Password',
-      },
-      {
-        name: 'isOctal',
-        key:  'Password',
-      }
-    ],
-  },
-  [SETTING.AUTH_USER_SESSION_TTL_MINUTES]:        {},
-  [SETTING.AUTH_TOKEN_MAX_TTL_MINUTES]:           {},
-}
-
 // These are the settings that are allowed to be edited via the UI
 export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.CA_CERTS]:            { kind: 'multiline', readOnly: true },

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

@@ -214,11 +214,7 @@ export default {
 </script>
 
 <template>
-
-  <!-- 如果没有获取到 value 数据，则显示加载组件 -->
   <Loading v-if="!value" />
-
-  <!-- 如果有数据，则进入资源编辑/创建的表单界面 -->
   <CruResource
     v-else
     :done-route="doneRoute"
@@ -230,14 +226,10 @@ export default {
     class="create-edit"
     @finish="save"
   >
-
-    <!-- 账户凭据区域 -->
     <div class="credentials">
       <h2> {{ t("user.edit.credentials.label") }}</h2>
-
-      <!-- 用户名 & 显示名 -->
       <div class="row">
-        <div class="col span-6">
+        <div class="col span-4">
           <LabeledInput
             ref="name"
             v-model:value="form.username"
@@ -249,7 +241,7 @@ export default {
             :ignore-password-managers="!isCreate"
           />
         </div>
-        <div class="col span-6">
+        <div class="col span-4">
           <LabeledInput
             v-model:value="form.displayName"
             label-key="user.edit.credentials.displayName.label"
@@ -258,10 +250,8 @@ export default {
           />
         </div>
       </div>
-
-      <!-- 用户描述 -->
-      <div class="row">
-        <div class="col span-6">
+      <div class="row mt-20 mb-10">
+        <div class="col span-8">
           <LabeledInput
             v-model:value="form.description"
             label-key="user.edit.credentials.userDescription.label"
@@ -271,7 +261,6 @@ export default {
         </div>
       </div>
 
-      <!-- 修改密码（仅非查看模式显示） -->
       <ChangePassword
         v-if="!isView"
         ref="changePassword"
@@ -281,8 +270,6 @@ export default {
         @valid="validation.password = $event"
       />
     </div>
-
-    <!-- 全局角色绑定区域（仅当 showGlobalRoles 为 true 时显示） -->
     <div
       v-if="showGlobalRoles"
       class="global-permissions"

package/edit/networking.k8s.io.ingress/RulePath.vue

@@ -189,7 +189,7 @@ $row-height: 40px;
     height: 100%;
 
     input.no-label {
-      height: calc($row-height - 2px);
+      height: 32px;
       padding: 10px;
     }
   }

package/edit/token.vue

@@ -184,7 +184,7 @@ export default {
         :label="err"
       />
     </div>
-    <div class="pr-10">
+    <div class="pl-10 pr-10">
       <LabeledInput
         key="description"
         v-model:value="value.description"

package/list/harvesterhci.io.management.cluster.vue

@@ -119,7 +119,6 @@ export default {
       :resource="resource"
       :is-creatable="false"
       :type-display="typeDisplay"
-      :main-button-visible="!rows || !rows.length"
     >
       <template #typeDescription>
         <TypeDescription :resource="hResource" />
@@ -145,23 +144,7 @@ export default {
       :is-creatable="true"
       :namespaced="false"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    
-      :resource="resource"
-      :main-button-visible="true"
     >
-
-      <template
-        v-if="canCreateCluster"
-        slot="extraActions"
-      >
-        <n-link
-          :to="importLocation"
-          class="btn role-primary"
-        >
-          {{ t('cluster.importAction') }}1451414651
-        </n-link>
-      </template>
-
       <template #col:name="{row}">
         <td>
           <span class="cluster-link">

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

@@ -122,9 +122,18 @@ export default {
       :show-incremental-loading-indicator="incrementalLoadingIndicator"
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
-      :main-button-visible="false"
     >
-
+      <template #extraActions>
+        <AsyncButton
+          v-if="canRefreshAccess"
+          mode="refresh"
+          :action-label="t('authGroups.actions.refresh')"
+          :waiting-label="t('authGroups.actions.refresh')"
+          :success-label="t('authGroups.actions.refresh')"
+          :error-label="t('authGroups.actions.refresh')"
+          @click="refreshGroupMemberships"
+        />
+      </template>
       <template
         v-if="isAdmin"
         #subHeader
@@ -133,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>
@@ -148,23 +156,7 @@ export default {
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-
-      :resource="resource"
-      :main-button-visible="true"
     >
-      <template #extraActions>
-        <AsyncButton
-          v-if="canRefreshAccess"
-          style="margin-right: 6px;"
-          mode="refresh"
-          :action-label="t('authGroups.actions.refresh')"
-          :waiting-label="t('authGroups.actions.refresh')"
-          :success-label="t('authGroups.actions.refresh')"
-          :error-label="t('authGroups.actions.refresh')"
-          @click="refreshGroupMemberships"
-        />
-      </template>
-
       <template #col:user-state="{row}">
         <td>
           <TableDataUserIcon
@@ -179,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/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

@@ -176,24 +176,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": "1.0.1000000117",
+  "version": "1.0.1000000118",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",