Merge pull request #64 from workfloworchestrator/quick-bugfix

Quick bugfix

Author: DutchBen

backend/main.py

@@ -28,7 +28,7 @@
     Hidden,
     Choice,
     choice_list,
-    unique_conlist
+    unique_conlist,
 )
 
 # Choice,
@@ -79,9 +79,14 @@ def example_backend_validation(val: int) -> bool:
 
 
 NumberExample = Annotated[
-    int, Ge(1), Le(10), MultipleOf(multiple_of=3), Predicate(example_backend_validation)
+    int,
+    Ge(18),
+    Le(99),
+    MultipleOf(multiple_of=3),
+    Predicate(example_backend_validation),
 ]
 
+
 class DropdownChoices(Choice):
     _1 = ("1", "Option 1")
     _2 = ("2", "Option 2")
@@ -112,83 +117,118 @@ class ListChoices(Choice):
     _6 = ("6", "Option 6")
 
 
-class Education(BaseModel):
-    degree: str | None
-    year: int | None
+TestString = Annotated[str, Field(min_length=2, max_length=10)]
 
 
-class Person(BaseModel):
-    name: str
-    age: Annotated[int, Ge(18), Le(99)]
-    education: Education
+class Education(BaseModel):
+    degree: str
+    years: int | None
+
 
 def example_list_validation(val: int) -> bool:
     return True
 
-TestList = Annotated[
-    unique_conlist(str, min_items=2, max_items=5), Predicate(example_backend_validation)
-]
 
 TestExampleNumberList = Annotated[
-    unique_conlist(NumberExample, min_items=2, max_items=5), Predicate(example_list_validation)
+    unique_conlist(NumberExample, min_items=2, max_items=5),
+    Predicate(example_list_validation),
 ]
 
+
+class Education2(BaseModel):
+    degree: str
+    years: int | None
+    options: ListChoices
+    languages: TestExampleNumberList
+
+
+class Person(BaseModel):
+    name: str
+    age: Annotated[int, Ge(18), Le(99), MultipleOf(multiple_of=3)]
+    education: Education
+
+
+class Person2(BaseModel):
+    name: str
+    age: Annotated[int, Ge(18), Le(99), MultipleOf(multiple_of=3)]
+    education: Education2
+
+
 TestPersonList = Annotated[
     unique_conlist(Person, min_items=2, max_items=5), Predicate(example_list_validation)
 ]
 
+
+def is_maurits(val: str) -> bool:
+    if val != "Maurits":
+        raise ValueError("Has to be Maurits!")
+    return True
+
+
+StringExample = Annotated[str, Predicate(is_maurits)]
+
+
 @app.post("/form")
 async def form(form_data: list[dict] = []):
     def form_generator(state: State):
         class TestForm0(FormPage):
-            model_config = ConfigDict(title="Form Title Page 0")
+            model_config = ConfigDict(title="Form Title Page 1")
 
-            numberList: TestExampleNumberList
-            # personList: TestPersonList = []
+            number: NumberExample
+            list: TestExampleNumberList
+            # list_list: unique_conlist(TestExampleNumberList, min_items=1, max_items=5)
+            # list_list_list: unique_conlist(
+            # unique_conlist(Person2, min_items=1, max_items=5),
+            # min_items=1,
+            # max_items=2,
+            # ) = [1, 2]
+            test: TestString
+            textList: unique_conlist(TestString, min_items=1, max_items=5)
+            # numberList: TestExampleNumberList = [1, 2]
+            person: Person2
+            personList: unique_conlist(Person2, min_items=2, max_items=5)
             # ingleNumber: NumberExample
-
             # number0: Annotated[int, Ge(18), Le(99)] = 17
 
         form_data_0 = yield TestForm0
 
         class TestForm1(FormPage):
             model_config = ConfigDict(title="Form Title Page 1")
 
-            number1: Annotated[int, Ge(18), Le(99)] = 17
+            contact_name2: StringExample
+            options: ListChoices
 
         form_data_1 = yield TestForm1
 
         class TestForm2(FormPage):
             model_config = ConfigDict(title="Form Title Page 2")
 
-            number: NumberExample = 3
-            text: Annotated[str, Field(min_length=3, max_length=12)] = "Default text"
-            textArea: LongText = "Text area default"
-            divider: Divider
-            label: Label = "Label"
-            hidden: Hidden = "Hidden"
-            # When there are > 3 choices a dropdown will be rendered
-            dropdown: DropdownChoices = "2"
-            # When there are <= 3 choices a radio group will be rendered
-            radio: RadioChoices = "3"
-            #  checkbox: bool = True TODO: Fix validation errors on this
+            contact_name3: StringExample
+            age: NumberExample
 
-            # When there are <= 5 choices in a list a set of checkboxes are rendered
-            # multicheckbox: choice_list(MultiCheckBoxChoices, min_items=3) = ["1", "2"]
-            # list: choice_list(ListChoices) = [0, 1]
+        form_data_2 = yield TestForm2
 
-            person: Person
+        class TestForm3(FormPage):
+            model_config = ConfigDict(title="Form Title Page 3")
 
-        form_data_2 = yield TestForm2
+            contact_person: Person
+
+        form_data_3 = yield TestForm3
 
-        class TestSubmitForm(SubmitFormPage):
-            model_config = ConfigDict(title="Submit Form")
+        class TestForm5(FormPage):
+            model_config = ConfigDict(title="Form Title Page 4")
 
-            name_2: str | None = None
+            contact_person_list: TestPersonList
 
-        form_data_submit = yield TestSubmitForm
+        form_data_5 = yield TestForm5
 
-        return form_data_0.model_dump() |  form_data_1.model_dump() | form_data_2.model_dump() | form_data_submit.model_dump()
+        return (
+            form_data_0.model_dump()
+            | form_data_1.model_dump()
+            | form_data_2.model_dump()
+            | form_data_3.model_dump()
+            | form_data_5.model_dump()
+        )
 
     post_form(form_generator, state={}, user_inputs=form_data)
     return "OK!"

frontend/.changeset/tiny-moles-happen.md

@@ -0,0 +1,5 @@
+---
+'pydantic-forms': patch
+---
+
+Fixes array field value error

frontend/packages/pydantic-forms/src/components/fields/ArrayField.tsx

@@ -76,7 +76,7 @@ export const ArrayField = ({ pydanticFormField }: PydanticFormElementProps) => {
                 <div
                     onClick={() => {
                         append({
-                            [arrayName]: undefined,
+                            [arrayName]: arrayItem.default ?? undefined,
                         });
                     }}
                     style={{

frontend/packages/pydantic-forms/src/components/fields/IntegerField.tsx

@@ -18,7 +18,8 @@ export const IntegerField = ({
                 onChange(value);
             }}
             disabled={disabled}
-            value={!isObject(value) ? value : ''} // Value can be an object when it is created from an ArrayField
+            // Value will be an object when it is added by an array field. We do this be able to add more than one empty field
+            value={isObject(value) ? undefined : value}
             type="number"
             style={{
                 padding: '8px',

frontend/packages/pydantic-forms/src/components/fields/TextField.tsx

@@ -5,6 +5,8 @@
  */
 import React from 'react';
 
+import { isObject } from 'lodash';
+
 import { PydanticFormControlledElementProps } from '@/types';
 
 export const TextField = ({
@@ -19,7 +21,8 @@ export const TextField = ({
             onChange(t.currentTarget.value);
         }}
         disabled={disabled}
-        value={value}
+        // Value will be an object when it is added by an array field. We do this be able to add more than one empty field
+        value={isObject(value) ? '' : value}
         type="text"
         style={{
             padding: '8px',