imio.smartweb.core 1.2.37__py3-none-any.whl → 1.2.79__py3-none-any.whl

imio/smartweb/core/tests/test_htmx_in_sections.py

@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.core.interfaces import IImioSmartwebCoreLayer
+from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
+from imio.smartweb.core.testing import ImioSmartwebTestCase
+from plone import api
+from plone.api import portal as portal_api
+from plone.app.testing import logout
+from plone.app.testing import setRoles
+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.textfield.value import RichTextValue
+from plone.protect.authenticator import createToken
+from plone.testing.zope import Browser
+from zope.component import getMultiAdapter
+from zope.component import queryMultiAdapter
+from zope.interface import alsoProvides
+
+import json
+import mock
+import re
+import transaction
+
+
+class TestSections(ImioSmartwebTestCase):
+    layer = IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
+
+    def setUp(self):
+        self.request = self.layer["request"]
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        self.page = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.Page",
+            id="page",
+        )
+        alsoProvides(self.request, IImioSmartwebCoreLayer)
+        self.section_text = api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionText",
+            title="Section Text",
+            id="section-text",
+        )
+        self.section_text.text = RichTextValue(
+            "<p>My rich text</p>", "text/html", "text/html"
+        )
+        api.content.transition(self.page, "publish")
+
+    def test_htmx_not_loaded_for_anonymous(self):
+        logout()
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
+        self.assertNotIn("https://unpkg.com/htmx.org@1.9.10/dist/htmx.js", view())
+
+    def test_all_html_elements_are_here(self):
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
+        # test if htmx well loaded
+        self.assertIn("https://unpkg.com/htmx.org@1.9.10/dist/htmx.js", view())
+        section_text_uid = self.section_text.UID()
+        # test if elements are here and have the right id
+        self.assertIn(f"sizesForm_{section_text_uid}", view())
+        self.assertIn(f'hx-boost="{section_text_uid}"', view())
+        self.assertIn(f'id="selected_size_{section_text_uid}"', view())
+        self.assertIn(f'hx-target="#selected_size_{section_text_uid}"', view())
+
+    def test_options_in_select(self):
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
+        section_text_view = getMultiAdapter(
+            (self.section_text, self.request), name="view"
+        )
+        available_sizes = section_text_view.get_sizes
+        match = re.search(
+            r'<form class="form_section_size".*?</form>', view(), re.DOTALL
+        )
+        form_to_choose_size = match.group(0)
+        nb_occurrences = len(re.findall(r"<option", form_to_choose_size))
+        self.assertEqual(len(available_sizes), nb_occurrences)
+        for size in available_sizes:
+            self.assertIn(
+                f'<option title="{size["value"]}" value="{size["key"]}" class="icon_{size["key"]}" >',
+                form_to_choose_size,
+            )
+            # self.assertIn(
+            #     f'<option value="{size["key"]}">{size["value"]}</option>',
+            #     form_to_choose_size,
+            # )
+
+    def test_change_section_size(self):
+        portal_api.get_current_language = mock.Mock(return_value="en")
+        transaction.commit()
+        section_text_uid = self.section_text.UID()
+        browser = Browser(self.layer["app"])
+        browser.addHeader(
+            "Authorization",
+            "Basic %s:%s"
+            % (
+                TEST_USER_NAME,
+                TEST_USER_PASSWORD,
+            ),
+        )
+        browser.open(f"{self.page.absolute_url()}/full_view/?language=fr")
+        contents = browser.contents
+        div_section_container = (
+            '<div class="sortable-section sectiontext" data-id="section-text" style="">'
+        )
+        self.assertIn(div_section_container, contents)
+
+        select = browser.getControl(name=f"select_{section_text_uid}")
+        select.value = "col-sm-12"
+        browser.getForm(name=f"sizesForm_{section_text_uid}").submit()
+        section_text_view = getMultiAdapter(
+            (self.section_text, self.request), name="view"
+        )
+        self.assertEqual(section_text_view.save_size, json.dumps({}))
+        select_name = f"select_{self.section_text.UID()}"
+        self.request.form[select_name] = select.value[0]
+        self.request.form["_authenticator"] = createToken()
+        section_text_view = getMultiAdapter(
+            (self.section_text, self.request), name="view"
+        )
+        section_text_view.save_size
+        self.assertEqual(
+            section_text_view.save_size,
+            json.dumps({"id": "col-sm-12", "title": "Full width"}),
+        )
+        transaction.commit()
+
+        browser.open(f"{self.page.absolute_url()}/full_view/?language=fr")
+        contents = browser.contents
+        div_section_container = f'<div class="sortable-section sectiontext {select.value[0]}" data-id="section-text" style="">'
+        self.assertIn(div_section_container, contents)

