dashboard-shell-shell 1.0.10000011121 → 1.6.0-alpha.1

package/pages/c/_cluster/apps/charts/install.vue

@@ -333,7 +333,6 @@ export default {
       this.chartValues = mergeWithReplace(
         merge({}, this.versionInfo?.values || {}),
         userValues,
-        { replaceObjectProps: true }
       );
 
       if (this.showCustomRegistry) {

package/pages/c/_cluster/auth/roles/index.vue

@@ -156,11 +156,13 @@ export default {
   <div v-else>
     <header>
       <div class="title">
+        <div class="excram-list">用户 & 认证 / <span style="color: #1890FF;">角色模板</span></div>
         <h1 class="m-0">
           {{ t('auth.roleTemplate') }}
         </h1>
+        <div style="margin: 20px 0;">支持管理员创建与管理不同角色‌，每个角色可预设特定权限集合，可简化用户权限分配流程，提升权限管理的灵活性与安全性。</div>
       </div>
-      <div class="actions-container">
+      <!-- <div class="actions-container actions-container-box">
         <div class="actions">
           <router-link
             v-if="canCreate"
@@ -170,7 +172,7 @@ export default {
             {{ createLabel }}
           </router-link>
         </div>
-      </div>
+      </div> -->
     </header>
     <Tabbed>
       <Tab
@@ -182,7 +184,18 @@ export default {
         <ResourceTable
           :schema="tabs[GLOBAL].schema"
           :rows="globalResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -195,7 +208,18 @@ export default {
           :schema="tabs[CLUSTER].schema"
           :headers="tabs[CLUSTER].headers"
           :rows="clusterResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -208,8 +232,35 @@ export default {
           :schema="tabs[PROJECT].schema"
           :headers="tabs[PROJECT].headers"
           :rows="namespaceResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
     </Tabbed>
   </div>
 </template>
+
+<style lang="scss" scoped>
+
+  .excram-list{
+    font-size: 14px;
+    line-height: 22px;
+    margin-bottom: 20px;
+    font-family: 'Microsoft YaHei';
+  }
+  .actions-container-box {
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
+
+</style>

package/pages/c/_cluster/auth/user.retention/index.vue

@@ -177,91 +177,93 @@ onBeforeRouteUpdate((_to: unknown, _from: unknown) => {
 </script>
 
 <template>
-  <div>
-    <user-retention-header />
-    <div
-      v-if="!loading"
-      class="form-user-retention"
-    >
-      <banner
-        v-if="error"
-        color="error"
+  <div class="user-retention">
+    <div class="user-retention-content">
+      <user-retention-header />
+      <div
+        v-if="!loading"
+        class="form-user-retention"
       >
-        {{ error }}
-      </banner>
-      <div class="input-fieldset">
-        <checkbox
-          v-model:value="disableAfterPeriod"
-          data-testid="disableAfterPeriod"
-          :label="t('user.retention.edit.form.disableAfter.checkbox')"
-        />
-        <labeled-input
-          v-model:value="userRetentionSettings[SETTING.DISABLE_INACTIVE_USER_AFTER]"
-          data-testid="disableAfterPeriodInput"
-          :tooltip="t('user.retention.edit.form.disableAfter.input.tooltip')"
-          class="input-field"
-          :label="t('user.retention.edit.form.disableAfter.input.label')"
-          :disabled="!disableAfterPeriod"
-          :rules="[validateDisableInactiveUserAfterDuration, validateDurationAgainstAuthUserSession]"
-          @update:validation="e => setValidation(SETTING.DISABLE_INACTIVE_USER_AFTER, e)"
-        />
-      </div>
-      <div class="input-fieldset">
-        <checkbox
-          v-model:value="deleteAfterPeriod"
-          data-testid="deleteAfterPeriod"
-          :label="t('user.retention.edit.form.deleteAfter.checkbox')"
-        />
-        <labeled-input
-          v-model:value="userRetentionSettings[SETTING.DELETE_INACTIVE_USER_AFTER]"
-          data-testid="deleteAfterPeriodInput"
-          :tooltip="t('user.retention.edit.form.deleteAfter.input.tooltip')"
-          class="input-field"
-          :label="t('user.retention.edit.form.deleteAfter.input.label')"
-          :sub-label="t('user.retention.edit.form.deleteAfter.input.subLabel')"
-          :disabled="!deleteAfterPeriod"
-          :rules="[validateDeleteInactiveUserAfterDuration, validateDurationAgainstAuthUserSession, validateDeleteInactiveUserAfter]"
-          @update:validation="e => setValidation(SETTING.DELETE_INACTIVE_USER_AFTER, e)"
-        />
-      </div>
-      <template
-        v-if="disableAfterPeriod || deleteAfterPeriod"
-      >
-        <div class="input-fieldset pt-12">
+        <banner
+          v-if="error"
+          color="error"
+        >
+          {{ error }}
+        </banner>
+        <div class="input-fieldset">
+          <checkbox
+            v-model:value="disableAfterPeriod"
+            data-testid="disableAfterPeriod"
+            :label="t('user.retention.edit.form.disableAfter.checkbox')"
+          />
           <labeled-input
-            v-model:value="userRetentionSettings[SETTING.USER_RETENTION_CRON]"
-            data-testid="userRetentionCron"
+            v-model:value="userRetentionSettings[SETTING.DISABLE_INACTIVE_USER_AFTER]"
+            data-testid="disableAfterPeriodInput"
+            :tooltip="t('user.retention.edit.form.disableAfter.input.tooltip')"
             class="input-field"
-            required
-            type="cron"
-            :tooltip="t('user.retention.edit.form.cron.subLabel')"
-            :rules="[validateUserRetentionCron]"
-            :label="t('user.retention.edit.form.cron.label')"
-            :require-dirty="false"
-            @update:validation="e => setValidation(SETTING.USER_RETENTION_CRON, e)"
+            :label="t('user.retention.edit.form.disableAfter.input.label')"
+            :disabled="!disableAfterPeriod"
+            :rules="[validateDisableInactiveUserAfterDuration, validateDurationAgainstAuthUserSession]"
+            @update:validation="e => setValidation(SETTING.DISABLE_INACTIVE_USER_AFTER, e)"
           />
         </div>
-        <div class="input-fieldset condensed pt-12">
-          <toggle-switch
-            v-model:value="userRetentionSettings[SETTING.USER_RETENTION_DRY_RUN]"
-            data-testid="userRetentionDryRun"
-            :onValue="'true'"
-            :offValue="'false'"
-            :on-label="t('user.retention.edit.form.dryRun.label')"
+        <div class="input-fieldset">
+          <checkbox
+            v-model:value="deleteAfterPeriod"
+            data-testid="deleteAfterPeriod"
+            :label="t('user.retention.edit.form.deleteAfter.checkbox')"
           />
-          <span class="input-detail">{{ t('user.retention.edit.form.dryRun.subLabel') }}</span>
-        </div>
-        <div class="input-fieldset condensed">
           <labeled-input
-            v-model:value="userRetentionSettings[SETTING.USER_LAST_LOGIN_DEFAULT]"
-            data-testid="userLastLoginDefault"
+            v-model:value="userRetentionSettings[SETTING.DELETE_INACTIVE_USER_AFTER]"
+            data-testid="deleteAfterPeriodInput"
+            :tooltip="t('user.retention.edit.form.deleteAfter.input.tooltip')"
             class="input-field"
-            :label="t('user.retention.edit.form.defaultLastLogin.label')"
-            :sub-label="t('user.retention.edit.form.defaultLastLogin.subLabel')"
-            :placeholder="t('user.retention.edit.form.defaultLastLogin.placeholder')"
+            :label="t('user.retention.edit.form.deleteAfter.input.label')"
+            :sub-label="t('user.retention.edit.form.deleteAfter.input.subLabel')"
+            :disabled="!deleteAfterPeriod"
+            :rules="[validateDeleteInactiveUserAfterDuration, validateDurationAgainstAuthUserSession, validateDeleteInactiveUserAfter]"
+            @update:validation="e => setValidation(SETTING.DELETE_INACTIVE_USER_AFTER, e)"
           />
         </div>
-      </template>
+        <template
+          v-if="disableAfterPeriod || deleteAfterPeriod"
+        >
+          <div class="input-fieldset pt-12">
+            <labeled-input
+              v-model:value="userRetentionSettings[SETTING.USER_RETENTION_CRON]"
+              data-testid="userRetentionCron"
+              class="input-field"
+              required
+              type="cron"
+              :tooltip="t('user.retention.edit.form.cron.subLabel')"
+              :rules="[validateUserRetentionCron]"
+              :label="t('user.retention.edit.form.cron.label')"
+              :require-dirty="false"
+              @update:validation="e => setValidation(SETTING.USER_RETENTION_CRON, e)"
+            />
+          </div>
+          <div class="input-fieldset condensed pt-12">
+            <toggle-switch
+              v-model:value="userRetentionSettings[SETTING.USER_RETENTION_DRY_RUN]"
+              data-testid="userRetentionDryRun"
+              :onValue="'true'"
+              :offValue="'false'"
+              :on-label="t('user.retention.edit.form.dryRun.label')"
+            />
+            <span class="input-detail">{{ t('user.retention.edit.form.dryRun.subLabel') }}</span>
+          </div>
+          <div class="input-fieldset condensed">
+            <labeled-input
+              v-model:value="userRetentionSettings[SETTING.USER_LAST_LOGIN_DEFAULT]"
+              data-testid="userLastLoginDefault"
+              class="input-field"
+              :label="t('user.retention.edit.form.defaultLastLogin.label')"
+              :sub-label="t('user.retention.edit.form.defaultLastLogin.subLabel')"
+              :placeholder="t('user.retention.edit.form.defaultLastLogin.placeholder')"
+            />
+          </div>
+        </template>
+      </div>
     </div>
     <Footer
       class="footer-user-retention"
@@ -274,6 +276,15 @@ onBeforeRouteUpdate((_to: unknown, _from: unknown) => {
 </template>
 
 <style lang="scss" scoped>
+  .user-retention {
+    height: 100%;
+  }
+
+  .user-retention-content {
+    height: 100%;
+    overflow-y: scroll;
+  }
+
   .form-user-retention {
     display: flex;
     flex: 1;
@@ -283,15 +294,13 @@ onBeforeRouteUpdate((_to: unknown, _from: unknown) => {
 
   .footer-user-retention {
     border-top: var(--header-border-size) solid var(--header-border);
-    right: 0;
-    position: sticky;
-    bottom: 0;
     background-color: var(--header-bg);
     margin-left: -20px;
     margin-right: -20px;
     margin-bottom: -20px;
     margin-top: 20px;
     padding: 10px 20px;
+    height: $footer-height;
 
     :deep() .spacer-small {
       padding: 0;

package/pages/c/_cluster/explorer/ConfigBadge.vue

@@ -49,7 +49,7 @@ export default {
     margin-left: 10px;
 
     &:hover {
-      border-color: var(--lightest);
+      // border-color: var(--lightest);
     }
 
     > I {

package/pages/c/_cluster/explorer/EventsTable.vue

@@ -121,6 +121,6 @@ export default {
 .events-link {
   align-self: center;
   padding-right: 20px;
-  min-width: 200px;
+  white-space: nowrap;
 }
 </style>

package/pages/c/_cluster/explorer/index.vue

@@ -513,6 +513,13 @@ export default {
     },
 
     getAgentStatus(resources, opt = { checkDisconnected: false }) {
+      // If there is a single resource that is null, then there was an error fetching the status, which
+      // is most likely because the user does not have permission, so we should hide the agent status
+      // as we can not determine what it is
+      if (resources.length === 1 && resources[0] === null) {
+        return { state: STATES_ENUM.OFF };
+      }
+
       if (resources.find((resource) => resource === 'loading')) {
         return { state: STATES_ENUM.IN_PROGRESS };
       }
@@ -826,7 +833,7 @@ export default {
             v-if="props.active"
             :detail-url="CLUSTER_METRICS_DETAIL_URL"
             :summary-url="CLUSTER_METRICS_SUMMARY_URL"
-            graph-height="825px"
+            graph-height="875px"
           />
         </template>
       </Tab>
@@ -841,7 +848,7 @@ export default {
             v-if="props.active"
             :detail-url="K8S_METRICS_DETAIL_URL"
             :summary-url="K8S_METRICS_SUMMARY_URL"
-            graph-height="550px"
+            graph-height="600px"
           />
         </template>
       </Tab>
@@ -857,7 +864,7 @@ export default {
             class="etcd-metrics"
             :detail-url="ETCD_METRICS_DETAIL_URL"
             :summary-url="ETCD_METRICS_SUMMARY_URL"
-            graph-height="550px"
+            graph-height="600px"
           >
             <EtcdInfoBanner />
           </DashboardMetrics>
@@ -1000,5 +1007,9 @@ export default {
       color: var(--success)
     }
   }
+
+  &.off {
+    display: none;
+  }
 }
 </style>

package/pages/c/_cluster/explorer/projectsecret.vue

@@ -0,0 +1,34 @@
+<script>
+import ResourceDetail from '@shell/components/ResourceDetail';
+import { _CLONE, _EDIT, MODE } from '@shell/config/query-params';
+import { SECRET, VIRTUAL_TYPES } from '@shell/config/types';
+import { STORE } from '@shell/store/store-types';
+
+export default {
+  name:       'ProjectSecretsPage',
+  components: { ResourceDetail },
+  data() {
+    return { STORE: STORE.MANAGEMENT };
+  },
+  computed: {
+    // Because we want to use the normal secret for editing and we want to use the project_secret for detail we had to change the override based on mode
+    resourceOverride() {
+      const isEdit = [_EDIT, _CLONE].includes(this.$route.query[MODE]);
+
+      return isEdit ? SECRET : VIRTUAL_TYPES.PROJECT_SECRETS;
+    }
+  }
+
+};
+</script>
+
+<template>
+  <!-- resourceOverride - used in both new and old resource details  -->
+  <!-- storeOverride - used in old resource details (specifically edit)  -->
+  <!--   v-bind="$attrs" - removes issues with `class` being passed through -->
+  <ResourceDetail
+    v-bind="$attrs"
+    :resourceOverride="resourceOverride"
+    :storeOverride="STORE"
+  />
+</template>

package/pages/c/_cluster/explorer/tools/index.vue

@@ -230,7 +230,7 @@ export default {
 
       .name {
         white-space: nowrap;
-        overflow: hidden;
+        // overflow: hidden;
         text-overflow: ellipsis;
         margin: 0;
       }
@@ -249,7 +249,7 @@ export default {
       .version {
         color: var(--muted);
         white-space: nowrap;
-        overflow: hidden;
+        // overflow: hidden;
         text-overflow: ellipsis;
         font-size: 0.9em;
         margin-top: 4px;
@@ -262,10 +262,10 @@ export default {
       .description-content {
         display: -webkit-box;
         -webkit-box-orient: vertical;
-        -webkit-line-clamp: 3;
-        line-clamp: 3;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        // -webkit-line-clamp: 3;
+        // line-clamp: 3;
+        // overflow: hidden;
+        // text-overflow: ellipsis;
         color: var(--text-muted);
       }
 

package/pages/c/_cluster/explorer/tools/pages/_page.vue

@@ -3,7 +3,6 @@ import EmberPage from '@shell/components/EmberPage';
 
 const PAGES = {
   monitoring: 'monitoring/cluster-setting',
-  cis:        'cis/scan',
   istio:      'istio/cluster-setting',
   snapshots:  'backups',
 };