imio.smartweb.core 1.2.47__tar.gz → 1.2.49__tar.gz

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/CHANGES.rst

@@ -2,6 +2,35 @@ Changelog
 =========
 
 
+1.2.49 (2024-05-29)
+-------------------
+
+- WEB-4101 : Encode URLs parameters for `search-filters`. This fixes issues with special chars.
+  [laulaz]
+
+- WEB-3802: Fix after testing, complited traduction, optimize code
+  [thomlamb]
+
+
+1.2.48 (2024-05-27)
+-------------------
+
+- WEB-3802: Add grouped filter for category and local category in React filters
+  [thomlamb]
+
+- WEB-4101 : Handle (local) categories translations correctly
+  [laulaz]
+
+- SUP-36937: Add Recurrence dates in React event content view
+  [thomlamb]
+
+- WEB-4104 : When change section size (front-office method), reindexParent to refresh cache
+  [boulch]
+
+- WEB-4105 : Make text section smarter about its lead image format (portrait / landscape)
+  [boulch]
+
+
 1.2.47 (2024-05-07)
 -------------------
 

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.47
+Version: 1.2.49
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -189,6 +189,35 @@ Changelog
 =========
 
 
+1.2.49 (2024-05-29)
+-------------------
+
+- WEB-4101 : Encode URLs parameters for `search-filters`. This fixes issues with special chars.
+  [laulaz]
+
+- WEB-3802: Fix after testing, complited traduction, optimize code
+  [thomlamb]
+
+
+1.2.48 (2024-05-27)
+-------------------
+
+- WEB-3802: Add grouped filter for category and local category in React filters
+  [thomlamb]
+
+- WEB-4101 : Handle (local) categories translations correctly
+  [laulaz]
+
+- SUP-36937: Add Recurrence dates in React event content view
+  [thomlamb]
+
+- WEB-4104 : When change section size (front-office method), reindexParent to refresh cache
+  [boulch]
+
+- WEB-4105 : Make text section smarter about its lead image format (portrait / landscape)
+  [boulch]
+
+
 1.2.47 (2024-05-07)
 -------------------
 

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/setup.py

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

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/rest/base.py

@@ -4,6 +4,7 @@ from imio.smartweb.core.utils import get_json
 from plone import api
 from plone.dexterity.content import Container
 from plone.rest import Service
+from urllib.parse import urlencode
 from zope.interface import implementer
 from zope.interface import Interface
 
@@ -47,21 +48,22 @@ class BaseEndpoint(object):
         )
         del item[field]
 
-    def get_extra_params(self, params):
+    def construct_query_string(self, params):
+        params = "&".join(params)
         form = self.request.form
         extra_params = []
         for k, v in form.items():
             if isinstance(v, list):
                 # handles multiple metadata_fields
                 for value in v:
-                    extra_params.append("{}={}".format(k, value))
+                    extra_params.append((k, value))
             else:
-                extra_params.append("{}={}".format(k, v))
+                extra_params.append((k, v))
         current_lang = api.portal.get_current_language()[:2]
         if current_lang != "fr":
-            extra_params.append("translated_in_{}=1".format(current_lang))
-        params = params + extra_params
-        return params
+            extra_params.append(("translated_in_{}".format(current_lang), 1))
+        extra_params = urlencode(extra_params)
+        return "&".join(filter(None, [params, extra_params]))
 
 
 class BaseService(Service):

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/rest/directory/endpoint.py

@@ -53,8 +53,8 @@ class BaseDirectoryEndpoint(BaseEndpoint):
             for category in self.context.selected_categories:
                 params.append(f"taxonomy_contact_category.query={category}")
             params.append("taxonomy_contact_category.operator=or")
-        params = self.get_extra_params(params)
-        url = f"{DIRECTORY_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{DIRECTORY_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/rest/events/endpoint.py

@@ -49,8 +49,8 @@ class BaseEventsEndpoint(BaseEndpoint):
         if self.context.selected_event_types is not None:
             for event_type in self.context.selected_event_types:
                 params.append(f"event_type={event_type}")
-        params = self.get_extra_params(params)
-        url = f"{EVENTS_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{EVENTS_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/rest/news/endpoint.py

