dashboard-shell-shell 0.0.1000000000001133 → 0.0.1000000000001138

package/assets/translations/zh-hans.yaml

@@ -7122,7 +7122,7 @@ registryConfig:
 ##############################
 
 advancedSettings:
-  label: 设置
+  label: 基础设置
   subtext: 一般用户不需要修改此处的设置。请谨慎操作，不正确的值会破坏 {appName} 的安装。与默认不同的设置会标记为“已修改”。
   show: 显示
   hide: 隐藏

package/components/CruResource.vue

@@ -895,6 +895,7 @@ form.create-resource-container .cru {
     display: flex;
     flex-direction: column;
     flex-grow: 1;
+    height: 100%;
   }
 
   &__content {

package/components/ExplorerProjectsNamespaces.vue

@@ -1,13 +1,13 @@
 <script>
 import { mapGetters, useStore } from 'vuex';
-import ResourceTable, { defaultTableSortGenerationFn } from '@shell/components/ResourceTable';
+import ResourceTable, { defaultTableSortGenerationFn } from '@shell/components/rancherResourceTable';
 import { STATE, AGE, NAME, NS_SNAPSHOT_QUOTA } from '@shell/config/table-headers';
 import { uniq } from '@shell/utils/array';
 import { MANAGEMENT, NAMESPACE, VIRTUAL_TYPES, HCI } from '@shell/config/types';
 import { PROJECT_ID, FLAT_VIEW } from '@shell/config/query-params';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
-import Masthead from '@shell/components/ResourceList/Masthead';
+import Masthead from '@shell/components/rancherResourceList/Masthead';
 import { mapPref, GROUP_RESOURCES, ALL_NAMESPACES, DEV } from '@shell/store/prefs';
 import MoveModal from '@shell/components/MoveModal';
 import ButtonMultiAction from '@shell/components/ButtonMultiAction.vue';
@@ -427,6 +427,8 @@ export default {
       :show-incremental-loading-indicator="showIncrementalLoadingIndicator"
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
+
+      :main-button-visible="false"
     >
       <template
         v-if="showCreateNsButton"
@@ -460,7 +462,26 @@ export default {
       :loading="loading"
       group-tooltip="resourceTable.groupBy.project"
       key-field="_key"
+
+      :create-location="createProjectLocation"
+      :schemaBtn="projectSchema"
+      :create-button-label="t('projectNamespaces.createProject')"
+      :type-display="t('projectNamespaces.label')"
+      :resource="MANAGEMENT.PROJECT"
+      :main-button-visible="true"
     >
+      <template
+        v-if="showCreateNsButton"
+        #extraActions
+      >
+        <router-link
+          :to="createNamespaceLocationFlatList()"
+          class="btn role-primary mr-10"
+          data-testid="create_project_namespaces"
+        >
+          {{ t('projectNamespaces.createNamespace') }}
+        </router-link>
+      </template>
       <template #group-by="group">
         <div
           class="project-bar"
@@ -481,10 +502,10 @@ export default {
               {{ projectDescription(group.group) }}
             </div>
           </div>
-          <div class="right mr-10">
+          <div class="right">
             <router-link
               v-if="isNamespaceCreatable && (canSeeProjectlessNamespaces || group.group.key !== notInProjectKey)"
-              class="create-namespace btn btn-sm role-secondary mr-5"
+              class="create-namespace btn btn-sm mr-5"
               :to="createNamespaceLocation(group.group)"
             >
               {{ t('projectNamespaces.createNamespace') }}
@@ -575,7 +596,6 @@ export default {
 <style lang="scss" scoped>
 .invisible {
   display: inline-block;
-  min-width: 28px;
 }
 
 .project-namespaces {
@@ -592,6 +612,16 @@ export default {
       display: flex;
       flex-direction: row;
       justify-content: space-between;
+      background-color: var(--sortable-table-bg) !important;
+      
+      .right {
+        display: flex;
+        align-items: center;
+      }
+
+      .create-namespace {
+        color: var(--link);
+      }
 
       .group-tab {
         max-width: calc(100% - 230px);

package/components/PodSecurityAdmission.vue

@@ -218,7 +218,7 @@ export default defineComponent({
       :key="i"
       class="row row--y-center mb-20"
     >
-      <span class="col span-2">
+      <span class="col">
         <Checkbox
           v-if="!labelsAlwaysActive"
           v-model:value="psaControl.active"

package/components/ResourceDetail/Masthead.vue

@@ -400,7 +400,9 @@ export default {
     demoDisplay() {
       const product = this.$store.getters['productId'];
 
-      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], this.location.params.resource);
+      const resources = this.location?.params?.resource || ''
+
+      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
 
       if (productId === undefined) {
         return '';
@@ -420,8 +422,10 @@ export default {
     },
     menuIcon() {
       const product = this.$store.getters['productId'];
+      
+      const resources = this.location?.params?.resource || ''
 
-      return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(this.location.params.resource));
+      return this.$store.getters['type-map/groupsForVirTypes'](product, cloud2harvesterhci(resources));
     },
 
     location() {

package/components/SortableTable/selection.js

@@ -10,7 +10,7 @@ export const NONE = 'none';
 
 export default {
   mounted() {
-    const table = this.$el.querySelector('TABLE');
+    const table = this.$el && this.$el.querySelector('TABLE');
 
     this._onRowClickBound = this.onRowClick.bind(this);
     this._onRowMousedownBound = this.onRowMousedown.bind(this);
@@ -22,7 +22,7 @@ export default {
   },
 
   beforeUnmount() {
-    const table = this.$el.querySelector('TABLE');
+    const table = this.$el && this.$el.querySelector('TABLE');
 
     table.removeEventListener('click', this._onRowClickBound);
     table.removeEventListener('mousedown', this._onRowMousedownBound);

package/components/Tabbed/index.vue

@@ -499,7 +499,7 @@ margin: 0px -20px;
     // }
     & .tab {
       /* width: 100%; */
-      width: 120px;
+      min-width: 120px;
       height: 36px;
       /* border-top: solid 5px transparent; */
       display: flex;