Merge branch 'main' into plip-1997-poc

Author: jnptk

.gitignore

@@ -44,9 +44,11 @@ local.cfg
 /instance/
 /.make-sentinels/
 /*-mxdev.txt
+/.mxdev_cache
 /reports/
 /sources/
 /venv/
+/.venv/
 .installed.txt
 .mxdev_cache/
 

.pre-commit-config.yaml

@@ -57,10 +57,6 @@ repos:
 #  _your own configuration lines_
 #  """
 ##
--   repo: https://github.com/mgedmin/check-manifest
-    rev: "0.51"
-    hooks:
-    -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
     rev: "5.0.1"
     hooks:

CHANGES.md

@@ -9,6 +9,23 @@
 
 <!-- towncrier release notes start -->
 
+## 10.0.0 (2026-05-18)
+
+No significant changes.
+
+
+## 10.0.0rc3 (2026-04-13)
+
+
+### New features
+
+- Add support for plate block from `@kitconcept/volto-plate` (text indexer, resolveuid transforms, link integrity). @davisagli #1998
+
+
+### Bug fixes
+
+- Fix deserialization of content that has a non-context-aware defaultFactory. @davisagli #2013
+
 ## 10.0.0rc2 (2026-03-27)
 
 

news/2013.bugfix

@@ -3,7 +3,7 @@
 import pathlib
 import sys
 
-version = "10.0.0rc3.dev0"
+version = "10.0.1.dev0"
 
 if getattr(sys.version_info, "major") == 2:
     raise ValueError(

setup.py

@@ -1,3 +1,4 @@
+from collections import deque
 from plone.restapi.interfaces import IBlockVisitor
 from zope.component import adapter
 from zope.component import subscribers
@@ -72,3 +73,15 @@ def __call__(self, block_value):
                     yield from block_value["data"]["blocks"].values()
         if "blocks" in block_value:
             yield from block_value["blocks"].values()
+        if block_value.get("@type") == "__somersault__":
+            yield from self.visit_plate_value(block_value.get("value", []))
+
+    def visit_plate_value(self, value):
+        queue = deque(value)
+        while queue:
+            child = queue.pop()
+            if isinstance(child, dict):
+                if "@type" in child:
+                    yield child
+                elif child.get("children", []):
+                    queue.extend(child["children"] or [])

src/plone/restapi/blocks.py

@@ -54,11 +54,7 @@ def __call__(self, block):
         return links
 
 
-@adapter(IBlocks, IBrowserRequest)
-@implementer(IBlockFieldLinkIntegrityRetriever)
-class SlateBlockLinksRetriever:
-    order = 100
-    block_type = "slate"
+class BaseSlateOrPlateBlockLinksRetriever:
     field = "value"
 
     def __init__(self, context, request):
@@ -77,9 +73,16 @@ def __call__(self, block):
                     value = handler(child)
                     if value:
                         self.links.append(value)
-
         return self.links
 
+
+@adapter(IBlocks, IBrowserRequest)
+@implementer(IBlockFieldLinkIntegrityRetriever)
+class SlateBlockLinksRetriever(BaseSlateOrPlateBlockLinksRetriever):
+    order = 100
+    block_type = "slate"
+    field = "value"
+
     def handle_a(self, child):
         data = child.get("data", {})
         if data.get("link", {}).get("internal", {}).get("internal_link"):
@@ -92,6 +95,17 @@ def handle_link(self, child):
             return child["data"]["url"]
 
 
+@adapter(IBlocks, IBrowserRequest)
+@implementer(IBlockFieldLinkIntegrityRetriever)
+class PlateBlockLinksRetriever(BaseSlateOrPlateBlockLinksRetriever):
+    order = 100
+    block_type = "__somersault__"
+    field = "value"
+
+    def handle_a(self, child):
+        return child.get("url")
+
+
 @adapter(IBlocks, IBrowserRequest)
 @implementer(IBlockFieldLinkIntegrityRetriever)
 class GenericBlockLinksRetriever:

src/plone/restapi/blocks_linkintegrity.py

@@ -152,5 +152,9 @@
       factory=".blocks_linkintegrity.SlateBlockLinksRetriever"
       provides="plone.restapi.interfaces.IBlockFieldLinkIntegrityRetriever"
       />
+  <subscriber
+      factory=".blocks_linkintegrity.PlateBlockLinksRetriever"
+      provides="plone.restapi.interfaces.IBlockFieldLinkIntegrityRetriever"
+      />
 
 </configure>

src/plone/restapi/configure.zcml

@@ -2,8 +2,10 @@
 from plone.indexer.decorator import indexer
 from plone.restapi import HAS_PLONE_6
 from plone.restapi.behaviors import IBlocks
+from plone.restapi.blocks import visit_blocks
 from plone.restapi.blocks import visit_subblocks
 from plone.restapi.interfaces import IBlockSearchableText
+from typing import List
 from zope.component import adapter
 from zope.component import queryMultiAdapter
 from zope.globalrequest import getRequest
@@ -65,6 +67,40 @@ def __call__(self, block):
         return block.get("plaintext", "")
 
 
+@implementer(IBlockSearchableText)
+@adapter(IBlocks, IBrowserRequest)
+class PlateTextIndexer:
+    """Searchable Text indexer for plate blocks."""
+
+    def __init__(self, context, request):
+        self.context = context
+        self.request = request
+
+    def __call__(self, block) -> str:
+        texts = [self.extract_plate_text(block["value"])]
+        for subblock in visit_subblocks(self.context, block):
+            texts.append(extract_text(subblock, self.context, self.request))
+        result = text_strip(texts)
+        print(result)
+        return result
+
+    def extract_plate_text(self, value) -> str:
+        if isinstance(value, list):
+            return " ".join(self.extract_plate_text(item) for item in value)
+        elif isinstance(value, dict):
+            if "@type" in value:
+                # sub-block, will be processed via visit_blocks
+                return ""
+            texts = []
+            for key in ("text", "children"):
+                if key in value:
+                    texts.append(self.extract_plate_text(value[key]))
+            return " ".join(texts)
+        elif isinstance(value, str):
+            return value.strip()
+        return ""
+
+
 def extract_text(block, obj, request):
     """Extract text information from a block.
 
@@ -93,23 +129,16 @@ def extract_text(block, obj, request):
     # Use server side adapters to extract the text data
     adapter = queryMultiAdapter((obj, request), IBlockSearchableText, name=block_type)
     result = adapter(block) if adapter is not None else ""
-    if not result:
-        for subblock in visit_subblocks(obj, block):
-            tmp_result = extract_text(subblock, obj, request)
-            result = f"{result}\n{tmp_result}"
     return result
 
 
-def get_blocks_text(obj):
+def get_blocks_text(obj) -> List[str]:
     """Extract text to be used by the SearchableText index in the Catalog."""
     request = getRequest()
-    blocks = obj.blocks
-    blocks_layout = obj.blocks_layout
-    blocks_text = []
-    for block_id in blocks_layout.get("items", []):
-        block = blocks.get(block_id, {})
-        blocks_text.append(extract_text(block, obj, request))
-    return blocks_text
+    texts = []
+    for block in visit_blocks(obj, obj.blocks):
+        texts.append(extract_text(block, obj, request))
+    return texts
 
 
 def text_strip(text_list):
@@ -139,5 +168,4 @@ def SearchableText_blocks(obj):
         blocks_text = get_blocks_text(obj)
         # Extract text using the base plone.app.contenttypes indexer
         std_text = SearchableText(obj)
-        blocks_text.append(std_text)
-        return text_strip(blocks_text)
+        return text_strip([std_text] + blocks_text)

src/plone/restapi/indexers.py

@@ -26,5 +26,9 @@
       factory=".indexers.TableBlockSearchableText"
       name="table"
       />
+  <adapter
+      factory=".indexers.PlateTextIndexer"
+      name="__somersault__"
+      />
 
 </configure>