@@ -49,8 +49,8 @@ class BaseNewsEndpoint(BaseEndpoint):
             "b_size={}".format(self.context.nb_results),
             "fullobjects=1",
         ]
-        params = self.get_extra_params(params)
-        url = f"{NEWS_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{NEWS_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/sections/events/view.py

@@ -30,6 +30,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
             selected_item,
             "metadata_fields=container_uid",
             "metadata_fields=category_title",
+            "metadata_fields=local_category",
             "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",
@@ -67,7 +68,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
             modified_hash = hash_md5(item["modified"])
             category = ""
             if self.context.show_categories_or_topics == "category":
-                category = item.get("category_title", "")
+                category = item.get("local_category") or item.get("category_title", "")
             elif self.context.show_categories_or_topics == "topic":
                 topic = item.get("topics") and item["topics"][0] or None
                 category = translate_vocabulary_term(

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/sections/news/view.py

@@ -28,6 +28,7 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
             "portal_type=imio.news.NewsItem",
             "metadata_fields=container_uid",
             "metadata_fields=category_title",
+            "metadata_fields=local_category",
             "metadata_fields=topics",
             "metadata_fields=has_leadimage",
             "metadata_fields=modified",
@@ -60,7 +61,7 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
             modified_hash = hash_md5(item["modified"])
             category = ""
             if self.context.show_categories_or_topics == "category":
-                category = item.get("category_title", "")
+                category = item.get("local_category") or item.get("category_title", "")
             elif self.context.show_categories_or_topics == "topic":
                 topic = item.get("topics") and item["topics"][0] or None
                 category = translate_vocabulary_term(

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/sections/text/views.py

@@ -10,4 +10,6 @@ class TextView(SectionView):
     def get_scale_url(self, item):
         request = self.request
         scale = self.context.image_size
+        if self.context.image._height > self.context.image._width:
+            return get_scale_url(item, request, "image", scale, "portrait")
         return get_scale_url(item, request, "image", scale, "paysage")

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/contents/sections/views.py

@@ -4,6 +4,7 @@ from Acquisition import aq_inner
 from imio.smartweb.common.utils import get_vocabulary
 from imio.smartweb.common.utils import translate_vocabulary_term
 from imio.smartweb.core.utils import hash_md5
+from imio.smartweb.core.utils import reindexParent
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
 from plone.locking.browser.info import LockInfoViewlet
@@ -89,6 +90,7 @@ class SectionView(BrowserView):
         context = aq_inner(self.context)
         context.bootstrap_css_class = section_size
         context.reindexObject()
+        reindexParent(context)
         current_lang = api.portal.get_current_language()[:2]
         size_txt = translate_vocabulary_term(
             "imio.smartweb.vocabulary.BootstrapCSS",

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/tests/resources/json_rest_events.json

@@ -12,6 +12,7 @@
             "@type": "imio.events.Event",
             "UID": "97902f2e26774a369035117d56381a2a",
             "breadcrumb": "Belleville » Accueil temps libre » Journée de l'ATL",
+            "category": "press",
             "category_title": "Presse",
             "description": "Description de mon événement",
             "end": "2023-10-31T10:00:00+00:00",
@@ -646,6 +647,7 @@
             ],
             "items_total": 7,
             "image_field": null,
+            "local_category": "Local Category title",
             "modified": "2021-05-11T13:31:00",
             "open_end": false,
             "recurrence": null,
@@ -659,7 +661,8 @@
             "@id": "http://localhost:8080/Plone/belleville/communal/9ff5c526d28e473db0065a6845686cfe",
             "@type": "imio.events.Event",
             "UID": "9ff5c526d28e473db0065a6845686cfe",
-            "category_title": null,
+            "category": "press",
+            "category_title": "Presse",
             "description": "une description",
             "end": "2023-04-01T20:02:00+00:00",
             "first_end": "2023-03-18T20:02:00+00:00",

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/tests/test_rest.py

@@ -134,34 +134,37 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
         endpoint.convert_cached_image_scales(item, modified_hash)
         self.assertEqual(len(item.keys()), 6)
 
-    def test_get_extra_params(self):
+    def test_construct_query_string(self):
+        request = TestRequest()
+        endpoint = DirectoryEndpoint(self.portal, request)
+        query = endpoint.construct_query_string([])
+        self.assertEqual(query, "translated_in_en=1")
+
+        query = endpoint.construct_query_string(["param=1", "param2=2"])
+        self.assertEqual(query, "param=1&param2=2&translated_in_en=1")
+
         request = TestRequest(
             form={"taxonomy_contact_category": '("token")', "topics": "education"}
         )
         endpoint = DirectoryEndpoint(self.portal, request)
-        params = endpoint.get_extra_params([])
+        query = endpoint.construct_query_string([])
         self.assertEqual(
-            params,
-            [
-                'taxonomy_contact_category=("token")',
-                "topics=education",
-                "translated_in_en=1",
-            ],
+            query,
+            "taxonomy_contact_category=%28%22token%22%29&topics=education&translated_in_en=1",
         )
 
         request = TestRequest(
-            form={"topics": "education", "metadata_fields": ["topics", "category"]}
+            form={
+                "topics": "education",
+                "metadata_fields": ["topics", "category"],
+                "local_category": "Local & category",
+            }
         )
         endpoint = DirectoryEndpoint(self.portal, request)
-        params = endpoint.get_extra_params([])
+        query = endpoint.construct_query_string([])
         self.assertEqual(
-            params,
-            [
-                "topics=education",
-                "metadata_fields=topics",
-                "metadata_fields=category",
-                "translated_in_en=1",
-            ],
+            query,
+            "topics=education&metadata_fields=topics&metadata_fields=category&local_category=Local+%26+category&translated_in_en=1",
         )
 
     @requests_mock.Mocker()

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/tests/test_section_events.py

@@ -59,12 +59,12 @@ class TestSectionEvents(ImioSmartwebTestCase):
             (self.events, self.request), name="carousel_view"
         )
         self.assertEqual(events_view.items, [])
-        url = "http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = "http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text=json.dumps(self.json_events))
         self.assertEqual(events_view.items[0][0].get("title"), "Journée de l'ATL")
         self.assertEqual(len(events_view.items[0]), 2)
         self.events.specific_related_events = ["1178188bddde4ced95a6cf8bf04c443c"]
