eea.volto.policy 5.5__zip → 5.7__zip

{eea.volto.policy-5.5/eea.volto.policy.egg-info → eea.volto.policy-5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.volto.policy
-Version: 5.5
+Version: 5.7
 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,20 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+5.7 - (2024-11-24)
+---------------------------
+* Change: Improve svg upgrade step to know which svgs are fixed and not revisit them
+  [avoinea]
+
+5.6 - (2024-11-11)
+---------------------------
+* Feature: customized actions endpoint to allow passing of props to the
+  actions endpoint
+  [ichim-david - refs #271001]
+* Feature: customized breadcrumbs endpoint to add portal_type info to the
+  items served by the breadcrumbs endpoint
+  [ichim-david - refs #271001]
+
 5.5 - (2024-10-18)
 ---------------------------
 * Change: Fix broken brain error at the upgrade svg step - refs #276995

{eea.volto.policy-5.5 → eea.volto.policy-5.7}/docs/HISTORY.txt

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+5.7 - (2024-11-24)
+---------------------------
+* Change: Improve svg upgrade step to know which svgs are fixed and not revisit them
+  [avoinea]
+
+5.6 - (2024-11-11)
+---------------------------
+* Feature: customized actions endpoint to allow passing of props to the
+  actions endpoint
+  [ichim-david - refs #271001]
+* Feature: customized breadcrumbs endpoint to add portal_type info to the
+  items served by the breadcrumbs endpoint
+  [ichim-david - refs #271001]
+
 5.5 - (2024-10-18)
 ---------------------------
 * Change: Fix broken brain error at the upgrade svg step - refs #276995

eea.volto.policy-5.7/eea/volto/policy/browser/breadcrumbs.py

@@ -0,0 +1,62 @@
+"""Breadcrumbs"""
+
+# -*- coding: utf-8 -*-
+from Acquisition import aq_base
+from Acquisition import aq_inner
+from plone.app.layout.navigation.interfaces import INavigationRoot
+from plone.app.layout.navigation.root import getNavigationRoot
+from Products.CMFPlone import utils
+from Products.CMFPlone.browser.interfaces import INavigationBreadcrumbs
+from Products.CMFPlone.browser.navigation import get_view_url
+from Products.CMFPlone.defaultpage import check_default_page_via_view
+from Products.CMFPlone.interfaces import IHideFromBreadcrumbs
+from Products.Five import BrowserView
+from zope.component import getMultiAdapter
+from zope.interface import implementer
+
+
+@implementer(INavigationBreadcrumbs)
+class PhysicalNavigationBreadcrumbs(BrowserView):
+    """EEA Physical Navigation Breadcrumbs"""
+
+    def breadcrumbs(self):
+        """breadcrumbs"""
+        context = aq_inner(self.context)
+        request = self.request
+        container = utils.parent(context)
+        _name, item_url = get_view_url(context)
+        # EEA add portal_type info to breadcrumbs
+        last_crumb = {
+            "absolute_url": item_url,
+            "Title": utils.pretty_title_or_id(context, context),
+            "portal_type": context.portal_type,
+            "nav_title": getattr(aq_base(context), "nav_title", ""),
+        }
+
+        if container is None:
+            return (last_crumb,)
+
+        # Replicate Products.CMFPlone.browser.navigation.
+        # RootPhysicalNavigationBreadcrumbs.breadcrumbs()
+        # cause it is not registered during tests
+        if INavigationRoot.providedBy(context):
+            return ()
+
+        view = getMultiAdapter((container, request),
+                               name="eea_breadcrumbs_view")
+        base = tuple(view.breadcrumbs())
+
+        # Some things want to be hidden from the breadcrumbs
+        if IHideFromBreadcrumbs.providedBy(context):
+            return base
+
+        rootPath = getNavigationRoot(context)
+        itemPath = "/".join(context.getPhysicalPath())
+
+        # don't show default pages in breadcrumbs or pages above the navigation
+        # root
+        if not check_default_page_via_view(
+            context, request
+        ) and not rootPath.startswith(itemPath):
+            base += (last_crumb,)
+        return base

{eea.volto.policy-5.5 → eea.volto.policy-5.7}/eea/volto/policy/browser/configure.zcml

@@ -27,4 +27,13 @@
     permission="cmf.ManagePortal"
     />
 
+  <browser:page
+      name="eea_breadcrumbs_view"
+      for="*"
+      class=".breadcrumbs.PhysicalNavigationBreadcrumbs"
+      allowed_attributes="breadcrumbs"
+      permission="zope.Public"
+      layer="eea.volto.policy.interfaces.IEeaVoltoPolicyLayer"
+      />
+
 </configure>

eea.volto.policy-5.7/eea/volto/policy/restapi/services/actions/__init__.py

@@ -0,0 +1 @@
+""" EEA Actions overrides """

eea.volto.policy-5.7/eea/volto/policy/restapi/services/actions/configure.zcml

@@ -0,0 +1,13 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:cache="http://namespaces.zope.org/cache"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    >
+
+  <adapter
+      factory=".get.EEAActions"
+      name="actions"
+      />
+
+</configure>

eea.volto.policy-5.7/eea/volto/policy/restapi/services/actions/get.py

@@ -0,0 +1,54 @@
+"""Breadcrumbs"""
+
+from zope.component import getMultiAdapter
+from zope.component import adapter
+from zope.i18n import translate
+from zope.interface import implementer
+from zope.interface import Interface
+from plone.restapi.interfaces import IExpandableElement, IPloneRestapiLayer
+from plone.restapi.services.actions.get import Actions
+
+
+@implementer(IExpandableElement)
+@adapter(Interface, IPloneRestapiLayer)
+class EEAActions(Actions):
+    """EEA Actions"""
+
+    def __call__(self, expand=False):
+        """ """
+        result = {"actions": {"@id":
+                              f"{self.context.absolute_url()}/@actions"}}
+        if not expand:
+            return result
+
+        context_state = getMultiAdapter(
+            (self.context, self.request), name="plone_context_state"
+        )
+
+        categories = self.request.form.get("categories", self.all_categories)
+        filtered_action_props = {
+            "category",
+            "link_target",
+            "available",
+            "visible",
+            "allowed",
+            "modal",
+        }
+        data = {}
+        for category in categories:
+            category_action_data = []
+            actions = context_state.actions(category=category)
+            for action in actions:
+                # EEA allow actions props to be served by the endpoint except
+                # for the ones listed in filtered_action_props
+                action_data = {
+                    key: translate(value, context=self.request)
+                    if key == "title"
+                    else value
+                    for key, value in action.items()
+                    if key not in filtered_action_props
+                }
+
+                category_action_data.append(action_data)
+            data[category] = category_action_data
+        return {"actions": data}

eea.volto.policy-5.7/eea/volto/policy/restapi/services/breadcrumbs/__init__.py

@@ -0,0 +1 @@
+""" Breadcrumbs """

eea.volto.policy-5.7/eea/volto/policy/restapi/services/breadcrumbs/configure.zcml

@@ -0,0 +1,13 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:cache="http://namespaces.zope.org/cache"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    >
+
+  <adapter
+      factory=".get.EEABreadcrumbs"
+      name="breadcrumbs"
+      />
+
+</configure>

eea.volto.policy-5.7/eea/volto/policy/restapi/services/breadcrumbs/get.py

@@ -0,0 +1,45 @@
+"""Breadcrumbs"""
+
+from zope.component import getMultiAdapter
+from zope.component import adapter
+from zope.interface import implementer
+from zope.interface import Interface
+from plone.restapi.interfaces import IExpandableElement, IPloneRestapiLayer
+from plone.restapi.services.breadcrumbs.get import Breadcrumbs
+
+
+@implementer(IExpandableElement)
+@adapter(Interface, IPloneRestapiLayer)
+class EEABreadcrumbs(Breadcrumbs):
+    """EEA Breadcrumbs"""
+
+    def __call__(self, expand=False):
+        """ """
+        result = {"breadcrumbs": {
+            "@id": f"{self.context.absolute_url()}/@breadcrumbs"}}
+        if not expand:
+            return result
+
+        portal_state = getMultiAdapter(
+            (self.context, self.request), name="plone_portal_state"
+        )
+        breadcrumbs_view = getMultiAdapter(
+            (self.context, self.request), name="eea_breadcrumbs_view"
+        )
+        items = []
+        # EEA add portal_type info to breadcrumbs
+        for crumb in breadcrumbs_view.breadcrumbs():
+            item = {
+                "title": crumb["Title"],
+                "portal_type": crumb.get("portal_type", ""),
+                "@id": crumb["absolute_url"],
+            }
+            if crumb.get("nav_title", False):
+                item.update({"title": crumb["nav_title"]})
+
+            items.append(item)
+
+        result["breadcrumbs"]["items"] = items
+        result["breadcrumbs"]["root"] = portal_state.navigation_root()\
+            .absolute_url()
+        return result

{eea.volto.policy-5.5 → eea.volto.policy-5.7}/eea/volto/policy/restapi/services/configure.zcml

@@ -3,4 +3,6 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     >
   <include package=".contextnavigation" />
+  <include package=".breadcrumbs" />
+  <include package=".actions" />
 </configure>

{eea.volto.policy-5.5 → eea.volto.policy-5.7}/eea/volto/policy/restapi/services/contextnavigation/get.py

@@ -243,6 +243,7 @@ class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
 @adapter(Interface, IPloneRestapiLayer)
 class EEAContextNavigation:
     """Custom context navigation"""
+
     def __init__(self, context, request):
         self.context = context
         self.request = request
@@ -255,7 +256,6 @@ class EEAContextNavigation:
         }
         if not expand:
             return result
-        print("REQUEST FORM", self.request.form)
         data = eea_extract_data(
             IEEANavigationPortlet,
             self.request.form,

{eea.volto.policy-5.5 → eea.volto.policy-5.7}/eea/volto/policy/upgrades/upgrade_svgs/upgrade_svg.py

@@ -1,36 +1,35 @@
 """Upgrade step for svgs to fix width and height"""
-
-import logging
 import transaction
 from plone.namedfile.utils import getImageInfo
 from zope.lifecycleevent import modified
 from zope.annotation.interfaces import IAnnotations
-
-logger = logging.getLogger("upgrade_svgs")
-logger.setLevel(logging.INFO)
+from Products.ZCatalog.ProgressHandler import ZLogHandler
 
 
 def upgrade_svgs(portal):
     """Upgrade SVG dimensions"""
+
     i = 0
     brains = portal.portal_catalog()
-    total = len(brains)
+    pghandler = ZLogHandler(100)
+    pghandler.init("Recalculate svgs width and height", len(brains))
     for idx, brain in enumerate(brains):
+        pghandler.report(idx)
         obj = dict()
         try:
             obj = brain.getObject()
         except Exception:
             continue  # Skip to the next item if there's an error
 
+        # Process the main image only if dimensions are less than 5
         if (
             hasattr(obj, "image") and
             hasattr(obj.image, "_width") and
-            hasattr(obj.image, "_height")
+            hasattr(obj.image, "_height") and
+            (obj.image._width < 5 or obj.image._height < 5)
         ):
-
             contentType, width, height = getImageInfo(obj.image.data)
             if contentType == "image/svg+xml":
-                logger.info("Processing %s", obj.absolute_url())
                 obj.image._width = width
                 obj.image._height = height
                 anno = IAnnotations(obj)
@@ -38,14 +37,16 @@ def upgrade_svgs(portal):
                     del anno["plone.scale"]
                 modified(obj)
                 i += 1
+
+        # Process the preview image only if dimensions are less than 5
         if (
             hasattr(obj, "preview_image") and
             hasattr(obj.preview_image, "_width") and
-            hasattr(obj.preview_image, "_height")
+            hasattr(obj.preview_image, "_height") and
+            (obj.preview_image._width < 5 or obj.preview_image._height < 5)
         ):
             contentType, width, height = getImageInfo(obj.preview_image.data)
             if contentType == "image/svg+xml":
-                logger.info("Processing %s", obj.absolute_url())
                 obj.preview_image._width = width
                 obj.preview_image._height = height
                 anno = IAnnotations(obj)
@@ -53,8 +54,8 @@ def upgrade_svgs(portal):
                     del anno["plone.scale"]
                 modified(obj)
                 i += 1
+
         if not i % 100:
-            logger.warning("Progress %s/%s", idx, total)
-            logger.warning("Modified %s items", i)
             transaction.commit()
+    pghandler.finish()
     transaction.commit()

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

@@ -0,0 +1 @@
+5.7

{eea.volto.policy-5.5 → eea.volto.policy-5.7/eea.volto.policy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.volto.policy
-Version: 5.5
+Version: 5.7
 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,20 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+5.7 - (2024-11-24)
+---------------------------
+* Change: Improve svg upgrade step to know which svgs are fixed and not revisit them
+  [avoinea]
+
+5.6 - (2024-11-11)
+---------------------------
+* Feature: customized actions endpoint to allow passing of props to the
+  actions endpoint
+  [ichim-david - refs #271001]
+* Feature: customized breadcrumbs endpoint to add portal_type info to the
+  items served by the breadcrumbs endpoint
+  [ichim-david - refs #271001]
+
 5.5 - (2024-10-18)
 ---------------------------
 * Change: Fix broken brain error at the upgrade svg step - refs #276995

{eea.volto.policy-5.5 → eea.volto.policy-5.7}/eea.volto.policy.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ eea/volto/policy/behaviors/__init__.py
 eea/volto/policy/behaviors/configure.zcml
 eea/volto/policy/behaviors/sidenavigation.py
 eea/volto/policy/browser/__init__.py
+eea/volto/policy/browser/breadcrumbs.py
 eea/volto/policy/browser/configure.zcml
 eea/volto/policy/browser/teaser.py
 eea/volto/policy/contentrules/__init__.py
@@ -187,6 +188,12 @@ eea/volto/policy/restapi/serializer/dxfields.py
 eea/volto/policy/restapi/serializer/summary.py
 eea/volto/policy/restapi/services/__init__.py
 eea/volto/policy/restapi/services/configure.zcml
+eea/volto/policy/restapi/services/actions/__init__.py
+eea/volto/policy/restapi/services/actions/configure.zcml
+eea/volto/policy/restapi/services/actions/get.py
+eea/volto/policy/restapi/services/breadcrumbs/__init__.py
+eea/volto/policy/restapi/services/breadcrumbs/configure.zcml
+eea/volto/policy/restapi/services/breadcrumbs/get.py
 eea/volto/policy/restapi/services/contextnavigation/__init__.py
 eea/volto/policy/restapi/services/contextnavigation/configure.zcml
 eea/volto/policy/restapi/services/contextnavigation/get.py

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

@@ -1 +0,0 @@
-5.5