Merge pull request #3403 from ingef/fix-disclosure-default-validation

Re-trigger validation of default values after applying them to disclosure list field

frontend/src/js/external-forms/form/Field.tsx

@@ -1,5 +1,10 @@
 import { memo } from "react";
-import { Control, UseFormRegister, UseFormSetValue } from "react-hook-form";
+import {
+  Control,
+  UseFormRegister,
+  UseFormSetValue,
+  UseFormTrigger,
+} from "react-hook-form";
 
 import type { SelectOptionT } from "../../api/types";
 import { useDatasetId } from "../../dataset/selectors";
@@ -35,6 +40,7 @@ const Field = ({
   register: UseFormRegister<DynamicFormValues>;
   setValue: UseFormSetValue<DynamicFormValues>;
   control: Control<DynamicFormValues>;
+  trigger: UseFormTrigger<DynamicFormValues>;
 }) => {
   const datasetId = useDatasetId();
   const { locale, availableDatasets } = commonProps;

frontend/src/js/external-forms/form/Form.tsx

@@ -46,6 +46,7 @@ const Form = memo(({ config, datasetOptions, methods }: Props) => {
             h1Index={h1Index}
             register={methods.register}
             control={methods.control}
+            trigger={methods.trigger}
             field={field}
             setValue={methods.setValue}
             availableDatasets={datasetOptions}

frontend/src/js/external-forms/form/fields/DisclosureListField.tsx

@@ -159,9 +159,10 @@ export const DisclosureListField = ({
         // to useForm above. But somehow, it doesn't. So we have to
         // manually apply the default value here.
         replace(defaultValue);
+        setTimeout(() => commonProps.trigger(), 100);
       }
     },
-    [fields.length, replace, defaultValue],
+    [fields.length, replace, defaultValue, commonProps],
   );
 
   if (field.fields.length === 0) return null;