From 46330d4e0605a25878016044037cdd3eb77d053a Mon Sep 17 00:00:00 2001
From: Ruben van Leeuwen <ruben.vanleeuwen@surf.nl>
Date: Mon, 29 Sep 2025 14:39:36 +0200
Subject: [PATCH 1/4] 2175: Adds changeset

---
 frontend/.changeset/big-dingos-follow.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 frontend/.changeset/big-dingos-follow.md

diff --git a/frontend/.changeset/big-dingos-follow.md b/frontend/.changeset/big-dingos-follow.md
new file mode 100644
index 0000000..f98629a
--- /dev/null
+++ b/frontend/.changeset/big-dingos-follow.md
@@ -0,0 +1,5 @@
+---
+'pydantic-forms': patch
+---
+
+Fixes resetting formdata with forms that have no properties

From cc63c090824c071b3f92efb6cb201941d2731804 Mon Sep 17 00:00:00 2001
From: Ruben van Leeuwen <ruben.vanleeuwen@surf.nl>
Date: Mon, 29 Sep 2025 14:40:05 +0200
Subject: [PATCH 2/4] 2175: Accept all 200 range status codes

---
 .../packages/pydantic-forms/src/core/hooks/useApiProvider.tsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/packages/pydantic-forms/src/core/hooks/useApiProvider.tsx b/frontend/packages/pydantic-forms/src/core/hooks/useApiProvider.tsx
