Refactor editing ux

backend/Makefile

@@ -84,15 +84,15 @@ clean: ## Clean environment
 
 .PHONY: start
 start: ## Start a Plone instance on localhost:8080
-	ALLOWED_DISTRIBUTIONS=portalbrasil-intranet PYTHONWARNINGS=ignore $(BIN_FOLDER)/runwsgi instance/etc/zope.ini
+	ENABLE_PRINTING_MAILHOST=True PYTHONWARNINGS=ignore $(BIN_FOLDER)/runwsgi instance/etc/zope.ini
 
 .PHONY: console
 console: instance/etc/zope.ini ## Start a console into a Plone instance
-	ALLOWED_DISTRIBUTIONS=portalbrasil-intranet PYTHONWARNINGS=ignore $(BIN_FOLDER)/zconsole debug instance/etc/zope.conf
+	PYTHONWARNINGS=ignore $(BIN_FOLDER)/zconsole debug instance/etc/zope.conf
 
 .PHONY: create-site
 create-site: instance/etc/zope.ini ## Create a new site from scratch
-	ALLOWED_DISTRIBUTIONS=portalbrasil-intranet PYTHONWARNINGS=ignore $(BIN_FOLDER)/zconsole run instance/etc/zope.conf ./scripts/create_site.py
+	PYTHONWARNINGS=ignore $(BIN_FOLDER)/zconsole run instance/etc/zope.conf ./scripts/create_site.py
 
 # Example Content
 .PHONY: update-example-content

backend/README.md

@@ -8,7 +8,7 @@ Works with volto-form-block >= v3.8.0
 
 ## plone.restapi endpoints
 
-### `@submit-form`
+### `@schemaform-data`
 
 Endpoint that the frontend should call as a submit action.
 

backend/pyproject.toml

@@ -42,6 +42,7 @@ dependencies = [
   "souper.plone",
   "click",
   "beautifulsoup4",
+  "jsonschema",
   "pyotp",
 ]
 
@@ -101,6 +102,7 @@ dependencies = [
   "plone.formwidget.recaptcha",
   "plone.restapi[test]",
   "Products.MailHost",
+  "Products.PrintingMailHost",
   "pytest-cov==5.0.0",
   "pytest-plone>=0.5.0",
   "pytest",

backend/src/collective/volto/formsupport/captcha/honeypot.py

@@ -6,6 +6,8 @@
 from zExceptions import BadRequest
 from zope.i18n import translate
 
+import json
+
 
 class HoneypotSupport(CaptchaSupport):
     name = _("Honeypot Support")
@@ -31,6 +33,8 @@ def verify(self, data):
         # first check if volto-form-block send the compiled token
         # (because by default it does not insert the honeypot field into the submitted
         # form)
+        if isinstance(data, str):
+            data = json.loads(data)
         if not data:
             # @submit-form has been called not from volto-form-block so do the standard
             # validation.

backend/src/collective/volto/formsupport/datamanager/catalog.py

@@ -1,7 +1,6 @@
 from collective.volto.formsupport import logger
 from collective.volto.formsupport.interfaces import IFormDataStore
 from collective.volto.formsupport.utils import get_blocks
-from copy import deepcopy
 from datetime import datetime
 from plone.dexterity.interfaces import IDexterityContent
 from plone.restapi.deserializer import json_body
@@ -46,28 +45,24 @@ def block_id(self):
 
     def get_form_fields(self):
         blocks = get_blocks(self.context)
-
         if not blocks:
             return {}
-        form_block = {}
-        for id_, block in blocks.items():
-            if id_ != self.block_id:
-                continue
-            block_type = block.get("@type", "")
-            if block_type == "form":
-                form_block = deepcopy(block)
-        if not form_block:
-            return {}
-
-        subblocks = form_block.get("subblocks", [])
-
-        # Add the 'custom_field_id' field back in as this isn't stored with each
-        # subblock
-        for index, field in enumerate(subblocks):
-            if form_block.get(field["field_id"]):
-                subblocks[index]["custom_field_id"] = form_block.get(field["field_id"])
-
-        return subblocks
+        block = blocks.get(self.block_id, {})
+        block_type = block.get("@type", "")
+        if block_type == "schemaForm":
+            return [
+                {"field_id": name, "label": field.get("title", name)}
+                for name, field in block["schema"]["properties"].items()
+            ]
+        elif block_type == "form":
+            subblocks = block.get("subblocks", [])
+            # Add the 'custom_field_id' field back in as this isn't stored with each
+            # subblock
+            for index, field in enumerate(subblocks):
+                if block.get(field["field_id"]):
+                    subblocks[index]["custom_field_id"] = block.get(field["field_id"])
+            return subblocks
+        return {}
 
     def add(self, data):
         form_fields = self.get_form_fields()

backend/src/collective/volto/formsupport/interfaces.py

@@ -1,5 +1,9 @@
+from plone.dexterity.content import DexterityContent
+from zope.interface import Attribute
 from zope.interface import Interface
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from ZPublisher.BaseRequest import BaseRequest
+import dataclasses
 
 
 class ICollectiveVoltoFormsupportLayer(IDefaultBrowserLayer):
@@ -44,3 +48,24 @@ def verify(data):
         """Verify the captcha
         @return: True if verified, Raise exception otherwise
         """
+
+
+@dataclasses.dataclass
+class FormSubmissionContext:
+    context: DexterityContent
+    block: dict
+    form_data: dict
+    attachments: dict
+    request: BaseRequest
+
+
+class IFormSubmissionProcessor(Interface):
+    """Subscriber which processes form data when it is submitted"""
+
+    order: int = Attribute("Processors with the lowest order are processed first")
+
+    def __init__(context: FormSubmissionContext):
+        pass
+
+    def __call__():
+        """Process the data."""

backend/src/collective/volto/formsupport/processors/__init__.py

@@ -0,0 +1,9 @@
+def filter_parameters(data, block):
+    """
+    TODO do not send attachments fields.
+    """
+    return [{
+        "field_id": k,
+        "value": v,
+        "label": block["schema"]["properties"].get(k, {}).get("title", k),
+    } for k, v in data.items()]

backend/src/collective/volto/formsupport/processors/configure.zcml

@@ -0,0 +1,8 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    >
+
+  <subscriber name="email" factory=".email.EmailFormProcessor" />
+  <subscriber name="store" factory=".store.StoreFormProcessor" />
+
+</configure>