imio/smartweb/core/tests/test_iadeliberations.py

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+from imio.smartweb.core.contents import IPublication
+from imio.smartweb.core.tests.utils import get_json
+from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_INTEGRATION_TESTING
+from imio.smartweb.core.testing import ImioSmartwebTestCase
+from plone import api
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from plone.dexterity.interfaces import IDexterityFTI
+from unittest.mock import patch
+from zope.component import createObject
+from zope.component import queryMultiAdapter
+from zope.component import queryUtility
+
+
+class TestIADeliberations(ImioSmartwebTestCase):
+    layer = IMIO_SMARTWEB_CORE_INTEGRATION_TESTING
+
+    def setUp(self):
+        """Custom shared utility setup for tests."""
+        self.portal = self.layer["portal"]
+        self.request = self.layer["request"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        self.page = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.Page",
+            title="A Page",
+        )
+        self.files_section = api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionFiles",
+            title="My files section",
+        )
+        self.json_publication_raw_mock = get_json(
+            "resources/json_iadeliberations_publication.json"
+        )
+
+    def test_ct_publication_schema(self):
+        fti = queryUtility(IDexterityFTI, name="imio.smartweb.Publication")
+        schema = fti.lookupSchema()
+        self.assertEqual(IPublication, schema)
+
+    def test_ct_publication_fti(self):
+        fti = queryUtility(IDexterityFTI, name="imio.smartweb.Publication")
+        self.assertTrue(fti)
+
+    def test_ct_publication_factory(self):
+        fti = queryUtility(IDexterityFTI, name="imio.smartweb.Publication")
+        factory = fti.factory
+        obj = createObject(factory)
+        self.assertTrue(
+            IPublication.providedBy(obj),
+            "IPublication not provided by {0}!".format(
+                obj,
+            ),
+        )
+
+    @patch("imio.smartweb.core.subscribers.get_iadeliberation_json")
+    @patch(
+        "imio.smartweb.core.subscribers.get_iadeliberation_institution_from_registry"
+    )
+    def test_ct_publication_adding(self, m_get_institution, m_get_publication):
+        m_get_institution.return_value = "https://conseil.staging.imio.be/liege"
+        m_get_publication.return_value = self.json_publication_raw_mock
+        obj = api.content.create(
+            container=self.files_section,
+            type="imio.smartweb.Publication",
+            linked_publication="ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid",
+            id="ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid",
+        )
+        self.assertTrue(
+            IPublication.providedBy(obj),
+            "IPublication not provided by {0}!".format(
+                obj.id,
+            ),
+        )
+        parent = obj.__parent__
+        self.assertIn(
+            "ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid",
+            parent.objectIds(),
+        )
+        title_resp = (
+            "Ordonnance concernant des mesures spécifiques en cas de grand froid."
+        )
+        self.assertEqual(obj.title, title_resp)
+        desc_resp = "Adopté par M. le Bourgmestre en date 12 décembre 2022"
+        self.assertEqual(obj.description, desc_resp)
+        url_resp = "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid"
+        self.assertEqual(obj.publication_url, url_resp)
+        self.assertEqual(obj.publication_category, "Sécurité & Prévention")
+        self.assertEqual(
+            obj.publication_attached_file.get("filename"), "013400000123949.PDF"
+        )
+
+        # check that deleting the object works too
+        api.content.delete(obj=obj)
+        self.assertNotIn("publication", parent.objectIds())
+
+    @patch("imio.smartweb.core.subscribers.get_iadeliberation_json")
+    @patch(
+        "imio.smartweb.core.subscribers.get_iadeliberation_institution_from_registry"
+    )
+    def test_publication_view(self, m_get_institution, m_get_publication):
+        m_get_institution.return_value = "https://conseil.staging.imio.be/liege"
+        m_get_publication.return_value = self.json_publication_raw_mock
+        obj = api.content.create(
+            container=self.files_section,
+            type="imio.smartweb.Publication",
+            id="18820593",
+        )
+        obj.reindexObject()
+        title_to_get = (
+            "Ordonnance concernant des mesures spécifiques en cas de grand froid."
+        )
+
+        view = queryMultiAdapter((self.files_section, self.request), name="full_view")
+        self.assertIn(title_to_get, view())
+        self.assertNotIn("013400000123949.PDF", view())
+
+        view = queryMultiAdapter((self.files_section, self.request), name="table_view")
+        self.assertIn(title_to_get, [item[0]["title"] for item in view.items()])
+        self.assertEqual(
+            [
+                item[0]["publication_attached_file"].get("filename")
+                for item in view.items()
+            ][0],
+            "013400000123949.PDF",
+        )
+        self.assertEqual(
+            [item[0]["publication_document_type"] for item in view.items()][0],
+            "Ordonnance de police administrative",
+        )
+        self.assertEqual(
+            [item[0]["publication_datetime"] for item in view.items()][0],
+            "2024-08-14T09:14:31",
+        )

