imio.smartweb.core 1.3.1__tar.gz → 1.3.2__tar.gz

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/CHANGES.rst

@@ -2,6 +2,16 @@ Changelog
 =========
 
 
+1.3.2 (2025-03-19)
+------------------
+
+- WEB-4134: Set default_view as table_view for section "Timestamped publications"
+  [boulch]
+
+- WEB-4165: Refactor some code for sitemap (Title, normalized_portal_type, ...)
+  [boulch]
+
+
 1.3.1 (2025-03-13)
 ------------------
 

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: imio.smartweb.core
-Version: 1.3.1
+Version: 1.3.2
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -203,6 +203,16 @@ Changelog
 =========
 
 
+1.3.2 (2025-03-19)
+------------------
+
+- WEB-4134: Set default_view as table_view for section "Timestamped publications"
+  [boulch]
+
+- WEB-4165: Refactor some code for sitemap (Title, normalized_portal_type, ...)
+  [boulch]
+
+
 1.3.1 (2025-03-13)
 ------------------
 

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/setup.py

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

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/src/imio/smartweb/core/browser/sitemap.py

@@ -1,8 +1,5 @@
 from Acquisition import aq_inner
 from BTrees.OOBTree import OOBTree
-from imio.smartweb.core.config import DIRECTORY_URL
-from imio.smartweb.core.config import EVENTS_URL
-from imio.smartweb.core.config import NEWS_URL
 from imio.smartweb.core.contents.rest.directory.endpoint import DirectoryEndpointGet
 from imio.smartweb.core.contents.rest.events.endpoint import EventsEndpointGet
 from imio.smartweb.core.contents.rest.news.endpoint import NewsEndpointGet
@@ -10,6 +7,7 @@ from imio.smartweb.core.interfaces import IImioSmartwebCoreLayer
 from plone.app.layout.navigation.navtree import buildFolderTree
 from plone.app.layout.sitemap.sitemap import SiteMapView
 from plone.base.interfaces import IPloneSiteRoot
+from plone.memoize import ram
 from Products.CMFPlone.browser.navigation import CatalogSiteMap as BaseCatalogSiteMap
 from Products.CMFPlone.browser.navtree import (
     SitemapNavtreeStrategy as BaseSitemapNavtreeStrategy,
@@ -25,6 +23,7 @@ from zope.interface import Interface
 
 import logging
 import Missing
+import time
 
 logger = logging.getLogger("imio.smartweb.core")
 
@@ -44,14 +43,18 @@ FRIENDLY_TYPES = [
 ]
 
 
+def cache_key(method, obj, request):
+    """We cache data from authentic sources for the sitemap (.xml.gz) for 2 hours."""
+    return f"sitemap_{obj.UID()}_{time.time() // 7200}"
+
+
+@ram.cache(cache_key)
 def get_endpoint_data(obj, request):
-    """Retourne les données issues du bon endpoint pour un objet donné"""
     endpoint_mapping = {
         "imio.smartweb.DirectoryView": DirectoryEndpointGet,
         "imio.smartweb.EventsView": EventsEndpointGet,
         "imio.smartweb.NewsView": NewsEndpointGet,
     }
-
     endpoint_class = endpoint_mapping.get(obj.portal_type)
     if not endpoint_class:
         return {}
@@ -67,7 +70,7 @@ def get_endpoint_data(obj, request):
 
 
 def format_sitemap_items(items, base_url):
-    """Formatte les items pour le sitemap"""
+    """Format items for sitemap(.xml.gz)"""
     formatted_items = []
     for item in items:
         item_id = normalizeString(item.get("title"))
@@ -77,14 +80,14 @@ def format_sitemap_items(items, base_url):
             {
                 "loc": f"{base_url}/{item_id}?u={item_uid}",
                 "lastmod": lastmod,
-                "Title": item_id,
+                "Title": item.get("title"),
                 "Description": item.get("description", ""),
                 "getURL": f"{base_url}/{item_id}?u={item_uid}",
                 "getRemoteUrl": Missing.Value,
                 "currentItem": False,
                 "currentParent": False,
                 "normalized_review_state": "published",
-                "normalized_portal_type": "imio-smartweb-directory-item",
+                "normalized_portal_type": "imio-smartweb-authsources-item",
             }
         )
     return formatted_items
@@ -132,13 +135,14 @@ class CustomSiteMapView(SiteMapView):
             )
             yield {"loc": loc, "lastmod": modified[1]}
 
-        for brain in catalog(
+        brains = catalog(
             portal_type=[
                 "imio.smartweb.EventsView",
                 "imio.smartweb.NewsView",
                 "imio.smartweb.DirectoryView",
             ]
-        ):
+        )
+        for brain in brains:
             obj = brain.getObject()
             data = get_endpoint_data(obj, obj.REQUEST)
             yield from format_sitemap_items(data.get("items", {}), obj.absolute_url())
