imio.smartweb.core 1.2.80__py3-none-any.whl → 1.2.84__py3-none-any.whl

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/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/rest/authentic_sources.py

@@ -48,6 +48,7 @@ class BaseRequestForwarder(Service):
         else:
             token = get_wca_token(self.client_id, self.client_secret)
             headers = {"Accept": "application/json", "Authorization": token}
+        self.request.form.pop("wcatoken", None)
         if is_log_active():
             logger.info("======== Forwarding request to AUTHENTIC SOURCE =========")
             logger.info(f"url to forward : {url} ({method})")

imio/smartweb/core/tests/test_redirect_to_main_react_view.py

@@ -59,21 +59,21 @@ class TestRedirectToMainReactView(ImioSmartwebTestCase):
             transaction.commit()
             rest_view_url = v.absolute_url()
             browser.open(f"{self.portal_url}/@@{k}_view")
-            self.assertEquals(browser.url, rest_view_url)
+            self.assertEqual(browser.url, rest_view_url)
 
             v = api.content.move(v, folder)
             transaction.commit()
             rest_view_url = v.absolute_url()
             browser.open(f"{self.portal_url}/@@{k}_view")
-            self.assertEquals(browser.url, rest_view_url)
+            self.assertEqual(browser.url, rest_view_url)
 
             obj = api_lng.translate(v, target_language="de")
             api.content.transition(obj, "publish")
             transaction.commit()
             browser.open(f"{self.portal_url}/@@{k}_view?language=de")
-            self.assertEquals(browser.url, obj.absolute_url())
+            self.assertEqual(browser.url, obj.absolute_url())
 
             api.content.delete(v)
             transaction.commit()
             browser.open(f"{self.portal_url}/@@{k}_view")
-            self.assertEquals(browser.url, self.portal_url)
+            self.assertEqual(browser.url, self.portal_url)

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/utils.py

@@ -59,7 +59,8 @@ def concat_voca_title(title1, title2):
 
 
 def get_json(url, auth=None, timeout=5):
-    headers = {"Accept": "application/json"}
+    language = api.portal.get_current_language()
+    headers = {"Accept": "application/json", "Cookie": f"I18N_LANGUAGE={language}"}
     if auth is not None:
         headers["Authorization"] = auth
     try:

{imio.smartweb.core-1.2.80.dist-info → imio.smartweb.core-1.2.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.80
+Version: 1.2.84
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -17,12 +17,12 @@ Classifier: Framework :: Plone :: Addon
 Classifier: Framework :: Plone :: 6.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
 Requires-Dist: setuptools
@@ -191,6 +191,37 @@ Changelog
 =========
 
 
+1.2.84 (2025-01-29)
+-------------------
+
+- Update Python classifiers to be compatible with Python 3.12
+  [remdub]
+
+
+1.2.83 (2025-01-29)
+-------------------
+
+- Migrate to Plone 6.0.14
+  [boulch]
+
+- WEB-4206 : Remove wcatoken from query parameters when forwarding requests
+  [remdub]
+
+
+1.2.82 (2025-01-23)
+-------------------
+
+- WEB-4153 : Add language cookie to python requests to avoid cache problems
+  [remdub]
+
+
+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)
 -------------------
 

