imio.smartweb.core 1.4.1__tar.gz → 1.4.2__tar.gz

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.4.2 (2025-05-20)
+------------------
+
+- WEB-4242 : Clear scales annotations when we remove lead image from an object
+  Avoid scale is still accessible with direct link
+  [boulch]
+
+- WEB-4218 : Fix cookie modal tab index and improve ux
+  [thomlamb]
+
+- WEB-4234 : Avoid using fullobjects when we get events from Agenda authentic sources
+  [boulch]
+
+
 1.4.1 (2025-05-14)
 ------------------
 

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imio.smartweb.core
-Version: 1.4.1
+Version: 1.4.2
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -208,6 +208,20 @@ Changelog
 =========
 
 
+1.4.2 (2025-05-20)
+------------------
+
+- WEB-4242 : Clear scales annotations when we remove lead image from an object
+  Avoid scale is still accessible with direct link
+  [boulch]
+
+- WEB-4218 : Fix cookie modal tab index and improve ux
+  [thomlamb]
+
+- WEB-4234 : Avoid using fullobjects when we get events from Agenda authentic sources
+  [boulch]
+
+
 1.4.1 (2025-05-14)
 ------------------
 

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.core",
-    version="1.4.1",
+    version="1.4.2",
     description="Core product for iMio websites",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

imio_smartweb_core-1.4.2/src/imio/smartweb/core/browser/static/smartweb-edit-compiled.css

@@ -0,0 +1 @@
+.modal-wrapper .pattern-modal-buttons{display:flex;gap:0 10px}div#formfield-form-widgets-basic_analytics{order:0!important}#contentview-preview .icon-preview:before{content:"\e833"}.pat-sortable>:hover{cursor:move}.pat-sortable{display:block;position:relative}.pat-sortable .sortable-section{border:1px solid #dee2e6!important;margin-bottom:1rem;margin-top:1rem;padding:.5rem}.hidden-section-title{opacity:.3}.section-title{vertical-align:middle}.content-section h2,.section-title,.show-hide-banner{display:inline-block}.show-hide-banner{background:#fff;border:1px solid #e6e6e6;padding:15px}.header-section{background:#f2f2f2;line-height:1.9;margin-bottom:1rem!important;margin-top:1rem!important;padding:0 1rem}table.table_schedule{cursor:default}ul.plonetoolbar-authentic-sources-menu,ul.plonetoolbar-smartweb-help-menu{padding-inline-start:0;width:100%}a.manage[class*=contenttype-imio-smartweb-]:before{display:none}a.manage[class*=contenttype-imio-smartweb-] svg{margin-right:5px}.manage-section .form_section_size option{font-size:15px}.manage-section .form_section_size option:before{aspect-ratio:16/9;content:"";display:block;width:40px}.form_section_size .icon_col-sm-3:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h40v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M45 5v90H5V5h40m5-5H0v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M45 5h40v90H45z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M85 5v90H45V5h40m5-5H40v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M85 5h40v90H85z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M125 5v90H85V5h40m5-5H80v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M125 5h40v90h-40z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-40V5h40m5-5h-50v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-4:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h53.36v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M58.36 5v90H5V5h53.36m5-5H0v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M58.27 5h53.36v90H58.27z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M111.64 5v90H58.28V5h53.36m5-5H53.28v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M111.64 5H165v90h-53.36z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-53.36V5H165m5-5h-63.36v100H170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-6:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h160v90H5z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90H5V5h160m5-5H0v100h170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M5 5h80v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M85 5v90H5V5h80m5-5H0v100h90V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-8:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h53.36v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M58.36 5v90H5V5h53.36m5-5H0v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M58.27 5h53.36v90H58.27z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M111.64 5v90H58.28V5h53.36m5-5H53.28v100h63.36V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M111.64 5H165v90h-53.36z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-53.36V5H165m5-5h-63.36v100H170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-9:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h40v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M45 5v90H5V5h40m5-5H0v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M45 5h40v90H45z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M85 5v90H45V5h40m5-5H40v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M85 5h40v90H85z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M125 5v90H85V5h40m5-5H80v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3Cpath d='M125 5h40v90h-40z' style='fill:%23fff;stroke-width:0'/%3E%3Cpath d='M165 5v90h-40V5h40m5-5h-50v100h50V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}.form_section_size .icon_col-sm-12:before{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h160v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M165 5v90H5V5h160m5-5H0v100h170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");background-repeat:no-repeat;background-size:contain}

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/src/imio/smartweb/core/browser/static/src/edit.less

