swoop-common 2.2.187 → 2.2.188

package/dist/rendering/components/StyledFormView.js

@@ -7,11 +7,44 @@ import { generateJsonSchema } from "../schema/generate/jsonSchemaGenerate";
 import { generateUiSchema } from "../schema/generate/uiSchemaGenerate";
 import { initialisedCheck } from "../../api/init";
 import ComponentContext from "../contexts/ComponentContext";
+function normalizeFormData(data, schema) {
+    if (!schema || typeof schema !== "object" || !data || typeof data !== "object") {
+        return data;
+    }
+    const normalized = Array.isArray(data) ? [...data] : Object.assign({}, data);
+    if (schema.type === "object" && schema.properties) {
+        for (const [key, propSchema] of Object.entries(schema.properties)) {
+            const val = data[key];
+            if (val !== undefined && propSchema && typeof propSchema === "object") {
+                const type = propSchema.type;
+                if (type === "array") {
+                    const itemsSchema = propSchema.items;
+                    const valAsArray = Array.isArray(val)
+                        ? val
+                        : (val === null || val === undefined ? [] : [val]);
+                    if (itemsSchema && typeof itemsSchema === "object") {
+                        normalized[key] = valAsArray.map((item) => normalizeFormData(item, itemsSchema));
+                    }
+                    else {
+                        normalized[key] = valAsArray;
+                    }
+                }
+                else if (type === "object") {
+                    normalized[key] = normalizeFormData(val, propSchema);
+                }
+            }
+        }
+    }
+    return normalized;
+}
 export const StyledFormView = ({ initialData, schema, onChange, stage, pool, readonly, hideReadonlyFields, hintComponentId, overrideJsonSchema, overrideUiSchema, }) => {
     useEffect(initialisedCheck, []);
     const wrapperRef = React.useRef(null);
     const json = overrideJsonSchema || generateJsonSchema(schema, stage, hideReadonlyFields);
     const ui = overrideUiSchema || generateUiSchema(schema, stage, hideReadonlyFields);
+    const normalizedData = React.useMemo(() => {
+        return normalizeFormData(initialData, json);
+    }, [initialData, json]);
     useEffect(() => {
         const root = wrapperRef.current;
         if (!root)
@@ -105,7 +138,7 @@ export const StyledFormView = ({ initialData, schema, onChange, stage, pool, rea
                 },
             } }),
         React.createElement("div", { className: "json-forms-wrapper", ref: wrapperRef },
-            React.createElement(JsonForms, { onChange: onChange, data: initialData, schema: json, uischema: ui, renderers: [
+            React.createElement(JsonForms, { onChange: onChange, data: normalizedData, schema: json, uischema: ui, renderers: [
                     ...materialRenderers,
                     ...((pool && getComponents(pool)) || []),
                 ], readonly: readonly, cells: materialCells }))));

package/dist/rendering/prebuild/generated/import_generated.d.ts

@@ -6,6 +6,7 @@ import "../../renderers/Debug";
 import "../../renderers/Example";
 import "../../renderers/Image/ImageForm";
 import "../../renderers/Image/ImagePresentation";
+import "../../renderers/MultiEnum";
 import "../../renderers/NestedObjectArray";
 import "../../renderers/StagedText";
 import "../../renderers/Subset";

package/dist/rendering/prebuild/generated/import_generated.js

@@ -8,6 +8,7 @@ import "../../renderers/Debug";
 import "../../renderers/Example";
 import "../../renderers/Image/ImageForm";
 import "../../renderers/Image/ImagePresentation";
+import "../../renderers/MultiEnum";
 import "../../renderers/NestedObjectArray";
 import "../../renderers/StagedText";
 import "../../renderers/Subset";

package/dist/rendering/renderers/MultiEnum.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/rendering/renderers/MultiEnum.js

@@ -0,0 +1,33 @@
+import { resolveSchema } from "@jsonforms/core";
+import React from "react";
+import { Autocomplete, TextField } from "@mui/material";
+import { ComponentPool } from "../registry/types";
+import { registerComponent } from "../registry/components";
+const MultiEnumRenderer = ({ data, handleChange, path, schema, label, enabled, required }) => {
+    const resolvedItems = schema.items;
+    const options = Array.isArray(resolvedItems === null || resolvedItems === void 0 ? void 0 : resolvedItems.enum) ? resolvedItems.enum : [];
+    const value = Array.isArray(data) ? data : [];
+    const handleSelectChange = (_event, newValue) => {
+        handleChange(path, newValue);
+    };
+    return (React.createElement(Autocomplete, { multiple: true, options: options, value: value, onChange: handleSelectChange, disabled: !enabled, renderInput: (params) => (React.createElement(TextField, Object.assign({}, params, { label: label, required: required, variant: "outlined", fullWidth: true }))), fullWidth: true, sx: { mt: 1.5, mb: 1.5 } }));
+};
+const multiEnumTester = (uischema, schema) => {
+    const ui = uischema;
+    if (!ui || !ui.scope)
+        return -1;
+    const resolved = resolveSchema(schema, ui.scope, schema);
+    if (!resolved)
+        return -1;
+    if (resolved.type === "array" &&
+        resolved.multiSelect === true &&
+        resolved.items &&
+        typeof resolved.items === "object") {
+        const items = resolved.items;
+        if (items.type === "string" && Array.isArray(items.enum)) {
+            return 10;
+        }
+    }
+    return -1;
+};
+registerComponent("multi-enum-select", MultiEnumRenderer, ComponentPool.FORM, multiEnumTester);

package/dist/rendering/renderers/NestedObjectArray.js

@@ -67,7 +67,7 @@ const NestedObjectArrayRenderer = ({ data, handleChange, path, schema, label, en
                         gap: 1
                     } },
                     React.createElement(Typography, { sx: { flex: 1 } }, getItemLabel(item, index)),
-                    enabled && (React.createElement(IconButton, { size: "small", color: "error", onClick: (e) => removeItem(e, index), "aria-label": "Remove item" },
+                    enabled && (React.createElement(IconButton, { component: "span", size: "small", color: "error", onClick: (e) => removeItem(e, index), "aria-label": "Remove item" },
                         React.createElement(DeleteIcon, { fontSize: "small" }))))),
             React.createElement(AccordionDetails, null,
                 React.createElement(JsonForms, { schema: itemSchema, data: item, onChange: ({ data: newData }) => handleItemChange(index, newData), renderers: renderers, cells: materialCells, readonly: !enabled }))))),

