@forestadmin/agent 1.41.12 → 1.43.0

package/dist/routes/modification/action/action.js

@@ -57,7 +57,8 @@ class ActionRoute extends collection_route_1.default {
         // As forms are dynamic, we don't have any way to ensure that we're parsing the data correctly
         // => better send invalid data to the getForm() customer handler than to the execute() one.
         const unsafeData = action_values_1.default.makeFormDataUnsafe(rawData);
-        const fields = await this.collection.getForm(caller, this.actionName, unsafeData, filterForCaller, { includeHiddenFields: true });
+        const form = await this.collection.getForm(caller, this.actionName, unsafeData, filterForCaller, { includeHiddenFields: true });
+        const { fields } = generator_actions_1.default.extractFieldsAndLayout(form);
         // Now that we have the field list, we can parse the data again.
         const data = action_values_1.default.makeFormData(dataSource, rawData, fields);
         const result = await this.collection.execute(caller, this.actionName, data, filterForCaller);
@@ -113,15 +114,13 @@ class ActionRoute extends collection_route_1.default {
         }
         const caller = query_string_1.default.parseCaller(context);
         const filter = await this.getRecordSelection(context);
-        const fields = await this.collection.getForm(caller, this.actionName, data, filter, {
+        const form = await this.collection.getForm(caller, this.actionName, data, filter, {
             changedField: body.data.attributes.changed_field,
             searchField: body.data.attributes.search_field,
             searchValues,
             includeHiddenFields: false,
         });
-        context.response.body = {
-            fields: fields.map(field => generator_actions_1.default.buildFieldSchema(this.collection.dataSource, field)),
-        };
+        context.response.body = generator_actions_1.default.buildFieldsAndLayout(this.collection.dataSource, form);
     }
     async middlewareCustomActionApprovalRequestData(context, next) {
         const requestBody = context.request.body;
@@ -167,4 +166,4 @@ class ActionRoute extends collection_route_1.default {
     }
 }
 exports.default = ActionRoute;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../../src/routes/modification/action/action.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../../src/routes/modification/action/action.ts"],"names":[],"mappings":"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"}

package/dist/utils/forest-schema/generator-actions.d.ts

@@ -1,5 +1,5 @@
-import { ActionField, Collection, DataSource } from '@forestadmin/datasource-toolkit';
-import { ForestServerAction, ForestServerActionField } from '@forestadmin/forestadmin-client';
+import { ActionField, ActionFormElement, ActionLayoutElement, Collection, DataSource } from '@forestadmin/datasource-toolkit';
+import { ForestServerAction, ForestServerActionField, ForestServerActionFormLayoutElement } from '@forestadmin/forestadmin-client';
 export default class SchemaGeneratorActions {
     /**
      * 'fields' sent to forestadmin-server when we want to generate the form on demand.
@@ -8,8 +8,17 @@ export default class SchemaGeneratorActions {
     static defaultFields: ForestServerActionField[];
     static getActionSlug(name: string): string;
     static buildSchema(collection: Collection, name: string): Promise<ForestServerAction>;
+    static buildFieldsAndLayout(dataSource: DataSource, form: ActionFormElement[]): {
+        fields: ForestServerActionField[];
+        layout: ForestServerActionFormLayoutElement[];
+    };
+    static setFieldsDefaultValue(fields: ForestServerActionField[]): void;
     /** Build schema for given field */
     static buildFieldSchema(dataSource: DataSource, field: ActionField): ForestServerActionField;
-    private static buildFields;
+    static buildLayoutSchema(element: ActionLayoutElement): ForestServerActionFormLayoutElement;
+    static extractFieldsAndLayout(formElements: ActionFormElement[]): {
+        fields: ActionField[];
+        layout: ActionLayoutElement[];
+    };
 }
 //# sourceMappingURL=generator-actions.d.ts.map

package/dist/utils/forest-schema/generator-actions.js

@@ -17,7 +17,12 @@ class SchemaGeneratorActions {
         const actionIndex = Object.keys(collection.schema.actions).indexOf(name);
         // Generate url-safe friendly name (which won't be unique, but that's OK).
         const slug = SchemaGeneratorActions.getActionSlug(name);
-        const fields = await SchemaGeneratorActions.buildFields(collection, name, schema);
+        let fields = SchemaGeneratorActions.defaultFields;
+        if (schema.staticForm) {
+            const rawForm = await collection.getForm(null, name, null, null);
+            fields = SchemaGeneratorActions.buildFieldsAndLayout(collection.dataSource, rawForm).fields;
+            SchemaGeneratorActions.setFieldsDefaultValue(fields);
+        }
         return {
             id: `${collection.name}-${actionIndex}-${slug}`,
             name,
@@ -35,6 +40,19 @@ class SchemaGeneratorActions {
             },
         };
     }
+    static buildFieldsAndLayout(dataSource, form) {
+        const { fields, layout } = SchemaGeneratorActions.extractFieldsAndLayout(form);
+        return {
+            fields: fields.map(field => SchemaGeneratorActions.buildFieldSchema(dataSource, field)),
+            layout: layout.map(layoutElement => SchemaGeneratorActions.buildLayoutSchema(layoutElement)),
+        };
+    }
+    static setFieldsDefaultValue(fields) {
+        fields.forEach(field => {
+            field.defaultValue = field.value;
+            delete field.value;
+        });
+    }
     /** Build schema for given field */
     static buildFieldSchema(dataSource, field) {
         const { label, description, isRequired, isReadOnly, watchChanges, type } = field;
@@ -62,24 +80,49 @@ class SchemaGeneratorActions {
         output.widgetEdit = generator_action_field_widget_1.default.buildWidgetOptions(field);
         return output;
     }
-    static async buildFields(collection, name, schema) {
-        // We want the schema to be generated on usage => send dummy schema
-        if (!schema.staticForm) {
-            return SchemaGeneratorActions.defaultFields;
+    static buildLayoutSchema(element) {
+        switch (element.component) {
+            case 'Input':
+                return {
+                    component: 'input',
+                    fieldId: element.fieldId,
+                };
+            case 'HtmlBlock':
+                return {
+                    component: 'htmlBlock',
+                    content: element.content,
+                };
+            case 'Separator':
+            default:
+                return {
+                    component: 'separator',
+                };
         }
-        // Ask the action to generate a form
-        const fields = await collection.getForm(null, name);
-        if (fields) {
-            // When sending to server, we need to rename 'value' into 'defaultValue'
-            // otherwise, it does not gets applied 🤷‍♂️
-            return fields.map(field => {
-                const newField = SchemaGeneratorActions.buildFieldSchema(collection.dataSource, field);
-                newField.defaultValue = newField.value;
-                delete newField.value;
-                return newField;
-            });
+    }
+    static extractFieldsAndLayout(formElements) {
+        let hasLayout = false;
+        const fields = [];
+        let layout = [];
+        if (!formElements)
+            return { fields: [], layout: [] };
+        formElements.forEach(element => {
+            if (element.type === 'Layout') {
+                hasLayout = true;
+                layout.push(element);
+            }
+            else {
+                fields.push(element);
+                layout.push({
+                    type: 'Layout',
+                    component: 'Input',
+                    fieldId: element.label,
+                });
+            }
+        });
+        if (!hasLayout) {
+            layout = [];
         }
-        return [];
+        return { fields, layout };
     }
 }
 exports.default = SchemaGeneratorActions;
@@ -102,4 +145,4 @@ SchemaGeneratorActions.defaultFields = [
         widgetEdit: null,
     },
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdG9yLWFjdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvZm9yZXN0LXNjaGVtYS9nZW5lcmF0b3ItYWN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQVF5QztBQUV6QyxnREFBd0I7QUFFeEIsb0VBQTJDO0FBQzNDLG9FQUFtRDtBQUNuRCxvR0FBeUU7QUFFekUsTUFBcUIsc0JBQXNCO0lBcUJ6QyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQVk7UUFDL0IsT0FBTyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxVQUFzQixFQUFFLElBQVk7UUFDM0QsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFL0MsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUV6RSwwRUFBMEU7UUFDMUUsTUFBTSxJQUFJLEdBQUcsc0JBQXNCLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hELE1BQU0sTUFBTSxHQUFHLE1BQU0sc0JBQXNCLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFbEYsT0FBTztZQUNMLEVBQUUsRUFBRSxHQUFHLFVBQVUsQ0FBQyxJQUFJLElBQUksV0FBVyxJQUFJLElBQUksRUFBRTtZQUMvQyxJQUFJO1lBQ0osSUFBSSxFQUFFLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFrQztZQUNoRSxPQUFPLEVBQUUsSUFBSTtZQUNiLFFBQVEsRUFBRSxjQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxVQUFVLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLENBQUM7WUFDekYsVUFBVSxFQUFFLE1BQU07WUFDbEIsUUFBUSxFQUFFLElBQUk7WUFDZCxRQUFRLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUM7WUFDdEMsTUFBTTtZQUNOLEtBQUssRUFBRTtnQkFDTCxJQUFJLEVBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVTtnQkFFeEIsbUZBQW1GO2dCQUNuRixNQUFNLEVBQUUsQ0FBQyxZQUFZLENBQUM7YUFDdkI7U0FDRixDQUFDO0lBQ0osQ0FBQztJQUVELG1DQUFtQztJQUNuQyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsVUFBc0IsRUFBRSxLQUFrQjtRQUNoRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsR0FBRyxLQUFLLENBQUM7UUFDakYsTUFBTSxNQUFNLEdBQUcsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBNkIsQ0FBQztRQUVsRixNQUFNLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztRQUNyQixNQUFNLENBQUMsS0FBSyxHQUFHLHVCQUFvQixDQUFDLGFBQWEsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRXRFLElBQUksWUFBWTtZQUFFLE1BQU0sQ0FBQyxJQUFJLEdBQUcsWUFBWSxDQUFDO1FBRTdDLElBQUksdUJBQVksQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUN6QyxNQUFNLFVBQVUsR0FBRyxVQUFVLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUNsRSxNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsZ0NBQVcsQ0FBQyxjQUFjLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzNELE1BQU0sUUFBUSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBaUIsQ0FBQztZQUU5RCxNQUFNLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxVQUFVLENBQUM7WUFDbEMsTUFBTSxDQUFDLFNBQVMsR0FBRyxHQUFHLFVBQVUsQ0FBQyxJQUFJLElBQUksRUFBRSxFQUFFLENBQUM7U0FDL0M7YUFBTSxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDaEMsTUFBTSxDQUFDLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFtQixDQUFDLENBQUM7U0FDdEU7YUFBTTtZQUNMLE1BQU0sQ0FBQyxJQUFJLEdBQUcsSUFBaUMsQ0FBQztTQUNqRDtRQUVELElBQUksdUJBQVksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLElBQUksdUJBQVksQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDMUUsTUFBTSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFDO1NBQ2pDO1FBRUQsTUFBTSxDQUFDLFVBQVUsR0FBRyx1Q0FBMEIsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUV6RSxPQUFPLE1BQWlDLENBQUM7SUFDM0MsQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUM5QixVQUFzQixFQUN0QixJQUFZLEVBQ1osTUFBb0I7UUFFcEIsbUVBQW1FO1FBQ25FLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFO1lBQ3RCLE9BQU8sc0JBQXNCLENBQUMsYUFBYSxDQUFDO1NBQzdDO1FBRUQsb0NBQW9DO1FBQ3BDLE1BQU0sTUFBTSxHQUFHLE1BQU0sVUFBVSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFcEQsSUFBSSxNQUFNLEVBQUU7WUFDVix3RUFBd0U7WUFDeEUsNENBQTRDO1lBQzVDLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRTtnQkFDeEIsTUFBTSxRQUFRLEdBQUcsc0JBQXNCLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDdkYsUUFBUSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDO2dCQUN2QyxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUM7Z0JBRXRCLE9BQU8sUUFBUSxDQUFDO1lBQ2xCLENBQUMsQ0FBQyxDQUFDO1NBQ0o7UUFFRCxPQUFPLEVBQUUsQ0FBQztJQUNaLENBQUM7O0FBL0dILHlDQWdIQztBQS9HQzs7O0dBR0c7QUFDSSxvQ0FBYSxHQUE4QjtJQUNoRDtRQUNFLEtBQUssRUFBRSxZQUFZO1FBQ25CLElBQUksRUFBRSxRQUFRO1FBQ2QsVUFBVSxFQUFFLElBQUk7UUFDaEIsWUFBWSxFQUFFLGlCQUFpQjtRQUMvQixLQUFLLEVBQUUsU0FBUztRQUNoQixXQUFXLEVBQUUsRUFBRTtRQUNmLEtBQUssRUFBRSxJQUFJO1FBQ1gsSUFBSSxFQUFFLElBQUk7UUFDVixVQUFVLEVBQUUsS0FBSztRQUNqQixTQUFTLEVBQUUsSUFBSTtRQUNmLFVBQVUsRUFBRSxJQUFJO0tBQ2pCO0NBQ0YsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdG9yLWFjdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvZm9yZXN0LXNjaGVtYS9nZW5lcmF0b3ItYWN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQVN5QztBQU16QyxnREFBd0I7QUFFeEIsb0VBQTJDO0FBQzNDLG9FQUFtRDtBQUNuRCxvR0FBeUU7QUFFekUsTUFBcUIsc0JBQXNCO0lBcUJ6QyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQVk7UUFDL0IsT0FBTyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxVQUFzQixFQUFFLElBQVk7UUFDM0QsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFL0MsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUV6RSwwRUFBMEU7UUFDMUUsTUFBTSxJQUFJLEdBQUcsc0JBQXNCLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hELElBQUksTUFBTSxHQUFHLHNCQUFzQixDQUFDLGFBQWEsQ0FBQztRQUVsRCxJQUFJLE1BQU0sQ0FBQyxVQUFVLEVBQUU7WUFDckIsTUFBTSxPQUFPLEdBQUcsTUFBTSxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ2pFLE1BQU0sR0FBRyxzQkFBc0IsQ0FBQyxvQkFBb0IsQ0FBQyxVQUFVLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLE1BQU0sQ0FBQztZQUU1Rixz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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/agent",
-  "version": "1.41.12",
+  "version": "1.43.0",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -14,9 +14,9 @@
   "dependencies": {
     "@fast-csv/format": "^4.3.5",
     "@fastify/express": "^1.1.0",
-    "@forestadmin/datasource-customizer": "1.47.2",
-    "@forestadmin/datasource-toolkit": "1.34.5",
-    "@forestadmin/forestadmin-client": "1.27.8",
+    "@forestadmin/datasource-customizer": "1.49.0",
+    "@forestadmin/datasource-toolkit": "1.36.0",
+    "@forestadmin/forestadmin-client": "1.29.0",
     "@koa/cors": "^5.0.0",
     "@koa/router": "^12.0.0",
     "@types/koa__router": "^12.0.0",