Merge branch 'custom-label-mapping' into deploy

# Conflicts:
#	setup.py
#	src/collective/volto/formsupport/restapi/services/submit_form/field.py

Author: JeffersonBledsoe

CHANGES.rst

@@ -1,10 +1,11 @@
 Changelog
 =========
 
-3.2.2 (unreleased)
+3.2.2 (2025-03-05)
 ------------------
 
-- Nothing changed yet.
+- Format list values in format_fields as comma separated strings to improve readability on email messages.
+  [cekk]
 
 
 3.2.1 (2025-01-09)

src/collective/volto/formsupport/restapi/services/submit_form/field.py

@@ -59,6 +59,8 @@ def _attribute(attribute_name: str):
     def display_value(self):
         if self._display_value_mapping:
             return self._display_value_mapping.get(self._value, self._value)
+        if isinstance(self._value, list):
+            return  ", ".join(self._value)
         return self._value
 
     @property
@@ -139,8 +141,9 @@ def send_in_email(self):
 class EmailField(Field):
     def validate(self, request):
         super().validate(request=request)
-
-        if _isemail(self.internal_value) is None:
+        if not self.internal_value:
+            return
+        if not _isemail(self.internal_value or ''):
             raise BadRequest(
                 translate(
                     _(
@@ -157,7 +160,7 @@ def validate(self, request):
 
 class DateField(Field):
     def display_value(self):
-        return api.portal.get_localized_time(self.internal_value)
+        return api.portal.get_localized_time(self.internal_value or '')
 
 class TimeField(Field):
     def display_value(self):

src/collective/volto/formsupport/tests/test_form_data_adapter.py

@@ -0,0 +1,46 @@
+from collective.volto.formsupport.interfaces import IPostAdapter
+from collective.volto.formsupport.testing import VOLTO_FORMSUPPORT_INTEGRATION_TESTING
+from plone import api
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from zope.component import getMultiAdapter
+
+import unittest
+
+
+class TestFormDataAdapter(unittest.TestCase):
+    layer = VOLTO_FORMSUPPORT_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.app = self.layer["app"]
+        self.portal = self.layer["portal"]
+        self.request = self.layer["request"]
+        self.portal_url = self.portal.absolute_url()
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+
+        self.document = api.content.create(
+            type="Document",
+            title="Example context",
+            container=self.portal,
+        )
+        self.document.blocks = {
+            "form-id": {
+                "@type": "form",
+                "send": ["recipient"],
+                "subblocks": [
+                    {
+                        "field_id": "xxx",
+                        "field_type": "text",
+                    },
+                ],
+            }
+        }
+
+    def test_format_fields_join_list_values(self):
+        self.request["BODY"] = (
+            b'{"data": [{"field_id": "xxx", "value": ["a", "b"]}], "block_id": "form-id"}'
+        )
+        adapter = getMultiAdapter((self.document, self.request), IPostAdapter)
+
+        self.assertEqual(adapter.format_fields()[0].internal_value, ["a", "b"])
+        self.assertEqual(adapter.format_fields()[0].display_value, "a, b")