Merge pull request #71 from kitconcept/63-vocab-support

Add vocabulary support for facet conditions (#63)

Author: davisagli

CLAUDE.md

@@ -0,0 +1,3 @@
+# Instructions for using kitconcept.solr
+
+The file `./markdown-docs/INSTRUCTIONS.md` contains instructions for using kitconcept.solr in selected use cases. Refer to this file for more details.

backend/news/63.bugfix

@@ -0,0 +1 @@
+Fix test_services_navigation.py which used the wrong layer and corrupted ZODB state @reebalazs

backend/news/63.feature

@@ -0,0 +1 @@
+Add vocabulary support for facet conditions. @reebalazs

backend/src/kitconcept/solr/interfaces.py

@@ -17,7 +17,26 @@ class IKitconceptSolrLayer(IDefaultBrowserLayer):
     "properties": {
         "fieldList": {
             "type": "array",
-            "items": {"type": "string"},
+            "items": {
+                "oneOf": [
+                    {"type": "string"},
+                    {
+                        "type": "object",
+                        "properties": {
+                            "name": {"type": "string"},
+                            "vocabulary": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {"type": "string"},
+                                    "isMultilingual": {"type": "boolean"},
+                                },
+                                "required": ["name"],
+                            },
+                        },
+                        "required": ["name"],
+                    },
+                ],
+            },
         },
         "searchTabs": {
             "type": "array",

backend/src/kitconcept/solr/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>1002</version>
+  <version>1003</version>
   <dependencies>
     <dependency>profile-collective.solr:default</dependency>
   </dependencies>

backend/src/kitconcept/solr/services/solr.py

@@ -253,6 +253,7 @@ def enhance_result(
             result.get("response", {}).get("docs", []),
             result.get("highlighting", {}),
         )
+        result["vocabularies"] = solr_config.vocabularies
         # Solr response is pruned of the unnecessary parts, unless explicitly requested.
         if not keep_full_solr_response:
             result.pop("facet_counts", None)

backend/src/kitconcept/solr/services/solr_utils.py

@@ -90,16 +90,33 @@ def select_condition(self, group_select: int) -> str:
         condition = filters[group_select]
         return f"{base_query}{condition}"
 
+    @staticmethod
+    def _field_name(item) -> str:
+        """Extract the field name from a fieldList item (string or dict)."""
+        if isinstance(item, dict):
+            return item["name"]
+        return item
+
     @property
     def field_list(self) -> str:
         raw_value = self.config.get("fieldList", [])
-        invalid_fields = [item for item in raw_value if "," in item]
+        names = [self._field_name(item) for item in raw_value]
+        invalid_fields = [name for name in names if "," in name]
         if invalid_fields:
             raise SolrConfigError(
                 "Error parsing solr config, fieldList item contains comma (,) "
                 "which is prohibited"
             )
-        return ",".join(raw_value)
+        return ",".join(names)
+
+    @property
+    def vocabularies(self) -> list:
+        raw_value = self.config.get("fieldList", [])
+        return [
+            {"field": item["name"], **item["vocabulary"]}
+            for item in raw_value
+            if isinstance(item, dict) and "vocabulary" in item
+        ]
 
     def select_layouts(self, group_select: int) -> list:
         return self.listOflayouts[group_select]

backend/src/kitconcept/solr/upgrades/__init__.py

@@ -1,4 +1,7 @@
+from kitconcept.solr.interfaces import IKitconceptSolrSettings
 from plone import api
+from plone.registry.interfaces import IRegistry
+from zope.component import getUtility
 
 
 def add_highlighting_config(context):
@@ -10,3 +13,8 @@ def add_highlighting_config(context):
             {"field": "Description", "prop": "highlighting_description"},
         ]
         api.portal.set_registry_record("kitconcept.solr.config", value)
+
+
+def update_registry_schema(context):
+    registry = getUtility(IRegistry)
+    registry.registerInterface(IKitconceptSolrSettings, prefix="kitconcept.solr")

backend/src/kitconcept/solr/upgrades/configure.zcml

@@ -26,4 +26,15 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      profile="kitconcept.solr:default"
+      source="1002"
+      destination="1003"
+      >
+    <genericsetup:upgradeStep
+        title="Update registry schema"
+        handler=".update_registry_schema"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>

backend/tests/services/navigation/test_services_navigation.py

