fixbug

open-formulieren · Aug 19, 2024 · 837b52a · 837b52a
1 parent b60aaff
commit 837b52a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/...enforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsForm.js b/...enforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsForm.js
@@ -20,6 +20,7 @@ const ObjectsApiOptionsForm = ({index, name, label, schema, formData, onChange})
   const {objectsApiGroup} = schema.properties;
   const apiGroupChoices = getChoicesFromSchema(objectsApiGroup.enum, objectsApiGroup.enumNames);
   const numErrors = filterErrors(name, validationErrors).length;
+  const defaultGroup = apiGroupChoices.length === 1 ? apiGroupChoices[0][0] : undefined;
 
   return (
     <Field name={name} label={label}>
@@ -76,10 +77,7 @@ const ObjectsApiOptionsForm = ({index, name, label, schema, formData, onChange})
             initialValues={{
               ...formData,
               // Ensure that if there's only one option, it is automatically selected.
-              objectsApiGroup:
-                formData.objectsApiGroup ?? apiGroupChoices.length === 1
-                  ? apiGroupChoices[0][0]
-                  : undefined,
+              objectsApiGroup: formData.objectsApiGroup ?? defaultGroup,
             }}
             onSubmit={(values, actions) => {
               onChange({formData: values});

diff --git a/src/openforms/js/components/admin/form_design/registrations/zgw/ZGWOptionsForm.js b/src/openforms/js/components/admin/form_design/registrations/zgw/ZGWOptionsForm.js
@@ -26,7 +26,7 @@ const ZGWOptionsForm = ({index, name, label, schema, formData, onChange}) => {
   );
 
   const numErrors = filterErrors(name, validationErrors).length;
-
+  const defaultGroup = apiGroupChoices.length === 1 ? apiGroupChoices[0][0] : undefined;
   return (
     <Field name={name} label={label}>
       <>
@@ -82,10 +82,7 @@ const ZGWOptionsForm = ({index, name, label, schema, formData, onChange}) => {
             initialValues={{
               ...formData,
               // Ensure that if there's only one option, it is automatically selected.
-              zgwApiGroup:
-                formData.zgwApiGroup ?? apiGroupChoices.length === 1
-                  ? apiGroupChoices[0][0]
-                  : undefined,
+              zgwApiGroup: formData.zgwApiGroup ?? defaultGroup,
             }}
             onSubmit={(values, actions) => {
               onChange({formData: values});
@@ -136,7 +133,7 @@ ZGWOptionsForm.propTypes = {
     }).isRequired,
   }).isRequired,
   formData: PropTypes.shape({
-    zgwApiGroup: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    zgwApiGroup: PropTypes.number,
     zaaktype: PropTypes.string,
     informatieobjecttype: PropTypes.string,
     organisatieRsin: PropTypes.string,