Merge remote-tracking branch 'origin/main' into plone_root

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

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+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
@@ -12,14 +13,12 @@
 from repoze.catalog.catalog import Catalog
 from repoze.catalog.indexes.field import CatalogFieldIndex
 from souper.interfaces import ICatalogFactory
-from souper.soup import get_soup, NodeAttributeIndexer, Record
-from zope.component import adapter, getUtility
-from zope.interface import implementer, Interface
-
-import logging
-
-
-logger = logging.getLogger(__name__)
+from souper.soup import get_soup
+from souper.soup import NodeAttributeIndexer
+from souper.soup import Record
+from zope.component import adapter
+from zope.interface import implementer
+from zope.interface import Interface
 
 
 @implementer(ICatalogFactory)

src/collective/volto/formsupport/restapi/services/form_data/form_data.py

@@ -7,8 +7,13 @@
 from plone.restapi.interfaces import IExpandableElement
 from plone.restapi.serializer.converters import json_compatible
 from plone.restapi.services import Service
-from zope.component import adapter, getMultiAdapter
-from zope.interface import implementer, Interface
+from zope.component import adapter
+from zope.component import getMultiAdapter
+from zope.interface import implementer
+from zope.interface import Interface
+
+import json
+import six
 
 
 @implementer(IExpandableElement)
@@ -40,19 +45,24 @@ def __call__(self, expand=False):
         result["form_data"] = data
         return result
 
-    def show_component(self):
-        if not api.user.has_permission("Modify portal content", obj=self.context):
-            return False
+    @property
+    @view.memoize
+    def form_block(self):
         blocks = get_blocks(self.context)
 
+        if isinstance(blocks, six.text_type):
+            blocks = json.loads(blocks)
         if not blocks:
-            return False
-
+            return {}
         for block in blocks.values():
             if block.get("@type", "") == "form" and block.get("store", False):
-                return True
+                return block
+        return {}
 
-        return False
+    def show_component(self):
+        if not api.user.has_permission("Modify portal content", obj=self.context):
+            return False
+        return self.form_block and True or False
 
     def expand_records(self, record):
         fields_labels = record.attrs.get("fields_labels", {})

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

@@ -1,19 +1,27 @@
 # -*- coding: utf-8 -*-
 from collective.volto.formsupport import _
+from collective.volto.formsupport.interfaces import ICaptchaSupport
 from collective.volto.formsupport.interfaces import IFormDataStore
+from collective.volto.formsupport.interfaces import IPostEvent
 from collective.volto.formsupport.utils import get_blocks
+from datetime import datetime
 from email.message import EmailMessage
 from plone import api
 from plone.protect.interfaces import IDisableCSRFProtection
 from plone.registry.interfaces import IRegistry
 from plone.restapi.deserializer import json_body
 from plone.restapi.services import Service
 from Products.CMFPlone.interfaces.controlpanel import IMailSchema
-from xml.etree.ElementTree import ElementTree, Element, SubElement
+from xml.etree.ElementTree import Element
+from xml.etree.ElementTree import ElementTree
+from xml.etree.ElementTree import SubElement
 from zExceptions import BadRequest
-from zope.component import getMultiAdapter, getUtility
+from zope.component import getMultiAdapter
+from zope.component import getUtility
+from zope.event import notify
 from zope.i18n import translate
 from zope.interface import alsoProvides
+from zope.interface import implementer
 
 import codecs
 import logging

src/collective/volto/formsupport/utils.py

@@ -1,5 +1,6 @@
 from collections import deque
-from plone.restapi.slots.interfaces import ISlot, ISlots
+from plone.restapi.slots.interfaces import ISlot
+from plone.restapi.slots.interfaces import ISlots
 
 import copy
 import json