@@ -1,8 +1,17 @@
+.modal-wrapper .pattern-modal-buttons {
+  display: flex;
+  gap: 0 10px;
+}
+
+div#formfield-form-widgets-basic_analytics {
+  order: initial !important;
+}
+
 #contentview-preview .icon-preview:before {
-  content: '\e833';
+  content: "\e833";
 }
 
-.pat-sortable> :hover {
+.pat-sortable > :hover {
   cursor: move;
 }
 
@@ -63,21 +72,21 @@ ul.plonetoolbar-smartweb-help-menu {
 }
 
 a.manage[class*="contenttype-imio-smartweb-"] {
-    &:before {
-        display: none;
-    }
-    svg {
-      margin-right: 5px;
-    }
+  &:before {
+    display: none;
+  }
+  svg {
+    margin-right: 5px;
+  }
 }
 
 // layout select
 
 .manage-section .form_section_size option {
-  font-size: 15px;    
+  font-size: 15px;
 }
 .manage-section .form_section_size option:before {
-  content:"";
+  content: "";
   display: block;
   width: 40px;
   aspect-ratio: 16/9;
@@ -111,4 +120,4 @@ a.manage[class*="contenttype-imio-smartweb-"] {
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 170 100'%3E%3Cpath d='M5 5h160v90H5z' style='fill:%2388c6ef;stroke-width:0'/%3E%3Cpath d='M165 5v90H5V5h160m5-5H0v100h170V0Z' style='fill:%230081f4;stroke-width:0'/%3E%3C/svg%3E");
   background-size: contain;
   background-repeat: no-repeat;
-}
+}

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/src/imio/smartweb/core/contents/rest/events/endpoint.py

@@ -11,6 +11,12 @@ from zope.interface import Interface
 
 
 class BaseEventsEndpoint(BaseEndpoint):
+    def __init__(self, context, request, fullobjects=0, batch_size=0):
+        self.fullobjects = fullobjects
+        super(BaseEventsEndpoint, self).__init__(
+            context, request, fullobjects=fullobjects, batch_size=batch_size
+        )
+
     def __call__(self):
         results = super(BaseEventsEndpoint, self).__call__() or {}
         if not results or not results.get("items"):
@@ -34,14 +40,56 @@ class BaseEventsEndpoint(BaseEndpoint):
     def query_url(self):
         params = [
             "selected_agendas={}".format(self.context.selected_agenda),
+            "metadata_fields=title_nl",
+            "metadata_fields=title_en",
+            "metadata_fields=title_de",
+            "metadata_fields=title_fr",
+            "metadata_fields=description",
+            "metadata_fields=description_nl",
+            "metadata_fields=description_en",
+            "metadata_fields=description_de",
+            "metadata_fields=description_fr",
+            "metadata_fields=latitude",
+            "metadata_fields=longitude",
+            "metadata_fields=city",
+            "metadata_fields=number",
+            "metadata_fields=street",
+            "metadata_fields=zipcode",
+            "metadata_fields=complement",
+            "metadata_fields=country",
+            "metadata_fields=contact_name",
+            "metadata_fields=contact_phone",
+            "metadata_fields=contact_email",
+            "metadata_fields=event_type",
+            "metadata_fields=event_url",
+            "metadata_fields=video_url",
+            "metadata_fields=facebook",
+            "metadata_fields=instagram",
+            "metadata_fields=twitter",
+            "metadata_fields=free_entry",
+            "metadata_fields=online_participation",
+            "metadata_fields=open_end",
+            "metadata_fields=topics",
             "metadata_fields=category",
             "metadata_fields=local_category",
-            "metadata_fields=container_uid",
-            "metadata_fields=topics",
+            "metadata_fields=iam",
+            "metadata_fields=usefull_container_id",
+            "metadata_fields=usefull_container_title",
+            "metadata_fields=whole_day",
+            "metadata_fields=created",
+            "metadata_fields=effective",
+            "metadata_fields=modified",
             "metadata_fields=start",
             "metadata_fields=end",
+            "metadata_fields=first_end",
+            "metadata_fields=first_start",
+            "metadata_fields=expires",
+            "metadata_fields=exclude_from_nav",
+            "metadata_fields=container_uid",
+            "metadata_fields=image_caption",
             "metadata_fields=has_leadimage",
             "metadata_fields=UID",
+            "metadata_fields=language",
             "sort_on=event_dates",
             "fullobjects={}".format(self.fullobjects),
         ]
@@ -73,7 +121,7 @@ class EventsEndpointGet(BaseService):
     def reply(self):
         return EventsEndpoint(self.context, self.request)()
 
-    def reply_for_given_object(self, obj, request, fullobjects=1, batch_size=0):
+    def reply_for_given_object(self, obj, request, fullobjects=0, batch_size=0):
         return EventsEndpoint(
             obj, request, fullobjects=fullobjects, batch_size=batch_size
         )()

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/src/imio/smartweb/core/subscribers.py

@@ -108,9 +108,19 @@ def check_image_field(obj, interface, class_name, field_name):
         logger.info(f"No existing cropping to purge for {field_name}.")
 
 
+def clear_image_scales(obj, event):
+    if not hasattr(obj, "image"):
+        return
+    if obj.image is None:
+        annotations = IAnnotations(obj)
+        if "plone.scale" in annotations:
+            del annotations["plone.scale"]
+
+
 def modified_content(obj, event):
     if not hasattr(event, "descriptions") or not event.descriptions:
         return
+    clear_image_scales(obj, event)
     for d in event.descriptions:
         if not IAttributes.providedBy(d):
             # we do not have fields change description, but maybe a request

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/src/imio/smartweb/core/tests/test_cropping.py

@@ -12,13 +12,20 @@ from plone.app.dexterity.behaviors.metadata import IBasic
 from plone.app.imagecropping import PAI_STORAGE_KEY
 from plone.app.imagecropping.interfaces import IImageCroppingUtils
 from plone.app.testing import TEST_USER_ID
+from plone.app.testing import TEST_USER_NAME
+from plone.app.testing import TEST_USER_PASSWORD
 from plone.app.testing import setRoles
 from plone.namedfile.file import NamedBlobImage
+from plone.testing.zope import Browser
+from unittest.mock import patch
+from urllib.error import HTTPError
 from zope.annotation.interfaces import IAnnotations
 from zope.component import getMultiAdapter
 from zope.lifecycleevent import Attributes
 from zope.lifecycleevent import modified
 
+import transaction
+
 
 class TestCropping(ImioSmartwebTestCase):
     layer = IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
@@ -148,3 +155,49 @@ class TestCropping(ImioSmartwebTestCase):
         )
         annotation = IAnnotations(self.folder).get(PAI_STORAGE_KEY)
         self.assertEqual(annotation, {})