-        url = "http://localhost:8080/Plone/@events?UID=1178188bddde4ced95a6cf8bf04c443c&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1"
+        url = "http://localhost:8080/Plone/@events?UID=1178188bddde4ced95a6cf8bf04c443c&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1"
         m.get(url, text=json.dumps(self.json_specific_event))
         self.assertEqual(len(events_view.items[0]), 1)
         self.assertEqual(events_view.items[0][0].get("title"), "Bonne cheville")
@@ -84,7 +84,7 @@ class TestSectionEvents(ImioSmartwebTestCase):
         events_view = queryMultiAdapter(
             (self.events, self.request), name="carousel_view"
         )
-        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text=json.dumps(self.json_events))
         self.assertEqual(len(events_view.items[0]), 2)
         hash_1 = annotations.get(SECTION_ITEMS_HASH_KEY)
@@ -92,7 +92,7 @@ class TestSectionEvents(ImioSmartwebTestCase):
         first_modification = self.portalpage.ModificationDate()
 
         sleep(1)
-        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text="{}")
         self.assertEqual(len(events_view.items), 0)
         next_modification = self.portalpage.ModificationDate()
@@ -119,7 +119,7 @@ class TestSectionEvents(ImioSmartwebTestCase):
         events_view = queryMultiAdapter(
             (self.events, self.request), name="carousel_view"
         )
-        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text=json.dumps(self.json_events))
 
         self.assertIn("paysage_vignette", events_view.items[0][0]["image"])
@@ -138,11 +138,12 @@ class TestSectionEvents(ImioSmartwebTestCase):
         events_view = queryMultiAdapter(
             (self.events, self.request), name="carousel_view"
         )
-        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text=json.dumps(self.json_events))
-        self.assertEqual(events_view.items[0][0]["category"], "Presse")
+        self.assertEqual(events_view.items[0][0]["category"], "Local Category title")
+        self.assertEqual(events_view.items[0][1]["category"], "Presse")
         self.events.show_categories_or_topics = "category"
