From 2291058da61d61e9cae06e1cce1b0499f30e045b Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 15 Aug 2024 09:17:50 +0100
Subject: [PATCH 1/3] Fix save button options not showing

---
 resources/js/components/publish/SaveButtonOptions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/publish/SaveButtonOptions.vue b/resources/js/components/publish/SaveButtonOptions.vue
index 27c7aaf2357..0814aac85b3 100644
--- a/resources/js/components/publish/SaveButtonOptions.vue
+++ b/resources/js/components/publish/SaveButtonOptions.vue
@@ -17,7 +17,7 @@
                 <div class="publish-field save-and-continue-options radio-fieldtype">
                     <radio-fieldtype
                         handle="save_and_continue_options"
-                        :config="options"
+                        :meta="options"
                         v-model="currentOption"
                     />
                 </div>

From 901404251b9ec6fc4ad8a80e9827e2ef15d404a3 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 15 Aug 2024 14:42:57 +0100
Subject: [PATCH 2/3] revert this change

---
 resources/js/components/publish/SaveButtonOptions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/publish/SaveButtonOptions.vue b/resources/js/components/publish/SaveButtonOptions.vue
index 0814aac85b3..27c7aaf2357 100644
--- a/resources/js/components/publish/SaveButtonOptions.vue
+++ b/resources/js/components/publish/SaveButtonOptions.vue
@@ -17,7 +17,7 @@
                 <div class="publish-field save-and-continue-options radio-fieldtype">
                     <radio-fieldtype
                         handle="save_and_continue_options"
-                        :meta="options"
+                        :config="options"
                         v-model="currentOption"
                     />
                 </div>

From e36553b01e5120f069b686d2bbbefe326807d5e0 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 15 Aug 2024 15:06:59 +0100
Subject: [PATCH 3/3] fallback to options from config

---
 .../js/components/fieldtypes/ArrayFieldtype.vue      | 12 ++++++++----
 .../components/fieldtypes/ButtonGroupFieldtype.vue   |  2 +-
 .../js/components/fieldtypes/CheckboxesFieldtype.vue |  2 +-
 .../js/components/fieldtypes/RadioFieldtype.vue      |  2 +-
 .../js/components/fieldtypes/SelectFieldtype.vue     |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/fieldtypes/ArrayFieldtype.vue b/resources/js/components/fieldtypes/ArrayFieldtype.vue
index b62dd7dc98b..16cdfc60c69 100644
--- a/resources/js/components/fieldtypes/ArrayFieldtype.vue
+++ b/resources/js/components/fieldtypes/ArrayFieldtype.vue
@@ -7,7 +7,7 @@
                      <select class="bg-transparent appearance-none shadow-none outline-none border-0 text-sm" @input="setKey($event.target.value)">
                         <option
                             v-for="(element, index) in keyedData"
-                            v-text="meta.keys[element.key] || element.key"
+                            v-text="keys[element.key] || element.key"
                             :key="element._id"
                             :value="element.key"
                             :selected="element.key === selectedKey" />
@@ -29,7 +29,7 @@
             <table class="array-table">
                 <tbody>
                     <tr v-if="data" v-for="(element, index) in keyedData" :key="element._id">
-                        <th class="w-1/4"><label :for="fieldId+'__'+element.key">{{ meta.keys[element.key] || element.key }}</label></th>
+                        <th class="w-1/4"><label :for="fieldId+'__'+element.key">{{ keys[element.key] || element.key }}</label></th>
                         <td>
                             <input type="text" class="input-text-minimal" :id="fieldId+'__'+element.key" v-model="data[index].value" :readonly="isReadOnly" />
                         </td>
@@ -129,8 +129,12 @@ export default {
     },
 
     computed: {
+        keys() {
+            return this.meta.keys || this.config.keys;
+        },
+
         isKeyed() {
-            return Boolean(Object.keys(this.meta.keys).length);
+            return Boolean(Object.keys(this.keys).length);
         },
 
         isDynamic() {
@@ -142,7 +146,7 @@ export default {
         },
 
         keyedData() {
-            return this.data.filter(element => this.meta.keys.hasOwnProperty(element.key));
+            return this.data.filter(element => this.keys.hasOwnProperty(element.key));
         },
 
         maxItems() {
diff --git a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
index 246833595f8..93aeb89e74f 100644
--- a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
+++ b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
@@ -39,7 +39,7 @@ export default {
 
     computed: {
         options() {
-            return this.normalizeInputOptions(this.meta.options);
+            return this.normalizeInputOptions(this.meta.options || this.config.options);
         },
 
         replicatorPreview() {
diff --git a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
index 93f35eaa655..96b717e64fd 100644
--- a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
+++ b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
@@ -30,7 +30,7 @@ export default {
 
     computed: {
         options() {
-            return this.normalizeInputOptions(this.meta.options);
+            return this.normalizeInputOptions(this.meta.options || this.config.options);
         },
 
         replicatorPreview() {
diff --git a/resources/js/components/fieldtypes/RadioFieldtype.vue b/resources/js/components/fieldtypes/RadioFieldtype.vue
index a9abd770eab..82b22b94ad1 100644
--- a/resources/js/components/fieldtypes/RadioFieldtype.vue
+++ b/resources/js/components/fieldtypes/RadioFieldtype.vue
@@ -48,7 +48,7 @@ export default {
 
     computed: {
         options() {
-            return this.normalizeInputOptions(this.meta.options);
+            return this.normalizeInputOptions(this.meta.options || this.config.options);
         },
 
         replicatorPreview() {
diff --git a/resources/js/components/fieldtypes/SelectFieldtype.vue b/resources/js/components/fieldtypes/SelectFieldtype.vue
index 1a06a08d769..945a10f1c35 100644
--- a/resources/js/components/fieldtypes/SelectFieldtype.vue
+++ b/resources/js/components/fieldtypes/SelectFieldtype.vue
@@ -106,7 +106,7 @@ export default {
         },
 
         options() {
-            return this.normalizeInputOptions(this.meta.options);
+            return this.normalizeInputOptions(this.meta.options || this.config.options);
         },
 
         replicatorPreview() {