Merge pull request #252 from code0-tech/feat/#247

Default value for nested objects is wrongly created

Author: nicosammito

src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx

@@ -9,7 +9,7 @@ import {
 } from "@edition/datatype/components/inputs/json/DataTypeJSONInputEditDialogComponent";
 import {DataTypeInputValueComponent} from "@edition/datatype/components/inputs/DataTypeInputValueComponent";
 import {useDebouncedCallback} from "use-debounce";
-import {DataInput} from "@code0-tech/triangulum/dist/util/schema.util";
+import {DataInput, ListInput} from "@code0-tech/triangulum/dist/util/schema.util";
 
 export interface EditableJSONEntry {
     key: string
@@ -19,7 +19,6 @@ export interface EditableJSONEntry {
 
 export type DataTypeJSONInputComponentProps = DataTypeInputComponentProps
 
-//TODO render fallback value if undefined based on schema
 export const DataTypeJSONInputComponent: React.FC<DataTypeJSONInputComponentProps> = (props) => {
 
     const {schema, title, description, suggestions, formValidation, initialValue, onChange} = props
@@ -87,22 +86,23 @@ export const DataTypeJSONInputComponent: React.FC<DataTypeJSONInputComponentProp
 }
 
 
-//TODO: only if required
 const generateDefaultDataValue = (schema: DataInput): LiteralValue => {
     return {
         __typename: "LiteralValue",
-        value: {
-            ...(Object.entries(schema.properties ?? {})?.map(([key, propSchema]) => {
-                if (!Array.isArray(propSchema)) {
-                    if (propSchema.input === "data") {
-                        return {[key]: generateDefaultDataValue(propSchema).value}
-                    }
-                    if (propSchema.input === "list") {
-                        return {[key]: []}
+        value: Object.assign({}, ...Object.entries(schema.properties ?? {}).map(([key, propSchema]) => {
+            if (!Array.isArray(propSchema)) {
+                if (propSchema.input === "data") {
+                    return {[key]: generateDefaultDataValue(propSchema).value}
+                }
+                if (propSchema.input === "list") {
+                    const itemSchema = (propSchema as ListInput).items?.[0]
+                    if (itemSchema && !Array.isArray(itemSchema) && itemSchema.input === "data") {
+                        return {[key]: [generateDefaultDataValue(itemSchema as DataInput).value]}
                     }
-                    return {[key]: null}
+                    return {[key]: []}
                 }
-            }))
-        }
+                return {[key]: null}
+            }
+        }))
     }
 }