imio/smartweb/core/tests/test_icons.py

@@ -54,7 +54,7 @@ class TestIcons(ImioSmartwebTestCase):
         self.assertIn('<path d="M18 0H2V2H18V0ZM2 24H18V22H2V24ZM18', view)
 
     def test_icons_override(self):
-        self.assertVocabularyLen("imio.smartweb.vocabulary.Icons", 49)
+        self.assertVocabularyLen("imio.smartweb.vocabulary.Icons", 64)
         portal_resources = getUtility(IResourceDirectory, name="persistent")
         portal_resources.makeDirectory("plone")
         portal_resources["plone"].makeDirectory("imio.smartweb.core")

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()
@@ -369,6 +372,8 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             "http://localhost:8080/Plone/@events?"
             "selected_agendas={}&"
             "metadata_fields=category&"
+            "metadata_fields=local_category&"
+            "metadata_fields=container_uid&"
             "metadata_fields=topics&"
             "metadata_fields=start&"
             "metadata_fields=end&"
@@ -425,6 +430,8 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             "selected_news_folders={}&"
             "portal_type=imio.news.NewsItem&"
             "metadata_fields=category&"
+            "metadata_fields=local_category&"
+            "metadata_fields=container_uid&"
             "metadata_fields=topics&"
             "metadata_fields=has_leadimage&"
             "metadata_fields=UID&"
@@ -487,6 +494,40 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
         view = queryMultiAdapter((self.rest_events, self.request), name="view")
         self.assertIn('display-map="True"', view())
 
+    def test_show_categories_or_topics(self):
+        rest_events = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.EventsView",
+            title="events view",
+        )
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_events.show_categories_or_topics = "category"
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_events.show_categories_or_topics = "topic"
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics="topic"', view())
+        rest_events.show_categories_or_topics = ""
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics=""', view())
+        rest_news = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.NewsView",
+            title="news view",
+        )
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_news.show_categories_or_topics = "category"
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_news.show_categories_or_topics = "topic"
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics="topic"', view())
+        rest_news.show_categories_or_topics = ""
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics=""', view())
+
     @patch("imio.smartweb.core.rest.authentic_sources.get_wca_token")
     @patch("imio.smartweb.core.rest.authentic_sources.requests.request")
     @patch("imio.smartweb.core.rest.authentic_sources.get_default_view_url")

imio/smartweb/core/tests/test_section_contact.py

@@ -8,6 +8,7 @@ from imio.smartweb.common.contact_utils import formatted_schedule
 from imio.smartweb.common.contact_utils import get_schedule_for_today
 from imio.smartweb.core.contents.sections.contact.utils import ContactProperties
 from imio.smartweb.core.contents.sections.views import SECTION_ITEMS_HASH_KEY
+from imio.smartweb.core.tests.utils import clear_cache
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
 from imio.smartweb.core.tests.utils import get_json