@@ -169,7 +173,7 @@ class CatalogSiteMap(BaseCatalogSiteMap):
 
 
 class SitemapQueryBuilder(BaseSitemapQueryBuilder):
-    """Construit la requête pour le sitemap avec des types de contenu personnalisés."""
+    """Builds the request for the sitemap with custom content types."""
 
     def __init__(self, context):
         self.context = context

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/src/imio/smartweb/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <metadata>
-  <version>1066</version>
+  <version>1067</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-plone.app.imagecropping:default</dependency>

{imio_smartweb_core-1.3.1/src/imio/smartweb/core/upgrades/profiles/1061_to_1062 → imio_smartweb_core-1.3.2/src/imio/smartweb/core/profiles/default}/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>
@@ -36,4 +32,8 @@
     <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-1.3.1 → imio_smartweb_core-1.3.2}/src/imio/smartweb/core/profiles/default/types.xml

@@ -27,5 +27,6 @@
   <object meta_type="Dexterity FTI" name="imio.smartweb.SectionSendinblue"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.SectionSlide"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.SectionText"/>
+  <object meta_type="Dexterity FTI" name="imio.smartweb.SectionTimestampedPublications"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.SectionVideo"/>
 </object>

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/src/imio/smartweb/core/profiles/default/workflows.xml

@@ -19,6 +19,7 @@
     <type type_id="imio.smartweb.SectionSlide"/>
     <type type_id="imio.smartweb.SectionNews"/>
     <type type_id="imio.smartweb.SectionText"/>
+    <type type_id="imio.smartweb.SectionTimestampedPublications"/>
     <type type_id="imio.smartweb.SectionVideo"/>
   </bindings>
 </object>

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/src/imio/smartweb/core/tests/test_sitemap.py

@@ -5,8 +5,10 @@ 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
@@ -14,9 +16,11 @@ 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 requests_mock
@@ -123,6 +127,10 @@ class TestPage(ImioSmartwebTestCase):
             "<loc>http://nohost/plone/folder/page1/gallery/image</loc>\n    <lastmod >2024-02-02T10:00:00",
             xml,
         )
+
+        cache = choose_cache("imio.smartweb.core.browser.sitemap.get_endpoint_data")
+        cache.ramcache.invalidateAll()
+
         with patch(
             "imio.smartweb.core.contents.rest.news.endpoint.BaseNewsEndpoint.__call__",
             return_value=self.json_rest_news,
@@ -132,6 +140,10 @@ class TestPage(ImioSmartwebTestCase):
                 "<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,
@@ -141,6 +153,10 @@ class TestPage(ImioSmartwebTestCase):
                 "<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.events.endpoint.BaseEventsEndpoint.__call__",
             return_value=self.json_rest_events,
@@ -185,6 +201,9 @@ class TestPage(ImioSmartwebTestCase):
         ][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.directory.endpoint.BaseDirectoryEndpoint.__call__",

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/src/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-1.3.2/src/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-1.3.1 → imio_smartweb_core-1.3.2}/src/imio.smartweb.core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: imio.smartweb.core
-Version: 1.3.1
+Version: 1.3.2
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -203,6 +203,16 @@ Changelog
 =========
 
 
+1.3.2 (2025-03-19)
+------------------
+
+- WEB-4134: Set default_view as table_view for section "Timestamped publications"
+  [boulch]
+
+- WEB-4165: Refactor some code for sitemap (Title, normalized_portal_type, ...)
+  [boulch]
+
+
 1.3.1 (2025-03-13)
 ------------------
 

{imio_smartweb_core-1.3.1 → imio_smartweb_core-1.3.2}/src/imio.smartweb.core.egg-info/SOURCES.txt

@@ -669,6 +669,7 @@ src/imio/smartweb/core/upgrades/profiles/1063_to_1064/types.xml
 src/imio/smartweb/core/upgrades/profiles/1063_to_1064/types/Link.xml
 src/imio/smartweb/core/upgrades/profiles/1063_to_1064/types/imio.smartweb.BlockLink.xml
 src/imio/smartweb/core/upgrades/profiles/1063_to_1064/types/imio.smartweb.SectionSlide.xml
+src/imio/smartweb/core/upgrades/profiles/1066_to_1067/types/imio.smartweb.SectionTimestampedPublications.xml
 src/imio/smartweb/core/viewlets/__init__.py
 src/imio/smartweb/core/viewlets/actions.py
 src/imio/smartweb/core/viewlets/arcgis_header.pt