imio.smartweb.core 1.3__py3-none-any.whl → 1.3.2__py3-none-any.whl

imio/smartweb/core/tests/test_rest.py

@@ -18,7 +18,6 @@ from plone.app.testing import TEST_USER_ID
 from plone.app.testing import TEST_USER_PASSWORD
 from plone.namedfile.file import NamedBlobImage
 from plone.restapi.testing import RelativeSession
-from unittest import mock
 from unittest.mock import patch
 from urllib.parse import urlparse
 from urllib.parse import parse_qs
@@ -29,7 +28,6 @@ from ZPublisher.pubevents import PubStart
 from imio.smartweb.core.viewlets.ogptags import OgpTagsViewlet
 
 import json
-import os
 import requests_mock
 import transaction
 
@@ -444,8 +442,8 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             "metadata_fields=UID&"
             "sort_on=effective&"
             "sort_order=descending&"
-            "b_size=20&"
             "fullobjects=1&"
+            "b_size=20&"
             "translated_in_en=1".format(self.rest_news.selected_news_folder),
         )
         m.get(url, text=json.dumps({}))

imio/smartweb/core/tests/test_sitemap.py

@@ -3,8 +3,12 @@
 from freezegun import freeze_time
 from gzip import GzipFile
 from io import BytesIO
+from imio.smartweb.core.browser.sitemap import CatalogSiteMap
+from imio.smartweb.core.browser.sitemap import get_endpoint_data
+from imio.smartweb.core.browser.sitemap import cache_key
 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 clear_cache
 from imio.smartweb.core.tests.utils import get_json
 from imio.smartweb.core.tests.utils import make_named_image
 from plone import api
@@ -12,11 +16,13 @@ from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.app.textfield.value import RichTextValue
 from plone.base.utils import safe_text
+from plone.memoize.ram import choose_cache
 from plone.namedfile.file import NamedBlobImage
 from unittest.mock import patch
+from unittest.mock import Mock
+from zope.annotation import IAnnotations
 from zope.component import getMultiAdapter
 
-import json
 import requests_mock
 
 
@@ -76,6 +82,10 @@ class TestPage(ImioSmartwebTestCase):
             title="news view",
         )
         self.rest_news.selected_news_folder = "64f4cbee9a394a018a951f6d94452914"
+        self.json_rest_directory = get_json("resources/json_rest_directory.json")
+        self.json_rest_events = get_json("resources/json_rest_events.json")
+        self.json_rest_news = get_json("resources/json_rest_news.json")
+
         api.content.transition(self.rest_directory, "publish")
         api.content.transition(self.rest_agenda, "publish")
         api.content.transition(self.rest_news, "publish")
@@ -111,60 +121,108 @@ class TestPage(ImioSmartwebTestCase):
             (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
         )
         xml = self.uncompress(sitemap())
-        self.assertIn(
-            "<loc>http://nohost/plone/folder/page1/gallery/image/view</loc>", xml
-        )
+        self.assertIn("<loc>http://nohost/plone/folder/page1/gallery/image</loc>", xml)
         # Gallery and image created 2024-02-02 10:00:00
         self.assertIn(
-            "<loc>http://nohost/plone/folder/page1/gallery/image/view</loc>\n    <lastmod >2024-02-02T10:00:00",
+            "<loc>http://nohost/plone/folder/page1/gallery/image</loc>\n    <lastmod >2024-02-02T10:00:00",
             xml,
         )
 
