removes AposEditor composable, moves postprocess logic in piece-type ui lib folder (no vue related)

Author: ValJed

modules/@apostrophecms/image-widget/ui/apos/components/AposImageWidget.vue

@@ -26,7 +26,7 @@ import {
 } from 'vue';
 import { useAposWidget } from 'Modules/@apostrophecms/widget-type/composables/AposWidget.js';
 import aposWidgetProps from 'Modules/@apostrophecms/widget-type/composables/AposWidgetProps.js';
-import { _postprocess } from 'Modules/@apostrophecms/modal/composables/AposEditor.js';
+import { postprocessRelationships } from 'Modules/@apostrophecms/piece-type/lib/postprocessRelationships.js';
 
 const props = defineProps(aposWidgetProps);
 const imgModuleOptions = apos.modules['@apostrophecms/image'];
@@ -83,7 +83,7 @@ async function selectFromManager() {
       ...props.modelValue,
       _image: [ selectedImg ]
     };
-    await _postprocess(widgetModuleOptions.schema, widgetData, props.options);
+    await postprocessRelationships(widgetModuleOptions.schema, widgetData, props.options);
 
     emit('update', widgetData);
   }
@@ -195,7 +195,7 @@ async function upload(files = []) {
       ...props.modelValue,
       _image: [ imgPiece ]
     };
-    await _postprocess(widgetModuleOptions.schema, widgetData, props.options);
+    await postprocessRelationships(widgetModuleOptions.schema, widgetData, props.options);
 
     emit('update', widgetData);
   } catch (e) {

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

@@ -18,7 +18,6 @@ import { klona } from 'klona';
 import {
   evaluateExternalConditions, getConditionalFields, getConditionTypesObject
 } from 'Modules/@apostrophecms/schema/lib/conditionalFields.js';
-import { _postprocess } from '../composables/AposEditor.js';
 
 export default {
   props: {

…/modal/ui/apos/composables/AposEditor.js …/ui/apos/lib/postprocessRelationships.jsmodules/@apostrophecms/modal/ui/apos/composables/AposEditor.js renamed to modules/@apostrophecms/piece-type/ui/apos/lib/postprocessRelationships.js modules/@apostrophecms/modal/ui/apos/composables/AposEditor.js renamed to modules/@apostrophecms/piece-type/ui/apos/lib/postprocessRelationships.js

@@ -1,24 +1,21 @@
-// 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) {
+export async function postprocessRelationships(schema, data, widgetOptions) {
   // Relationship fields may have postprocessors (e.g. autocropping)
-  const relationships = _findRelationships(schema, data);
+  const relationships = findRelationships(schema, data);
 
   for (const {
     value, field, context
   } of relationships) {
-    context[field.name] = await _getPostprocessedRelationship(
+    context[field.name] = await getPostprocessedRelationship(
       value,
       field,
       widgetOptions
     );
   }
 }
 
-export async function _getPostprocessedRelationship(
+export async function getPostprocessedRelationship(
   value,
   field,
   widgetOptions
@@ -44,7 +41,7 @@ export async function _getPostprocessedRelationship(
   return response.relationship;
 }
 
-function _findRelationships(schema, object) {
+function findRelationships(schema, object) {
   let relationships = [];
   for (const field of schema) {
     if (field.type === 'relationship') {
@@ -57,13 +54,13 @@ function _findRelationships(schema, object) {
       for (const value of (object[field.name] || [])) {
         relationships = [
           ...relationships,
-          _findRelationships(field.schema, value)
+          findRelationships(field.schema, value)
         ];
       }
     } else if (field.type === 'object') {
       relationships = [
         ...relationships,
-        _findRelationships(field.schema, object[field.name] || {})
+        findRelationships(field.schema, object[field.name] || {})
       ];
     }
   }

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

@@ -1,7 +1,7 @@
 import { klona } from 'klona';
 import AposInputMixin from 'Modules/@apostrophecms/schema/mixins/AposInputMixin';
 import newInstance from 'apostrophe/modules/@apostrophecms/schema/lib/newInstance.js';
-import { _getPostprocessedRelationship } from 'Modules/@apostrophecms/modal/composables/AposEditor.js';
+import { getPostprocessedRelationship } from 'Modules/@apostrophecms/piece-type/lib/postprocessRelationships.js';
 
 export default {
   name: 'AposInputRelationship',
@@ -157,7 +157,7 @@ export default {
       this.disabled = !!this.limitReached;
     },
     async updateSelected(items) {
-      this.next = await _getPostprocessedRelationship(
+      this.next = await getPostprocessedRelationship(
         items,
         this.field,
         this.widgetOptions
@@ -303,7 +303,7 @@ export default {
           : rel;
       });
 
-      this.next = await _getPostprocessedRelationship(
+      this.next = await getPostprocessedRelationship(
         updatedItems,
         this.field,
         this.widgetOptions