fix: pass usefieldff to modelsingleselectfield

dhis2 · Dec 10, 2024 · af49454 · af49454
1 parent 6365b6b
commit af49454
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/components/metadataFormControls/ModelSingleSelect/BaseModelSingleSelect.tsx b/src/components/metadataFormControls/ModelSingleSelect/BaseModelSingleSelect.tsx
@@ -11,7 +11,7 @@ const toDisplayOption = (model: DisplayableModel) => ({
 })
 
 type OwnProps<TModel> = {
-    selected: TModel | undefined
+    selected?: TModel
     available: TModel[]
     onChange: (selected: TModel | undefined) => void
     showNoValueOption?: boolean

diff --git a/src/components/metadataFormControls/ModelSingleSelect/ModelSingleSelectField.tsx b/src/components/metadataFormControls/ModelSingleSelect/ModelSingleSelectField.tsx
@@ -1,7 +1,6 @@
 import { Field } from '@dhis2/ui'
 import React from 'react'
-import { useField } from 'react-final-form'
-import { PlainResourceQuery } from '../../../types'
+import { useField, UseFieldConfig } from 'react-final-form'
 import { DisplayableModel } from '../../../types/models'
 import {
     ModelSingleSelectProps,
@@ -10,31 +9,46 @@ import {
 
 type OwnProps<TModel extends DisplayableModel> = {
     name: string
-    query: PlainResourceQuery
     label?: string
     placeholder?: string
     helpText?: string
     required?: boolean
     onChange?: ModelSingleSelectProps<TModel>['onChange']
 }
 
+type RelevantUseFieldProps<TModel extends DisplayableModel> = Pick<
+    UseFieldConfig<TModel | undefined>,
+    'validate' | 'validateFields' | 'initialValue' | 'format' | 'parse' | 'data'
+    >
+
 type ModelSingleSelectFieldProps<TModel extends DisplayableModel> = Omit<
     ModelSingleSelectProps<TModel>,
     'selected' | 'onChange'
 > &
-    OwnProps<TModel>
+    OwnProps<TModel> & RelevantUseFieldProps<TModel>
 
 export function ModelSingleSelectField<TModel extends DisplayableModel>({
     name,
-    query,
     label,
     helpText,
     required,
     onChange,
+    // react-final-form props
+    validate,
+    validateFields,
+    initialValue,
+    format,
+    parse,
+    data,
     ...modelSingleSelectProps
 }: ModelSingleSelectFieldProps<TModel>) {
     const { input, meta } = useField<TModel | undefined>(name, {
-        validateFields: [],
+        validateFields: validateFields ?? [],
+        validate,
+        initialValue,
+        format,
+        parse,
+        data
     })
 
     return (
@@ -55,7 +69,6 @@ export function ModelSingleSelectField<TModel extends DisplayableModel>({
                     input.onBlur()
                     onChange?.(selected)
                 }}
-                query={query}
             />
         </Field>
     )