eea.volto.policy 5.8__zip → 6.1__zip

{eea.volto.policy-5.8/eea.volto.policy.egg-info → eea.volto.policy-6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.volto.policy
-Version: 5.8
+Version: 6.1
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.volto.policy
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,22 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+6.1 - (2024-12-10)
+---------------------------
+* Fix: large query on context navigation when on layout or add new item.
+  We return no results when we have the `Additional files` variation set
+  since it has potential to have a very large number of items.
+  [ichim-david - refs #280463]
+* Feature: Add `Language` querystring field in order to be able to filter by language in Search block
+  [avoinea - refs #281503]
+
+6.0 - (2024-12-05)
+---------------------------
+* Change: Fix plone.app.vocabularies.Users to work with Creators and Contributors Field
+  [avoinea - refs #274362]
+* Fix: Context Navigation title becoming undefined on Edit when deleting a manually added title
+  [ichim-david - refs #280463]
+
 5.8 - (2024-11-26)
 ---------------------------
 * Feature: added getObjSize info for File portal_type used to get file size information

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/docs/HISTORY.txt

@@ -1,6 +1,22 @@
 Changelog
 =========
 
+6.1 - (2024-12-10)
+---------------------------
+* Fix: large query on context navigation when on layout or add new item.
+  We return no results when we have the `Additional files` variation set
+  since it has potential to have a very large number of items.
+  [ichim-david - refs #280463]
+* Feature: Add `Language` querystring field in order to be able to filter by language in Search block
+  [avoinea - refs #281503]
+
+6.0 - (2024-12-05)
+---------------------------
+* Change: Fix plone.app.vocabularies.Users to work with Creators and Contributors Field
+  [avoinea - refs #274362]
+* Fix: Context Navigation title becoming undefined on Edit when deleting a manually added title
+  [ichim-david - refs #280463]
+
 5.8 - (2024-11-26)
 ---------------------------
 * Feature: added getObjSize info for File portal_type used to get file size information

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/eea/volto/policy/overrides.zcml

@@ -10,4 +10,9 @@
             permission="zope.Public" />
     </configure>
 
+  <utility
+    factory=".vocabularies.principals.UsersFactory"
+    name="plone.app.vocabularies.Users"
+    />
+
 </configure>

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/eea/volto/policy/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>5.4</version>
+  <version>6.1</version>
   <dependencies>
     <dependency>profile-plone.volto:default</dependency>
   </dependencies>

eea.volto.policy-6.1/eea/volto/policy/profiles/multilingual/registry/plone.app.querystring.field.Language.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+          i18n:domain="eea.volto.policy">
+    <records interface="plone.app.querystring.interfaces.IQueryField"
+             prefix="plone.app.querystring.field.Language">
+       <value key="title" i18n:translate="">Language</value>
+       <value key="description" i18n:translate="">The language of the content.</value>
+       <value key="enabled">True</value>
+       <value key="sortable">False</value>
+        <value key="operations">
+            <element>plone.app.querystring.operation.selection.any</element>
+        </value>
+       <value key="vocabulary">plone.app.vocabularies.SupportedContentLanguages</value>
+       <value key="group" i18n:domain="plone" i18n:translate="">Text</value>
+    </records>
+</registry>

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/eea/volto/policy/profiles.zcml

@@ -16,6 +16,15 @@
       post_handler=".setuphandlers.post_install"
       />
 
+  <genericsetup:registerProfile
+      name="multilingual"
+      title="eea.volto.policy"
+      directory="profiles/multilingual"
+      description="Installs the eea.volto.policy multilingual options."
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      post_handler=".setuphandlers.post_install"
+      />
+
   <genericsetup:registerProfile
       name="uninstall"
       title="eea.volto.policy (uninstall)"

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/eea/volto/policy/restapi/services/contextnavigation/get.py

@@ -1,11 +1,15 @@
 """EEA Context Navigation"""
 
+from Acquisition import aq_inner
 from zope.component import getUtility
 from zope.component import adapter
+from zope.globalrequest import getRequest
 from zope.schema.interfaces import IFromUnicode
 from zope.interface import implementer
 from zope.interface import Interface
+from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFPlone.utils import normalizeString
+from plone.app.layout.navigation.navtree import buildFolderTree
 from plone.app.layout.navigation.root import getNavigationRoot
 from plone.app.dexterity import _
 from plone.restapi.services.contextnavigation import get as original_get
@@ -15,6 +19,7 @@ from plone.restapi import bbb as restapi_bbb
 from plone.restapi.bbb import safe_hasattr
 from plone import schema
 from plone import api
+from plone.memoize.instance import memoize
 
 
 class IEEANavigationPortlet(original_get.INavigationPortlet):
@@ -87,11 +92,25 @@ class EEAContextNavigationQueryBuilder(original_get.QueryBuilder):
         if depth == 0:
             depth = 999
 
+        currentFolderOnly = data.currentFolderOnly
+
         root = original_get.get_root(context, data.root_path)
         if root is not None:
             rootPath = "/".join(root.getPhysicalPath())
         else:
-            rootPath = getNavigationRoot(context)
+            rootPath = getNavigationRoot(context) if not currentFolderOnly \
+                else "/".join(context.getPhysicalPath())
+
+        # avoid large queries on layout pages where context is site
+        if currentFolderOnly:
+            request = getRequest()
+            # don't query when we add a new page and we use report_navigation
+            is_site = ISiteRoot.providedBy(context)
+            if is_site or 'add?type' in request.get('HTTP_REFERER', '') and \
+                    request.form.get('expand.contextnavigation.variation', '')\
+                    == 'report_navigation':
+                self.query = {}
+                return
 
         # EEA modification to always use the rootPath for query
         self.query["path"] = {"query": rootPath, "depth": depth,
@@ -106,7 +125,15 @@ class EEAContextNavigationQueryBuilder(original_get.QueryBuilder):
             self.query["path"]["navtree_start"] = depth
 
 
-original_get.QueryBuilder = EEAContextNavigationQueryBuilder
+class EEANavtreeStrategy(original_get.NavtreeStrategy):
+    """Custom NavtreeStrategy for context navigation"""
+
+    def decoratorFactory(self, node):
+        """Decorate the navigation tree"""
+        new_node = super().decoratorFactory(node)
+        if getattr(new_node["item"], "side_nav_title", False):
+            new_node["side_nav_title"] = new_node["item"].side_nav_title
+        return new_node
 
 
 class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
@@ -173,6 +200,31 @@ class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
 
         return res
 
+    def title(self):
+        """ title """
+        # Allow to have empty title without Navigation fallback
+        name = self.data.name
+        # handle bug where empty title is set to undefined from Volto
+        return name if name != "undefined" else self.data.title
+
+    @memoize
+    def getNavTree(self, _marker=None):
+        """ Get the navigation tree """
+
+        if _marker is None:
+            _marker = []
+        context = aq_inner(self.context)
+        queryBuilder = EEAContextNavigationQueryBuilder(context, self.data)
+        query_result = queryBuilder()
+        if not query_result:
+            return {"children": []}
+        strategy = EEANavtreeStrategy(context, self.data)
+
+        tree = buildFolderTree(
+            context, obj=context, query=query_result, strategy=strategy
+        )
+        return tree
+
     def recurse(self, children, level, bottomLevel):
         """Recurse through the navigation tree"""
         res = []
@@ -282,18 +334,3 @@ class EEAContextNavigationGet(original_get.ContextNavigationGet):
         return navigation(expand=True, prefix="expand.contextnavigation.")[
             "contextnavigation"
         ]
-
-
-class EEANavtreeStrategy(original_get.NavtreeStrategy):
-    """Custom NavtreeStrategy for context navigation"""
-
-    def decoratorFactory(self, node):
-        """Decorate the navigation tree"""
-        new_node = super().decoratorFactory(node)
-        if getattr(new_node["item"], "side_nav_title", False):
-            new_node["side_nav_title"] = new_node["item"].side_nav_title
-        return new_node
-
-
-# Monkey patch the original NavtreeStrategy
-original_get.NavtreeStrategy = EEANavtreeStrategy

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/eea/volto/policy/setuphandlers.py

@@ -19,6 +19,7 @@ class HiddenProfiles:
         """ Hide uninstall profile from site-creation and quickinstaller.
         """
         return [
+            'eea.volto.policy:multilingual',
             'eea.volto.policy:uninstall',
         ]
 

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/eea/volto/policy/upgrades/configure.zcml

@@ -74,4 +74,16 @@
 
   </genericsetup:upgradeSteps>
 
+ <genericsetup:upgradeSteps
+    source="5.4"
+    destination="6.1"
+    profile="eea.volto.policy:default">
+
+    <genericsetup:upgradeDepends
+       title="Import all steps from eea.volto.policy multilingual profile"
+       import_profile="eea.volto.policy:multilingual"
+      />
+
+  </genericsetup:upgradeSteps>
+
 </configure>

eea.volto.policy-6.1/eea/volto/policy/version.txt

@@ -0,0 +1 @@
+6.1

eea.volto.policy-6.1/eea/volto/policy/vocabularies/principals.py

@@ -0,0 +1,33 @@
+""" Vocabulary for users.
+"""
+from plone import api
+from plone.app.vocabularies.principals import UsersFactory as BaseUsersFactory
+from plone.app.vocabularies.principals import PrincipalsVocabulary
+from zope.schema.vocabulary import SimpleTerm
+from zope.component.hooks import getSite
+from Products.CMFCore.utils import getToolByName
+
+
+class UsersFactory(BaseUsersFactory):
+    """ Factory creating a UsersVocabulary
+    """
+    @property
+    def items(self):
+        """Return a list of users"""
+        if not self.should_search(query=""):
+            return
+        acl_users = getToolByName(getSite(), "acl_users")
+        userids = set(u.get('id') for u in acl_users.searchUsers())
+        for userid in userids:
+            user = api.user.get(userid)
+            if not user:
+                continue
+            fullname = user.getProperty("fullname", "")
+            if not fullname:
+                continue
+            yield SimpleTerm(userid, userid, fullname)
+
+    def __call__(self, *args, **kwargs):
+        vocabulary = PrincipalsVocabulary(list(self.items))
+        vocabulary.principal_source = self.source
+        return vocabulary

{eea.volto.policy-5.8 → eea.volto.policy-6.1/eea.volto.policy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.volto.policy
-Version: 5.8
+Version: 6.1
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.volto.policy
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,22 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+6.1 - (2024-12-10)
+---------------------------
+* Fix: large query on context navigation when on layout or add new item.
+  We return no results when we have the `Additional files` variation set
+  since it has potential to have a very large number of items.
+  [ichim-david - refs #280463]
+* Feature: Add `Language` querystring field in order to be able to filter by language in Search block
+  [avoinea - refs #281503]
+
+6.0 - (2024-12-05)
+---------------------------
+* Change: Fix plone.app.vocabularies.Users to work with Creators and Contributors Field
+  [avoinea - refs #274362]
+* Fix: Context Navigation title becoming undefined on Edit when deleting a manually added title
+  [ichim-david - refs #280463]
+
 5.8 - (2024-11-26)
 ---------------------------
 * Feature: added getObjSize info for File portal_type used to get file size information

{eea.volto.policy-5.8 → eea.volto.policy-6.1}/eea.volto.policy.egg-info/SOURCES.txt

@@ -173,6 +173,7 @@ eea/volto/policy/profiles/default/contentrules.xml
 eea/volto/policy/profiles/default/metadata.xml
 eea/volto/policy/profiles/default/registry.xml
 eea/volto/policy/profiles/default/registry/side_nav_types.xml
+eea/volto/policy/profiles/multilingual/registry/plone.app.querystring.field.Language.xml
 eea/volto/policy/profiles/uninstall/browserlayer.xml
 eea/volto/policy/restapi/__init__.py
 eea/volto/policy/restapi/blocks.py
@@ -204,4 +205,5 @@ eea/volto/policy/upgrades/__init__.py
 eea/volto/policy/upgrades/configure.zcml
 eea/volto/policy/upgrades/upgrade_svgs/upgrade_svg.py
 eea/volto/policy/vocabularies/__init__.py
-eea/volto/policy/vocabularies/configure.zcml
+eea/volto/policy/vocabularies/configure.zcml
+eea/volto/policy/vocabularies/principals.py

eea.volto.policy-5.8/eea/volto/policy/version.txt

@@ -1 +0,0 @@
-5.8