index 9e94e3e..89fd15f 100644
--- a/frontend/packages/pydantic-forms/src/core/hooks/useApiProvider.tsx
+++ b/frontend/packages/pydantic-forms/src/core/hooks/useApiProvider.tsx
@@ -55,7 +55,8 @@ export function useApiProvider(
                     }
                     if (
                         request.status &&
-                        (request.status === 200 || request.status === 201)
+                        request.status >= 200 &&
+                        request.status < 300
                     ) {
                         return {
                             type: PydanticFormApiResponseType.SUCCESS,

From c79ba32f014fd025189faced509bdebc57cd9be7 Mon Sep 17 00:00:00 2001
From: Ruben van Leeuwen <ruben.vanleeuwen@surf.nl>
Date: Mon, 29 Sep 2025 14:41:16 +0200
Subject: [PATCH 3/4] 2175: Make options optional and dont add them to array
 fields with arrayItems

---
 .../src/components/defaultComponentMatchers.ts      |  6 ++++++
 .../src/components/fields/MultiCheckboxField.tsx    |  2 +-
 .../src/components/fields/MultiSelectField.tsx      |  2 +-
 .../src/components/fields/RadioField.tsx            |  2 +-
 .../src/core/hooks/usePydanticFormParser.tsx        | 13 +++++++++----
 frontend/packages/pydantic-forms/src/types.ts       |  2 +-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/frontend/packages/pydantic-forms/src/components/defaultComponentMatchers.ts b/frontend/packages/pydantic-forms/src/components/defaultComponentMatchers.ts
index 31ea907..6750c3b 100644
--- a/frontend/packages/pydantic-forms/src/components/defaultComponentMatchers.ts
+++ b/frontend/packages/pydantic-forms/src/components/defaultComponentMatchers.ts
@@ -3,6 +3,8 @@
  *
  * We will search for the first field that returns a positive match
  */
+import _ from 'lodash';
+
 import {
     ArrayField,
     CheckboxField,
@@ -101,6 +103,7 @@ const defaultComponentMatchers: PydanticComponentMatcher[] = [
             // We are looking for a single value from a set list of options. With less than 4 options, use radio buttons.
             return (
                 field.type === PydanticFormFieldType.STRING &&
+                _.isArray(field.options) &&
                 field.options?.length > 0 &&
                 field.options?.length <= 3
             );
@@ -116,6 +119,7 @@ const defaultComponentMatchers: PydanticComponentMatcher[] = [
             // We are looking for a single value from a set list of options. With more than 3 options, use a dropdown.
             return (
                 field.type === PydanticFormFieldType.STRING &&
+                _.isArray(field.options) &&
                 field.options?.length >= 4
             );
         },
@@ -139,6 +143,7 @@ const defaultComponentMatchers: PydanticComponentMatcher[] = [
         matcher(field) {
             return (
                 field.type === PydanticFormFieldType.ARRAY &&
+                _.isArray(field.options) &&
                 field.options?.length > 0 &&
                 field.options?.length <= 5
             );
@@ -153,6 +158,7 @@ const defaultComponentMatchers: PydanticComponentMatcher[] = [
         },
         matcher(field) {
             return (
+                _.isArray(field.options) &&
                 field.options?.length > 0 &&
                 field.type === PydanticFormFieldType.ARRAY
             );
diff --git a/frontend/packages/pydantic-forms/src/components/fields/MultiCheckboxField.tsx b/frontend/packages/pydantic-forms/src/components/fields/MultiCheckboxField.tsx
index ce4a6ad..f5c2a9e 100644
--- a/frontend/packages/pydantic-forms/src/components/fields/MultiCheckboxField.tsx
+++ b/frontend/packages/pydantic-forms/src/components/fields/MultiCheckboxField.tsx
@@ -28,7 +28,7 @@ export const MultiCheckboxField = ({
 
     return (
         <div>
-            {options.map((option: PydanticFormFieldOption) => {
+            {options?.map((option: PydanticFormFieldOption) => {
                 // Extract the unique ID for this option
                 const optionId = `${id}-${option.value}`;
 
diff --git a/frontend/packages/pydantic-forms/src/components/fields/MultiSelectField.tsx b/frontend/packages/pydantic-forms/src/components/fields/MultiSelectField.tsx
index 9f49ac6..f03452b 100644
--- a/frontend/packages/pydantic-forms/src/components/fields/MultiSelectField.tsx
+++ b/frontend/packages/pydantic-forms/src/components/fields/MultiSelectField.tsx
@@ -38,7 +38,7 @@ export const MultiSelectField = ({
                 }}
                 multiple
             >
-                {pydanticFormField.options.map(
+                {pydanticFormField.options?.map(
                     (option: PydanticFormFieldOption) => (
                         <option key={option.value} value={option.value}>
                             {option.label}
diff --git a/frontend/packages/pydantic-forms/src/components/fields/RadioField.tsx b/frontend/packages/pydantic-forms/src/components/fields/RadioField.tsx
index de39bb1..bf7d99c 100644
--- a/frontend/packages/pydantic-forms/src/components/fields/RadioField.tsx
+++ b/frontend/packages/pydantic-forms/src/components/fields/RadioField.tsx
@@ -16,7 +16,7 @@ export const RadioField = ({
 
     return (
         <div>
-            {options.map((option, key) => (
+            {options?.map((option, key) => (
                 <div key={key}>
                     <input
                         data-testid={`${id}-${option.value}`}
diff --git a/frontend/packages/pydantic-forms/src/core/hooks/usePydanticFormParser.tsx b/frontend/packages/pydantic-forms/src/core/hooks/usePydanticFormParser.tsx
index 9f7eccb..490ed52 100644
--- a/frontend/packages/pydantic-forms/src/core/hooks/usePydanticFormParser.tsx
+++ b/frontend/packages/pydantic-forms/src/core/hooks/usePydanticFormParser.tsx
@@ -74,9 +74,6 @@ const getPydanticFormField = (
           )
         : '';
 
-    const addConstValue =
-        typeof flatSchema.const === 'undefined' ? false : true;
-
     const arrayItem = flatSchema.items
         ? getPydanticFormField(
               flatSchema.items,
@@ -87,6 +84,14 @@ const getPydanticFormField = (
           )
         : undefined;
 
+    const addConstValue =
+        typeof flatSchema.const === 'undefined' ? false : true;
+
+    // Don't add options to array items if they have an arrayItem where they live
+    const addOptions = !(
+        flatSchema.type === PydanticFormFieldType.ARRAY && arrayItem
+    );
+
     //TODO: I think object properties should never be required only their properties are or aren't. Should we fix this in the backend?
     const required =
         flatSchema.type === PydanticFormFieldType.OBJECT
@@ -100,7 +105,7 @@ const getPydanticFormField = (
         arrayItem,
         format: flatSchema.format || PydanticFormFieldFormat.DEFAULT,
         type: flatSchema.type || PydanticFormFieldType.STRING,
-        options: options,
+        ...toOptionalObjectProperty({ options }, addOptions),
         default: flatSchema.default,
         attributes: attributes,
         schema: propertySchema,
diff --git a/frontend/packages/pydantic-forms/src/types.ts b/frontend/packages/pydantic-forms/src/types.ts
index 171787d..77c1cc9 100644
--- a/frontend/packages/pydantic-forms/src/types.ts
+++ b/frontend/packages/pydantic-forms/src/types.ts
@@ -46,7 +46,7 @@ export interface PydanticFormField {
     description?: string;
     type: PydanticFormFieldType;
     format: PydanticFormFieldFormat;
-    options: PydanticFormFieldOption[];
+    options?: PydanticFormFieldOption[];
     disabledOptions?: string[];
     default?: PydanticFormFieldValue;
     required: boolean;

From b5cf834f88d80927c6c43bf18310b2660c6b6544 Mon Sep 17 00:00:00 2001
From: Ruben van Leeuwen <ruben.vanleeuwen@surf.nl>
Date: Mon, 29 Sep 2025 15:15:22 +0200
Subject: [PATCH 4/4] 2175: Temp fix for adding simple values to arrayItems

---
 .../src/components/fields/IntegerField.tsx    | 13 +++++-
 .../src/components/fields/TextField.tsx       | 45 ++++++++++++-------
 frontend/packages/pydantic-forms/src/utils.ts |  2 +-
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/frontend/packages/pydantic-forms/src/components/fields/IntegerField.tsx b/frontend/packages/pydantic-forms/src/components/fields/IntegerField.tsx
index 23b4e26..c198e0f 100644
--- a/frontend/packages/pydantic-forms/src/components/fields/IntegerField.tsx
+++ b/frontend/packages/pydantic-forms/src/components/fields/IntegerField.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
 
+import _ from 'lodash';
+
 import type { PydanticFormControlledElementProps } from '@/types';
+import { getFormFieldIdWithPath } from '@/utils';
 
 export const IntegerField = ({
     value,
@@ -9,6 +12,14 @@ export const IntegerField = ({
     disabled,
     pydanticFormField,
 }: PydanticFormControlledElementProps) => {
+    // If the field is part of an array the value is passed in as an object with the field name as key
+    // this is imposed by react-hook-form. We try to detect this and extract the actual value
+    const fieldName = getFormFieldIdWithPath(pydanticFormField.id);
+    const fieldValue =
+        _.isObject(value) && _.has(value, fieldName)
+            ? _.get(value, fieldName)
+            : value;
+
     return (
         <input
             data-testid={pydanticFormField.id}
@@ -18,7 +29,7 @@ export const IntegerField = ({
                 onChange(value);
             }}
             disabled={disabled}
-            value={value}
+            value={fieldValue}
             type="number"
             style={{
                 padding: '8px',
diff --git a/frontend/packages/pydantic-forms/src/components/fields/TextField.tsx b/frontend/packages/pydantic-forms/src/components/fields/TextField.tsx
index a0933fa..9604d98 100644
--- a/frontend/packages/pydantic-forms/src/components/fields/TextField.tsx
+++ b/frontend/packages/pydantic-forms/src/components/fields/TextField.tsx
@@ -5,7 +5,10 @@
  */
 import React from 'react';
 
+import _ from 'lodash';
+
 import { PydanticFormControlledElementProps } from '@/types';
+import { getFormFieldIdWithPath } from '@/utils';
 
 export const TextField = ({
     value,
@@ -13,19 +16,29 @@ export const TextField = ({
     onBlur,
     disabled,
     pydanticFormField,
-}: PydanticFormControlledElementProps) => (
-    <input
-        data-testid={pydanticFormField.id}
-        onBlur={onBlur}
-        onChange={(t) => {
-            onChange(t.currentTarget.value);
-        }}
-        disabled={disabled}
-        value={value}
-        type="text"
-        style={{
-            padding: '8px',
-            margin: '8px 0',
-        }}
-    />
-);
+}: PydanticFormControlledElementProps) => {
+    // If the field is part of an array the value is passed in as an object with the field name as key
+    // this is imposed by react-hook-form. We try to detect this and extract the actual value
+    const fieldName = getFormFieldIdWithPath(pydanticFormField.id);
+    const fieldValue =
+        _.isObject(value) && _.has(value, fieldName)
+            ? _.get(value, fieldName)
+            : value;
+
+    return (
+        <input
+            data-testid={pydanticFormField.id}
+            onBlur={onBlur}
+            onChange={(t) => {
+                onChange(t.currentTarget.value);
+            }}
+            disabled={disabled}
+            value={fieldValue}
+            type="text"
+            style={{
+                padding: '8px',
+                margin: '8px 0',
+            }}
+        />
+    );
+};
diff --git a/frontend/packages/pydantic-forms/src/utils.ts b/frontend/packages/pydantic-forms/src/utils.ts
index 8c5030c..6e1f033 100644
--- a/frontend/packages/pydantic-forms/src/utils.ts
+++ b/frontend/packages/pydantic-forms/src/utils.ts
@@ -127,7 +127,7 @@ export function getFormFieldValue(
  */
 export function getFormFieldIdWithPath(
     pydanticFormFieldId: PydanticFormField['id'],
-    fieldName: string,
+    fieldName?: string,
 ): string {
     const pathToParent = pydanticFormFieldId.split('.');
     pathToParent.pop();