imio.smartweb.core 1.2.79__tar.gz → 1.2.81__tar.gz

{imio_smartweb_core-1.2.79 → imio_smartweb_core-1.2.81}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.2.81 (2025-01-15)
+-------------------
+
+- SUP-41924 : Fix a bug when there is some "void" urls getting in section Contact (and display "contact_informations")
+  [boulch]
+
+
+1.2.80 (2025-01-15)
+-------------------
+
+- Fix: svg icon refactor
+  [thomlamb]
+
+
 1.2.79 (2025-01-15)
 -------------------
 

{imio_smartweb_core-1.2.79 → imio_smartweb_core-1.2.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.79
+Version: 1.2.81
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -191,6 +191,20 @@ Changelog
 =========
 
 
+1.2.81 (2025-01-15)
+-------------------
+
+- SUP-41924 : Fix a bug when there is some "void" urls getting in section Contact (and display "contact_informations")
+  [boulch]
+
+
+1.2.80 (2025-01-15)
+-------------------
+
+- Fix: svg icon refactor
+  [thomlamb]
+
+
 1.2.79 (2025-01-15)
 -------------------
 

{imio_smartweb_core-1.2.79 → imio_smartweb_core-1.2.81}/setup.py

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

imio_smartweb_core-1.2.81/src/imio/smartweb/core/browser/static/icons/categorie-mon-dossier.svg

@@ -0,0 +1 @@
+<svg data-name="Calque 1" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 18.46 24"><g data-name="Calque 2"><g data-name="Calque 1-2"><path d="M11.79 24 0 22.03V5l13.76-5v8.52l-1.97 2V24ZM1.31 20.9l9.17 1.55V10l1.97-2V1.86L1.31 5.9v15.01Z"/><path d="M18.46 22.11h-5.78V9.98l2-2V4.76h3.78v17.35Z"/></g></g></svg>

{imio_smartweb_core-1.2.79 → imio_smartweb_core-1.2.81}/src/imio/smartweb/core/contents/sections/contact/macros.pt

@@ -63,8 +63,7 @@
           <span tal:replace="python:contact.vat_number"></span>
           <ul class="contact_informations_genral"
               tal:define="phones python:contact.phones;
-                          mails python:contact.mails;
-                          urls python:contact.urls">
+                          mails python:contact.mails">
             <li class="phones"
                 tal:repeat="phone phones"
                 tal:attributes="class python:phone.get('type') or ''">
@@ -81,7 +80,8 @@
             </li>
           </ul>
           <ul class="contact_informations_social"
-              tal:define="urls python:contact.urls">
+              tal:define="urls python:contact.get_urls"
+              tal:condition="urls">
             <li class="urls"
                 tal:repeat="url urls"
                 tal:attributes="class python:url.get('type') or ''">

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

@@ -133,3 +133,23 @@ class ContactProperties(ContactSchedule):
         if not (street or entity or country):
             return None
         return {"street": street, "entity": entity, "country": country}
+
+    @property
+    def get_urls(self):
+        if isinstance(self.urls, list):
+            result = (
+                None
+                if all(
+                    item["type"] is None and item["url"] is None for item in self.urls
+                )
+                else [
+                    item
+                    for item in self.urls
+                    if not (item["type"] is None and item["url"] is None)
+                ]
+            )
+        elif self.urls is None:
+            result = None
+        else:
+            result = self.urls
+        return result

{imio_smartweb_core-1.2.79 → imio_smartweb_core-1.2.81}/src/imio/smartweb/core/tests/test_section_contact.py

@@ -601,3 +601,61 @@ class TestSectionContact(ImioSmartwebTestCase):
 
         # TODO we should test with various contact sections containing
         # contacts
+
+    @requests_mock.Mocker()
+    def test_contact_urls(self, m):
+        contact = api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionContact",
+            title="My contact",
+        )
+        contact.visible_blocks = ["contact_informations"]
+        authentic_contact_uid = "2dc381f0fb584381b8e4a19c84f53b35"
+        contact.related_contacts = [authentic_contact_uid]
+        contact_search_url = (
+            "http://localhost:8080/Plone/@search?UID={}&fullobjects=1".format(
+                authentic_contact_uid
+            )
+        )
+        m.get(contact_search_url, text=json.dumps(self.json_contact))
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
+        self.assertNotIn('Error in section : "My contact"', view())
+        self.assertNotIn("contact_informations_social", view())
+
+        self.json_contact.get("items")[0]["urls"] = None
+        sleep(1)
+        m.get(contact_search_url, text=json.dumps(self.json_contact))
+        clear_cache(self.request)
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
+        self.assertNotIn('Error in section : "My contact"', view())
+        self.assertNotIn("contact_informations_social", view())
+
+        urls = [
+            {"type": None, "url": None},
+            {"type": None, "url": None},
+            {"type": None, "url": None},
+        ]
+        self.json_contact.get("items")[0]["urls"] = urls
+        sleep(1)
+        m.get(contact_search_url, text=json.dumps(self.json_contact))
+        clear_cache(self.request)
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
+        self.assertNotIn('Error in section : "My contact"', view())
+        self.assertNotIn("contact_informations_social", view())
+
+        urls = [
+            {"type": None, "url": None},
+            {"type": "facebook", "url": "Yolo"},
+            {"type": None, "url": None},
+        ]
+        self.json_contact.get("items")[0]["urls"] = urls
+        sleep(1)
+        m.get(contact_search_url, text=json.dumps(self.json_contact))
+        clear_cache(self.request)
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+        view = queryMultiAdapter((self.page, self.request), name="full_view")
+        self.assertNotIn('Error in section : "My contact"', view())
+        self.assertIn("contact_informations_social", view())

{imio_smartweb_core-1.2.79 → imio_smartweb_core-1.2.81}/src/imio.smartweb.core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.79
+Version: 1.2.81
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -191,6 +191,20 @@ Changelog
 =========
 
 
+1.2.81 (2025-01-15)
+-------------------
+
+- SUP-41924 : Fix a bug when there is some "void" urls getting in section Contact (and display "contact_informations")
+  [boulch]
+
+
+1.2.80 (2025-01-15)
+-------------------
+
+- Fix: svg icon refactor
+  [thomlamb]
+
+
 1.2.79 (2025-01-15)
 -------------------
 

imio_smartweb_core-1.2.79/src/imio/smartweb/core/browser/static/icons/categorie-mon-dossier.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#000"  viewBox="0 0 28.18 36.64"><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path d="M18,36.64l-18-3v-26L21,0V13L18,16.06ZM2,31.91l14,2.36v-19l3-3.06V2.84L2,9Z"/><path d="M28.18,33.75H19.35V15.23l3.06-3.06V7.26h5.77Z"/></g></g></svg>