dashboard-shell-shell 3.0.5-test.9 → 3.0.5-tsh-rh02

package/components/Drawer/ResourceDetailDrawer/ConfigTab.vue

@@ -16,25 +16,19 @@ const store = useStore();
 const i18n = useI18n(store);
 </script>
 <template>
-  <Tab
-    class="config-tab"
-    name="config-tab"
-    :label="i18n.t('component.drawer.resourceDetailDrawer.configTab.title')"
-  >
-  <div class="container">
-    <component
-      :is="props.component"
-      :value="props.resource"
-      :liveValue="props.resource"
-      :resourceType="props.resourceType"
-      :mode="_VIEW"
-      :real-mode="_VIEW"
-      :initial-value="props.resource"
-      :use-tabbed-hash="false /* Have to disable hashing on child components or it modifies the url and closes the drawer */"
-      as="config"
-    />
-  </div>
-</Tab>
+<div class="container">
+  <component
+    :is="props.component"
+    :value="props.resource"
+    :liveValue="props.resource"
+    :resourceType="props.resourceType"
+    :mode="_VIEW"
+    :real-mode="_VIEW"
+    :initial-value="props.resource"
+    :use-tabbed-hash="false /* Have to disable hashing on child components or it modifies the url and closes the drawer */"
+    as="config"
+  />
+</div>
 </template>
 
 <style lang="scss" scoped>
@@ -45,6 +39,15 @@ const i18n = useI18n(store);
   max-width: 100%;
   width: 100%;
   position: relative;
