@luomus/laji-form 15.1.59 → 15.1.60

package/lib/components/LajiForm.js

@@ -269,7 +269,7 @@ class LajiForm extends React.Component {
                     this.validateAndSubmit(warnings, onlySchema);
                 }
                 else if (valid) {
-                    onSubmit && onSubmit({ formData: this.memoizedFormContext.services.ids.removeLajiFormIds(formData) });
+                    onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit({ formData: removeUndefinedFromArrays(this.memoizedFormContext.services.ids.removeLajiFormIds(formData)) });
                 }
                 else {
                     onValidationError && onValidationError(this.state.extraErrors);
@@ -303,7 +303,7 @@ class LajiForm extends React.Component {
                 liveValidations = {};
             }
             const schemaErrors = nonlive || onlySchema
-                ? validator_ajv6_1.default.validateFormData(formData, this.props.schema, undefined, ((e) => validation_2.transformErrors(this.state.formContext.translations, e))).errorSchema
+                ? validator_ajv6_1.default.validateFormData(removeUndefinedFromArrays(formData), this.props.schema, undefined, ((e) => validation_2.transformErrors(this.state.formContext.translations, e))).errorSchema
                 : {};
             block && this.memoizedFormContext.services.blocker.push();
             return new Promise(resolve => Promise.all([validation_1.default(validations, formData), validation_1.default(liveValidations, formData)]).then(([_validations, _liveValidations]) => {
@@ -639,3 +639,21 @@ LajiForm.defaultProps = {
     schema: {},
     uiSchema: {}
 };
+const removeUndefinedFromArrays = (formData) => {
+    if (utils_1.isObject(formData)) {
+        return Object.keys(formData).reduce((obj, k) => {
+            obj[k] = removeUndefinedFromArrays(formData[k]);
+            return obj;
+        }, {});
+    }
+    else if (Array.isArray(formData)) {
+        return formData.reduce((filtered, i) => {
+            if (i === undefined || i === null || i === "") {
+                return filtered;
+            }
+            filtered.push(removeUndefinedFromArrays(i));
+            return filtered;
+        }, []);
+    }
+    return formData;
+};

package/lib/components/fields/SchemaField.js

@@ -77,13 +77,14 @@ class _SchemaField extends React.Component {
         return Object.assign(Object.assign({}, _props), { uiSchema: Object.assign(Object.assign({}, _props.uiSchema), { "ui:functions": restUiFns }) });
     }
     render() {
+        var _a;
         const props = this.applyFunction(this.props);
         let { schema, uiSchema = {}, formContext, registry } = props, _props = __rest(props, ["schema", "uiSchema", "formContext", "registry"]); // eslint-disable-line @typescript-eslint/no-unused-vars
         const { formContext: _formContext } = registry;
         // rjsf displays a duplicate label if 'uniqueItems' is true in some cases. We prevent that here.
         // Example of when it shows duplicate is http://localhost:8083/?id=JX.652&local=true, "Elinympäristö" on gathering
         // level.
-        if (types_1.isJSONSchemaArray(schema) && uiSchema && uiSchema.items && uiSchema.items["ui:field"]) {
+        if (types_1.isJSONSchemaArray(schema) && ((_a = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema.items) === null || _a === void 0 ? void 0 : _a["ui:field"])) {
             schema = Object.assign(Object.assign({}, schema), { uniqueItems: false });
         }
         const options = utils_1.getUiOptions(uiSchema);

package/lib/components/fields/SelectTreeField.js

@@ -110,7 +110,7 @@ const getChildProps = (props) => {
     while (d >= 0) {
         formData[d] = n;
         if (utils_1.isEmptyString(n)) {
-            n = undefined; //object keys can't be "", so root key is in childrenMap 'undefined'.
+            n = undefined; // object keys can't be "", so root key is in childrenMap 'undefined'.
         }
         addSelect(d, n, Object.keys(childrenMap[parentsMap[n]]));
         d--;

package/lib/components/widgets/SelectWidget.js

@@ -85,7 +85,7 @@ function SearchableDrowndown(props) {
     const enumOptions = react_1.useMemo(() => 
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     getEnumOptions(options.enumOptions, uiSchema, includeEmpty), [options.enumOptions, uiSchema, includeEmpty]);
-    const getLabelFromValue = react_1.useCallback((value) => value !== undefined && value !== ""
+    const getLabelFromValue = react_1.useCallback((value) => value !== undefined && value !== "" && value !== null
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         ? enumOptions.find(item => item.value === value).label
         : "", [enumOptions]);

package/lib/types.js

@@ -6,7 +6,7 @@ function isJSONSchemaObject(schema) {
 }
 exports.isJSONSchemaObject = isJSONSchemaObject;
 function isJSONSchemaArray(schema) {
-    return schema.type === "object";
+    return schema.type === "array";
 }
 exports.isJSONSchemaArray = isJSONSchemaArray;
 function isJSONSchemaEnum(jsonSchema) {

package/package.json

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