wip postprocess when relationship changed only

Author: ValJed

modules/@apostrophecms/modal/ui/apos/composables/AposEditor.js

@@ -1,21 +1,16 @@
-import { isEqual } from 'lodash';
 // For now just moving postprocess logic here,
 // if needed we might move more from AposEditorMixin.js
 
 // Perform any postprocessing required by direct or nested schema fields
 // before the object can be saved
-export async function _postprocess(schema, data, widgetOptions, oldData) {
+export async function _postprocess(schema, data, widgetOptions/* , oldData */) {
   // Relationship fields may have postprocessors (e.g. autocropping)
-  const [ relationships, oldRelationships ] = findRelationships(schema, data, oldData);
+  const relationships = findRelationships(schema, data);
 
-  for (const [ i, relationship ] of relationships.entries()) {
-    const oldRelationship = oldRelationships[i];
+  for (const relationship of relationships) {
     if (!(relationship.value && relationship.field.postprocessor)) {
       continue;
     }
-    if (checkSameRelationships(relationship.value, oldRelationship)) {
-      continue;
-    }
     const withType = relationship.field.withType;
     const mod = apos.modules[withType];
     const response = await apos.http.post(`${mod.action}/${relationship.field.postprocessor}`, {
@@ -31,6 +26,7 @@ export async function _postprocess(schema, data, widgetOptions, oldData) {
       },
       busy: true
     });
+    console.log('response.relationship', response.relationship);
     relationship.context[relationship.field.name] = response.relationship;
   }
 }
@@ -45,9 +41,6 @@ function findRelationships(schema, object, oldObject) {
         field,
         value: object[field.name]
       });
-      if (oldObject) {
-        oldRelationships.push(oldObject[field.name]);
-      }
     } else if (field.type === 'array') {
       for (const value of (object[field.name] || [])) {
         relationships = [
@@ -64,18 +57,3 @@ function findRelationships(schema, object, oldObject) {
   }
   return [ relationships, oldRelationships ];
 }
-
-function checkSameRelationships(relationship, oldRelationship) {
-  for (const piece of relationship) {
-    const oldPiece = oldRelationship.find((p) => p._id === piece._id);
-    console.log('piece', piece);
-    console.log('oldPiece', oldPiece);
-    if (!oldPiece) {
-      return false;
-    }
-    if (!isEqual(piece._fields, oldPiece._fields)) {
-      return false;
-    }
-  }
-  return true;
-}

modules/@apostrophecms/modal/ui/apos/mixins/AposEditorMixin.js

@@ -224,8 +224,7 @@ export default {
       await _postprocess(
         this.schema,
         this.docFields.data,
-        apos.area.widgetOptions[0],
-        oldData
+        apos.area.widgetOptions[0]
       );
     }
   }

modules/@apostrophecms/schema/ui/apos/logic/AposSchema.js

@@ -275,6 +275,7 @@ export default {
       const newFieldState = { ...this.fieldState };
 
       let changeFound = false;
+      const changedTypes = new Set();
 
       this.next.hasErrors = false;
       this.next.fieldState = { ...this.fieldState };
@@ -296,22 +297,25 @@ export default {
             )
           ) {
             changeFound = true;
+            changedTypes.add(field.type);
+
             this.next.data[field.name] = this.fieldState[field.name].data;
           } else {
             this.next.data[field.name] = this.modelValue.data[field.name];
           }
         });
       if (
-        oldHasErrors !== this.next.hasErrors ||
-        oldFieldState !== newFieldState
+        oldHasErrors !== this.next.hasErrors
+        /* oldFieldState !== newFieldState */
       ) {
+        console.log('=====> weird change found <=====');
         // Otherwise the save button may never unlock
         changeFound = true;
       }
 
       if (changeFound) {
         // ... removes need for deep watch at parent level
-        this.$emit('update:model-value', { ...this.next });
+        this.$emit('update:model-value', { ...this.next }, { changedTypes });
       }
     },
     displayComponent({ name, hidden = false }) {

modules/@apostrophecms/widget-type/ui/apos/components/AposWidgetEditor.vue

@@ -229,22 +229,25 @@ export default {
     this.initPreview();
   },
   methods: {
-    async updateDocFields(value) {
+    async updateDocFields(value, { changedTypes = new Set() } = {}) {
       this.updateFieldErrors(value.fieldState);
-      const oldDocFields = klona(this.docFields.data);
       this.docFields.data = {
         ...this.docFields.data,
         ...value.data
       };
+      console.log('changedTypes', changedTypes);
+      if (changedTypes.has('relationship')) {
+        try {
+          console.log('this.docFields.data', JSON.stringify(this.docFields.data?._image));
+          await this.postprocess();
+        } catch (e) {
+          await this.handleSaveError(e, {
+            fallback: 'An error occurred updating the widget.'
+          });
+        }
+      }
       this.evaluateConditions();
       this.updatePreview();
-      try {
-        await this.postprocess(oldDocFields);
-      } catch (e) {
-        await this.handleSaveError(e, {
-          fallback: 'An error occurred updating the widget.'
-        });
-      }
     },
     initPreview() {
       if (!this.preview) {