[4.x] Improve post-save performance with many Bard and Revealer fields (

#8712)
statamic · Oct 9, 2023 · eef1f28 · eef1f28
1 parent a9344ba
commit eef1f28
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/resources/js/components/publish/HasHiddenFields.js b/resources/js/components/publish/HasHiddenFields.js
@@ -36,9 +36,7 @@ export default {
             let originalValues = new Values(this.values, this.jsonSubmittingFields);
             let newValues = new Values(responseValues, this.jsonSubmittingFields);
 
-            preserveFields.forEach(dottedKey => {
-                newValues.set(dottedKey, originalValues.get(dottedKey));
-            });
+            newValues.mergeDottedKeys(preserveFields, originalValues);
 
             return newValues.all();
         },

diff --git a/resources/js/components/publish/Values.js b/resources/js/components/publish/Values.js
@@ -39,6 +39,20 @@ export default class Values {
         return this;
     }
 
+    mergeDottedKeys(dottedKeys, values)  {
+        let decodedValues = new this.constructor(clone(values.values), values.jsonFields)
+            .jsonDecode()
+            .values;
+
+        this.jsonDecode();
+        dottedKeys.forEach(dottedKey => {
+            data_set(this.values, dottedKey, data_get(decodedValues, dottedKey));
+        });
+        this.jsonEncode();
+
+        return this;
+    }
+
     except(dottedKeys) {
         return this.jsonDecode()
             .rejectValuesByKey(dottedKeys)