imio.smartweb.core 1.2.73__tar.gz → 1.2.75__tar.gz

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.2.75 (2024-11-19)
+-------------------
+
+- Reduce queries to directory
+  [boulch, laulaz]
+
+
+1.2.74 (2024-11-13)
+-------------------
+
+- Avoid request for images when gallery block is not visible in Section Contact
+  [laulaz]
+
+
 1.2.73 (2024-10-14)
 -------------------
 

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.73
+Version: 1.2.75
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -23,9 +23,40 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.8
-Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
+Requires-Dist: setuptools
+Requires-Dist: z3c.jbot
+Requires-Dist: z3c.unconfigure
+Requires-Dist: plone.api>=1.8.4
+Requires-Dist: plone.gallery
+Requires-Dist: plone.restapi
+Requires-Dist: plone.app.dexterity
+Requires-Dist: plone.app.imagecropping
+Requires-Dist: eea.facetednavigation
+Requires-Dist: collective.anysurfer
+Requires-Dist: collective.autopublishing
+Requires-Dist: collective.faceted.map
+Requires-Dist: collective.geolocationbehavior
+Requires-Dist: collective.instancebehavior
+Requires-Dist: collective.messagesviewlet
+Requires-Dist: collective.sendinblue
+Requires-Dist: collective.solr
+Requires-Dist: collective.taxonomy
+Requires-Dist: collective.z3cform.datagridfield
+Requires-Dist: embeddify
+Requires-Dist: more-itertools
+Requires-Dist: imio.smartweb.common
+Requires-Dist: imio.smartweb.locales
+Provides-Extra: test
+Requires-Dist: plone.app.testing; extra == "test"
+Requires-Dist: plone.testing>=5.0.0; extra == "test"
+Requires-Dist: plone.app.contenttypes; extra == "test"
+Requires-Dist: plone.app.robotframework[debug]; extra == "test"
+Requires-Dist: plone.restapi[test]; extra == "test"
+Requires-Dist: requests-mock; extra == "test"
+Requires-Dist: beautifulsoup4; extra == "test"
+Requires-Dist: freezegun; extra == "test"
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -160,6 +191,20 @@ Changelog
 =========
 
 
+1.2.75 (2024-11-19)
+-------------------
+
+- Reduce queries to directory
+  [boulch, laulaz]
+
+
+1.2.74 (2024-11-13)
+-------------------
+
+- Avoid request for images when gallery block is not visible in Section Contact
+  [laulaz]
+
+
 1.2.73 (2024-10-14)
 -------------------
 

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/setup.py

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

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/src/imio/smartweb/core/contents/pages/configure.zcml

@@ -15,6 +15,7 @@
       template="view.pt"
       class=".views.PagesView"
       permission="zope2.View"
+      allowed_attributes="get_page_contacts"
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
 

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/src/imio/smartweb/core/contents/pages/views.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 
 from Acquisition import aq_inner
+from imio.smartweb.core.config import DIRECTORY_URL
 from imio.smartweb.core.utils import get_scale_url
 from imio.smartweb.core.interfaces import IHtmxViewUtils
 from imio.smartweb.core.interfaces import IViewWithoutLeadImage
+from imio.smartweb.core.utils import get_json
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from Products.CMFPlone.resources import add_bundle_on_request
 from plone import api
@@ -11,11 +13,14 @@ from plone.app.content.browser.contents.rearrange import OrderContentsBaseAction
 from plone.app.content.utils import json_loads
 from plone.app.contenttypes.browser.folder import FolderView
 from plone.app.contenttypes.browser.full_view import FullViewItem as BaseFullViewItem
+from plone.memoize.view import memoize
 from Products.CMFPlone import utils
 from Products.CMFPlone.browser.navigation import PhysicalNavigationBreadcrumbs
 from zope.component import getMultiAdapter
 from zope.interface import implementer
 
+import itertools
+
 
 @implementer(IViewWithoutLeadImage)
 @implementer(IHtmxViewUtils)
@@ -46,6 +51,42 @@ class PagesView(FolderView):
             add_bundle_on_request(self.request, "flexbin")
         return self.index()
 
