More generic function for form field conversion

Author: Archmonger

src/reactpy_django/forms/components.py

@@ -17,7 +17,7 @@
     set_value_prop_on_select_element,
     transform_value_prop_on_input_element,
 )
-from reactpy_django.forms.utils import convert_boolean_fields, convert_multiple_choice_fields
+from reactpy_django.forms.utils import convert_form_fields
 from reactpy_django.types import AsyncFormEvent, FormEventData, SyncFormEvent
 from reactpy_django.utils import ensure_async
 
@@ -95,8 +95,7 @@ async def render_form():
     async def on_submit_callback(new_data: dict[str, Any]):
         """Callback function provided directly to the client side listener. This is responsible for transmitting
         the submitted form data to the server for processing."""
-        convert_multiple_choice_fields(new_data, initialized_form)
-        convert_boolean_fields(new_data, initialized_form)
+        convert_form_fields(new_data, initialized_form)
 
         if on_receive_data:
             new_form_event = FormEventData(

src/reactpy_django/forms/utils.py

@@ -5,27 +5,12 @@
 from django.forms import BooleanField, Form, ModelForm, ModelMultipleChoiceField, MultipleChoiceField, NullBooleanField
 
 
-def convert_multiple_choice_fields(data: dict[str, Any], initialized_form: Form | ModelForm) -> None:
-    multi_choice_fields = {
-        field_name
-        for field_name, field in initialized_form.fields.items()
-        if isinstance(field, (MultipleChoiceField, ModelMultipleChoiceField))
-    }
+def convert_form_fields(data: dict[str, Any], initialized_form: Form | ModelForm) -> None:
+    for field_name, field in initialized_form.fields.items():
+        value = data.get(field_name)
 
-    # Convert multiple choice field text into a list of values
-    for choice_field_name in multi_choice_fields:
-        value = data.get(choice_field_name)
-        if value is not None and not isinstance(value, list):
-            data[choice_field_name] = [value]
+        if isinstance(field, (MultipleChoiceField, ModelMultipleChoiceField)) and value is not None:
+            data[field_name] = value if isinstance(value, list) else [value]
 
-
-def convert_boolean_fields(data: dict[str, Any], initialized_form: Form | ModelForm) -> None:
-    boolean_fields = {
-        field_name
-        for field_name, field in initialized_form.fields.items()
-        if isinstance(field, BooleanField) and not isinstance(field, NullBooleanField)
-    }
-
-    # Convert boolean field text into actual booleans
-    for boolean_field_name in boolean_fields:
-        data[boolean_field_name] = boolean_field_name in data
+        elif isinstance(field, BooleanField) and not isinstance(field, NullBooleanField):
+            data[field_name] = field_name in data