+
+    def test_removing_image_and_scales(self):
+        self.folder.image = NamedBlobImage(**make_named_image("plone.png"))
+        modified(
+            self.folder, Attributes(ILeadImageBehavior, "ILeadImageBehavior.image")
+        )
+        scales = self.folder.restrictedTraverse("@@images")
+        image = scales.scale("image", scale="paysage_vignette")
+        image_url = image.url
+        transaction.commit()
+        browser = Browser(self.layer["app"])
+        browser.addHeader(
+            "Authorization",
+            "Basic %s:%s"
+            % (
+                TEST_USER_NAME,
+                TEST_USER_PASSWORD,
+            ),
+        )
+        browser.open(image_url)
+        content = browser.contents
+        # Got picture.
+        self.assertIsInstance(content, bytes)
+
+        # Old situation before fix
+        # Ensure browser still can access the image URL
+        # Situation BEFORE we make clear_image_scales function
+        self.folder.image = None  # remive image from object
+        with patch("imio.smartweb.core.subscribers.clear_image_scales") as mock_clear:
+            modified(
+                self.folder, Attributes(ILeadImageBehavior, "ILeadImageBehavior.image")
+            )
+            transaction.commit()
+            browser.open(image_url)
+            content = browser.contents
+            self.assertIsInstance(content, bytes)
+
+        # New situation with fix
+        # Call subrscriber and pass in "real" clear_image_scales function
+        modified(
+            self.folder, Attributes(ILeadImageBehavior, "ILeadImageBehavior.image")
+        )
+        transaction.commit()
+        with self.assertRaises(HTTPError) as context:
+            browser.open(image_url)
+            self.assertIn("NotFound", str(context.exception))