@@ -57,7 +58,8 @@ class TestSectionContact(ImioSmartwebTestCase):
         view = queryMultiAdapter((self.page, self.request), name="full_view")
         self.assertIn("My contact", view())
         contact_view = queryMultiAdapter((contact, self.request), name="view")
-        self.assertIsNone(contact_view.contacts())
+        self.assertEqual(contact_view.contacts(), [])
+
         authentic_contact_uid = "2dc381f0fb584381b8e4a19c84f53b35"
         contact.related_contacts = [authentic_contact_uid]
         contact_search_url = (
@@ -69,12 +71,13 @@ class TestSectionContact(ImioSmartwebTestCase):
             authentic_contact_uid
         )
         m.get(contact_search_url, exc=requests.exceptions.ConnectTimeout)
-        self.assertIsNone(contact_view.contacts())
+        self.assertEqual(contact_view.contacts(), [])
         m.get(contact_search_url, status_code=404)
-        self.assertIsNone(contact_view.contacts())
+        self.assertEqual(contact_view.contacts(), [])
         m.get(contact_search_url, text=json.dumps(self.json_no_contact))
-        self.assertIsNone(contact_view.contacts())
+        self.assertEqual(contact_view.contacts(), [])
         m.get(contact_search_url, text=json.dumps(self.json_contact))
+        clear_cache(self.request)
         self.assertIsNotNone(contact_view.contacts())
         json_contact = ContactProperties(self.json_contact.get("items")[0], contact)
         self.assertEqual(json_contact.contact_type_class, "contact-type-organization")
@@ -113,6 +116,13 @@ class TestSectionContact(ImioSmartwebTestCase):
         m.get(contact_images_url, text=json.dumps(self.json_contact_images))
         self.assertIn("contact_gallery", view())
 
+        contact.visible_blocks = ["titles"]
+        json_contact = ContactProperties(self.json_contact.get("items")[0], contact)
+        images = json_contact.images(contact.image_scale, contact.nb_results_by_batch)
+        self.assertNotIn("contact_gallery", view())
+        self.assertIsNone(images)
+
+        contact.visible_blocks = ["titles", "gallery"]
         json_contact = ContactProperties(self.json_contact.get("items")[0], contact)
         images = json_contact.images(contact.image_scale, contact.nb_results_by_batch)
         self.assertEqual(len(images[0]), 2)
@@ -130,6 +140,18 @@ class TestSectionContact(ImioSmartwebTestCase):
         images = json_contact.images(contact.image_scale, contact.nb_results_by_batch)
         self.assertIsNone(images)
 
+    @requests_mock.Mocker()
+    def test_sorted_contacts_are_empty(self, m):
+        # TODO Separate test test_sorted_contacts_is_none /
+        # test_sorted_contacts 'cause of Memoize ??!!
+        contact = api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionContact",
+            title="My contact",
+        )
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+        self.assertEqual(contact_view.contacts(), [])
+
     @requests_mock.Mocker()
     def test_sorted_contacts(self, m):
         contact = api.content.create(
@@ -138,7 +160,6 @@ class TestSectionContact(ImioSmartwebTestCase):
             title="My contact",
         )
         contact_view = queryMultiAdapter((contact, self.request), name="view")
-        self.assertIsNone(contact_view.contacts())
         authentic_contact_uid = [
             "2dc381f0fb584381b8e4a19c84f53b35",
             "af7bd1f547034b24a2e0da16c0ba0358",
@@ -501,7 +522,9 @@ class TestSectionContact(ImioSmartwebTestCase):
             "afternoonend": "",
             "comments": "",
         }
+        clear_cache(self.request)
         m.get(contact_search_url, text=json.dumps(json_contact_empty_schedule))
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
         json_contact = ContactProperties(
             json_contact_empty_schedule.get("items")[0], contact
         )
@@ -549,7 +572,6 @@ class TestSectionContact(ImioSmartwebTestCase):
 
         annotations = IAnnotations(contact)
         self.assertIsNone(annotations.get(SECTION_ITEMS_HASH_KEY))
-
         self.assertIsNotNone(contact_view.contacts())
         hash_1 = annotations.get(SECTION_ITEMS_HASH_KEY)
         self.assertIsNotNone(hash_1)