-        rest_views = {
-            "directory": self.rest_directory,
-            "events": self.rest_agenda,
-            "news": self.rest_news,
-        }
-        contact_search_url = news_search_url = events_search_url = (
-            "http://localhost:8080/Plone/@querystring-search"
-        )
-        for k, v in rest_views.items():
-            api.portal.set_registry_record(f"smartweb.default_{k}_view", v.UID())
+        cache = choose_cache("imio.smartweb.core.browser.sitemap.get_endpoint_data")
+        cache.ramcache.invalidateAll()
+
         with patch(
-            "imio.smartweb.core.contents.rest.utils.get_wca_token",
-            return_value="kamoulox",
-        ):
-            self.json_contacts = get_json("resources/json_contacts_raw_mock.json")
-            m.post(contact_search_url, text=json.dumps(self.json_contacts))
-            sitemap = getMultiAdapter(
-                (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
+            "imio.smartweb.core.contents.rest.news.endpoint.BaseNewsEndpoint.__call__",
+            return_value=self.json_rest_news,
+        ) as mypatch:
+            xml = self.uncompress(sitemap())
+            self.assertIn(
+                "<loc>http://nohost/plone/news-view/ceci-est-une-deuxieme-actualite",
+                xml,
             )
+
+        cache = choose_cache("imio.smartweb.core.browser.sitemap.get_endpoint_data")
+        cache.ramcache.invalidateAll()
+
+        with patch(
+            "imio.smartweb.core.contents.rest.directory.endpoint.BaseDirectoryEndpoint.__call__",
+            return_value=self.json_rest_directory,
+        ) as mypatch:
             xml = self.uncompress(sitemap())
-            self.assertIn("<loc>http://nohost/plone/directory-view/contact1-title", xml)
+            self.assertIn(
+                "<loc>http://nohost/plone/directory-view/service-communication-de-ladministration-communale",
+                xml,
+            )
+
+        cache = choose_cache("imio.smartweb.core.browser.sitemap.get_endpoint_data")
+        cache.ramcache.invalidateAll()
 
         with patch(
-            "imio.smartweb.core.contents.rest.utils.get_wca_token",
-            return_value="kamoulox",
+            "imio.smartweb.core.contents.rest.events.endpoint.BaseEventsEndpoint.__call__",
+            return_value=self.json_rest_events,
         ):
-            self.json_news = get_json("resources/json_rest_news.json")
-            m.post(news_search_url, text=json.dumps(self.json_news))
-            sitemap = getMultiAdapter(
-                (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
-            )
             xml = self.uncompress(sitemap())
-            self.assertIn("<loc>http://nohost/plone/news-view/", xml)
+            self.assertIn(
+                "<loc>http://nohost/plone/agenda-view/evenement-recurrent-tous-les-samedi",
+                xml,
+            )
+
+    def test_site_map_for_user_display(self):
+        sitemap = CatalogSiteMap(self.portal, self.request)
+        # 3 authentic sources
+        self.assertEqual(len(sitemap.siteMap().get("children")), 3)
+        self.assertNotIn(
+            "Folder",
+            [child.get("Title") for child in sitemap.siteMap().get("children")],
+        )
 
+        # Publish folder and page (private content don't appear in sitemap)
+        api.content.transition(self.folder, "publish")
+        api.content.transition(self.page, "publish")
+        sitemap = CatalogSiteMap(self.portal, self.request)
+        self.assertEqual(len(sitemap.siteMap().get("children")), 4)
+        self.assertIn(
+            "Folder",
+            [child.get("Title") for child in sitemap.siteMap().get("children")],
+        )
+        folder_entry = [
+            child
+            for child in sitemap.siteMap().get("children")
+            if child.get("Title") == "Folder"
+        ][0]
+        self.assertIn(
+            "Page 1", [child.get("Title") for child in folder_entry.get("children")]
+        )
+
+        directory_entry = [
+            child
+            for child in sitemap.siteMap().get("children")
+            if child.get("Title") == "directory view"
+        ][0]
+        self.assertEqual(len(directory_entry.get("children")), 0)
+
+        cache = choose_cache("imio.smartweb.core.browser.sitemap.get_endpoint_data")
+        cache.ramcache.invalidateAll()
+
+        # Populate directory view with 6 contacts
         with patch(
-            "imio.smartweb.core.contents.rest.utils.get_wca_token",
-            return_value="kamoulox",
+            "imio.smartweb.core.contents.rest.directory.endpoint.BaseDirectoryEndpoint.__call__",
+            return_value=self.json_rest_directory,
         ):
-            self.json_events = get_json("resources/json_rest_events.json")
-            m.post(events_search_url, text=json.dumps(self.json_events))
-            sitemap = getMultiAdapter(
-                (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
-            )
-            xml = self.uncompress(sitemap())
-            self.assertIn("<loc>http://nohost/plone/agenda-view/", xml)
+            sitemap = CatalogSiteMap(self.portal, self.request)
+            directory_entry = [
+                child
+                for child in sitemap.siteMap().get("children")
+                if child.get("Title") == "directory view"
+            ][0]
+            self.assertEqual(len(directory_entry.get("children")), 6)
+
+    def test_bad_portal_type(self):
+        obj = Mock()
+        obj.portal_type = None
+        request = Mock()
+        result = get_endpoint_data(obj, request)
+        assert result == {}
 
     def uncompress(self, sitemapdata):
         sio = BytesIO(sitemapdata)

imio/smartweb/core/tests/test_vocabulary.py

@@ -41,3 +41,21 @@ class TestVocabulary(ImioSmartwebTestCase):
             self.assertEqual(
                 result["results"][0]["text"], "Activités et divertissement"
             )
+
+        self.page = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.Page",
+            title="My Page",
+        )
+        self.contacts = api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionContact",
+            title="My contancts",
+        )
+        self.request.form = {
+            "name": "imio.smartweb.vocabulary.RemoteContacts",
+            "field": "related_contacts",
+        }
+        view = queryMultiAdapter((self.contacts, self.request), name="getVocabulary")
+        result = json.loads(view())
+        self.assertEqual(result["results"], [])

imio/smartweb/core/upgrades/configure.zcml

@@ -291,6 +291,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1066_to_1067"
+      title="Upgrade core from 1066 to 1067"
+      directory="profiles/1066_to_1067"
+      description="BLA BLA BLA"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />      
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed profiles steps and reindex catalog"
@@ -961,6 +969,17 @@
       profile="imio.smartweb.core:default"
       />
 
+  <genericsetup:upgradeSteps
+      source="1066"
+      destination="1067"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="BLA BLA BLA"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1066_to_1067"
+    />
+  </genericsetup:upgradeSteps>
+
+
   <!--genericsetup:upgradeStep
       title="Check contact itinerary if address was checked in visible blocks"
       description=""

imio/smartweb/core/upgrades/profiles/1061_to_1062/types/imio.smartweb.SectionTimestampedPublications.xml

@@ -16,11 +16,7 @@
 
   <!-- Hierarchy control -->
   <property name="global_allow">False</property>
-    <property name="filter_content_types">True</property>
-  <property name="allowed_content_types">
-    <element value="imio.smartweb.SectionTimestampedPublications" />
-  </property>
-
+  <property name="filter_content_types">True</property>
   <!-- Schema, class and security -->
   <!-- if we can add a page, we can add a page section -->
   <property name="add_permission">imio.smartweb.core.AddPage</property>

imio/smartweb/core/upgrades/profiles/1066_to_1067/types/imio.smartweb.SectionTimestampedPublications.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.SectionTimestampedPublications"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <!-- Basic properties -->
+  <property
+      i18n:translate=""
+      name="title">Timestamped publications section</property>
+  <property
+      i18n:translate=""
+      name="description">Timestamped publication section for a page</property>
+
+  <property name="icon_expr">string:newspaper</property>
+
+  <!-- Hierarchy control -->
+  <property name="global_allow">False</property>
+  <property name="filter_content_types">True</property>
+  <!-- Schema, class and security -->
+  <!-- if we can add a page, we can add a page section -->
+  <property name="add_permission">imio.smartweb.core.AddPage</property>
+  <property name="klass">imio.smartweb.core.contents.SectionTimestampedPublications</property>
+  <property name="schema">imio.smartweb.core.contents.ISectionTimestampedPublications</property>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="plone.namefromtitle"/>
+    <element value="plone.locking"/>
+    <element value="plone.shortname"/>
+    <element value="imio.smartweb.category_display"/>
+    <element value="imio.smartweb.orientation"/>
+  </property>
+
+  <property name="default_view">table_view</property>
+  <property name="default_view_fallback">False</property>
+  <property name="immediate_view">view</property>
+
+</object>

imio/smartweb/core/viewlets/offcanvas.pt

@@ -7,6 +7,8 @@
       <template id="search-template">
         <smartweb-search tal:attributes="current-language view/current_language;
                                        query-url view/navroot_url;
+                                       context-user-has-roles view/context_user_has_roles;
+                                       are-views-available view/are_views_available;
                                        result-option view/get_search_result_option">
         </smartweb-search>
       </template>

imio/smartweb/core/webcomponents/build/css/919.smartweb-webcomponents-compiled.css

@@ -1 +1 @@
-.userrole-authenticated .r-search-container{padding:0 20px 0 123px}.r-search-container{margin:0 auto;max-width:1330px;padding:0 20px}.r-search-container .full-width{left:50%;margin-left:-50vw;margin-right:-50vw;position:relative;right:50%;width:100vw}.r-search-container .r-search-highlighter{background:#0000;border-bottom:2px solid #f9b300;font-weight:700;padding:0;position:relative}.r-search-container .r-search-header{border-bottom:1px solid #000}.r-search-container .r-search-header-title{font-size:15px;font-weight:700;text-transform:uppercase}.r-search-container .r-search-header-count{color:gray;font-size:10px;text-transform:uppercase}.r-search-container .r-search-result{display:grid;gap:1.5rem;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));margin-top:2rem}.r-search-container .r-search.search-bar-filter,.r-search-container .r-search.search-bar-filter form{position:relative}.r-search-container .r-search.search-bar-filter input,.r-search-container .r-search.search-bar-filter label{width:100%}.r-search-container .r-search.search-bar-filter input{border:1px solid #ccc;color:#000;font-weight:700;height:50px;letter-spacing:1.2px;line-height:50px;padding:0 10px}.r-search-container .r-search.search-bar-filter input::placeholder{color:#000;font-size:12px;letter-spacing:1.2px;opacity:1;text-transform:uppercase}.r-search-container .r-search.search-bar-filter button{background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cg data-name='Calque 2'%3E%3Cpath d='M11.08 6.77a4.31 4.31 0 1 0-4.31 4.31 4.32 4.32 0 0 0 4.31-4.31m4.92 8A1.24 1.24 0 0 1 14.77 16a1.17 1.17 0 0 1-.86-.37l-3.3-3.28a6.77 6.77 0 1 1 1.74-1.74l3.3 3.3a1.25 1.25 0 0 1 .35.86' data-name='Calque 1' style='fill:%23141414;fill-rule:evenodd'/%3E%3C/g%3E%3C/svg%3E") no-repeat;background-position:50%;background-size:80%;border:none;bottom:0;position:absolute;right:10px;top:0;width:20px}.r-search-container .r-search-select{border-radius:0;height:50px}.r-search-container .r-search-list{margin-top:20px;overflow-y:scroll}@media screen and (min-width:992px){.r-search-container .r-search-list{max-height:375px}}.r-search-container .r-search-list .r-search-item{border-bottom:1px solid #00000040;display:flex;font-size:14px;gap:10px;list-style:none;padding:1rem 0}.r-search-container .r-search-list .r-search-item .r-search-img{background-repeat:no-repeat;background-size:cover;flex-basis:100%;flex-basis:91px;flex-grow:0;flex-shrink:0;height:61px;width:91px}.offcanvas-header .btn-close{position:absolute;right:10px;top:10px}.search-contact .r-search-img,.search-events .r-search-img,.search-news .r-search-img{float:left;margin-right:.5rem}.r-search-result mark{display:initial}
+.userrole-authenticated .r-search-container{padding:0 20px 0 123px}.r-search-container{margin:0 auto;max-width:1330px;padding:0 20px}.r-search-container .full-width{left:50%;margin-left:-50vw;margin-right:-50vw;position:relative;right:50%;width:100vw}.r-search-container .r-search-highlighter{background:#0000;border-bottom:2px solid #f9b300;font-weight:700;padding:0;position:relative}.r-search-container .r-search-header{border-bottom:1px solid #000}.r-search-container .r-search-header-title{font-size:15px;font-weight:700;text-transform:uppercase}.r-search-container .r-search-header-count{color:gray;font-size:10px;text-transform:uppercase}.r-search-container .r-search-result{display:grid;gap:1.5rem;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));margin-top:2rem}.r-search-container .r-search.search-bar-filter,.r-search-container .r-search.search-bar-filter form{position:relative}.r-search-container .r-search.search-bar-filter input,.r-search-container .r-search.search-bar-filter label{width:100%}.r-search-container .r-search.search-bar-filter input{border:1px solid #ccc;color:#000;font-weight:700;height:50px;letter-spacing:1.2px;line-height:50px;padding:0 10px}.r-search-container .r-search.search-bar-filter input::placeholder{color:#000;font-size:12px;letter-spacing:1.2px;opacity:1;text-transform:uppercase}.r-search-container .r-search.search-bar-filter button{background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cg data-name='Calque 2'%3E%3Cpath d='M11.08 6.77a4.31 4.31 0 1 0-4.31 4.31 4.32 4.32 0 0 0 4.31-4.31m4.92 8A1.24 1.24 0 0 1 14.77 16a1.17 1.17 0 0 1-.86-.37l-3.3-3.28a6.77 6.77 0 1 1 1.74-1.74l3.3 3.3a1.25 1.25 0 0 1 .35.86' data-name='Calque 1' style='fill:%23141414;fill-rule:evenodd'/%3E%3C/g%3E%3C/svg%3E") no-repeat;background-position:50%;background-size:80%;border:none;bottom:0;position:absolute;right:10px;top:0;width:20px}.r-search-container .r-search-select{border-radius:0;height:50px}.r-search-container .r-search-list{margin-top:20px;overflow-y:scroll}@media screen and (min-width:992px){.r-search-container .r-search-list{max-height:375px}}.r-search-container .r-search-list .r-search-item{border-bottom:1px solid #00000040;display:flex;font-size:14px;gap:10px;list-style:none;padding:1rem 0}.r-search-container .r-search-list .r-search-item .r-search-img{background-repeat:no-repeat;background-size:cover;flex-basis:100%;flex-basis:91px;flex-grow:0;flex-shrink:0;height:61px;width:91px}.offcanvas-header .btn-close{position:absolute;right:10px;top:10px}.search-contact .r-search-img,.search-events .r-search-img,.search-news .r-search-img{float:left;margin-right:.5rem}.r-search-result mark{display:initial}.search-disabled-message{background-color:#f8f9fa;border:1px solid #dee2e6;border-radius:4px;color:#6c757d;margin:1rem 0;padding:1rem}