{imio_smartweb_core-1.4.1 → imio_smartweb_core-1.4.2}/src/imio/smartweb/core/tests/test_rest.py

@@ -378,20 +378,62 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
         endpoint = EventsEndpoint(self.rest_events, self.request)
         url = endpoint.query_url
         self.maxDiff = None
+
         self.assertEqual(
             url,
-            "http://localhost:8080/Plone/@events?"
-            "selected_agendas={}&"
+            "http://localhost:8080/Plone/@events?selected_agendas={}&"
+            "metadata_fields=title_nl&"
+            "metadata_fields=title_en&"
+            "metadata_fields=title_de&"
+            "metadata_fields=title_fr&"
+            "metadata_fields=description&"
+            "metadata_fields=description_nl&"
+            "metadata_fields=description_en&"
+            "metadata_fields=description_de&"
+            "metadata_fields=description_fr&"
+            "metadata_fields=latitude&"
+            "metadata_fields=longitude&"
+            "metadata_fields=city&"
+            "metadata_fields=number&"
+            "metadata_fields=street&"
+            "metadata_fields=zipcode&"
+            "metadata_fields=complement&"
+            "metadata_fields=country&"
+            "metadata_fields=contact_name&"
+            "metadata_fields=contact_phone&"
+            "metadata_fields=contact_email&"
+            "metadata_fields=event_type&"
+            "metadata_fields=event_url&"
+            "metadata_fields=video_url&"
+            "metadata_fields=facebook&"
+            "metadata_fields=instagram&"
+            "metadata_fields=twitter&"
+            "metadata_fields=free_entry&"
+            "metadata_fields=online_participation&"
+            "metadata_fields=open_end&"
+            "metadata_fields=topics&"
             "metadata_fields=category&"
             "metadata_fields=local_category&"
-            "metadata_fields=container_uid&"
-            "metadata_fields=topics&"
+            "metadata_fields=iam&"
+            "metadata_fields=usefull_container_id&"
+            "metadata_fields=usefull_container_title&"
+            "metadata_fields=whole_day&"
+            "metadata_fields=created&"
+            "metadata_fields=effective&"
+            "metadata_fields=modified&"
             "metadata_fields=start&"
             "metadata_fields=end&"
+            "metadata_fields=first_end&"
+            "metadata_fields=first_start&"
+            "metadata_fields=expires&"
+            "metadata_fields=exclude_from_nav&"
+            "metadata_fields=container_uid&"
+            "metadata_fields=image_caption&"
             "metadata_fields=has_leadimage&"
             "metadata_fields=UID&"
+            "metadata_fields=language&"
             "sort_on=event_dates&"
-            "fullobjects=1&"
+            "fullobjects=0&"
             "b_size=20&"
             "event_type=event-driven&"
             "translated_in_en=1".format(self.rest_events.selected_agenda),