dashboard-shell-shell 3.0.5-test.12 → 3.0.5-test.13

package/assets/icons/iconfont.css

@@ -213,4 +213,7 @@ src: url('iconfont.woff2?t=1753758703852') format('woff2'),
 }
 .icon-mingming:before {
   content: "\e62c";
-}
+}
+.icon-default:before {
+  content: "\e61c";
+}

package/assets/styles/global/_tooltip.scss

@@ -147,7 +147,7 @@
 }
 
 .v-popper__popper.v-popper--theme-dropdown {
-  border-radius: 4px;
+  border-radius: 0px;
   z-index: z-index('tooltip');
   border: 1px solid #d9d9d9 !important;
 
@@ -157,6 +157,10 @@
     }
   }
 }
+.v-popper__popper .v-popper__arrow-container {
+  display: none;
+}
+
 
 .v-popper {
   display: inline;

package/assets/translations/zh-hans.yaml

@@ -6482,7 +6482,7 @@ typeDescription:
   kubevirt.io.virtualmachine: 云虚拟机是一种安全可靠、弹性可伸缩的云计算服务器，助您降低 IT 成本，提升运维效率，使您更专注于核心业务创新。
   harvesterhci.io.volume: 虚拟磁盘具有高性能和低时延的特点，支持随机读写，可以像使用物理硬盘一样，在虚拟机上进行格式化并建立文件系统来使用块存储。
   harvesterhci.io.volumesnapshot: 虚拟磁盘快照功能通过捕获虚拟磁盘在特定时间点的状态，生成增量副本，支持快速回滚磁盘状态，为测试验证、容灾恢复提供高效解决方案
-  harvesterhci.io.virtualmachinebackup: 虚拟机备份功能通过创建包含磁盘数据、配置信息的完整副本，支持跨环境恢复及长期数据保护，为系统故障或灾难提供可靠容灾方案。
+  harvesterhci.io.virtualmachinebackup: 虚拟机备份恢复功能通过创建包含磁盘数据、配置信息的完整副本，支持跨环境恢复及长期数据保护，为系统故障或灾难提供可靠容灾方案。
   harvesterhci.io.schedulevmbackup: 虚拟机备份策略功能通过创建定时任务，对虚拟机进行完整备份或增量快照，为用户提供自动化的数据备份和容灾方案。
   harvesterhci.io.vmsnapshot: 虚拟机快照功能通过捕获特定时间点的系统状态，支持快速恢复虚拟机状态，为数据备份与系统调试提供灵活解决方案。
   harvesterhci.io.keypair: SSH密钥对是一种安全便捷的登录认证方式，您可以实现免密码远程登录，并在无需人工干预的情况下进行安全的自动化操作，实现服务器配置和应用程序部署的自动化。

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

@@ -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/GlobalRoleBindings.vue

@@ -333,7 +333,7 @@ export default {
 
   <div v-else>
     <form v-if="selectedRoles">
-      <template v-if="topLevelPermissions && topLevelPermissions !== 'superadmin'">
+      <template>
         <div
           v-for="(sortedRole, roleType) in sortedRoles"
           :key="roleType"
@@ -389,63 +389,6 @@ export default {
           </Card>
         </div>
       </template>
-
-      <template v-else>
-        <div
-          v-for="(sortedRole, roleType) in { global: sortedRoles['global'] }"
-          :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>
     </form>
   </div>
 </template>

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,32 @@ 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?.location?.params?.resource || ''
-
-  return store.getters['type-map/groupsForVirTypes'](product, resources);
-})
-
+  const resources = parent.value.location?.params?.resource || '';
+  return store.getters['type-map/groupsForVirTypes'](product, resources) || 'default menuIcon';
+});
 
 watch(
   () => currentView.value,
@@ -131,7 +122,7 @@ watch(
     <breadcrumb :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,7 +180,7 @@ watch(
           :options="viewOptions"
         />
         <RcButton
-          v-if="onShowConfiguration"
+          v-if="onShowConfiguration && configTabProps"
           :data-testid="showConfigurationDataTestId"
           class="show-configuration"
           :primary="true"
@@ -222,6 +213,7 @@ watch(
 </template>
 
 <style lang="scss" scoped>
+
 .detailIcon-span{
   width: 24px;
   height: 24px;
@@ -230,6 +222,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 = {
@@ -443,7 +443,7 @@ export default {
 
       const resources = this.location?.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 +506,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 +530,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

package/components/SortableTable/index.vue

@@ -1841,7 +1841,7 @@ export default {
         class="paging"
       >
         <div style="height: 100%; align-content: center;">
-          共 {{ filteredRows.length }} 条
+          共 {{ filteredRows?.length }} 条
         </div>
 
         <button

package/components/auth/Principal.vue

@@ -20,7 +20,11 @@ export default {
     isShowPass: {
       type:    Boolean,
       default: false,
-    }
+    },
+    userLogoSize: {
+      type:    Number,
+      default: 20,
+    },
   },
 
   async fetch() {
@@ -90,8 +94,9 @@ export default {
     </template>
 
     <template v-else-if="principal">
-      <div class="avatar">
+      <div :style="userLogoSize === 79 ? { width: '287px' } : {}" class="avatar">
         <img
+          :style="{ width: userLogoSize + 'px', height: userLogoSize + 'px' }"
           src="@shell/assets/images/user.png"
           :class="{'round': principal.roundAvatar}"
           :alt="t('principal.alt.avatar')"
@@ -209,7 +214,6 @@ export default {
     .avatar {
       /* grid-area: avatar;
       text-align: center; */
-      width: 287px;
       display: flex;
       justify-content: center;
       align-items: center;

package/components/auth/RoleDetailEdit.vue

@@ -152,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;
     }
 

package/components/form/ArrayList.vue

@@ -464,7 +464,7 @@ export default {
     text-align: right;
   }
   .footer {
-    margin-bottom: 24px;
+    margin-bottom: 20px;
     .protip {
       float: right;
       padding: 5px 0;

package/components/form/KeyValue.vue

@@ -390,6 +390,17 @@ export default {
         });
       }
 
+      rows = rows.map((item) => {
+        if (item.key.includes('harvester')) {
+          item.key = item.key.replace('harvester', 'cloud');
+        }
+        if (item.value.includes('harvester')) {
+          item.value = item.value.replace('harvester', 'cloud');
+        }
+
+        return item;
+      });
+
       return rows;
     },
 
@@ -400,6 +411,8 @@ export default {
         [this.valueName]: value,
       };
 
+      obj.key = obj.key.replace('harvester', 'cloud');
+      obj.value = obj.value.replace('harvester', 'cloud');
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -481,8 +494,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName] || '').trim();
-          let value = (row[valueName] || '').trim();
+          const key = (row[keyName].replace('cloud', 'harvester') || '').trim();
+          let value = (row[valueName].replace('cloud', 'harvester') || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));

package/components/form/Labels.vue

@@ -161,7 +161,7 @@ export default {
   <div :class="containerClass">
     <div :class="defaultSectionClass">
       <div class="labels">
-        <div class="labels__header">
+        <div class="labels__header mb-20">
           <div v-if="showLabelTitle">
             <t k="labels.labels.title" />
           </div>

package/components/form/MatchExpressions.vue

@@ -330,7 +330,7 @@ export default {
         :data-testid="`input-match-type-field-${index}`"
       >
         <div v-if="isView">
-          {{ row.matching }}
+          {{ row.matching.replace('harvester', 'cloud') }}
         </div>
         <LabeledSelect
           v-else
@@ -345,7 +345,7 @@ export default {
         :data-testid="`input-match-expression-key-${index}`"
       >
         <div v-if="isView" class="view-item-value">
-          {{ row.key }}
+          {{ row.key.replace('harvester', 'cloud') }}
         </div>
         <input
           v-else-if="!hasKeySelectOptions"

package/components/form/NameNsDescription.vue

@@ -256,7 +256,7 @@ export default {
       const options = namespaces
         .map((namespace) => ({ nameDisplay: namespace, id: namespace }))
         .map(props.namespaceMapper || ((obj) => ({
-          label: obj.nameDisplay,
+          label: obj.nameDisplay.replace('harvester', 'cloud'),
           value: obj.id,
         })));
 

package/components/form/ResourceQuota/NamespaceRow.vue

@@ -212,7 +212,7 @@ export default {
   .rowNew {
     margin-bottom: 10px;
     display: flex;
-    justify-content: space-between;
+    justify-content: space-between !important;
 
     & > * {
       width: 400px;

package/components/form/ResourceQuota/Project.vue

@@ -57,7 +57,7 @@ export default {
 </script>
 <template>
   <div>
-    <div style="justify-content: right;" class="headers mb-10">
+    <div style="justify-content: space-between;" class="headers mb-10">
       <div style="width: 400px;">
         <label>{{ t('resourceQuota.headers.resourceType') }}</label>
       </div>

package/components/form/ResourceQuota/ProjectRow.vue

@@ -107,6 +107,6 @@ export default {
 <style lang='scss' scoped>
   .rowNew {
     display: flex;
-    justify-content: space-between;
+    justify-content: space-between !important;
   }
 </style>

package/components/nav/NamespaceFilter.vue

@@ -748,7 +748,7 @@ export default {
         data-testid="namespaces-values-label"
         class="ns-values"
       >
-        {{ value[0].label }}
+        {{ value[0].label.replace('harvester', 'cloud') }}
       </div>
 
       <!-- All the selected namespaces -->
@@ -774,20 +774,18 @@ export default {
           :data-testid="`namespaces-value-${j}`"
           class="ns-value"
         >
-          <div>{{ ns.label }}</div>
+          <div>{{ ns.label.replace('harvester', 'cloud') }}</div>
           <!-- block user from removing the last selection if ns forced filtering is on -->
-          <RcButton
+          <i
             v-if="!namespaceFilterMode || value.length > 1"
             small
             ghost
-            class="ns-chip-button"
+            class="ns-chip-button icon icon-close"
             :data-testid="`namespaces-values-close-${j}`"
             @click="removeOption(ns, $event)"
             @keydown.enter.space.stop="removeOption(ns, $event)"
             @mousedown="handleValueMouseDown(ns, $event)"
-          >
-            <i class="icon icon-close" />
-          </RcButton>
+          />
         </div>
       </div>
 
@@ -836,19 +834,15 @@ export default {
             @click="focusFilter"
             @keydown="inputKeyHandler($event)"
           >
-          <RcButton
+          <i
             v-if="hasFilter"
             small
             ghost
-            class="ns-filter-clear"
+            class="ns-filter-clear icon icon-close"
             :aria-label="t('namespaceFilter.button.clearFilter')"
             @click="clearFilter"
             @keydown.enter.stop="clearFilter"
-          >
-            <i
-              class="icon icon-close"
-            />
-          </RcButton>
+          />
         </div>
         <div
           v-if="namespaceFilterMode"
@@ -859,7 +853,7 @@ export default {
             class="icon icon-info"
           />
         </div>
-        <RcButton
+        <div
           v-else
           small
           ghost
@@ -871,8 +865,9 @@ export default {
         >
           <i
             class="icon icon-close"
+            @click="clear()"
           />
-        </RcButton>
+        </div>
       </div>
       <div class="ns-divider mt-0" />
       <div
@@ -889,12 +884,12 @@ export default {
           v-for="(opt, i) in cachedFiltered"
           :key="opt.id"
         >
-          <hr
+          <div
             v-if="opt.kind === NAMESPACE_FILTER_KINDS.DIVIDER"
             role="separator"
             aria-orientation="horizontal"
             class="ns-divider"
-          >
+          />
           <div
             v-else
             :id="opt.elementId"
@@ -919,7 +914,7 @@ export default {
                 v-if="opt.kind === NAMESPACE_FILTER_KINDS.NAMESPACE"
                 class="icon icon-folder"
               />
-              <div>{{ opt.label }}</div>
+              <div>{{ opt.label.replace('harvester', 'cloud') }}</div>
               <i
                 v-if="opt.selected"
                 class="icon icon-checkmark"