-        self.assertEqual(events_view.items[0][0]["category"], "Presse")
+        self.assertEqual(events_view.items[0][0]["category"], "Local Category title")
         self.events.show_categories_or_topics = "topic"
         self.assertEqual(events_view.items[0][0]["category"], "Education")
         self.events.show_categories_or_topics = ""

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/tests/test_section_news.py

@@ -53,7 +53,7 @@ class TestSectionNews(ImioSmartwebTestCase):
         self.assertIn("My news", view())
         news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
         self.assertEqual(news_view.items, [])
-        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
         m.get(url, text=json.dumps(self.json_news))
         self.assertEqual(news_view.items[0][0].get("title"), "Première actualité")
         self.assertEqual(len(news_view.items[0]), 3)
@@ -62,7 +62,7 @@ class TestSectionNews(ImioSmartwebTestCase):
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
             "bfe2b4391a0f4a8db6d8b7fed63d1c4a",
         ]
-        url = "http://localhost:8080/Plone/@search?UID=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&UID=bfe2b4391a0f4a8db6d8b7fed63d1c4a&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1"
+        url = "http://localhost:8080/Plone/@search?UID=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&UID=bfe2b4391a0f4a8db6d8b7fed63d1c4a&portal_type=imio.news.NewsItem&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1"
         m.get(url, text=json.dumps(self.json_specific_news))
         self.assertEqual(len(news_view.items[0]), 2)
         self.assertEqual(
@@ -87,7 +87,7 @@ class TestSectionNews(ImioSmartwebTestCase):
         self.assertIsNone(annotations.get(SECTION_ITEMS_HASH_KEY))
 
         news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
-        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
         m.get(url, text=json.dumps(self.json_news))
         self.assertEqual(len(news_view.items[0]), 3)
         hash_1 = annotations.get(SECTION_ITEMS_HASH_KEY)
@@ -95,7 +95,7 @@ class TestSectionNews(ImioSmartwebTestCase):
         first_modification = self.portalpage.ModificationDate()
 
         sleep(1)
-        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
         m.get(url, text="{}")
         self.assertEqual(len(news_view.items), 0)
         next_modification = self.portalpage.ModificationDate()
@@ -116,7 +116,7 @@ class TestSectionNews(ImioSmartwebTestCase):
         self.news.related_news = "64f4cbee9a394a018a951f6d94452914"
         self.news.linking_rest_view = RelationValue(intids.getId(self.rest_news_view))
         news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
-        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
         m.get(url, text=json.dumps(self.json_news))
 
         self.assertIn("paysage_vignette", news_view.items[0][0]["image"])
@@ -129,7 +129,7 @@ class TestSectionNews(ImioSmartwebTestCase):
         self.news.related_news = "64f4cbee9a394a018a951f6d94452914"
         self.news.linking_rest_view = RelationValue(intids.getId(self.rest_news_view))
         news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
-        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
         m.get(url, text=json.dumps(self.json_news))
         self.assertEqual(news_view.items[0][0]["category"], "Presse")
         self.news.show_categories_or_topics = "category"

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/tests/test_vocabularies.py

@@ -265,7 +265,7 @@ class TestVocabularies(ImioSmartwebTestCase):
         json_agendas_raw_mock = get_json("resources/json_events_agendas_raw_mock.json")
         url = f"{config.EVENTS_URL}/imio-events-entity/@search?portal_type=imio.events.Agenda&sort_on=sortable_title&b_size=1000000&metadata_fields=UID"
         m.get(url, text=json.dumps(json_agendas_raw_mock))
-        url = f"{config.EVENTS_URL}/@search?selected_agendas=64f4cbee9a394a018a951f6d94452914&selected_agendas=96d3e3299dc74386943e12c4f4fd0b8a&portal_type=imio.events.Event&metadata_fields=category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=breadcrumb&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=1000000"
+        url = f"{config.EVENTS_URL}/@search?selected_agendas=64f4cbee9a394a018a951f6d94452914&selected_agendas=96d3e3299dc74386943e12c4f4fd0b8a&portal_type=imio.events.Event&metadata_fields=category_title&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=breadcrumb&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=1000000"
         json_rest_events = get_json("resources/json_rest_events_with_breadcrumbs.json")
         m.get(url, text=json.dumps(json_rest_events))
         vocabulary = get_vocabulary("imio.smartweb.vocabulary.EventsFromEntity")
@@ -284,7 +284,7 @@ class TestVocabularies(ImioSmartwebTestCase):
         )
         url = f"{config.NEWS_URL}/imio-news-entity/@search?portal_type=imio.news.NewsFolder&sort_on=sortable_title&b_size=1000000&metadata_fields=UID"
         m.get(url, text=json.dumps(json_newsfolders_raw_mock))