{imio.smartweb.core-1.2.80.dist-info → imio.smartweb.core-1.2.84.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.core-1.2.80-py3.8-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.core-1.2.84-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
 imio/smartweb/core/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
 imio/smartweb/core/config.py,sha256=BUgfvh4hCaw0onCYAG4gQI1O4hZ-GzXWEltdHi4YLIs,337
 imio/smartweb/core/configure.zcml,sha256=PeC4rF--rF6MfVQ0NzggQrZWIl35oPtJdEhvQwGxhhI,1459
@@ -12,7 +12,7 @@ imio/smartweb/core/subscribers.py,sha256=zOmwTw0XvE6_bdoZI7qQln_W__7MxXCnKh6QwNK
 imio/smartweb/core/subscribers.zcml,sha256=BnrxZp4AfsRYreYHsJJxKgPQZJ-wpNM2XnDTuDUbBkA,1616
 imio/smartweb/core/testing.py,sha256=t0Y3t3FXX2RjgklcRzHT37AjKbMKL3ZjjT3d2UhQm7A,3636
 imio/smartweb/core/testing.zcml,sha256=VyKjWW2QHYuUYKkGUvtsdFI_Pa7Wcp1yBBDla112eMc,172
-imio/smartweb/core/utils.py,sha256=krc0msUa9cHIALgT1RpqMXAslusg3FswRy4aY5o6oIo,7597
+imio/smartweb/core/utils.py,sha256=dQzbLYiJh55dtQ0qekQNr2tPCiXVABiMPjTpcf2zj3U,7685
 imio/smartweb/core/vocabularies.py,sha256=ZzdnK7m0dPogoKSrtdTjsxCQjaSqgVDAL9YPWMOHync,22905
 imio/smartweb/core/vocabularies.zcml,sha256=KSH7JWlAJtKawLvfmsztZzE_AK1JR6B5udY6tleY2cQ,5904
 imio/smartweb/core/behaviors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -252,8 +252,8 @@ imio/smartweb/core/contents/sections/contact/__init__.py,sha256=47DEQpj8HBSa-_TI
 imio/smartweb/core/contents/sections/contact/configure.zcml,sha256=WjyGXO7alNf4yDW5dZCS_xQ_AYbQVQuRVRIeoyLIBzY,1591
 imio/smartweb/core/contents/sections/contact/content.py,sha256=MdhY6QPMdCseThddjwZ0e7xzkx1-p21MBuwqEic1f90,2690
 imio/smartweb/core/contents/sections/contact/forms.py,sha256=VlN_jse8tYxE9RCro2RgHlZRDDIyZA8Bjr-dNePZYwU,1387
-imio/smartweb/core/contents/sections/contact/macros.pt,sha256=bCuvXDaNBT84AHXHYUkazJ35FJ2YVGl61Ry7rXuLHgA,10870
-imio/smartweb/core/contents/sections/contact/utils.py,sha256=XPZW3b6kqiUQ7YxHP6r5mqYlXGsi7n0prepeTy-8EY8,5205
+imio/smartweb/core/contents/sections/contact/macros.pt,sha256=wU-wXeHzq6gvm-q2RmnjE53H1AMkVYhq2YyYZU1speM,10857
+imio/smartweb/core/contents/sections/contact/utils.py,sha256=4OlmRHwvR_lUiR1DAuFbSaRhqBboZHdrPVRJz1wZN9s,5778
 imio/smartweb/core/contents/sections/contact/view.pt,sha256=CyNoSxzf9kNQdjN2iCp77zpFeXfC1KGgQlx_UeTSQ6M,1170
 imio/smartweb/core/contents/sections/contact/view.py,sha256=7zTN6JPUaeomzfiaE5eUyvFIqfyPNg2UJDOVpzt6vJ8,1962
 imio/smartweb/core/contents/sections/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -394,7 +394,7 @@ imio/smartweb/core/profiles/testing/types/imio.smartweb.NewsView.xml,sha256=6Rpf
 imio/smartweb/core/profiles/uninstall/browserlayer.xml,sha256=K8KnZFW9E6Hwi61Z6XZlXOjUpAKzJR6HjmjoOjFEWrk,128
 imio/smartweb/core/profiles/validation/contentrules.xml,sha256=QyX3E0ihDOMhaJPrKPRqRiCUvPoghs3fwYOj_eNtbqw,4626
 imio/smartweb/core/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-imio/smartweb/core/rest/authentic_sources.py,sha256=ZH7kHNAow_t6pnEObZ_x2jfnHi0pZOrr9OO6MQHiG_8,4957
+imio/smartweb/core/rest/authentic_sources.py,sha256=GesGFal1TsEN6LRwI_idcpoxJ6bBzYYxV4Lfk2plqtQ,5005
 imio/smartweb/core/rest/configure.zcml,sha256=3tEU99M_deyoRN0YeIVQmPk7NL88gjYtXZOT8QmSbN4,2891
 imio/smartweb/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/tests/test_banner.py,sha256=83Q86ezLMJVwCLxoJddmlE9GKR3h6Qyb-rbqVSFc8a0,7838
@@ -421,11 +421,11 @@ imio/smartweb/core/tests/test_page.py,sha256=1dD9M_6nwS6M2OuyWmT5cPq5qnxnog3tcqF
 imio/smartweb/core/tests/test_plausibleview.py,sha256=G1ryfnz3TuQBG8VFO5KzEylT5DFABW58PQuuvPq_ccY,3229
 imio/smartweb/core/tests/test_portal_page.py,sha256=hIqg4eb91o8BsSj7eSKdvoxehzOXt8bzpg1o5ej__zg,7215
 imio/smartweb/core/tests/test_procedure.py,sha256=0w8phOwYfpp9vb3KDsnwjX8AhQXWdodA06W4koderQo,6474
-imio/smartweb/core/tests/test_redirect_to_main_react_view.py,sha256=k4gU6xBIA5m8Vrb27rt8nWCs8ix2Lf9j49WnIXl4eO0,2990
+imio/smartweb/core/tests/test_redirect_to_main_react_view.py,sha256=3Pa_4BAmyz67onEaHochsubdEqszAMf2j0lkscEY50c,2986
 imio/smartweb/core/tests/test_rest.py,sha256=t7dp7YWUCKR75tsU3vVOzAy9HivGBWuMJoeMpuKOXbM,27374
 imio/smartweb/core/tests/test_robot.py,sha256=NQ7AkN4tEva3bgGjMxmyqY0zIo4pJPnPOwnD9hmrTVI,926
 imio/smartweb/core/tests/test_search.py,sha256=VryeRI4_5CvnStKOoNoG95M2WTy7Lyy_AhHIDG40M14,2182
-imio/smartweb/core/tests/test_section_contact.py,sha256=TePnLCLu8pqA4d1SYRK8dGi7m7BbooiTTkQUC4KztAs,24693
+imio/smartweb/core/tests/test_section_contact.py,sha256=BiJPxb67d7zURE5Dtk-9xOUbuJitcQ7YnlzDS1sT-cE,27344
 imio/smartweb/core/tests/test_section_events.py,sha256=7eP-HmXp0D3gvOrjVpzVPmV9nF_PKERnmOGz1G3Z0l0,8641
 imio/smartweb/core/tests/test_section_external_content.py,sha256=JI_zm3160ryO8a6NjtcmcboUJdJDa7lEX6ommbxlGao,7617
 imio/smartweb/core/tests/test_section_news.py,sha256=6S7-r6ZnpeN_JdLYLZMWbHKRzeuf5ynPWnox2DDFPZk,9126
@@ -756,10 +756,10 @@ imio/smartweb/core/webcomponents/src/utils/Map.jsx,sha256=cYuZykMIaLjr4KiLvmS4aY
 imio/smartweb/core/webcomponents/src/utils/Map.scss,sha256=xXWz0O-JBwSZrzz2XeQdN4nZEOjppU2sVFtlLQOitQ8,77
 imio/smartweb/core/webcomponents/src/utils/translation.js,sha256=5YDHwdaRNWFWOgyNd7YejoAdcDvnvAENo3Xn0GDT8P8,8941
 imio/smartweb/core/webcomponents/src/utils/url.js,sha256=iyl_1QXfPBgUn0LEbZYT_zMEEjmj5DMiEz44Z6AKLcg,244
-imio.smartweb.core-1.2.80.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.core-1.2.80.dist-info/LICENSE.rst,sha256=RzkMFz6AX3-cHd531zd2YQcXai8RIbjFWTs6m66Y5u4,653
-imio.smartweb.core-1.2.80.dist-info/METADATA,sha256=bVc7fUNc0miHO2YTqzs7gCnP8RwTZeiGiAo0PeiTvfQ,58951
-imio.smartweb.core-1.2.80.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-imio.smartweb.core-1.2.80.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.core-1.2.80.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.core-1.2.80.dist-info/RECORD,,
+imio.smartweb.core-1.2.84.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.core-1.2.84.dist-info/LICENSE.rst,sha256=RzkMFz6AX3-cHd531zd2YQcXai8RIbjFWTs6m66Y5u4,653
+imio.smartweb.core-1.2.84.dist-info/METADATA,sha256=alCP5U7_-Zpi5R2qfvYdJhnKoWIFvNdh6qKFJlN7gbI,59541
+imio.smartweb.core-1.2.84.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+imio.smartweb.core-1.2.84.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.core-1.2.84.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.core-1.2.84.dist-info/RECORD,,

{imio.smartweb.core-1.2.80.dist-info → imio.smartweb.core-1.2.84.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any