@@ -1,56 +1,74 @@
+from kitconcept.solr.testing import FUNCTIONAL_TESTING
 from plone.app.testing import setRoles
 from plone.app.testing import SITE_OWNER_NAME
 from plone.app.testing import SITE_OWNER_PASSWORD
 from plone.app.testing import TEST_USER_ID
 from plone.dexterity.utils import createContentInContainer
 from plone.registry.interfaces import IRegistry
 from plone.restapi.bbb import INavigationSchema
-from plone.restapi.testing import PLONE_RESTAPI_DX_FUNCTIONAL_TESTING
 from plone.restapi.testing import RelativeSession
 from zope.component import getUtility
 
 import transaction
 import unittest
 
 
+LANG = "en"
+
+
+def create(container, portal_type, **kw):
+    content = createContentInContainer(container, portal_type, **kw)
+    content.language = LANG
+    return content
+
+
 class TestServicesNavigation(unittest.TestCase):
-    layer = PLONE_RESTAPI_DX_FUNCTIONAL_TESTING
+    layer = FUNCTIONAL_TESTING
 
     def setUp(self):
         self.app = self.layer["app"]
         self.portal = self.layer["portal"]
         self.portal_url = self.portal.absolute_url()
         setRoles(self.portal, TEST_USER_ID, ["Manager"])
 
+        # Re-enable Folder type (disabled by plone.volto profile)
+        fti = self.portal.portal_types["Folder"]
+        fti.global_allow = True
+
+        # Ensure Folder is in displayed_types for navigation
+        registry = getUtility(IRegistry)
+        settings = registry.forInterface(INavigationSchema, prefix="plone")
+        displayed_types = settings.displayed_types
+        if "Folder" not in displayed_types:
+            settings.displayed_types = tuple(list(displayed_types) + ["Folder"])
+
         self.api_session = RelativeSession(self.portal_url, test=self)
         self.api_session.headers.update({"Accept": "application/json"})
         self.api_session.auth = (SITE_OWNER_NAME, SITE_OWNER_PASSWORD)
 
-        self.folder = createContentInContainer(
-            self.portal, "Folder", id="folder", title="Some Folder"
-        )
-        self.folder2 = createContentInContainer(
+        self.folder = create(self.portal, "Folder", id="folder", title="Some Folder")
+        self.folder2 = create(
             self.portal, "Folder", id="folder2", title="Some Folder 2"
         )
-        self.subfolder1 = createContentInContainer(
+        self.subfolder1 = create(
             self.folder, "Folder", id="subfolder1", title="SubFolder 1"
         )
-        self.subfolder2 = createContentInContainer(
+        self.subfolder2 = create(
             self.folder, "Folder", id="subfolder2", title="SubFolder 2"
         )
-        self.thirdlevelfolder = createContentInContainer(
+        self.thirdlevelfolder = create(
             self.subfolder1,
             "Folder",
             id="thirdlevelfolder",
             title="Third Level Folder",
         )
-        self.fourthlevelfolder = createContentInContainer(
+        self.fourthlevelfolder = create(
             self.thirdlevelfolder,
             "Folder",
             id="fourthlevelfolder",
             title="Fourth Level Folder",
         )
-        createContentInContainer(self.folder, "Document", id="doc1", title="A document")
+        create(self.folder, "Document", id="doc1", title="A document")
         transaction.commit()
 
     def tearDown(self):
@@ -93,13 +111,13 @@ def test_dont_broke_with_contents_without_review_state(self):
         settings = registry.forInterface(INavigationSchema, prefix="plone")
         displayed_types = settings.displayed_types
         settings.displayed_types = tuple(list(displayed_types) + ["File"])
-        createContentInContainer(
+        create(
             self.portal,
             "File",
             id="example-file",
             title="Example file",
         )
-        createContentInContainer(
+        create(
             self.folder,
             "File",
             id="example-file-1",
@@ -123,7 +141,7 @@ def test_show_excluded_items(self):
         # False for Plone 6.0 and True for Plone 5.2
         # explicitly set the value to False to avoid test failures
         settings.show_excluded_items = False
-        createContentInContainer(
+        create(
             self.folder,
             "Folder",
             id="excluded-subfolder",
@@ -161,13 +179,13 @@ def test_navigation_sorting(self):
             "Collection",
             "File",
         )
-        createContentInContainer(
+        create(
             self.portal,
             "File",
             id="example-file",
             title="Example file",
         )
-        createContentInContainer(
+        create(
             self.folder,
             "File",
             id="example-file-1",
@@ -208,7 +226,7 @@ def test_use_nav_title_when_available_and_set(self):
         title = "Example Document"
         nav_title = "Fancy title"
 
-        createContentInContainer(
+        create(
             self.folder,
             "DXTestDocument",
             id="example-dx-document",