From 2cbeef5820de0c485117238bb654cb4de2f68f90 Mon Sep 17 00:00:00 2001
From: jonaspiterek <piterek@kitconcept.com>
Date: Fri, 17 May 2024 16:56:40 +0200
Subject: [PATCH 1/2] Add endpoint that uses plone.volto  indexer

---
 .../restapi/services/blocktypes/__init__.py   |  0
 .../services/blocktypes/configure.zcml        | 15 +++++++
 src/plone/restapi/services/blocktypes/get.py  | 39 +++++++++++++++++++
 src/plone/restapi/services/configure.zcml     |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 src/plone/restapi/services/blocktypes/__init__.py
 create mode 100644 src/plone/restapi/services/blocktypes/configure.zcml
 create mode 100644 src/plone/restapi/services/blocktypes/get.py

diff --git a/src/plone/restapi/services/blocktypes/__init__.py b/src/plone/restapi/services/blocktypes/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/plone/restapi/services/blocktypes/configure.zcml b/src/plone/restapi/services/blocktypes/configure.zcml
new file mode 100644
index 0000000000..56f2127305
--- /dev/null
+++ b/src/plone/restapi/services/blocktypes/configure.zcml
@@ -0,0 +1,15 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    >
+
+  <plone:service
+      method="GET"
+      factory=".get.BlockTypesGet"
+      for="zope.interface.Interface"
+      permission="zope2.View"
+      name="@blocktypes"
+      />
+
+</configure>
diff --git a/src/plone/restapi/services/blocktypes/get.py b/src/plone/restapi/services/blocktypes/get.py
new file mode 100644
index 0000000000..c4f942e5c7
--- /dev/null
+++ b/src/plone/restapi/services/blocktypes/get.py
@@ -0,0 +1,39 @@
+from plone import api
+from plone.restapi.services import Service
+from collections import Counter
+from plone.dexterity.content import get_assignable
+
+
+class BlockTypesGet(Service):
+    def reply(self):
+        catalog = api.portal.get_tool(name="portal_catalog")
+        request_body = self.request.form
+        result = {}
+
+        if request_body.get("blocktypes") != "":
+            blocktypes = request_body.get("blocktypes").split(",")
+
+            for blocktype in blocktypes:
+                brains = catalog.searchResults(block_types=blocktype)
+                result[blocktype] = Counter()
+
+                for brain in brains:
+                    obj = brain.getObject()
+                    assignable = get_assignable(obj)
+
+                    hasBlocksBehavior = bool(
+                        {
+                            behavior
+                            for behavior in assignable.enumerateBehaviors()
+                            if behavior.name == "volto.blocks"
+                        }
+                    )
+
+                    if hasBlocksBehavior:
+                        url = brain.getURL()  # or brain.getPath()
+
+                        for block in obj.blocks.values():
+                            if block["@type"] == blocktype:
+                                result[blocktype].update({url: 1})
+
+        return result
diff --git a/src/plone/restapi/services/configure.zcml b/src/plone/restapi/services/configure.zcml
index ed31ccf121..0a443df55f 100644
--- a/src/plone/restapi/services/configure.zcml
+++ b/src/plone/restapi/services/configure.zcml
@@ -13,6 +13,7 @@
   <include package=".actions" />
   <include package=".addons" />
   <include package=".aliases" />
+  <include package=".blocktypes" />
   <include package=".breadcrumbs" />
   <include package=".content" />
   <include package=".controlpanels" />

From 097b624917a31d3a1c96af2721465b55f07d82f6 Mon Sep 17 00:00:00 2001
From: jonaspiterek <piterek@kitconcept.com>
Date: Fri, 26 Jul 2024 16:31:18 +0200
Subject: [PATCH 2/2] Use IBlocks identifier to get Objects with blocks, make
 use of visit_blocks function to get nested blocks

---
 src/plone/restapi/services/blocktypes/get.py | 26 +++++++-------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/plone/restapi/services/blocktypes/get.py b/src/plone/restapi/services/blocktypes/get.py
index c4f942e5c7..5e08aa5de2 100644
--- a/src/plone/restapi/services/blocktypes/get.py
+++ b/src/plone/restapi/services/blocktypes/get.py
@@ -1,7 +1,8 @@
 from plone import api
 from plone.restapi.services import Service
 from collections import Counter
-from plone.dexterity.content import get_assignable
+from plone.restapi.behaviors import IBlocks
+from plone.restapi.blocks import visit_blocks
 
 
 class BlockTypesGet(Service):
@@ -14,26 +15,17 @@ def reply(self):
             blocktypes = request_body.get("blocktypes").split(",")
 
             for blocktype in blocktypes:
-                brains = catalog.searchResults(block_types=blocktype)
+                brains = catalog(object_provides=IBlocks.__identifier__)
                 result[blocktype] = Counter()
 
                 for brain in brains:
                     obj = brain.getObject()
-                    assignable = get_assignable(obj)
+                    url = brain.getPath() # or .getURL()
+                    title = obj.title
+                    result[blocktype][title] = Counter()
 
-                    hasBlocksBehavior = bool(
-                        {
-                            behavior
-                            for behavior in assignable.enumerateBehaviors()
-                            if behavior.name == "volto.blocks"
-                        }
-                    )
-
-                    if hasBlocksBehavior:
-                        url = brain.getURL()  # or brain.getPath()
-
-                        for block in obj.blocks.values():
-                            if block["@type"] == blocktype:
-                                result[blocktype].update({url: 1})
+                    for block in visit_blocks(obj, obj.blocks):
+                        if block["@type"] == blocktype:
+                            result[blocktype][title].update({url: 1})
 
         return result