@aemforms/af-core 0.22.38 → 0.22.41

package/lib/FileUpload.js

@@ -17,6 +17,7 @@ const Field_1 = __importDefault(require("./Field"));
 const FormUtils_1 = require("./utils/FormUtils");
 const FileObject_1 = require("./FileObject");
 const ValidationUtils_1 = require("./utils/ValidationUtils");
+const EmptyDataValue_1 = __importDefault(require("./data/EmptyDataValue"));
 function addNameToDataURL(dataURL, name) {
     return dataURL.replace(';base64', `;name=${encodeURIComponent(name)};base64`);
 }
@@ -105,7 +106,7 @@ class FileUpload extends Field_1.default {
     importData(dataModel) {
         this._bindToDataModel(dataModel);
         const dataNode = this.getDataNode();
-        if (dataNode !== undefined) {
+        if (dataNode !== undefined && dataNode !== EmptyDataValue_1.default) {
             const value = dataNode === null || dataNode === void 0 ? void 0 : dataNode.$value;
             if (value != null) {
                 const res = ValidationUtils_1.Constraints.type(this.getInternalType(), value);

package/lib/rules/FunctionRuntime.js

@@ -64,7 +64,7 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     else {
         context.form.logger.error('Error invoking a rest API');
         const eName = getCustomEventName(error);
-        context.form.dispatch(new Events_1.CustomEvent(eName, {}, true));
+        context.form.dispatch(new Events_1.CustomEvent(eName, result, true));
     }
 });
 exports.request = request;
@@ -118,7 +118,7 @@ const submit = (context, success, error, submitAs = 'multipart/form-data', input
     if (typeof data != 'object' || data == null) {
         data = context.form.exportData();
     }
-    const attachments = (0, FormUtils_1.getAttachments)(context.form);
+    const attachments = (0, FormUtils_1.getAttachments)(context.form, true);
     let submitContentType = submitAs;
     const submitDataAndMetaData = { 'data': data, 'submitMetadata': { 'lang': context.form.lang } };
     let formData = submitDataAndMetaData;

package/lib/utils/Fetch.js

@@ -20,16 +20,13 @@ const request = (url, data = null, options = {}) => {
         var _a, _b, _c;
         let body;
         if (!response.ok) {
-            console.error(`Error fetching response from ${url} : ${response.statusText}`);
-            body = response.statusText;
+            console.error(`Error while fetching response from ${url} : ${response.statusText}`);
+        }
+        if ((_b = (_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a.get('Content-Type')) === null || _b === void 0 ? void 0 : _b.includes('application/json')) {
+            body = yield response.json();
         }
         else {
-            if ((_b = (_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a.get('Content-Type')) === null || _b === void 0 ? void 0 : _b.includes('application/json')) {
-                body = yield response.json();
-            }
-            else {
-                body = yield response.text();
-            }
+            body = yield response.text();
         }
         const headers = {};
         (_c = response === null || response === void 0 ? void 0 : response.headers) === null || _c === void 0 ? void 0 : _c.forEach((value, key) => {

package/lib/utils/FormUtils.d.ts

@@ -1,7 +1,7 @@
 import { ContainerModel } from '../types/index';
 export declare const randomWord: (l: number) => string;
 export declare const isEmpty: (value: any) => boolean;
-export declare const getAttachments: (input: ContainerModel) => any;
+export declare const getAttachments: (input: ContainerModel, excludeUnbound?: boolean) => any;
 export declare const getFileSizeInBytes: (str: any) => number;
 export declare const IdGenerator: (initial?: number) => Generator<string, void, string>;
 export declare const isDataUrl: (str: string) => boolean;

package/lib/utils/FormUtils.js

@@ -24,12 +24,15 @@ const isEmpty = (value) => {
     return value === '' || value === null || value === undefined;
 };
 exports.isEmpty = isEmpty;
-const getAttachments = (input) => {
+const getAttachments = (input, excludeUnbound = false) => {
     const items = input.items || [];
     return items === null || items === void 0 ? void 0 : items.reduce((acc, item) => {
+        if (excludeUnbound && item.dataRef === null) {
+            return acc;
+        }
         let ret = null;
         if (item.isContainer) {
-            ret = (0, exports.getAttachments)(item);
+            ret = (0, exports.getAttachments)(item, excludeUnbound);
         }
         else {
             if ((0, JsonUtils_1.isFile)(item.getState())) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.38",
+  "version": "0.22.41",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.38"
+    "@aemforms/af-formatters": "^0.22.41"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",