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

package/components/auth/RoleDetailEdit.vue

@@ -18,6 +18,7 @@ import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 
 import { SUBTYPE_MAPPING, VERBS } from '@shell/models/management.cattle.io.roletemplate';
 import Loading from '@shell/components/Loading';
+import Banner from '@components/Banner/Banner.vue';
 
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 const CLUSTER = SUBTYPE_MAPPING.CLUSTER.key;
@@ -64,7 +65,8 @@ export default {
     SortableTable,
     Loading,
     Error,
-    LabeledInput
+    LabeledInput,
+    Banner,
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -150,7 +152,7 @@ export default {
       });
     }
 
-    if (this.value?.metadata?.name && !this.value.displayName) {
+    if (this.value?.metadata?.name && !this.value?.displayName) {
       this.value['displayName'] = this.value.metadata.name;
     }
 
@@ -331,7 +333,7 @@ export default {
       return this.value.listLocation;
     },
     ruleClass() {
-      return `col ${ this.isNamespaced ? 'span-4' : 'span-3' }`;
+      return `ruleCls col ${ this.isNamespaced ? 'span-3' : 'span-3' }`;
     },
     // Detail View
     rules() {
@@ -497,7 +499,8 @@ export default {
           index:           i,
           apiGroups:       rule.apiGroups || [''],
           resources:       rule.resources || [],
-          nonResourceURLs: rule.nonResourceURLs || []
+          nonResourceURLs: rule.nonResourceURLs || [],
+          verbs:           rule.verbs,
         };
 
         VERBS.forEach((verb) => {
@@ -531,12 +534,23 @@ export default {
 
       return res;
     },
+
+    showPsaWarning(grant) {
+      return this.value.subtype === NAMESPACE &&
+        grant.verbs?.includes('updatepsa') &&
+        grant.resources?.includes('projects') &&
+        grant.apiGroups?.includes('management.cattle.io');
+    }
   }
 };
 </script>
 
 <template>
+
+  <!-- 加载状态下显示 Loading 组件 -->
   <Loading v-if="$fetchState.pending" />
+
+  <!-- 主表单容器，基于 CruResource 封装 -->
   <CruResource
     v-else
     class="receiver"
@@ -550,7 +564,10 @@ export default {
     @finish="save"
     @cancel="cancel"
   >
+    <!-- ========== 详情模式显示规则表 ========== -->
     <template v-if="isDetail">
+      
+      <!-- 当前规则列表 -->
       <SortableTable
         key-field="index"
         :rows="rules"
@@ -558,7 +575,28 @@ export default {
         :table-actions="false"
         :row-actions="false"
         :search="false"
-      />
+        :sub-rows="true"
+      >
+        <template #sub-row="{row, fullColspan, onRowMouseEnter, onRowMouseLeave}">
+          <tr
+
+            class="sub-row"
+            @mouseenter="onRowMouseEnter"
+            @mouseleave="onRowMouseLeave"
+          >
+            <td
+              v-if="showPsaWarning(row)"
+              :colspan="fullColspan"
+            >
+              <Banner
+                style="margin: 0px"
+                label-key="rbac.roletemplate.tabs.grantResources.psaWarning"
+                color="warning"
+              />
+            </td>
+          </tr>
+        </template>
+      </SortableTable>
       <div
         v-for="(inherited, index) of inheritedRules"
         :key="index"
@@ -580,7 +618,11 @@ export default {
         />
       </div>
     </template>
+
+    <!-- ========== 表单编辑/创建模式 ========== -->
     <template v-else>
+
+      <!-- 名称 & 命名空间 & 描述输入 -->
       <NameNsDescription
         :value="value"
         :namespaced="isNamespaced"
@@ -591,11 +633,15 @@ export default {
         :rules="{ name: fvGetAndReportPathRules('displayName') }"
         @update:value="$emit('input', $event)"
       />
+
+      <!-- Rancher 相关的默认选项设置 -->
       <div
         v-if="isRancherType"
         class="row"
       >
         <div class="col span-6">
+
+          <!-- 默认角色选项 -->
           <RadioGroup
             v-model:value="defaultValue"
             name="storageSource"
@@ -606,6 +652,8 @@ export default {
             :mode="mode"
           />
         </div>
+
+        <!-- 锁定角色模板选项 -->
         <div
           v-if="isRancherRoleTemplate"
           class="col span-6"
@@ -622,17 +670,25 @@ export default {
         </div>
       </div>
       <div class="spacer" />
+
+      <!-- ========== 选项卡容器 ========== -->
       <Tabbed :side-tabs="true">
+
+        <!-- ---------- 授权资源 Tab ---------- -->
         <Tab
           name="grant-resources"
           :label="t('rbac.roletemplate.tabs.grantResources.label')"
           :weight="1"
         >
+
+          <!-- 校验错误展示 -->
           <Error
             :value="value.rules"
             :rules="fvGetAndReportPathRules('rules')"
             as-banner
           />
+
+          <!-- 规则编辑列表 -->
           <ArrayList
             v-model:value="value.rules"
             label="Resources"
@@ -642,17 +698,19 @@ export default {
             :default-add-value="defaultRule"
             :initial-empty-row="true"
             :show-header="true"
-            add-label="Add Resource"
+            add-label="添加资源"
             :mode="mode"
           >
+
+            <!-- 列表头部 -->
             <template #column-headers>
               <div class="column-headers row">
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">{{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.verbs') }}
                     <span class="required">*</span>
                   </span>
                 </div>
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">
                     {{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.resources') }}
                     <i
@@ -665,7 +723,7 @@ export default {
                     >*</span>
                   </span>
                 </div>
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">{{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.apiGroups') }}</span>
                 </div>
                 <div
@@ -676,9 +734,13 @@ export default {
                 </div>
               </div>
             </template>
+
+            <!-- 列内容渲染 -->
             <template #columns="props">
               <div class="columns row mr-20">
-                <div :class="ruleClass">
+
+                <!-- 动作（verbs）选择 -->
+                <div class="arrayListCls" :class="ruleClass">
                   <!-- Select verbs -->
                   <Select
                     :value="props.row.value.verbs"
@@ -694,8 +756,11 @@ export default {
                     @update:value="updateSelectValue(props.row.value, 'verbs', $event)"
                   />
                 </div>
-                <div :class="ruleClass">
+
+                <!-- 资源（resources）选择 -->
+                <div class="arrayListCls" :class="ruleClass">
                   <Select
+                    style="width: auto;"
                     :value="getRule('resources', props.row.value)"
                     :disabled="isBuiltin"
                     :options="resourceOptions"
@@ -709,7 +774,9 @@ export default {
                     @createdListItem="setRule('resources', props.row.value, $event)"
                   />
                 </div>
-                <div :class="ruleClass">
+
+                <!-- API Groups 输入 -->
+                <div class="arrayListCls" :class="ruleClass">
                   <LabeledInput
                     :value="getRule('apiGroups', props.row.value)"
                     :disabled="isBuiltin"
@@ -718,7 +785,10 @@ export default {
                     @input="setRule('apiGroups', props.row.value, $event.target.value)"
                   />
                 </div>
+
+                <!-- 非命名空间 URL 输入（仅非命名空间模式显示） -->
                 <div
+                  class="arrayListCls"
                   v-if="!isNamespaced"
                   :class="ruleClass"
                 >
@@ -732,8 +802,21 @@ export default {
                 </div>
               </div>
             </template>
+            <template #value-sub-row="{row}">
+              <div
+                v-if="showPsaWarning(row.value)"
+                class="mr-20"
+              >
+                <Banner
+                  label-key="rbac.roletemplate.tabs.grantResources.psaWarning"
+                  color="warning"
+                />
+              </div>
+            </template>
           </ArrayList>
         </Tab>
+
+        <!-- ---------- 继承角色模板 Tab（仅 Rancher 角色模板可用） ---------- -->
         <Tab
           v-if="isRancherRoleTemplate"
           name="inherit-from"
@@ -746,7 +829,7 @@ export default {
             :remove-allowed="!isBuiltin"
             :add-allowed="!isBuiltin"
             label="Resources"
-            add-label="Add Resource"
+            add-label="添加资源"
             :mode="mode"
           >
             <template #columns="props">
@@ -777,13 +860,19 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .arrayListCls {
+    min-width: 360px;
+  }
+  .ruleCls {
+    margin-right: 10px;
+  }
   .required {
     color: var(--error);
   }
 
   :deep() {
     .column-headers {
-      margin-right: 75px;
+      margin-right: 95px;
       margin-bottom: 5px;
     }
 
@@ -793,7 +882,6 @@ export default {
       .remove {
         display: flex;
         flex-direction: column;
-        justify-content: center;
         align-items: flex-end;
       }
     }
@@ -805,4 +893,13 @@ export default {
       }
     }
   }
+
+  .columns {
+    :deep() {
+      .unlabeled-select {
+        width: auto;
+      }
+    }
+
+  }
 </style>

package/components/auth/SelectPrincipal.vue

@@ -212,6 +212,7 @@ export default {
       <Principal
         :value="option.label"
         :use-muted="false"
+        style="padding-top: 6px;"
       />
     </template>
 

package/components/auth/login/ldap.vue

@@ -54,7 +54,7 @@ export default {
 </script>
 
 <template>
-  <form>
+  <form @submit.prevent>
     <template v-if="open">
       <div class="span-6 offset-3">
         <div class="mb-20">
@@ -69,7 +69,7 @@ export default {
             v-model:value="password"
             type="password"
             :label="t('login.password')"
-            autocomplete="password"
+            autocomplete="current-password"
           />
         </div>
       </div>

package/components/auth/login/oidc.vue

@@ -6,7 +6,12 @@ export default {
 
   computed: {
     uniqueDisplayName() {
-      return this.t('model.authConfig.description.oidc');
+      switch (this.name) {
+      case 'cognito':
+        return this.t('model.authConfig.description.cognito');
+      default:
+        return this.t('model.authConfig.description.oidc');
+      }
     },
   },
 

package/components/breadcrumb/index.vue

@@ -0,0 +1,119 @@
+<script>
+import { get } from '@shell/utils/object';;
+import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
+import { useStore } from 'vuex';
+
+export default {
+
+  name: 'MastheadBreadcrumb',
+
+  components: {
+  },
+  props: {
+    resourceTypeLabel: {
+      type:    String,
+      default: ''
+    },
+
+    resource: {
+      type:    String,
+      default: null,
+    },
+
+    realMode: {
+      type:    String,
+      default: 'view',
+    }
+
+  },
+
+  setup() {
+    const store = useStore();
+    const { featureDropdownMenu } = useRuntimeFlag(store);
+
+    return { featureDropdownMenu };
+  },
+
+  data() {
+    return {
+    };
+  },
+
+  computed: {
+
+    demoDisplay() {
+
+      const resources = this.$route.params?.resource || ''
+
+      let productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
+      const parts = productId?.split('::') || [];
+      const newString = 'root';
+
+      if (!parts?.includes(newString)) {
+        parts?.unshift(newString); // 将字符串添加到数组第一位
+      }
+
+      const partsEn = parts.map((item) => {
+        return this.$store.getters['i18n/t'](`typeLabel."${ item.toLowerCase() }"`);
+      });
+
+      return partsEn;
+    },
+
+  },
+
+  methods: {
+    get,
+  }
+};
+</script>
+
+<template>
+  <div class="masthead">
+    <div class="title">
+      <!-- 标题区域 -->
+      <div
+        class="excram-list"
+      >
+        <span
+          v-for="(item,index) in demoDisplay"
+          :key="index"
+        >
+          <span>{{ item }}</span>
+          <span>/</span>
+        </span>
+        <span class="excram-last-name">
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + resourceTypeLabel }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang='scss' scoped>
+
+  .excram-list{
+    font-size: 14px;
+    margin-bottom: 20px;
+  }
+  .excram-last-name{
+    color: var(--link);
+  }
+
+  .detailIcon-span{
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+    position: relative;
+    background: var(--primary);
+    margin-right: 10px;
+  }
+  .detailIcon{
+    position: absolute;
+    color: #fff;
+    font-size: 38px;
+    left: 4px;
+    top: -2px;
+  }
+
+</style>

package/components/fleet/FleetApplications.vue

@@ -0,0 +1,174 @@
+<script lang="ts">
+import { PropType } from 'vue';
+import { checkPermissions } from '@shell/utils/auth';
+import { FLEET } from '@shell/config/types';
+import { Application } from '@shell/types/fleet';
+import ResourceTable from '@shell/components/ResourceTable.vue';
+import FleetIntro from '@shell/components/fleet/FleetIntro.vue';
+import {
+  AGE,
+  NAME,
+  STATE,
+  FLEET_APPLICATION_TYPE,
+  FLEET_APPLICATION_SOURCE,
+  FLEET_APPLICATION_TARGET,
+  FLEET_APPLICATION_CLUSTERS_READY,
+  FLEET_APPLICATION_RESOURCES_SUMMARY,
+} from '@shell/config/table-headers';
+
+interface Permissions {
+  gitRepos: boolean,
+  helmOps: boolean,
+}
+
+interface DataType {
+  permissions: Permissions
+}
+
+export default {
+  name: 'FleetApplications',
+
+  components: {
+    FleetIntro,
+    ResourceTable,
+  },
+
+  props: {
+    schema: {
+      type:     Object,
+      required: true,
+    },
+
+    workspace: {
+      type:    String,
+      default: ''
+    },
+
+    clusterId: {
+      type:     String,
+      required: false,
+      default:  null,
+    },
+
+    rows: {
+      type:     Array as PropType<Application[]>,
+      required: true,
+    },
+
+    loading: {
+      type:     Boolean,
+      required: false,
+    },
+
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    },
+
+    showIntro: {
+      type:    Boolean,
+      default: true,
+    }
+  },
+
+  async fetch() {
+    try {
+      const permissionsSchemas = {
+        gitRepos: {
+          type:            FLEET.GIT_REPO,
+          schemaValidator: (schema: any) => schema.resourceMethods.includes('PUT')
+        },
+        helmOps: {
+          type:            FLEET.HELM_OP,
+          schemaValidator: (schema: any) => schema.resourceMethods.includes('PUT')
+        },
+      };
+
+      const permissions = await checkPermissions(permissionsSchemas, this.$store.getters) as Permissions;
+
+      this.permissions = permissions;
+    } catch (e) {
+      console.error(e); // eslint-disable-line no-console
+    }
+  },
+
+  data(): DataType {
+    return {
+      permissions: {
+        gitRepos: true,
+        helmOps:  true
+      }
+    };
+  },
+
+  computed: {
+    createLocation() {
+      return { name: 'c-cluster-fleet-application-create' };
+    },
+
+    filteredRows() {
+      if (!this.rows) {
+        return [];
+      }
+
+      const selectedNamespaces = this.$store.getters['namespaces']();
+
+      return this.rows.filter((row) => {
+        if (this.workspace) {
+          return this.workspace === row.metadata.namespace;
+        }
+
+        return !!selectedNamespaces[row.metadata.namespace];
+      });
+    },
+
+    isClusterView() {
+      return !!this.clusterId;
+    },
+
+    shouldShowIntro() {
+      return this.showIntro && !this.filteredRows.length;
+    },
+
+    headers() {
+      return [
+        STATE,
+        NAME,
+        FLEET_APPLICATION_TYPE,
+        FLEET_APPLICATION_SOURCE,
+        FLEET_APPLICATION_TARGET,
+        FLEET_APPLICATION_CLUSTERS_READY,
+        FLEET_APPLICATION_RESOURCES_SUMMARY,
+        AGE
+      ];
+    },
+  },
+};
+</script>
+
+<template>
+  <div>
+    <FleetIntro
+      v-if="shouldShowIntro && !loading"
+      :schema="schema"
+      :is-creatable="permissions.gitRepos || permissions.helmOps"
+      :labelKey="'application'"
+      :route="createLocation"
+      :icon="'icon-repository'"
+    />
+    <ResourceTable
+      v-if="!shouldShowIntro"
+      v-bind="$attrs"
+      key-field="_key"
+      :schema="schema"
+      :headers="headers"
+      :rows="filteredRows"
+      :loading="loading"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :namespaced="!workspace"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+</style>