first working

Author: jnptk

backend/src/kitconcept/keywordmanager/services/delete.py

@@ -1,21 +1,22 @@
 from kitconcept.keywordmanager.interfaces import IKeywordManager
 from plone.restapi.deserializer import json_body
 from plone.restapi.services import Service
-from zope.component import getUtility
-from zExceptions import HTTPAccepted as Accepted
 from zExceptions import BadRequest
+from zope.component import getUtility
 
 
 class TagsDelete(Service):
     def reply(self):
-        km = getUtility(IKeywordManager)
         data = json_body(self.request)
-        if keywords := data.get("items"):
-            keywords = keywords.split(",")
-        else:
-            raise BadRequest("Please provide keywords to delete")
-        breakpoint()
+        km = getUtility(IKeywordManager)
+        keywords = data.get("items", [])
+
+        if isinstance(keywords, str):
+            keywords = [keywords]
 
-        deleted = km.delete(keywords)
+        try:
+            km.delete(keywords)
+        except Exception as err:
+            raise BadRequest(err) from err
 
-        return Accepted(f"Updated {deleted} objects")
+        return self.reply_no_content()

backend/src/kitconcept/keywordmanager/services/get.py

@@ -1,5 +1,4 @@
 from kitconcept.keywordmanager.interfaces import IKeywordManager
-from plone import api
 from plone.restapi.batching import HypermediaBatch
 from plone.restapi.deserializer import json_body
 from plone.restapi.services import Service
@@ -8,23 +7,18 @@
 
 class TagsGet(Service):
     def reply(self):
-        km = getUtility(IKeywordManager)
         data = json_body(self.request)
-        query = {}
+        km = getUtility(IKeywordManager)
+        query = {"withLengths": True}
         if idx := data.get("idx"):
             query = {"indexName": idx}
 
         keywords = km.getKeywords(**query)
 
         batch = HypermediaBatch(self.request, keywords)
-        # get the total count of each keyword in the batch
-        # TODO: can we optimize this?
         items = []
         for kw in batch:
-            catalog = api.portal.get_tool("portal_catalog")
-            brains = catalog(Subject=kw)
-            total = len(brains)
-            items.append({"name": kw, "total": total})
+            items.append({"name": kw[0], "total": kw[1]})
 
         keywords_data = {
             "@id": batch.canonical_url,

backend/src/kitconcept/keywordmanager/services/update.py

@@ -1,5 +1,21 @@
+from kitconcept.keywordmanager.interfaces import IKeywordManager
+from plone.restapi.deserializer import json_body
 from plone.restapi.services import Service
+from zExceptions import BadRequest
+from zope.component import getUtility
 
 
 class TagsPatch(Service):
-    """"""
+    def reply(self):
+        data = json_body(self.request)
+        km = getUtility(IKeywordManager)
+
+        new_keyword = data.get("new_keyword", "")
+        old_keywords = data.get("old_keywords", [])
+
+        try:
+            km.change(new_keyword, old_keywords)
+        except Exception as err:
+            raise BadRequest(err) from err
+
+        return self.reply_no_content()

backend/src/kitconcept/keywordmanager/tool.py

@@ -42,7 +42,11 @@ def _getFullIndexList(self, indexName):
 
     @security.protected(config.MANAGE_KEYWORDS_PERMISSION)
     def change(
-        self, old_keywords, new_keyword, context=None, indexName="Subject"
+        self,
+        new_keyword: str,
+        old_keywords: list,
+        context=None,
+        indexName: str = "Subject",
     ) -> int:
         """Updates all objects using the old_keywords.
 
@@ -59,16 +63,16 @@ def change(
 
         new_keyword = to_str(new_keyword)
         try:
-            querySet = api.content.find(**query)
+            brains = api.content.find(**query)
         except UnicodeDecodeError:
             old_keywords = [
                 k.decode("utf8") if isinstance(k, str) else k for k in old_keywords
             ]
             query[indexName] = old_keywords
-            querySet = api.content.find(**query)
+            brains = api.content.find(**query)
 
-        for item in querySet:
-            obj = item.getObject()
+        for brain in brains:
+            obj = brain.getObject()
             # #MOD Dynamic field getting
 
             value = self.getFieldValue(obj, indexName)
@@ -87,7 +91,7 @@ def change(
 
             self.updateObject(obj, indexName, value)
 
-        return len(querySet)
+        return len(brains)
 
     @security.protected(config.MANAGE_KEYWORDS_PERMISSION)
     def delete(self, keywords: list, context=None, indexName: str = "Subject") -> int:
@@ -119,27 +123,46 @@ def delete(self, keywords: list, context=None, indexName: str = "Subject") -> in
 
         return len(brains)
 
-    def updateObject(self, obj, indexName, value) -> None:
+    def updateObject(self, obj, indexName: str, value) -> None:
         updateField = self.getSetter(obj, indexName)
         if updateField is not None:
             updateField(value)
             idxs = self._getFullIndexList(indexName)
             obj.reindexObject(idxs=idxs)
 
     @security.protected(config.MANAGE_KEYWORDS_PERMISSION)
-    def getKeywords(self, indexName="Subject"):
+    def getKeywords(
+        self, indexName: str = "Subject", withLengths: bool = False
+    ) -> list[str] | list[tuple[str, int]]:
+        """Return all unique keyword values from the specified catalog index,
+        sorted alphabetically.
+
+        Args:
+            indexName: The name of the keyword index to query. Defaults to "Subject".
+            withLengths: If True, returns tuples of (keyword, count) instead of
+            just keywords. Defaults to False.
+
+        Returns:
+            A sorted list of keyword strings, or a sorted list of (keyword, count)
+            tuples if withLengths is True.
+
+        Raises:
+            ValueError: If indexName is not a valid keyword index.
+        """
         processQueue()
         if indexName not in self.getKeywordIndexes():
-            raise ValueError(f"{indexName} is not a valid field")
+            raise ValueError(f"'{indexName}' is not a valid index")
 
         catalog = api.portal.get_tool("portal_catalog")
-        keywords = [x for x in catalog.uniqueValuesFor(indexName) if x is not None]
-        keywords.sort(key=lambda x: x.lower())
+        keywords = sorted(
+            catalog.Indexes[indexName].uniqueValues(withLengths=withLengths),
+            key=lambda x: x.lower() if isinstance(x, str) else x[0].lower(),
+        )
 
         # can we turn this into a yield?
         return keywords
 
-    def getKeywordLength(self, key, indexName="Subject") -> int:
+    def getKeywordLength(self, key, indexName: str = "Subject") -> int:
         processQueue()
         if indexName not in self.getKeywordIndexes():
             raise ValueError(f"{indexName} is not a valid field")
@@ -184,7 +207,7 @@ def getScoredMatches(self, word, possibilities, num, score, context=None):
         # Return first n terms without scores
         return [item[1] for item in res[:num]]
 
-    def getKeywordIndexes(self):
+    def getKeywordIndexes(self) -> list[str]:
         """Gets a list of indexes from the catalog. Uses config.py to choose the
         meta type and filters out a subset of known indexes that should not be
         managed.
@@ -200,7 +223,7 @@ def getKeywordIndexes(self):
         return idxs
 
     @security.private
-    def fieldNameForIndex(self, indexName):
+    def fieldNameForIndex(self, indexName: str) -> str:
         """The name of the index may not be the same as the field on the object,
         and we need the actual field name in order to find its mutator.
         """

frontend/packages/volto-keywordmanager/src/actions/keywords.js

@@ -2,8 +2,6 @@ import { GET_KEYWORDS } from 'volto-keywordmanager/constants/Keywords';
 import { UPDATE_KEYWORDS } from 'volto-keywordmanager/constants/Keywords';
 import { DELETE_KEYWORDS } from 'volto-keywordmanager/constants/Keywords';
 
-import { AnyAction } from 'redux';
-
 export function getKeywords(options = {}) {
   const { groupKeywords, batchSize, batchStart, ...rest } = options;
   const params = new URLSearchParams({
@@ -21,27 +19,24 @@ export function getKeywords(options = {}) {
   };
 }
 
-export function updateKeywords() {
+export function updateKeywords(data) {
   return {
     type: UPDATE_KEYWORDS,
     request: {
-      op: 'post',
+      op: 'patch',
       path: '/@tags',
+      data,
     },
   };
 }
 
-/**
- * @param {string | string[]} keywords
- * @returns {AnyAction}
- */
-export function deleteKeywords(keywords) {
-  const result = Array.isArray(keywords) ? keywords.join(',') : keywords;
+export function deleteKeywords(data) {
   return {
     type: DELETE_KEYWORDS,
     request: {
       op: 'del',
-      path: `/@tags?${result}`,
+      path: '/@tags',
+      data,
     },
   };
 }