From 95ca164900622a4906db1ebe29c92e3ecf3ba0a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harouna=20Traor=C3=A9?= <haroun@users.noreply.github.com>
Date: Fri, 28 Jul 2023 18:39:32 +0200
Subject: [PATCH 1/3] add support for tabs without isVisible

---
 .../modal/ui/apos/components/AposModalTabs.vue             | 7 ++-----
 .../modal/ui/apos/mixins/AposModalTabsMixin.js             | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue b/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue
index 9f4111b166..2611428bbd 100644
--- 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
index 731c25819c..f1b0e8fe52 100644
--- 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;
     }

From 97179d7c8b8d122cef8984f73ede4ee7ac6831ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harouna=20Traor=C3=A9?= <haroun@users.noreply.github.com>
Date: Fri, 28 Jul 2023 18:41:22 +0200
Subject: [PATCH 2/3] remove unused currentFields computed property

---
 .../doc-type/ui/apos/components/AposDocEditor.vue      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue b/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
index 6262931dfd..352614144d 100644
--- 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';

From 69b563b73e442c2ecc3ef043e8c737decc38d8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harouna=20Traor=C3=A9?= <haroun@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:47:05 +0200
Subject: [PATCH 3/3] compute default for non read-only/restore-only documents

---
 .../doc-type/ui/apos/components/AposDocEditor.vue             | 4 ++++
 .../schema/ui/apos/components/AposInputRelationship.vue       | 4 ++++
 .../widget-type/ui/apos/components/AposWidgetEditor.vue       | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue b/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
index 352614144d..acb59aa80b 100644
--- a/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
+++ b/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue
@@ -482,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/schema/ui/apos/components/AposInputRelationship.vue b/modules/@apostrophecms/schema/ui/apos/components/AposInputRelationship.vue
index 99480d7a98..2603f47828 100644
--- 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
index a35e3ef252..691b47d516 100644
--- 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;