@headless-adminapp/app 0.0.17-alpha.19 → 0.0.17-alpha.21

package/dataform/utils/index.js

@@ -59,8 +59,8 @@ function getModifiedValues(initialValues, values, exclude) {
 function saveRecord(_a) {
     return __awaiter(this, arguments, void 0, function* ({ values, form, schema, dataService, initialValues, record, schemaStore, }) {
         const controls = (0, DataResolver_1.getControls)(form);
-        const editableGridControls = controls.filter(control => control.type === 'editablegrid');
-        const modifiedValues = getModifiedValues(initialValues, values, editableGridControls.map(x => x.attributeName));
+        const editableGridControls = controls.filter((control) => control.type === 'editablegrid');
+        const modifiedValues = getModifiedValues(initialValues, values, editableGridControls.map((x) => x.attributeName));
         let recordId;
         if (record) {
             recordId = record[schema.idAttribute];
@@ -77,9 +77,9 @@ function saveRecord(_a) {
                 const gridSchema = schemaStore.getSchema(control.logicalName);
                 const gridRows = values[control.attributeName];
                 const initialGridRows = initialValues[control.attributeName];
-                const newRows = gridRows.filter(x => !x[gridSchema.idAttribute]);
-                const updatedRows = gridRows.filter(x => x[gridSchema.idAttribute]);
-                const deletedIds = initialGridRows === null || initialGridRows === void 0 ? void 0 : initialGridRows.map(x => x[gridSchema.idAttribute]).filter(id => !gridRows.find(x => x[gridSchema.idAttribute] === id));
+                const newRows = gridRows.filter((x) => !x[gridSchema.idAttribute]);
+                const updatedRows = gridRows.filter((x) => x[gridSchema.idAttribute]);
+                const deletedIds = initialGridRows === null || initialGridRows === void 0 ? void 0 : initialGridRows.map((x) => x[gridSchema.idAttribute]).filter((id) => !gridRows.find((x) => x[gridSchema.idAttribute] === id));
                 for (const row of newRows) {
                     operations.push({
                         type: 'create',
@@ -90,7 +90,7 @@ function saveRecord(_a) {
                     });
                 }
                 for (const row of updatedRows) {
-                    const initialRow = initialGridRows.find(x => x[gridSchema.idAttribute] === row[gridSchema.idAttribute]);
+                    const initialRow = initialGridRows.find((x) => x[gridSchema.idAttribute] === row[gridSchema.idAttribute]);
                     if (!initialRow) {
                         throw new Error('Initial row not found');
                     }
@@ -154,10 +154,10 @@ function saveRecord(_a) {
 }
 function getInitialValues({ cloneRecord, form, record, recordId, defaultParameters, }) {
     const formColumns = (0, DataResolver_1.getColumns)(form);
-    const editableGridControls = (0, DataResolver_1.getControls)(form).filter(control => control.type === 'editablegrid');
+    const editableGridControls = (0, DataResolver_1.getControls)(form).filter((control) => control.type === 'editablegrid');
     const allColumns = [
         ...formColumns,
-        ...editableGridControls.map(x => x.attributeName),
+        ...editableGridControls.map((x) => x.attributeName),
     ];
     if (!recordId && !record && form.experience.cloneAttributes && cloneRecord) {
         const cloneAttributesObj = form.experience.cloneAttributes.reduce((acc, item) => {
@@ -217,12 +217,12 @@ exports.formValidator = (0, lodash_1.memoize)(function formValidator({ form, sch
         let validator = yup.object().shape({});
         if (!formReadOnly) {
             const activeControls = form.experience.tabs
-                .flatMap(tab => tab.tabColumns)
-                .flatMap(tabColumn => tabColumn.sections)
-                .flatMap(section => {
+                .flatMap((tab) => tab.tabColumns)
+                .flatMap((tabColumn) => tabColumn.sections)
+                .flatMap((section) => {
                 return section.controls;
             })
-                .filter(control => {
+                .filter((control) => {
                 if (control.type === 'standard') {
                     const attribute = schema.attributes[control.attributeName];
                     if (attribute.readonly) {
@@ -231,15 +231,15 @@ exports.formValidator = (0, lodash_1.memoize)(function formValidator({ form, sch
                 }
                 return true;
             });
-            const editableGridControls = activeControls.filter(control => control.type === 'editablegrid');
+            const editableGridControls = activeControls.filter((control) => control.type === 'editablegrid');
             const columns = Array.from(new Set([
                 schema.primaryAttribute,
                 ...activeControls
-                    .filter(control => control.type === 'standard')
-                    .map(control => control.attributeName),
+                    .filter((control) => control.type === 'standard')
+                    .map((control) => control.attributeName),
             ]));
             validator = (0, exports.generateValidationSchema)({
-                editableGrids: editableGridControls.map(control => {
+                editableGrids: editableGridControls.map((control) => {
                     if (control.type !== 'editablegrid') {
                         throw new Error('Invalid control type');
                     }
@@ -312,6 +312,11 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
         case 'number':
             validationSchema = yup.number().nullable();
             break;
+        case 'attachments':
+        case 'choices':
+        case 'lookups':
+            validationSchema = yup.array().nullable();
+            break;
         default:
             validationSchema = yup.mixed().nullable();
             break;
@@ -338,10 +343,23 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
                 validationSchema = validationSchema.matches(/^(\+\d{1,2}\s?)?\d{10}$/, `${label}: ${strings.invalidPhoneNumber}`);
             }
             break;
+        case 'attachments':
+            if (attribute.required) {
+                validationSchema = validationSchema.min(1, `${label}: ${strings.required}`);
+            }
+            if (attribute.maxSize) {
+                validationSchema = validationSchema.test('fileSize', `${label}: ${strings.fileSizeExceeded}`, (value) => {
+                    if (!value) {
+                        return true;
+                    }
+                    return value.every((file) => (file === null || file === void 0 ? void 0 : file.size) && file.size <= attribute.maxSize);
+                });
+            }
+            break;
         default:
             break;
     }
-    validationSchema = validationSchema.transform(value => {
+    validationSchema = validationSchema.transform((value) => {
         if (value === '') {
             return null;
         }

package/form/FormValidationStringContext.d.ts

@@ -6,6 +6,7 @@ export interface FormValidationStringSet {
     invalidEmail: string;
     invalidPhoneNumber: string;
     atLeastOneRowRequired: string;
+    fileSizeExceeded: string;
 }
 export declare const defaultFormValidationStrings: FormValidationStringSet;
 export declare const FormValidationStringContext: import("react").Context<FormValidationStringSet>;

package/form/FormValidationStringContext.js

@@ -11,6 +11,7 @@ exports.defaultFormValidationStrings = {
     invalidEmail: 'Invalid email.',
     invalidPhoneNumber: 'Invalid phone number.',
     atLeastOneRowRequired: 'At least one row required.',
+    fileSizeExceeded: 'File size exceeded.',
 };
 exports.FormValidationStringContext = (0, react_1.createContext)(exports.defaultFormValidationStrings);
 function useFormValidationStrings() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "0.0.17-alpha.19",
+  "version": "0.0.17-alpha.21",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -39,5 +39,5 @@
     "react-hook-form": "7.52.2",
     "yup": "^1.4.0"
   },
-  "gitHead": "89b5dcafe7018f95dd77861003216f4fa365d15f"
+  "gitHead": "559490088acc4f2c5c54a7d6aa913f21747ccee8"
 }