+  // Handle the loading indicator
+  :deep() .overlay-content-mode {
+    left: 0;
+    top: 0;
+  }
+
+  :deep() .cru-resource-footer {
+    display: none;
+  }
 }
 .config-tab {
 

package/components/Drawer/ResourceDetailDrawer/index.vue

@@ -3,7 +3,7 @@ import Drawer from '@shell/components/Drawer/Chrome.vue';
 import { useI18n } from '@shell/composables/useI18n';
 import { useStore } from 'vuex';
 import Tabbed from '@shell/components/Tabbed/index.vue';
-import YamlTab, { Props as YamlProps } from '@shell/components/Drawer/ResourceDetailDrawer/YamlTab.vue';
+// import YamlTab, { Props as YamlProps } from '@shell/components/Drawer/ResourceDetailDrawer/YamlTab.vue';
 import { useDefaultConfigTabProps, useDefaultYamlTabProps } from '@shell/components/Drawer/ResourceDetailDrawer/composables';
 import ConfigTab from '@shell/components/Drawer/ResourceDetailDrawer/ConfigTab.vue';
 import { computed, ref } from 'vue';
@@ -87,10 +87,10 @@ const canEdit = computed(() => {
           v-if="configTabProps"
           v-bind="configTabProps"
         />
-        <YamlTab
+        <!-- <YamlTab
           v-if="yamlTabProps"
           v-bind="yamlTabProps"
-        />
+        /> -->
       </Tabbed>
     </template>
     <template #additional-actions>

package/components/ExplorerMembers.vue

@@ -115,6 +115,10 @@ export default {
           labelKey: 'tableHeaders.role',
           value:    'roleTemplate.nameDisplay'
         },
+        {
+          name:     '操作',
+          labelKey: 'tableHeaders.action',
+        },
       ],
       loadingProjectBindings: true,
       loadingClusterBindings: true
@@ -361,12 +365,13 @@ export default {
                 v-trim-whitespace
                 class="group-tab"
               >
+
                 <div
                   v-clean-html="getProjectLabel(group)"
                   class="project-name"
                 />
               </div>
-              <div class="right">
+              <div class="right" style="margin-right: 80px;">
                 <button
                   v-if="canEditProjectMembers"
                   type="button"
@@ -460,8 +465,12 @@ export default {
   & :deep() .group-bar{
     display: flex;
     justify-content: space-between;
+    align-items: center;
   }
 }
+.role-secondary.btn-sm:focus, .role-secondary.btn-sm.focused{
+  border: 1px solid #d7d7d7;
+}
 .cluster-add {
   justify-content: flex-end;
 }

package/components/GlobalRoleBindings.vue

@@ -103,23 +103,36 @@ export default {
         this.sortedRoles.global.push(...remainingGlobalRoles);
         // End sort of global roles
 
+        if (!(sessionStorage.getItem('TOPLEVELPERMISSIONS') && sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin')) {
+          delete this.sortedRoles.builtin
+          delete this.sortedRoles.custom
+        }
+
         this.update();
       }
     } catch (e) { }
   },
   data() {
 
-    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
-
-    return {
-      topLevelPermissions,
+    let globalPermissions = [
+        'admin',
+        'safe-admin',
+        'tenant',
+      ]
 
-      // This not only identifies global roles but the order here is the order we want to display them in the UI
-      globalPermissions: [
+    if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+      globalPermissions = [
         'admin',
+        'safe-admin',
         'user',
         'user-base',
-      ],
+        'tenant',
+      ]
+    }
+
+    return {
+      // This not only identifies global roles but the order here is the order we want to display them in the UI
+      globalPermissions,
       globalRoleBindings:    null,
       sortedRoles:           null,
       selectedRoles:         [],
@@ -333,119 +346,60 @@ export default {
 
   <div v-else>
     <form v-if="selectedRoles">
-      <template v-if="topLevelPermissions && topLevelPermissions !== 'superadmin'">
-        <div
-          v-for="(sortedRole, roleType) in sortedRoles"
-          :key="roleType"
-          class="role-group mb-10"
-        >
-          <Card
-            v-if="Object.keys(sortedRole).length"
-            :show-highlight-border="false"
-            :show-actions="false"
-          >
-            <template v-slot:title>
-              <div class="type-title">
-                <h3>{{ t(`rbac.globalRoles.types.${roleType}.label`) }}</h3>
-                <div class="type-description">
-                  {{ t(`rbac.globalRoles.types.${roleType}.description`, { isUser }) }}
-                </div>
-              </div>
-            </template>
-            <template v-slot:body>
-              <div
-                class="checkbox-section"
-                :class="'checkbox-section--' + roleType"
-              >
-                <div
-                  v-for="(role, i) in sortedRoles[roleType]"
-                  :key="i"
-                  class="checkbox mb-10 mr-10"
-                >
-                  <Checkbox
-                    v-model:value="selectedRoles"
-                    :value-when-true="role.id"
-                    :disabled="!!assignOnlyRoles[role.id]"
-                    :label="role.nameDisplay"
-                    :description="role.descriptionDisplay"
-                    :mode="mode"
-                    :data-testId="'grb-checkbox-' + role.id"
-                    @update:value="checkboxChanged"
-                  >
-                    <template #label>
-                      <div class="checkbox-label-slot">
-                        <span class="checkbox-label">{{ role.nameDisplay }}</span>
-                        <i
-                          v-if="!!assignOnlyRoles[role.id]"
-                          v-clean-tooltip="t('rbac.globalRoles.assignOnlyRole')"
-                          class="checkbox-info icon icon-info icon-lg"
-                        />
-                      </div>
-                    </template>
-                  </Checkbox>
-                </div>
-              </div>
-            </template>
-          </Card>
-        </div>
-      </template>
-
-      <template v-else>
-        <div
-          v-for="(sortedRole, roleType) in { global: sortedRoles['global'] }"
-          :key="roleType"
-          class="role-group mb-10"
+      <div
+        v-for="(sortedRole, roleType) in sortedRoles"
+        :key="roleType"
+        class="role-group mb-10"
+      >
+        <Card
+          v-if="Object.keys(sortedRole).length"
+          :show-highlight-border="false"
+          :show-actions="false"
         >
-          <Card
-            v-if="Object.keys(sortedRole).length"
-            :show-highlight-border="false"
-            :show-actions="false"
-          >
-            <template v-slot:title>
-              <div class="type-title">
-                <h3>{{ t(`rbac.globalRoles.types.${roleType}.label`) }}</h3>
-                <div class="type-description">
-                  {{ t(`rbac.globalRoles.types.${roleType}.description`, { isUser }) }}
-                </div>
+          <template v-slot:title>
+            <div class="type-title">
+              <h3>{{ t(`rbac.globalRoles.types.${roleType}.label`) }}</h3>
+              <div class="type-description">
+                {{ t(`rbac.globalRoles.types.${roleType}.description`, { isUser }) }}
               </div>
-            </template>
-            <template v-slot:body>
+            </div>
+          </template>
+          <template v-slot:body>
+            <div
+              class="checkbox-section"
+              :class="'checkbox-section--' + roleType"
+            >
               <div
-                class="checkbox-section"
-                :class="'checkbox-section--' + roleType"
+                v-for="(role, i) in sortedRoles[roleType]"
+                :key="i"
+                class="checkbox mb-10 mr-10"
               >
-                <div
-                  v-for="(role, i) in sortedRoles[roleType]"
-                  :key="i"
-                  class="checkbox mb-10 mr-10"
+                <Checkbox
+                  v-model:value="selectedRoles"
+                  :value-when-true="role.id"
+                  :disabled="!!assignOnlyRoles[role.id]"
+                  :label="role.nameDisplay"
+                  :description="role.descriptionDisplay"
+                  :mode="mode"
+                  :data-testId="'grb-checkbox-' + role.id"
+                  @update:value="checkboxChanged"
                 >
-                  <Checkbox
-                    v-model:value="selectedRoles"
-                    :value-when-true="role.id"
-                    :disabled="!!assignOnlyRoles[role.id]"
-                    :label="role.nameDisplay"
-                    :description="role.descriptionDisplay"
-                    :mode="mode"
-                    :data-testId="'grb-checkbox-' + role.id"
-                    @update:value="checkboxChanged"
-                  >
-                    <template #label>
-                      <div class="checkbox-label-slot">
-                        <span class="checkbox-label">{{ role.nameDisplay }}</span>
-                        <i
-                          v-if="!!assignOnlyRoles[role.id]"
-                          v-clean-tooltip="t('rbac.globalRoles.assignOnlyRole')"
-                          class="checkbox-info icon icon-info icon-lg"
-                        />
-                      </div>
-                    </template>
-                  </Checkbox>
-                </div>
+                  <template #label>
+                    <div class="checkbox-label-slot">
+                      <span class="checkbox-label">{{ role.nameDisplay }}</span>
+                      <i
+                        v-if="!!assignOnlyRoles[role.id]"
+                        v-clean-tooltip="t('rbac.globalRoles.assignOnlyRole')"
+                        class="checkbox-info icon icon-info icon-lg"
+                      />
+                    </div>
+                  </template>
+                </Checkbox>
               </div>
-            </template>
-          </Card>
-        </div>
-      </template>
+            </div>
+          </template>
+        </Card>
+      </div>
     </form>
   </div>
 </template>
@@ -490,4 +444,5 @@ export default {
       }
     }
   }
+
 </style>

package/components/PodSecurityAdmission.vue

@@ -216,7 +216,7 @@ export default defineComponent({
     <div
       v-for="(psaControl, level, i) in psaControls"
       :key="i"
-      class="row row--y-center mb-20"
+      class="row row--y-center"
     >
       <span class="col span-1">
         <Checkbox

package/components/PromptRemove.vue

@@ -83,6 +83,22 @@ export default {
       return this.$store.getters['type-map/labelFor'](schema, this.toRemove.length);
     },
 
+   typeZh() {
+    const typeLabel = this.type
+
+    const lowerKey = typeLabel.toLowerCase();
+    const i18nKey = `promptRemoveText.${lowerKey}`;
+
+    console.log(i18nKey, ' i18nKey-------------------------');
+    
+
+    if (this.t(i18nKey)) {
+      return this.t(i18nKey);
+    }
+
+    return typeLabel;
+  },
+
     selfLinks() {
       return this.toRemove.map((resource) => {
         return get(resource, 'links.self');
@@ -296,6 +312,12 @@ export default {
         this.done();
       } catch (err) {
         this.error = err.message || err;
+        if (this.error.includes('not supported')) {
+          this.$store.dispatch('growl/error', {
+            title:   '权限不足',
+            message: '当前用户不允许删除集群'
+          }, { root: true });
+        }
         btnCB(false);
       }
     },
@@ -380,7 +402,7 @@ export default {
             :needs-confirm="needsConfirm"
             :value="toRemove"
             :names="names"
-            :type="type"
+            :type="typeZh"
             :done-location="doneLocation"
             @errors="e => error = e"
             @done="done"

package/components/RelatedResources.vue

@@ -175,5 +175,8 @@ export default {
     <template #cell:state="{row}">
       <BadgeState :value="row" />
     </template>
+    <template #cell:name="{row}">
+      <span>{{ row.name }}</span>
+    </template>
   </ResourceTable>
 </template>

package/components/Resource/Detail/TitleBar/composables.ts

@@ -14,7 +14,22 @@ export const useDefaultTitleBarProps = (resource: any, resourceSubtype?: Ref<str
     const resourceSubtypeValue = toValue(resourceSubtype);
     const currentStore = store.getters['currentStore'](resourceValue.type);
     const schema = store.getters[`${ currentStore }/schemaFor`](resourceValue.type);
-    const resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+    let resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+
+    // 转换为中文
+    const displayName_zh_hans: Record<string, string> = {
+      'GlobalRole': '全局角色',
+      'RoleTemplate': '集群角色',
+    }
+
+    if (displayName_zh_hans[resourceTypeLabel]) {
+      resourceTypeLabel = displayName_zh_hans[resourceTypeLabel]
+    }
+    
+    if (resourceTypeLabel == '集群角色' && (route.query?.roleContext == 'NAMESPACE' || resource?.parentLocationOverride?.hash == '#NAMESPACE')) {
+      resourceTypeLabel = '项目或资源组角色'
+    }
+    
     const resourceName = resourceSubtypeValue ? `${ resourceSubtypeValue } - ${ resourceValue.nameDisplay }` : resourceValue.nameDisplay;
     const resourceTo = resourceValue.listLocation || {
       name:   'c-cluster-product-resource',

package/components/Resource/Detail/TitleBar/index.vue

@@ -38,7 +38,6 @@ export interface TitleBarProps {
   showViewOptions?: boolean;
 
   onShowConfiguration?: (returnFocusSelector: string) => void;
-  value?: any;
   parentRouteOverride?: string;
 }
 
@@ -47,9 +46,10 @@ const showConfigurationIcon = require(`@shell/assets/images/icons/document.svg`)
 
 <script setup lang="ts">
 const {
-  parentRouteOverride, value, resource, resourceTypeLabel, resourceTo, resourceName, description, badge, showViewOptions, onShowConfiguration,
+  parentRouteOverride, resource, resourceTypeLabel, resourceTo, resourceName, description, badge, showViewOptions, onShowConfiguration,
 } = defineProps<TitleBarProps>();
 
+
 const store = useStore();
 const i18n = useI18n(store);
 const router = useRouter();
@@ -61,8 +61,6 @@ const showConfigurationReturnFocusSelector = computed(() => `[data-testid="${ sh
 
 const configTabProps = useDefaultConfigTabProps(resource);
 
-console.log(configTabProps, ' configTabProps---------------------------------1');
-
 
 const currentView = ref(router?.currentRoute?.value?.query?.as || _CONFIG);
 const viewOptions = computed(() => {
@@ -84,39 +82,42 @@ const viewOptions = computed(() => {
 
 const Svg = require('~shell/assets/images/API.svg')
 
-const parent = computed(() =>{
-  const displayName = value?.parentNameOverride || store.getters['type-map/labelFor'](schema);
+const parent = computed(() => {
+
   const product = store.getters['currentProduct'].name;
 
   const defaultLocation = {
-    name:   'c-cluster-product-resource',
+    name: 'c-cluster-product-resource',
     params: {
-      resource: resource,
+      resource,
       product,
     }
   };
 
-  const location = value?.parentLocationOverride || defaultLocation;
+  const location = resource?.parentLocationOverride || defaultLocation;
 
   if (parentRouteOverride) {
     location.name = parentRouteOverride;
   }
 
-  const out = {
-    location
-  };
-
-  return out;
-})
+  return { location };
+});
 
 const menuIcon = computed(() => {
   const product = store.getters['productId'];
+  const resources = parent.value.location?.params?.resource || '';
+  return store.getters['type-map/groupsForVirTypes'](product, resources) || 'default menuIcon';
+});
 
-  const resources = parent?.location?.params?.resource || ''
-
-  return store.getters['type-map/groupsForVirTypes'](product, resources);
-})
+const hiddenTypes = [
+  'harvesterhci.io.virtualmachinebackup',
+];
 
+const shouldShowConfiguration = computed(() =>
+  onShowConfiguration &&
+  configTabProps &&
+  !hiddenTypes.includes(resource?.type)
+);
 
 watch(
   () => currentView.value,
@@ -128,10 +129,10 @@ watch(
 
 <template>
   <div class="title-bar">
-    <breadcrumb :resource="resource"/>
+    <breadcrumb :resourceTypeLabel="resourceTypeLabel" :resource="resource"/>
     <Top>
       <Title class="title">
-        <span v-if="menuIcon && parentRouteOverride === 'account' && resource=== 'token'" class="detailIcon-span">
+        <span class="detailIcon-span">
           <img
             v-if="parentRouteOverride === 'account' && resource=== 'token'"
             :src="Svg"
@@ -189,18 +190,18 @@ watch(
           :options="viewOptions"
         />
         <RcButton
-          v-if="onShowConfiguration"
+          v-if="shouldShowConfiguration"
           :data-testid="showConfigurationDataTestId"
           class="show-configuration"
           :primary="true"
           :aria-label="i18n.t('component.resource.detail.titleBar.ariaLabel.showConfiguration', { resource: resourceName })"
           @click="() => emit('show-configuration', showConfigurationReturnFocusSelector)"
         >
-          <img
+         <!-- <img
             :src="showConfigurationIcon"
             class="mmr-3"
             aria-hidden="true"
-          >
+          > -->
           {{ i18n.t('component.resource.detail.titleBar.showConfiguration') }}
         </RcButton>
         <ActionMenu
@@ -222,6 +223,7 @@ watch(
 </template>
 
 <style lang="scss" scoped>
+
 .detailIcon-span{
   width: 24px;
   height: 24px;
@@ -230,6 +232,17 @@ watch(
   background: var(--primary);
   margin-right: 10px;
 }
+.detailIcon{
+  position: absolute;
+  color: #fff;
+  font-size: 38px;
+  left: 4px;
+  top: -2px;
+}
+
+.detailIcon-span-title{
+  font-weight: bold;
+}
 .resourceTypeLabelCls {
   font-weight: 700;
 }

package/components/ResourceDetail/Masthead/index.vue

@@ -60,6 +60,6 @@ const showLatestMasthead = computed(() => isNewDetailPageEnabled.value && isView
 <style lang="scss" scoped>
 .new.state-banner {
   margin: 0;
-  margin-top: 16px;
+  margin-bottom: 20px;
 }
 </style>

package/components/ResourceDetail/Masthead/latest.vue

@@ -39,6 +39,6 @@ const bannerProps = useResourceDetailBannerProps(props.value);
 <style lang="scss" scoped>
 .new.state-banner {
   margin: 0;
-  margin-top: 16px;
+  margin-bottom: 20px;
 }
 </style>

package/components/ResourceDetail/Masthead/legacy.vue

@@ -254,7 +254,7 @@ export default {
     },
 
     parent() {
-      const displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
+      let displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
       const product = this.$store.getters['currentProduct'].name;
 
       const defaultLocation = {
@@ -418,14 +418,14 @@ export default {
     demoDisplay() {
       const product = this.$store.getters['productId'];
 
-      const resources = this.location?.params?.resource || ''
+      const resources = this.location?.params?.resource || this.$route.params?.resource || ''
 
       const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
 
       if (productId === undefined) {
         return '';
       }
-      const parts = productId.split('::');
+      const parts = productId?.split('::') || [];
       const newString = 'root';
 
       if (!parts?.includes(newString)) {
@@ -441,9 +441,10 @@ export default {
     menuIcon() {
       const product = this.$store.getters['productId'];
 
-      const resources = this.location?.params?.resource || ''
+      const resources = this.location?.params?.resource || this.$route.params?.resource || ''
 
-      return this.$store.getters['type-map/groupsForVirTypes'](product, resources);
+
+      return this.$store.getters['type-map/groupsForVirTypes'](product, resources) || 'default menuIcon';
     },
 
     location() {
@@ -506,7 +507,7 @@ export default {
           <span>/</span>
         </span>
         <span class="excram-last-name">
-          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent?.displayName }}
         </span>
       </div>
     <header>
@@ -530,7 +531,7 @@ export default {
                   :class="'icon-'+ menuIcon + ' detailIcon'"
                 />
               </span>
-              <span class="detailIcon-span-title">{{ realMode=== 'create'? '创建': '' }}{{ parent.displayName }}{{ realMode=== 'create'? '': '名称:' }}</span>
+              <span class="detailIcon-span-title">{{ realMode=== 'create'? '创建': '' }}{{ parent?.displayName }}{{ realMode=== 'create'? '': '名称:' }}</span>
               <span v-if="realMode !== 'create'">
                 <span v-if="value.detailPageHeaderActionOverride && value.detailPageHeaderActionOverride(realMode)">{{ value.detailPageHeaderActionOverride(realMode) }}</span>
                 <t