Merge pull request #89 from workfloworchestrator/fix-show-minus-button

Show minus button in ArrayField even if min_items value is not provided.

Author: DutchBen

frontend/.changeset/clear-roses-report.md

@@ -0,0 +1,5 @@
+---
+'pydantic-forms': patch
+---
+
+Exports util functions and RenderFields component. Bugfixes

frontend/.changeset/vast-wings-sit.md

@@ -0,0 +1,5 @@
+---
+'pydantic-forms': patch
+---
+
+Show minus button in ArrayField even if min_items value is not provided.

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

@@ -46,15 +46,9 @@ export const ArrayField = ({ pydanticFormField }: PydanticFormElementProps) => {
                     ]}
                     extraTriggerFields={[arrayName]}
                 />
-                {!minItems ||
-                    (minItems && fields.length > minItems && (
-                        <span
-                            style={{ fontSize: '24px' }}
-                            onClick={() => remove(index)}
-                        >
-                            -
-                        </span>
-                    ))}
+                {(!minItems || (minItems && fields.length > minItems)) && (
+                    <span onClick={() => remove(index)}>-</span>
+                )}
             </div>
         );
     };

frontend/packages/pydantic-forms/src/components/render/index.ts

@@ -3,3 +3,4 @@ export * from './FormRenderer';
 export * from './RenderForm';
 export * from './RenderFormErrors';
 export * from './RenderReactHookFormErrors';
+export * from './RenderFields';

frontend/packages/pydantic-forms/src/components/zodValidationsPresets.ts

@@ -37,7 +37,7 @@ export const zodValidationPresets: PydanticFormZodValidationPresets = {
             try {
                 validationRule = validationRule?.regex(
                     new RegExp(pattern),
-                    'De invoer is niet volgens het juiste formaat',
+                    `De invoer is niet volgens het juiste formaat: ${pattern}`,
                 );
             } catch (error) {
                 console.error(

frontend/packages/pydantic-forms/src/index.tsx

@@ -2,3 +2,4 @@ export * from './types';
 export * from './PydanticForm';
 export * from './core';
 export * from './components';
+export * from './utils';

frontend/packages/pydantic-forms/src/types.ts

@@ -106,11 +106,7 @@ export interface PydanticFormField {
     oneOf?: PydanticFormFieldAnyOfDef[];
     allOf?: PydanticFormFieldAnyOfDef[];
 
-    uniforms?: {
-        disabled: boolean;
-        sensitive: boolean;
-        password: boolean;
-    };
+    uniforms?: UniformProperties;
     arrayItem?: PydanticFormField;
     properties?: Properties;
 }
@@ -436,11 +432,7 @@ export interface PydanticFormPropertySchemaParsed
     default?: string | null;
     format: PydanticFormFieldFormat;
 
-    uniforms?: {
-        disabled: boolean;
-        sensitive: boolean;
-        password: boolean;
-    };
+    uniforms?: UniformProperties;
 
     properties?: ParsedProperties;
 }
@@ -470,6 +462,13 @@ export interface PydanticFormFieldAnyOfItemParsed
     properties?: ParsedProperties;
 }
 
+type UniformProperties = {
+    disabled: boolean;
+    sensitive: boolean;
+    password: boolean;
+    [key: string]: string | boolean | number;
+};
+
 export interface PydanticFormPropertySchemaRawJson
     extends Omit<PydanticFormBaseSchema, 'type'>,
         PydanticFormFieldValidations,
@@ -483,11 +482,7 @@ export interface PydanticFormPropertySchemaRawJson
     default?: string | null;
     format: PydanticFormFieldFormat;
 
-    uniforms?: {
-        disabled: boolean;
-        sensitive: boolean;
-        password: boolean;
-    };
+    uniforms?: UniformProperties;
 
     properties?: RawJsonProperties;
 }