dashboard-shell-shell 1.0.1000000081 → 1.0.1000000083

package/components/ExplorerProjectsNamespaces.vue

@@ -416,7 +416,6 @@ export default {
 </script>
 
 <template>
-  测试111111111111111111111111
   <div class="project-namespaces outlet">
     <Masthead
       :schema="projectSchema"

package/components/ResourceList/Masthead.vue

@@ -92,6 +92,9 @@ export default {
 
     const hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.resource);
 
+    console.log(hasEditComponent, ' hasEditComponent------------------------------------1');
+    
+
     const yamlRoute = {
       name:  `${ cloud2harvesterhci(this.$route.name) }-create`,
       params,
@@ -186,6 +189,23 @@ export default {
     _createButtonlabel() {
       return this.createButtonLabel || this.t('resourceList.head.create');
     },
+
+    canCreateCustom() {
+      return this.hasEditComponent && this._isCreatable;
+    },
+  },
+
+  watch: {
+    canCreateCustom: {
+      immediate: true,
+      handler(newVal) {
+
+        console.log(newVal, ' newVal---------------------------');
+        
+
+        this.$store.commit('type-map/setMastheadCreatable', newVal);
+      }
+    }
   }
 };
 </script>

package/components/SortableTable/index.vue

@@ -418,13 +418,28 @@ export default {
     let isCreatable = false;
     const lastPath = cloud2harvesterhci(this.$route.path.split('/').pop());
 
-    if (lastPath.includes('.')) {
+    if (lastPath?.includes('.')) {
       isCreatable = this.$store.getters['type-map/optionsFor'](lastPath).isCreatable;
     } else if (lastPath === 'namespace') {
       isCreatable = this.$store.getters['type-map/optionsFor'](this.$route.name).isCreatable;
     }
 
+    const resource = cloud2harvesterhci(this.$route.params.resource);
+
+    let hasEditComponent = false
+
+    if (lastPath?.includes('.')) {
+      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](lastPath);
+    } else if (lastPath === 'namespace') {
+      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.$route.name);
+    } else {
+      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](resource);
+    }
+
+    console.log(hasEditComponent, ' hasEditComponent------------------------------------2');
+
     return {
+      hasEditComponent,
       refreshButtonPhase:         isLoading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION,
       expanded:                   {},
       searchQuery,
@@ -1227,7 +1242,7 @@ export default {
     <div
       :class="{'titled': $slots.title && $slots.title.length,  'mb-40': isFilterLabel, 'mb-20': search || isCreatable}"
       class="sortable-table-header "
-       :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable ? '100px' : '-10px',maxHeight: '32px'}"
+       :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable && hasEditComponent ? '100px' : '-10px',maxHeight: '32px'}"
     >
       <slot name="title" />
       <div

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000081",
+  "version": "1.0.1000000083",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/store/type-map.js

@@ -432,10 +432,13 @@ export const state = function() {
       'cloud-credential': {}
 
     },
+    mastheadCreatable:       true,
   };
 };
 
 export const getters = {
+  mastheadCreatable: (state) => state.mastheadCreatable,
+
   // ----------------------------------------------------------------------------
   // 1 ) Getting info
   // ----------------------------------------------------------------------------
@@ -1484,6 +1487,10 @@ export const getters = {
 };
 
 export const mutations = {
+  setMastheadCreatable(state, value) {
+    state.mastheadCreatable = value;
+  },
+
   schemaChanged(state) {
     state.schemaGeneration = state.schemaGeneration + 1;
   },

package/types/cloud-shell/index.d.ts

@@ -3858,8 +3858,10 @@ export function state(): {
         'machine-config': {};
         'cloud-credential': {};
     };
+    mastheadCreatable: boolean;
 };
 export namespace getters {
+    function mastheadCreatable(state: any): any;
     function labelFor(state: any, getters: any, rootState: any, rootGetters: any): (schema: any, count?: number, language?: any) => any;
     function groupLabelFor(state: any): (schemaOrName: any) => any;
     function groupForBasicType(state: any): (product: any, schemaId: any) => any;
@@ -3922,6 +3924,7 @@ export namespace getters {
     function productByName(state: any): (productName: any) => any;
 }
 export namespace mutations {
+    function setMastheadCreatable(state: any, value: any): void;
     function schemaChanged(state: any): void;
     function remove(state: any, { product, plugin }: {
         product: any;
@@ -9407,8 +9410,10 @@ export function state(): {
         'machine-config': {};
         'cloud-credential': {};
     };
+    mastheadCreatable: boolean;
 };
 export namespace getters {
+    function mastheadCreatable(state: any): any;
     function labelFor(state: any, getters: any, rootState: any, rootGetters: any): (schema: any, count?: number, language?: any) => any;
     function groupLabelFor(state: any): (schemaOrName: any) => any;
     function groupForBasicType(state: any): (product: any, schemaId: any) => any;
@@ -9471,6 +9476,7 @@ export namespace getters {
     function productByName(state: any): (productName: any) => any;
 }
 export namespace mutations {
+    function setMastheadCreatable(state: any, value: any): void;
     function schemaChanged(state: any): void;
     function remove(state: any, { product, plugin }: {
         product: any;