@@ -557,15 +579,25 @@ class TestSectionContact(ImioSmartwebTestCase):
 
         sleep(1)
         m.get(contact_search_url, text=json.dumps(self.json_no_contact))
-        self.assertIsNone(contact_view.contacts())
+        clear_cache(self.request)
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+        self.assertEqual(contact_view.contacts(), [])
+        # refresh_modification_date doesn't calculate when json_data is None
+        # For this section, this is the case
+        # For other sections, we get json_data with empty "items"
+        # Refactoring needed to ensure clarity ?
         next_modification = self.page.ModificationDate()
         hash_2 = annotations.get(SECTION_ITEMS_HASH_KEY)
-        self.assertNotEqual(hash_1, hash_2)
-        self.assertNotEqual(first_modification, next_modification)
+        self.assertEqual(hash_1, hash_2)
+        self.assertEqual(first_modification, next_modification)
 
         sleep(1)
-        self.assertIsNone(contact_view.contacts())
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+        self.assertEqual(contact_view.contacts(), [])
         last_modification = self.page.ModificationDate()
         hash_3 = annotations.get(SECTION_ITEMS_HASH_KEY)
         self.assertEqual(hash_2, hash_3)
         self.assertEqual(next_modification, last_modification)
+
+        # TODO we should test with various contact sections containing
+        # contacts

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=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=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=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=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,9 +119,32 @@ 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=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"])
         self.events.orientation = "portrait"
         self.assertIn("portrait_vignette", events_view.items[0][0]["image"])
+
+    @requests_mock.Mocker()
+    def test_show_categories_or_topics(self, m):
+        today = datetime.now()
+        today_str = today.strftime("%Y-%m-%d")
+        intids = getUtility(IIntIds)
+        self.events.related_events = "e73e6a81afea4a579cd0da2773af8d29"
+        self.events.linking_rest_view = RelationValue(
+            intids.getId(self.rest_events_view)
+        )
+        events_view = queryMultiAdapter(
+            (self.events, self.request), name="carousel_view"
+        )
+        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"], "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"], "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 = ""
+        self.assertEqual(events_view.items[0][0]["category"], "")

imio/smartweb/core/tests/test_section_external_content.py

@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.core.interfaces import IOdwbViewUtils
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
 from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from zope.component import queryMultiAdapter
+from zope.interface import alsoProvides
+from zope.interface import noLongerProvides
 
 
 class TestSectionExternalContent(ImioSmartwebTestCase):
@@ -21,6 +24,28 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
             id="page",
         )
 
+    def test_parent_marker_interface(self):
+        sec1 = api.content.create(
+            container=self.page, type="imio.smartweb.SectionExternalContent", id="sec1"
+        )
+        self.assertTrue(IOdwbViewUtils.providedBy(self.page))
+
+        sec2 = api.content.create(
+            container=self.page, type="imio.smartweb.SectionExternalContent", id="sec2"
+        )
+        api.content.delete(obj=sec1)
+        self.assertTrue(IOdwbViewUtils.providedBy(self.page))
+
+        api.content.delete(obj=sec2)
+        self.assertFalse(IOdwbViewUtils.providedBy(self.page))
+
+        api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionText",
+            id="not_external_content_section",
+        )
+        self.assertFalse(IOdwbViewUtils.providedBy(self.page))
+
     def test_unknow_service(self):
         sec = api.content.create(
             container=self.page, type="imio.smartweb.SectionExternalContent", id="sec"
@@ -71,8 +96,9 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
             "ConstellationWidgetContainer" : "11111111-1111-1111-1111-111111111111",
             "Idoi" : "22222222-2222-2222-2222-222222222222"
         }"""
+        self.maxDiff = None
         section_view = queryMultiAdapter((sec, self.request), name="view")
-        result = '<div class="elloha"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
+        result = '<div class="elloha" style="position:relative;"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
         self.assertEqual(section_view.contents, result)
 
         # good extra params / dict keys are case insensitive
@@ -81,7 +107,7 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
             "IDOI" : "22222222-2222-2222-2222-222222222222"
         }"""
         section_view = queryMultiAdapter((sec, self.request), name="view")
-        result = '<div class="elloha"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
+        result = '<div class="elloha" style="position:relative;"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
         self.assertEqual(section_view.contents, result)
 
         # with bad params