@luomus/laji-form 15.1.120 → 15.1.121

package/lib/components/LajiForm.d.ts

@@ -488,7 +488,7 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
     addEventListener: (target: typeof document | typeof window, name: string, fn: (e: Event) => void) => void;
     setTimeout: (fn: () => void, time?: number) => number;
     destroy: () => void;
-    getSchemaValidationErrors: (formData: any) => any;
+    getSchemaValidationErrors: (formData: any) => ErrorSchema;
     getFormDataReadyForSubmit: (formData: any, schema: JSONSchema) => {
         formData: any;
         removedArrayItemsAndObjects: string[];

package/lib/components/LajiForm.js

@@ -377,7 +377,7 @@ class LajiForm extends React.Component {
             ignoreErrorPaths.forEach(path => {
                 schemaErrors = (0, utils_1.immutableDelete)(schemaErrors, path);
             });
-            return schemaErrors;
+            return removeEmptyErrorObjects(schemaErrors);
         };
         this.getFormDataReadyForSubmit = (formData, schema) => {
             formData = this.memoizedFormContext.services.ids.removeLajiFormIds(formData);
@@ -597,6 +597,21 @@ const removeEmptyValuesAndTrim = (formData, schema) => {
         return formData;
     }
 };
+const removeEmptyErrorObjects = (errors) => {
+    const result = {};
+    for (const key of Object.keys(errors)) {
+        if (key === "__errors") {
+            result[key] = errors[key];
+        }
+        else if (errors[key]) {
+            const cleanedValue = removeEmptyErrorObjects(errors[key]);
+            if (Object.keys(cleanedValue).length > 0) {
+                result[key] = cleanedValue;
+            }
+        }
+    }
+    return Object.keys(result).length === 0 ? {} : result;
+};
 const getShortcuts = (uiSchema) => {
     var _a, _b;
     if ((_b = (_a = window.navigator) === null || _a === void 0 ? void 0 : _a.platform) === null || _b === void 0 ? void 0 : _b.includes("Mac")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.120",
+  "version": "15.1.121",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/test-export/test-utils.d.ts

@@ -268,4 +268,5 @@ export declare const maybeJSONPointerToLocator: (pointer: string) => string;
 /** Fills value into given input and presses tab to unfocus it. Useful for inputs with debounce */
 export declare const updateValue: ($input: Locator, value: string) => Promise<void>;
 export declare const getRemoveUnit: (page: Page) => (gatheringIdx: number, unitIdx: number) => Promise<void>;
+export declare const getRemoveIdentification: (page: Page) => (gatheringIdx: number, unitIdx: number, identificationIdx: number) => Promise<void>;
 export {};

package/test-export/test-utils.js

@@ -53,7 +53,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemoveUnit = exports.updateValue = exports.maybeJSONPointerToLocator = exports.filterUUIDs = exports.mockImageMetadata = exports.DemoPageForm = exports.Form = exports.getFocusedId = exports.getFocusedElement = exports.lajiFormLocate = exports.lajiFormLocator = exports.navigateToForm = exports.emptyForm = void 0;
+exports.getRemoveIdentification = exports.getRemoveUnit = exports.updateValue = exports.maybeJSONPointerToLocator = exports.filterUUIDs = exports.mockImageMetadata = exports.DemoPageForm = exports.Form = exports.getFocusedId = exports.getFocusedElement = exports.lajiFormLocate = exports.lajiFormLocator = exports.navigateToForm = exports.emptyForm = void 0;
 exports.createForm = createForm;
 const path = __importStar(require("path"));
 const test_utils_1 = require("@luomus/laji-map/test-export/test-utils");
@@ -415,3 +415,8 @@ const getRemoveUnit = (page) => (gatheringIdx, unitIdx) => __awaiter(void 0, voi
     return page.locator(`#root_gatherings_${gatheringIdx}_units_${unitIdx}-delete-confirm-yes`).click();
 });
 exports.getRemoveUnit = getRemoveUnit;
+const getRemoveIdentification = (page) => (gatheringIdx, unitIdx, identificationIdx) => __awaiter(void 0, void 0, void 0, function* () {
+    yield page.locator(`#root_gatherings_${gatheringIdx}_units_${unitIdx}_identifications_${identificationIdx}-delete`).click();
+    return page.locator(`#root_gatherings_${gatheringIdx}_units_${unitIdx}_identifications_${identificationIdx}-delete-confirm-yes`).click();
+});
+exports.getRemoveIdentification = getRemoveIdentification;