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

package/components/nav/Type.vue

@@ -112,7 +112,6 @@ export default {
 </script>
 
 <template>
-  <!-- 当 type 有 route 时，渲染一个 Vue Router 自定义链接 -->
   <router-link
     v-if="type.route"
     :key="type.name"
@@ -120,24 +119,18 @@ export default {
     custom
     :to="type.route"
   >
-
-    <!-- 导航项容器 -->
     <li
       class="child nav-type"
       :class="{'root': isRoot, [`depth-${depth}`]: true, 'router-link-active': isActive, 'router-link-exact-active': isExactActive}"
       @click="navigate"
       @keypress.enter="navigate"
     >
-
-      <!-- 如果是精确匹配激活状态，则显示 TabTitle 组件 -->
       <TabTitle
         v-if="isExactActive"
         :show-child="false"
       >
         {{ type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label) }}
       </TabTitle>
-
-      <!-- 链接主体 -->
       <a
         role="link"
         :aria-label="type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label)"
@@ -148,50 +141,38 @@ export default {
         @mouseenter="setNear(true)"
         @mouseleave="setNear(false)"
       >
-        <!-- 文本标签：优先使用多语言 key -->
         <span
           v-if="type.labelKey"
           class="label"
         ><t :k="type.labelKey" /></span>
-
-        <!-- 没有 labelKey 时，直接使用 HTML 文本 -->
-         <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"
-             class="label"
-             :class="{'no-icon': !type.icon}"
-           />
-         </div>
-
-        <!-- 右侧附加信息（收藏按钮 / 命名空间图标 / 计数） -->
-        <!-- <span
+        <span
+          v-else
+          v-clean-html="type.labelDisplay || type.label"
+          class="label"
+          :class="{'no-icon': !type.icon}"
+        />
+        <span
           v-if="showFavorite || namespaceIcon || showCount"
           class="count"
         >
-
           <Favorite
             v-if="showFavorite"
             :resource="type.name"
           />
-
           <i
             v-if="namespaceIcon"
             class="icon icon-namespace"
             :class="{'ns-and-icon': showCount}"
             data-testid="type-namespaced"
           />
-
           <span
             v-if="showCount"
             data-testid="type-count"
           >{{ count }}</span>
-        </span> -->
+        </span>
       </a>
     </li>
   </router-link>
-
-  <!-- 当 type 没有 route 但有外部 link 时 -->
   <li
     v-else-if="type.link"
     class="child nav-type nav-link"
@@ -207,8 +188,6 @@ export default {
       <span class="label">{{ type.label }}&nbsp;<i class="icon icon-external-link" /></span>
     </a>
   </li>
-
-  <!-- 兜底情况：既没有 route，也没有 link -->
   <li v-else>
     {{ type }}?
   </li>
@@ -235,7 +214,6 @@ export default {
     .label {
       align-items: center;
       grid-area: label;
-      display: flex;
       overflow: hidden;
       text-overflow: ellipsis;
 
@@ -243,13 +221,13 @@ export default {
         padding-left: 3px;
       }
 
-      ::v-deep .highlight {
+      :deep() .highlight {
         background: var(--diff-ins-bg);
         color: var(--body-text);
         padding: 2px;
       }
 
-      ::v-deep .icon {
+      :deep() .icon {
         position: relative;
         color: var(--muted);
       }
@@ -258,28 +236,24 @@ export default {
     A {
       display: grid;
       grid-template-areas: "label count";
-      grid-template-columns: auto 20px;
+      grid-template-columns: auto auto;
       grid-column-gap: 5px;
       font-size: 14px;
       line-height: 24px;
-      /* padding: 7.5px 7px 7.5px 10px; */
-      padding: 0px 16px 0px 30px;
-      height: 50px;
+      padding: 7.5px 7px 7.5px 10px;
       margin: 0 0 0 -3px;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
       color: var(--body-text);
+      height: 33px;
 
       &:hover {
-        background: var(--nav-active) !important;
-        color: var(--nav-hover-color);
-        /* background: var(--nav-hover); */
+        background: var(--nav-hover);
         text-decoration: none;
 
-        ::v-deep .icon {
-          /* color: var(--body-text); */
-          color: var(--nav-hover-color);
+        :deep() .icon {
+          color: var(--body-text);
         }
       }
     }
@@ -288,42 +262,46 @@ export default {
       grid-area: favorite;
       font-size: 12px;
       position: relative;
+      vertical-align: middle;
+      margin-right: 4px;
     }
 
     .count {
-      grid-area: count;
       font-size: 12px;
-      text-align: right;
       justify-items: center;
-      line-height: 50px;
+      padding-right: 4px;
+      display: flex;
+      align-items: center;
+    }
+
+    &.nav-type.nav-link {
+      a .label {
+        display: flex;
+      }
     }
 
     &.nav-type:not(.depth-0) {
       A {
-        font-size: 13px;
-        padding: 5.5px 7px 5.5px 40px;
+        padding-left: 16px;
       }
 
-      ::v-deep .label I {
+      :deep() .label I {
         padding-right: 2px;
       }
     }
-  }
 
-.labelKey_menu{
-  display: flex;
-  align-items: center;
-}
-.labelKey_menu:hover{
-  i{
-    color: var(--nav-hover-color) !important;
-  }
-}
-.router-link-active{
-  .labelKey_menu{
-    i{
-      color: var(--nav-hover-color) !important;
+    &.nav-type:is(.depth-1) {
+      A {
+        font-size: 13px;
+        padding-left: 23px;
+      }
+    }
+
+    &.nav-type:not(.depth-0):not(.depth-1) {
+      A {
+        padding-left: 14px;
+      }
     }
   }
-}
+
 </style>

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/private-label.js

@@ -58,21 +58,17 @@ export function matches(pl) {
 }
 
 export function getVendor() {
+  if ( vendor === SETTING.PL_RANCHER_VALUE ) {
+    // Custom vendor override based on brand
+    if (brand && CUSTOM_VENDOR[brand]) {
+      return CUSTOM_VENDOR[brand];
+    }
 
-  return 'HCI';
-}
-// export function getVendor() {
-//   if ( vendor === SETTING.PL_RANCHER_VALUE ) {
-//     // Custom vendor override based on brand
-//     if (brand && CUSTOM_VENDOR[brand]) {
-//       return CUSTOM_VENDOR[brand];
-//     }
-
-//     return STANDARD_VENDOR;
-//   }
+    return STANDARD_VENDOR;
+  }
 
-//   return vendor;
-// }
+  return vendor;
+}
 
 export function getProduct() {
   return product;
@@ -84,13 +80,13 @@ export function setTitle() {
   if (v === 'Harvester') {
     const ico = require(`~shell/assets/images/pl/harvester.png`);
 
-    document.title = 'HCI';
+    document.title = 'Harvester';
     const link = document.createElement('link');
 
     link.hid = 'icon';
     link.rel = 'icon';
     link.type = 'image/x-icon';
-    link.href = ico;
+    link.hrefv = ico;
     const head = document.getElementsByTagName('head')[0];
 
     head.appendChild(link);

package/config/product/auth.js

@@ -191,23 +191,13 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/cognito`, 'auth/oidc');
 
-  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
-
-  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
-    basicType([
-      'config',
-      USERS_VIRTUAL_TYPE,
-      NORMAN.SPOOFED.GROUP_PRINCIPAL,
-      ROLES_VIRTUAL_TYPE,
-      MANAGEMENT.OIDC_CLIENT
-    ]);
-  } else {
-    basicType([
-      USERS_VIRTUAL_TYPE,
-      ROLES_VIRTUAL_TYPE
-    ]);
-  }
-
+  basicType([
+    'config',
+    USERS_VIRTUAL_TYPE,
+    NORMAN.SPOOFED.GROUP_PRINCIPAL,
+    ROLES_VIRTUAL_TYPE,
+    MANAGEMENT.OIDC_CLIENT
+  ]);
 
   headers(NORMAN.SPOOFED.GROUP_PRINCIPAL, [
     GROUP_NAME,

package/config/product/settings.js

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

package/config/settings.ts

@@ -112,34 +112,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/config/table-headers.js

@@ -52,7 +52,6 @@ export const NAME = {
   getValue:      (row) => row.nameDisplay,
   sort:          ['nameSort'],
   formatter:     'LinkDetail',
-  width:         200,
   canBeVariable: true,
 };
 
@@ -162,7 +161,7 @@ export const NAMESPACE = {
   name:        'namespace',
   labelKey:    'tableHeaders.namespace',
   value:       'namespace',
-  getValue:    row => row && row.namespace && row.namespace,
+  getValue:    (row) => row.namespace,
   sort:        'namespace',
   dashIfEmpty: true,
 };
@@ -281,7 +280,7 @@ export const NS_SNAPSHOT_QUOTA = {
   labelKey:      'harvester.tableHeaders.totalSnapshotQuota',
   value:         'snapshotSizeQuota',
   sort:          'snapshotSizeQuota',
-  align:         'left',
+  align:         'center',
   formatter:     'Si',
   formatterOpts: {
     opts: {

package/dialog/ForceMachineRemoveDialog.vue

@@ -98,9 +98,9 @@ export default {
           v-model="confirmName"
           type="text"
         >
-        <!-- <div class="text-info mt-20">
+        <div class="text-info mt-20">
           {{ protip }}
-        </div> -->
+        </div>
         <Banner
           v-for="(error, i) in errors"
           :key="i"

package/dialog/ScalePoolDownDialog.vue

@@ -91,9 +91,9 @@ export default {
             @update:value="update()"
           />
         </div>
-        <!-- <div class="text-info mt-20">
+        <div class="text-info mt-20">
           {{ protip }}
-        </div> -->
+        </div>
       </div>
     </template>
     <template #actions>

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/monitoring.coreos.com.alertmanagerconfig/auth.vue

@@ -243,14 +243,14 @@ export default {
           v-model:value="authType"
           :disabled="mode === view"
           :options="authOptions"
-          label="验证类型"
+          label="Auth Type"
           @update:value="initializeType(authOptions, authType)"
         />
       </div>
     </div>
-    <div
-      v-if="authType === 'basicAuth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basicAuth'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -265,16 +265,16 @@ export default {
         @updateSecretName="updateBasicAuthUsernameSecretName"
         @updateSecretKey="updateBasicAuthUsernameSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>
     </div>
-    <div
-      v-if="authType === 'basicAuth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basicAuth'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -289,16 +289,16 @@ export default {
         @updateSecretName="updateBasicAuthPasswordSecretName"
         @updateSecretKey="updateBasicAuthPasswordSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>
     </div>
-    <div
-      v-if="authType === 'bearerTokenSecret'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'bearerTokenSecret'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -313,9 +313,9 @@ export default {
         @updateSecretName="updateBearerTokenSecretName"
         @updateSecretKey="updateBearerTokenSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -17,14 +17,14 @@ import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
 // i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
 // i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
 export const RECEIVERS_TYPES = [
-  // {
-  //   name:  'slack',
-  //   label: 'monitoringReceiver.slack.label',
-  //   title: 'monitoringReceiver.slack.title',
-  //   info:  'monitoringReceiver.slack.info',
-  //   key:   'slackConfigs',
-  //   logo:  require(`@shell/assets/images/vendor/slack.svg`)
-  // },
+  {
+    name:  'slack',
+    label: 'monitoringReceiver.slack.label',
+    title: 'monitoringReceiver.slack.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'slackConfigs',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
   {
     name:  'email',
     label: 'monitoringReceiver.email.label',
@@ -32,21 +32,21 @@ export const RECEIVERS_TYPES = [
     key:   'emailConfigs',
     logo:  require(`@shell/assets/images/vendor/email.svg`)
   },
-  // {
-  //   name:  'pagerduty',
-  //   label: 'monitoringReceiver.pagerduty.label',
-  //   title: 'monitoringReceiver.pagerduty.title',
-  //   info:  'monitoringReceiver.pagerduty.info',
-  //   key:   'pagerdutyConfigs',
-  //   logo:  require(`@shell/assets/images/vendor/pagerduty.svg`)
-  // },
-  // {
-  //   name:  'opsgenie',
-  //   label: 'monitoringReceiver.opsgenie.label',
-  //   title: 'monitoringReceiver.opsgenie.title',
-  //   key:   'opsgenieConfigs',
-  //   logo:  require(`@shell/assets/images/vendor/email.svg`)
-  // },
+  {
+    name:  'pagerduty',
+    label: 'monitoringReceiver.pagerduty.label',
+    title: 'monitoringReceiver.pagerduty.title',
+    info:  'monitoringReceiver.pagerduty.info',
+    key:   'pagerdutyConfigs',
+    logo:  require(`@shell/assets/images/vendor/pagerduty.svg`)
+  },
+  {
+    name:  'opsgenie',
+    label: 'monitoringReceiver.opsgenie.label',
+    title: 'monitoringReceiver.opsgenie.title',
+    key:   'opsgenieConfigs',
+    logo:  require(`@shell/assets/images/vendor/email.svg`)
+  },
   {
     name:  'webhook',
     label: 'monitoringReceiver.webhook.label',
@@ -54,14 +54,14 @@ export const RECEIVERS_TYPES = [
     key:   'webhookConfigs',
     logo:  require(`@shell/assets/images/vendor/webhook.svg`),
   },
-  // {
-  //   name:  'custom',
-  //   label: 'monitoringReceiver.custom.label',
-  //   title: 'monitoringReceiver.custom.title',
-  //   info:  'monitoringReceiver.custom.info',
-  //   key:   'webhookConfigs',
-  //   logo:  require(`@shell/assets/images/vendor/custom.svg`)
-  // },
+  {
+    name:  'custom',
+    label: 'monitoringReceiver.custom.label',
+    title: 'monitoringReceiver.custom.title',
+    info:  'monitoringReceiver.custom.info',
+    key:   'webhookConfigs',
+    logo:  require(`@shell/assets/images/vendor/custom.svg`)
+  },
 ];
 
 export default {