-        url = f"{config.NEWS_URL}/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&selected_news_folders=96d3e3299dc74386943e12c4f4fd0b8a&portal_type=imio.news.NewsItem&metadata_fields=category&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=breadcrumb&metadata_fields=UID&b_size=1000000"
+        url = f"{config.NEWS_URL}/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&selected_news_folders=96d3e3299dc74386943e12c4f4fd0b8a&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=topics&metadata_fields=has_leadimage&metadata_fields=breadcrumb&metadata_fields=UID&b_size=1000000"
         json_rest_news = get_json("resources/json_rest_news.json")
         m.get(url, text=json.dumps(json_rest_news))
         vocabulary = get_vocabulary("imio.smartweb.vocabulary.NewsItemsFromEntity")

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/utils.py

@@ -111,7 +111,7 @@ def batch_results(iterable, batch_size):
     return list(chunked(iterable, batch_size, strict=False))
 
 
-def reindexParent(obj, event):
+def reindexParent(obj, event=None):
     parent = aq_parent(obj)
     if parent is not None:
         # in some cases (ex: relation breaking), we do not get the object in

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/viewlets/footer.pt

@@ -6,6 +6,11 @@
          tal:attributes="id view/css_id;
                          style view/background_style;
                          class string:smartweb-footer ${footer/css_class}">
+    <a class="show-on-focus skip-before-footer"
+      tal:define="url view/current_page_url"
+      tal:attributes="href string:${url}#content-header"
+      i18n:domain="imio.smartweb"
+      i18n:translate="">Skip to navigation</a>
       <div class="container">
         <div class="row">
           <tal:bcl tal:repeat="section view/sections">

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/viewlets/footer.py

@@ -8,6 +8,7 @@ from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.layout.viewlets import common
 from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
 from Products.CMFPlone.utils import parent
+from zope.component import getMultiAdapter
 
 
 class BaseFooterViewlet(common.ViewletBase):
@@ -28,9 +29,13 @@ class BaseFooterViewlet(common.ViewletBase):
         return " ".join([css_bg_image, css_bg_size])
 
     def update(self):
+        context_state = getMultiAdapter(
+            (self.context, self.request), name="plone_context_state"
+        )
         if not self.available():
             return
         self.sections = self.footer.listFolderContents()
+        self.current_page_url = context_state.current_page_url
 
 
 class FooterViewlet(BaseFooterViewlet):

{imio.smartweb.core-1.2.47 → imio.smartweb.core-1.2.49}/src/imio/smartweb/core/vocabularies.py