+    @memoize
+    def get_page_contacts(self):
+        # TODO We need to check every tests to be sure to avoid caching that
+        # creates false positive assertions
+        sections_contacts = self.context.listFolderContents(
+            contentFilter={
+                "portal_type": [
+                    "imio.smartweb.SectionContact",
+                ]
+            }
+        )
+        if len(sections_contacts) == 0:
+            return None
+        nested_contact_list = [
+            section_contacts.related_contacts
+            for section_contacts in sections_contacts
+            if section_contacts.related_contacts is not None
+        ]
+        if nested_contact_list == []:
+            return None
+        # Make a "set" to simplifying request in url (avoid duplicate uid)
+        # Sometimes we have duplicate uid because some pages were build with contact attributes
+        # in a section and for layout issues,for the same contact, others attributes are in another section.
+        page_contacts = list(
+            set(list(itertools.chain.from_iterable(nested_contact_list)))
+        )
+        uids = "&UID=".join(page_contacts)
+        url = "{}/@search?UID={}&fullobjects=1".format(DIRECTORY_URL, uids)
+        current_lang = api.portal.get_current_language()[:2]
+        if current_lang != "fr":
+            url = f"{url}&translated_in_{current_lang}=1"
+        json_data = get_json(url)
+        if json_data is None or len(json_data.get("items", [])) == 0:
+            return
+        return json_data
+
     def results(self, **kwargs):
         """
         Gets results for folder listings without taking care of friendly_types

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/src/imio/smartweb/core/contents/sections/contact/utils.py

@@ -69,6 +69,8 @@ class ContactProperties(ContactSchedule):
         return json.dumps(geo_json)
 
     def images(self, image_scale, nb_results_by_batch):
+        if "gallery" not in self.context.visible_blocks:
+            return
         contact_url = self.contact["@id"]
         query = "@search?portal_type=Image&path.depth=1&metadata_fields=modified"
         images_url_request = "{}/{}".format(contact_url, query)

imio_smartweb_core-1.2.75/src/imio/smartweb/core/contents/sections/contact/view.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.core.config import DIRECTORY_URL
+from imio.smartweb.core.contents.sections.contact.utils import ContactProperties
+from imio.smartweb.core.contents.sections.views import HashableJsonSectionView
+from imio.smartweb.core.utils import batch_results
+from plone import api
+from zope.component import queryMultiAdapter
+
+
+class ContactView(HashableJsonSectionView):
+    """Contact Section view"""
+
+    def contacts(self):
+        # Firstly, try to get contact from the container view
+        container_view = queryMultiAdapter(
+            (self.context.aq_parent, self.request), name="full_view"
+        )
+        self.json_data = container_view.get_page_contacts()
+        if self.json_data is None or len(self.json_data.get("items", [])) == 0:
+            return []
+
+        container_contacts = self.json_data.get("items")
+        results_items = [
+            contact
+            for contact in container_contacts
+            if contact["UID"] in self.context.related_contacts
+        ]
+        index_map = {
+            value: index for index, value in enumerate(self.context.related_contacts)
+        }
+        results_items = sorted(results_items, key=lambda x: index_map[x["UID"]])
+
+        # construct JSON data as before WEBBDC-1265 to avoid hash differences
+        uids = "&UID=".join(self.context.related_contacts)
+        url = "{}/@search?UID={}&fullobjects=1".format(DIRECTORY_URL, uids)
+        current_lang = api.portal.get_current_language()[:2]
+        if current_lang != "fr":
+            url = f"{url}&translated_in_{current_lang}=1"
+        self.json_data = {
+            "@id": url,
+            "items": results_items,
+            "items_total": len(results_items),
+        }
+        self.refresh_modification_date()
+        return batch_results(results_items, self.context.nb_contact_by_line)
+
+    def get_contact_properties(self, json_dict):
+        return ContactProperties(json_dict, self.context)

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/src/imio/smartweb/core/contents/sections/events/view.py

@@ -51,7 +51,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
         url = "{}/@events?{}".format(EVENTS_URL, "&".join(params))
         self.json_data = get_json(url)
         self.refresh_modification_date()
-        if self.json_data is None or len(self.json_data.get("items", [])) == 0:  # NOQA
+        if self.json_data is None or len(self.json_data.get("items", [])) == 0:
             return []
         linking_view_url = self.context.linking_rest_view.to_object.absolute_url()
         image_scale = self.image_scale

{imio.smartweb.core-1.2.73 → imio_smartweb_core-1.2.75}/src/imio/smartweb/core/contents/sections/news/view.py

@@ -47,7 +47,7 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
         url = "{}/@search?{}".format(NEWS_URL, "&".join(params))
         self.json_data = get_json(url)
         self.refresh_modification_date()
-        if self.json_data is None or len(self.json_data.get("items", [])) == 0:  # NOQA
+        if self.json_data is None or len(self.json_data.get("items", [])) == 0:
             return []
         linking_view_url = self.context.linking_rest_view.to_object.absolute_url()
         image_scale = self.image_scale

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.73
+Version: 1.2.75
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -23,9 +23,40 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.8
-Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
+Requires-Dist: setuptools
+Requires-Dist: z3c.jbot
+Requires-Dist: z3c.unconfigure
+Requires-Dist: plone.api>=1.8.4
+Requires-Dist: plone.gallery
+Requires-Dist: plone.restapi
+Requires-Dist: plone.app.dexterity
+Requires-Dist: plone.app.imagecropping
+Requires-Dist: eea.facetednavigation
+Requires-Dist: collective.anysurfer
+Requires-Dist: collective.autopublishing
+Requires-Dist: collective.faceted.map
+Requires-Dist: collective.geolocationbehavior
+Requires-Dist: collective.instancebehavior
+Requires-Dist: collective.messagesviewlet
+Requires-Dist: collective.sendinblue
+Requires-Dist: collective.solr
+Requires-Dist: collective.taxonomy
+Requires-Dist: collective.z3cform.datagridfield
+Requires-Dist: embeddify
+Requires-Dist: more-itertools
+Requires-Dist: imio.smartweb.common
+Requires-Dist: imio.smartweb.locales
+Provides-Extra: test
+Requires-Dist: plone.app.testing; extra == "test"
+Requires-Dist: plone.testing>=5.0.0; extra == "test"
+Requires-Dist: plone.app.contenttypes; extra == "test"
+Requires-Dist: plone.app.robotframework[debug]; extra == "test"
+Requires-Dist: plone.restapi[test]; extra == "test"
+Requires-Dist: requests-mock; extra == "test"
+Requires-Dist: beautifulsoup4; extra == "test"
+Requires-Dist: freezegun; extra == "test"
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -160,6 +191,20 @@ Changelog
 =========
 
 
+1.2.75 (2024-11-19)
+-------------------
+
+- Reduce queries to directory
+  [boulch, laulaz]
+
+
+1.2.74 (2024-11-13)
+-------------------
+
+- Avoid request for images when gallery block is not visible in Section Contact
+  [laulaz]
+
+
 1.2.73 (2024-10-14)
 -------------------
 

imio.smartweb.core-1.2.73/src/imio/smartweb/core/contents/sections/contact/view.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from imio.smartweb.core.config import DIRECTORY_URL
-from imio.smartweb.core.contents.sections.contact.utils import ContactProperties
-from imio.smartweb.core.contents.sections.views import HashableJsonSectionView
-from imio.smartweb.core.utils import batch_results
-from imio.smartweb.core.utils import get_json
-from plone import api
-
-
-class ContactView(HashableJsonSectionView):
-    """Contact Section view"""
-
-    def contacts(self):
-        if self.context.related_contacts is None:
-            return
-        related_contacts = self.context.related_contacts
-        uids = "&UID=".join(related_contacts)
-        url = "{}/@search?UID={}&fullobjects=1".format(DIRECTORY_URL, uids)
-        current_lang = api.portal.get_current_language()[:2]
-        if current_lang != "fr":
-            url = f"{url}&translated_in_{current_lang}=1"
-        self.json_data = get_json(url)
-        self.refresh_modification_date()
-        if self.json_data is None or len(self.json_data.get("items", [])) == 0:  # NOQA
-            return
-        results = self.json_data.get("items")
-        index_map = {value: index for index, value in enumerate(related_contacts)}
-        results = sorted(results, key=lambda x: index_map[x["UID"]])
-        return batch_results(results, self.context.nb_contact_by_line)
-
-    def get_contact_properties(self, json_dict):
-        return ContactProperties(json_dict, self.context)