package/dist/rendering/schema/generate/jsonSchemaGenerate.js

@@ -29,7 +29,7 @@ export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
     }
 };
 const defaultConverter = (field, stage, omitTitle, isChild) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     field.fieldType = (_a = field.fieldType) !== null && _a !== void 0 ? _a : "string";
     let schema = getType(field.fieldType);
     if (!schema)
@@ -94,5 +94,11 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
         : {};
     let title = omitTitle ? undefined : field.name;
     let isReadonly = !isChild && !field.editableIn.map(Number).includes(stage);
+    if (field.fieldType === "enum" && ((_e = field.enumOptions) === null || _e === void 0 ? void 0 : _e.multiSelect)) {
+        return Object.assign(Object.assign(Object.assign({}, (isReadonly && { readOnly: true })), { title, type: "array", "x-type": schema.schema["x-type"], items: {
+                type: "string",
+                enum: enumOpts || [],
+            }, uniqueItems: true }), directOptions);
+    }
     return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (isReadonly && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), (field.fieldType === "object" && { required: requiredFields })), (enumOpts && { enum: enumOpts })), (radioOpts && { enum: radioOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties })), directOptions);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "swoop-common",
-    "version": "2.2.187",
+    "version": "2.2.188",
     "main": "dist/api/index.js",
     "types": "dist/api/index.d.ts",
     "exports": {