@@ -522,7 +522,7 @@ class EventsFromEntityVocabularyFactory:
         params = [
             selected_agendas,
             "portal_type=imio.events.Event",
-            "metadata_fields=category",
+            "metadata_fields=category_title",
             "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",
@@ -562,7 +562,7 @@ class NewsItemsFromEntityVocabularyFactory:
         params = [
             selected_newsfolders,
             "portal_type=imio.news.NewsItem",
-            "metadata_fields=category",
+            "metadata_fields=category_title",
             "metadata_fields=topics",
             "metadata_fields=has_leadimage",
             "metadata_fields=breadcrumb",

imio.smartweb.core-1.2.49/src/imio/smartweb/core/webcomponents/build/css/373.smartweb-webcomponents-compiled.css

@@ -0,0 +1 @@
+.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:300px}.flexbin>*{display:block;flex-grow:1;height:300px;margin:2.5px;position:relative}.flexbin>*>img{height:300px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}@media (max-width:980px){.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:150px}.flexbin>*{display:block;flex-grow:1;height:150px;margin:2.5px;position:relative}.flexbin>*>img{height:150px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}}@media (max-width:400px){.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:100px}.flexbin>*{display:block;flex-grow:1;height:100px;margin:2.5px;position:relative}.flexbin>*>img{height:100px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}}.breadcrumb{padding:0}.r-result-list{list-style:none;margin-top:50px;padding-left:0}#portal-column-content h1{font-size:0;position:absolute}#viewlet-below-content-description,#viewlet-below-content-title{display:none}.r-item-text{display:flex;flex-direction:column;margin:20px 30px;position:relative}.r-item-title{display:block}.r-content-img{padding-bottom:60%}.new-content{margin:0 auto;max-width:700px}.r-load-more{margin-bottom:2rem;text-align:center}.r-load-more button{background:#000;border:1px solid #0000;border-radius:10px;border-bottom-left-radius:10px;border-bottom-left-radius:0;color:#fff;display:block;font-size:14px;font-weight:700;margin:0 auto;padding:.4rem 1rem}.r-load-more button:hover{background:rgba(0,0,0,.871)}.r-actu-wrapper{position:relative}.r-actu-wrapper:after{content:url(../57d3b7cb1ab874660b39.svg);display:block;position:absolute;right:0;top:0;transform:translateY(-20%);width:495px;z-index:-1}.r-actu-wrapper .r-list-item-group{background:#fff;border:1px solid #d1d1d1;border-radius:15px 15px 15px 0;margin:30px auto;max-width:900px}.r-item-title{font-size:18px;font-weight:700}.r-item-description{color:#444;font-size:16px;margin-top:10px}.r-item-img{border-radius:15px 15px 15px 0}.r-actu-wrapper .r-item-img{aspect-ratio:1.6741071429;background-position:top;background-repeat:no-repeat;background-size:cover;width:100%}@media screen and (min-width:775px){.r-actu-wrapper .r-item-img{width:323px}}.r-item-read-more{margin-top:auto}.r-item-arrow-more{align-self:center;background:#f9b331;background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20.44 10'%3E%3Cg data-name='Calque 2'%3E%3Cg data-name='Calque 1'%3E%3Cpath d='M1 5h18.44' data-name='Ligne 7' style='fill:none;stroke:%23000;stroke-linecap:round;stroke-width:2px'/%3E%3Cpath d='m14.83 1 4.61 4' data-name='Ligne 8' style='fill:none;stroke:%23000;stroke-linecap:round;stroke-width:2px'/%3E%3Cpath d='m14.83 9 4.61-4' data-name='Ligne 9' style='fill:none;stroke:%23000;stroke-linecap:round;stroke-width:2px'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");background-position:50%;background-repeat:no-repeat;background-size:20px;border-radius:50px;flex:0 0 50px;height:50px;margin-left:auto;margin-right:30px;width:50px}.r-list-item-group:hover .r-item-arrow-more{background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20.44 10'%3E%3Cg data-name='Calque 2'%3E%3Cg data-name='Calque 1'%3E%3Cpath d='M1 5h18.44' data-name='Ligne 7' style='fill:none;stroke:%23fff;stroke-linecap:round;stroke-width:2px'/%3E%3Cpath d='m14.83 1 4.61 4' data-name='Ligne 8' style='fill:none;stroke:%23fff;stroke-linecap:round;stroke-width:2px'/%3E%3Cpath d='m14.83 9 4.61-4' data-name='Ligne 9' style='fill:none;stroke:%23fff;stroke-linecap:round;stroke-width:2px'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E"),#f9b331;background-position:50%;background-repeat:no-repeat;background-size:20px}@media screen and (max-width:774px){.r-list-item{flex-direction:column}}@media screen and (max-width:600px){.r-item-read-more{position:relative}}.icon-baseline{align-self:center;display:inline-flex;margin-right:.4rem}.icon-baseline svg{height:1em;position:relative;top:.125em;width:1em}.dpinlb{display:inline-block;vertical-align:top}.r-content-news-info-social svg{height:30px;width:30px}.r-content-news-info-social ul{align-items:center;display:flex;margin:0}.r-content-news-info-social ul li{list-style:none}.r-content-news-info-social ul li a:hover{opacity:.7}.r-item-categorie{color:#747474;font-size:13px;font-weight:400;margin-top:5px;text-transform:uppercase}.r-result-filter-container{background:#fff;z-index:1}@media screen and (min-width:1200px){.r-result-filter-container{position:-webkit-sticky;position:sticky}}.r-result-filter-container:after{background:#fff;content:"";height:312px;left:0;position:absolute;right:0;top:0;transform:translateY(-100%)}.r-result-filter-container .r-result-filter{border-bottom:1px solid #cccc;padding-bottom:1rem;padding-top:1rem;position:relative}.r-results-numbers{margin-bottom:0;padding-top:1rem;width:100%}.r-results-numbers span{font-weight:700}.r-result-filter{position:relative}.react-filters-menu{display:flex;margin-bottom:1rem;width:100%}.react-filters-menu .react-filters-container{align-items:flex-start;background:#fff;border-radius:30px;display:flex;flex-direction:column;gap:10px;position:relative;width:auto;width:100%}@media screen and (min-width:630px){.react-filters-menu .react-filters-container{align-items:center;border:1px solid #cfcfcf;box-shadow:0 3px 12px 0 #0000001a,0 1px 2px 0 #0000000d;flex-direction:row;padding:4px 15px;width:auto}}.react-filters-menu .react-sep-menu{background:#cfcfcf;display:none;height:20px;width:1px}@media screen and (min-width:630px){.react-filters-menu .react-sep-menu{display:block}}.react-filters-menu span[class$=-indicatorSeparator]{display:none}.react-filters-menu div[class$=-indicatorContainer]{padding:0}.react-filters-menu .accordion-collapse{padding-top:1rem}.react-filters-menu .top-filter{width:100%}@media screen and (min-width:630px){.react-filters-menu .top-filter{width:auto}}.react-filters-menu .top-filter .select-custom-no-border{width:100%}@media screen and (min-width:630px){.react-filters-menu .top-filter .select-custom-no-border{width:auto}}.react-filters-menu .top-filter .select-custom-no-border div[class$=-control]{width:100%}@media screen and (max-width:629px){.react-filters-menu .top-filter .select-custom-no-border div[class$=-control]{border:1px solid #cfcfcf;color:#333}}@media screen and (min-width:630px){.react-filters-menu .top-filter .select-custom-no-border div[class$=-control]{width:auto}}.r-filter-search{border-radius:50px;display:block;padding:12px 6px;position:relative;width:100%}@media screen and (max-width:629px){.r-filter-search{border:1px solid #cfcfcf;box-shadow:0 3px 12px 0 #0000001a,0 1px 2px 0 #0000000d;width:calc(100% - 40px)}}@media screen and (min-width:630px){.r-filter-search{width:175px}}.r-filter-search input{border:none;width:100%}.r-filter-search input:focus{outline:none}.r-filter-search svg{position:absolute;right:0;transform:translateX(-100%)}.r-filter-search .relative{align-items:center;display:flex;justify-content:center}.more-filter-btn{background-color:#0000;border:none;position:absolute;right:0;top:18px}@media screen and (min-width:630px){.more-filter-btn{top:inherit;translate:40px;width:auto}}.more-filter-btn.collapsed{transform:rotate(180deg)}.more-filter-btn.collapsed svg{stroke:#9f9f9f}.more-filter-container.collapse:not(.show){display:none}.more-filter-container .accordion-body{align-items:center;background-color:#f8f8f8;border:1px solid #e4e4e4;border-left:none;border-right:none;display:flex;gap:20px;justify-content:center;padding:1rem}@media screen and (max-width:630px){.more-filter-container .accordion-body{display:flex;flex-direction:column}}.more-filter-container .free-Filter label{font-size:12px;font-weight:700;letter-spacing:1.4px}.more-filter-container .free-Filter .form-check{align-items:center;display:flex;gap:5px;padding:0}.more-filter-container .free-Filter .form-check input{margin:0}