Merge pull request #4244 from apostrophecms/pro-4542-support-tab-with…

…out-is-visible Pro 4542 support tab without is visible
apostrophecms · Aug 1, 2023 · 7966868 · 7966868
2 parents c0cb7b2 + 69b563b
commit 7966868
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue b/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
@@ -271,16 +271,6 @@ export default {
         };
       }
     },
-    currentFields() {
-      if (this.currentTab) {
-        const tabFields = this.tabs.find((item) => {
-          return item.name === this.currentTab;
-        });
-        return this.filterOutParkedFields(tabFields.fields);
-      } else {
-        return [];
-      }
-    },
     saveLabel() {
       if (this.restoreOnly) {
         return 'apostrophe:restore';
@@ -492,6 +482,10 @@ export default {
     },
     getDefault() {
       const doc = {};
+      if (this.readOnly || this.restoreOnly) {
+        return doc;
+      }
+
       this.schema.forEach(field => {
         if (field.name.startsWith('_')) {
           return;

diff --git a/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue b/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue
@@ -5,11 +5,11 @@
         class="apos-modal-tabs__tab"
         v-for="tab in tabs"
         :key="tab.name"
-        v-show="tab.isVisible"
+        v-show="tab.isVisible !== false"
       >
         <button
           :id="tab.name" class="apos-modal-tabs__btn"
-          :aria-selected="tab.name === currentTab ? true : false"
+          :aria-selected="tab.name === current ? true : false"
           @click="selectTab"
         >
           {{ $t(tab.label) }}
@@ -43,9 +43,6 @@ export default {
   },
   emits: [ 'select-tab' ],
   computed: {
-    currentTab() {
-      return this.current || this.tabs.find(tab => tab.isVisible).name;
-    },
     tabErrors() {
       const errors = {};
       for (const key in this.errors) {

diff --git a/modules/@apostrophecms/modal/ui/apos/mixins/AposModalTabsMixin.js b/modules/@apostrophecms/modal/ui/apos/mixins/AposModalTabsMixin.js
@@ -61,7 +61,7 @@ export default {
       return tabs;
     },
     firstVisibleTabName() {
-      const { name = null } = this.tabs.find(tab => tab.isVisible === true) || {};
+      const { name = null } = this.tabs.find(tab => tab.isVisible === true) || this.tabs[0] || {};
 
       return name;
     }

diff --git a/modules/@apostrophecms/schema/ui/apos/components/AposInputRelationship.vue b/modules/@apostrophecms/schema/ui/apos/components/AposInputRelationship.vue
@@ -323,6 +323,10 @@ export default {
     },
     getDefault() {
       const object = {};
+      if (this.readOnly) {
+        return object;
+      }
+
       this.field.schema.forEach(field => {
         if (field.name.startsWith('_')) {
           return;

diff --git a/modules/@apostrophecms/widget-type/ui/apos/components/AposWidgetEditor.vue b/modules/@apostrophecms/widget-type/ui/apos/components/AposWidgetEditor.vue
@@ -188,6 +188,10 @@ export default {
     },
     getDefault() {
       const widget = {};
+      if (this.readOnly) {
+        return widget;
+      }
+
       this.schema.forEach(field => {
         if (field.name.startsWith('_')) {
           return;