imio.smartweb.common 1.2.8__py3-none-any.whl → 1.2.12__py3-none-any.whl

imio/smartweb/common/behaviors/topics.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from imio.smartweb.locales import SmartwebMessageFactory as _
-from plone.app.z3cform.widget import SelectFieldWidget
+from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.supermodel import model
@@ -21,4 +21,4 @@ class ITopics(model.Schema):
         default=[],
         required=False,
     )
-    directives.widget(topics=SelectFieldWidget)
+    directives.widget(topics=AjaxSelectFieldWidget)

imio/smartweb/common/rest/odwb.py

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.utils import is_staging_or_local
+from plone import api
+from plone.restapi.services import Service
+from zope.interface import implementer
+from zope.interface import Interface
+
+import logging
+import requests
+
+logger = logging.getLogger("imio.smartweb.common")
+
+
+class IOdwbService(Interface):
+
+    def available():
+        """ """
+
+    def reply():
+        """ """
+
+    def remove():
+        """ """
+
+
+@implementer(IOdwbService)
+class OdwbService(Service):
+
+    def available(self):
+        staging_or_local = is_staging_or_local()
+        if staging_or_local:
+            logger.info(
+                "Don't send odwb data when we are in staging or local environment"
+            )
+        return not staging_or_local
+
+
+class OdwbBaseEndpointGet(OdwbService):
+
+    def __init__(self, context, request, odwb_imio_service, odbw_pushkey):
+        self.odwb_api_push_url = "https://www.odwb.be/api/push/1.0"
+        self.odwb_imio_service = odwb_imio_service
+        self.odwb_pushkey = api.portal.get_registry_record(odbw_pushkey)
+
+        self.context = context
+        self.request = request
+        self.__datas__ = []
+
+    def odwb_query(self, url, payload, headers=None):
+        if headers is None:
+            headers = {"Content-Type": "application/json"}
+        try:
+            response = requests.post(url, headers=headers, data=payload)
+            return response.text
+        except requests.exceptions.ConnectionError as e:
+            logger.error("ODWB : Connection error: %s", e)
+            return "ODWB : Connection error occurred"
+        except requests.exceptions.Timeout as e:
+            logger.error("ODWB : Request timed out: %s", e)
+            return "ODWB : Request timed out"
+        except requests.exceptions.HTTPError as e:
+            logger.error("ODWB : HTTP error occurred: %s", e)
+            return "ODWB : HTTP error occurred"
+        except Exception as e:
+            logger.error("ODWB : An unexpected error occurred: %s", e)
+            return "ODWB : Unexpected error occurred"

imio/smartweb/common/tests/test_rest.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.rest.odwb import OdwbService
 from imio.smartweb.common.rest.utils import get_restapi_query_lang
 from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_ACCEPTANCE_TESTING
 from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.restapi.testing import RelativeSession
+from unittest.mock import patch
 
 import transaction
 import unittest
@@ -117,3 +119,14 @@ class TestREST(unittest.TestCase):
         self.assertNotIn("has_leadimage", json)
         self.assertNotIn("start", json)
         self.assertNotIn("UID", json)
+
+    @patch("imio.smartweb.common.utils.api.portal.get")
+    def test_odwb_service_environnement(self, mock_get):
+        mock_portal = mock_get.return_value
+        mock_portal.absolute_url.return_value = "http://localhost:8080"
+        endpoint = OdwbService()
+        self.assertEqual(endpoint.available(), False)
+
+        mock_portal.absolute_url.return_value = "https://www.production.be"
+        endpoint = OdwbService()
+        self.assertEqual(endpoint.available(), True)

imio/smartweb/common/upgrades/configure.zcml

@@ -376,4 +376,12 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeStep
+      title="Reindex SolR"
+      source="1026"
+      destination="1027"
+      handler=".upgrades.reindex_solr"
+      profile="imio.smartweb.common:default"
+      />
+
 </configure>

imio/smartweb/common/upgrades/upgrades.py

@@ -146,3 +146,10 @@ def set_effective_date_equal_to_created_date(context):
             obj = brain.getObject()
             obj.setEffectiveDate(obj.created())
             obj.reindexObject(idxs=["effective"])
+
+
+def reindex_solr(context):
+    portal = api.portal.get()
+    maintenance = portal.unrestrictedTraverse("@@solr-maintenance")
+    maintenance.clear()
+    maintenance.reindex()

imio/smartweb/common/utils.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from Acquisition import aq_parent
 from imio.smartweb.common.config import TRANSLATED_VOCABULARIES
 from imio.smartweb.common.interfaces import ICropping
 from imio.smartweb.locales import SmartwebMessageFactory as _
@@ -9,6 +10,7 @@ from plone.dexterity.utils import iterSchemata
 from plone.formwidget.geolocation.geolocation import Geolocation
 from plone.namedfile.field import NamedBlobImage
 from plone.namedfile.interfaces import IAvailableSizes
+from urllib.parse import urlparse
 from zope.component import getUtility
 from zope.i18n import translate
 from zope.schema import getFields
@@ -168,3 +170,30 @@ def clean_invisible_char(value):
 
 def is_log_active():
     return api.portal.get_registry_record("imio.smartweb.common.log", default=False)
+
+
+# todo: create staging/prod env var. instead of using parsed_url
+def is_staging_or_local():
+    portal = api.portal.get()
+    portal_url = portal.absolute_url()
+    parsed_url = urlparse(portal_url)
+    scheme = parsed_url.scheme
+    netloc = parsed_url.netloc
+    elem = ["localhost", "127.0.0.1", "nohost"]
+    pattern = "|".join(map(re.escape, elem))
+    if scheme == "http" and re.search(pattern, netloc):
+        return True
+    elif scheme == "https" and "staging" in netloc:
+        return True
+    else:
+        return False
+
+
+def get_parent_of_type(context, content_type):
+    # Traverse up the hierarchy until we find an object with the specified content type
+    parent = context
+    while parent is not None:
+        if getattr(parent, "portal_type", None) == content_type:
+            return parent
+        parent = aq_parent(parent)
+    return None

imio/smartweb/common/viewlets/skip_to_content.pt

@@ -3,3 +3,9 @@
    tal:attributes="href string:${url}#content"
    i18n:domain="smartweb"
    i18n:translate="">Skip to content</a>
+
+<a class="show-on-focus"
+   tal:define="url view/current_page_url"
+   tal:attributes="href string:${url}#portal-footer-wrapper"
+   i18n:domain="smartweb"
+   i18n:translate="">Skip to footer</a>

imio/smartweb/common/vocabularies.py

@@ -5,6 +5,7 @@ from plone import api
 from plone.i18n.normalizer.interfaces import IIDNormalizer
 from plone.registry.interfaces import IRegistry
 from zope.component import getUtility
+from zope.i18n import translate
 from zope.i18n.locales import locales
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
@@ -14,6 +15,7 @@ import json
 
 class TopicsVocabularyFactory:
     def __call__(self, context=None):
+        lang = api.portal.get_current_language()[:2]
         topics = [
             ("entertainment", _("Entertainment")),
             ("agriculture", _("Agriculture")),
@@ -33,7 +35,14 @@ class TopicsVocabularyFactory:
             ("territory_public_space", _("Territory and public space")),
             ("tourism", _("Tourism")),
         ]
-        terms = [SimpleTerm(value=t[0], token=t[0], title=t[1]) for t in topics]
+        terms = [
+            SimpleTerm(
+                value=t[0],
+                token=t[0],
+                title=translate(t[1], target_language=lang),
+            )
+            for t in topics
+        ]
         return SimpleVocabulary(terms)
 
 

{imio.smartweb.common-1.2.8.dist-info → imio.smartweb.common-1.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.8
+Version: 1.2.12
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -28,8 +28,8 @@ Requires-Dist: z3c.jbot
 Requires-Dist: z3c.unconfigure
 Requires-Dist: beautifulsoup4
 Requires-Dist: geopy
-Requires-Dist: Products.GenericSetup >=1.8.2
-Requires-Dist: plone.api >=1.8.4
+Requires-Dist: Products.GenericSetup (>=1.8.2)
+Requires-Dist: plone.api (>=1.8.4)
 Requires-Dist: plone.restapi
 Requires-Dist: plone.app.dexterity
 Requires-Dist: plone.app.imagecropping
@@ -44,7 +44,7 @@ Requires-Dist: imio.smartweb.locales
 Requires-Dist: more-itertools
 Provides-Extra: test
 Requires-Dist: plone.app.testing ; extra == 'test'
-Requires-Dist: plone.testing >=5.0.0 ; extra == 'test'
+Requires-Dist: plone.testing (>=5.0.0) ; extra == 'test'
 Requires-Dist: plone.app.robotframework[debug] ; extra == 'test'
 Requires-Dist: plone.restapi[test] ; extra == 'test'
 Requires-Dist: freezegun ; extra == 'test'
@@ -160,6 +160,38 @@ Changelog
 =========
 
 
+1.2.12 (2024-05-06)
+-------------------
+
+- WEB-4102 : Add second skip to footer
+  [thomlamb]
+
+
+1.2.11 (2024-05-02)
+-------------------
+
+- WEB-4101 : Fix vocabulary terms translation (for Topics only - for the moment)
+  when used with `AjaxSelectFieldWidget`
+  [laulaz]
+
+
+1.2.10 (2024-05-02)
+-------------------
+
+- WEB-4101 : Change Topics field widget to keep value ordering
+  [laulaz]
+
+- WEB-4088 : Implement some odwb utils and generic classes
+  [boulch]
+
+
+1.2.9 (2024-02-08)
+------------------
+
+- WEB-4064 : Reindex SolR because of changes in schema
+  [remdub]
+
+
 1.2.8 (2024-02-02)
 ------------------
 

{imio.smartweb.common-1.2.8.dist-info → imio.smartweb.common-1.2.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.common-1.2.8-py3.8-nspkg.pth,sha256=wnCUSUElqssZ5FI3x-9HqwD229HQ-bAuPoDUNJHmMtU,1684
+imio.smartweb.common-1.2.12-py3.10-nspkg.pth,sha256=wnCUSUElqssZ5FI3x-9HqwD229HQ-bAuPoDUNJHmMtU,1684
 imio/smartweb/common/__init__.py,sha256=Na9XBfEQUMrm2c5jbqQgwWeg40ih0aXVG1vT8NeAjMQ,2709
 imio/smartweb/common/adapters.py,sha256=rLlObjqZm3hs2hgUT-LmJytwhT-E1rTvbpIi0mmKQqY,610
 imio/smartweb/common/adapters.zcml,sha256=ndYNj0J_BFfVpX_7JhY2asSwLzXG-WmjLdfwL9hX_No,254
@@ -17,13 +17,13 @@ imio/smartweb/common/setuphandlers.py,sha256=ejKHdgROXjmDM7dgoAh9sITiAJDfQGNxTEO
 imio/smartweb/common/subscribers.py,sha256=GHG_PIqsNV7K-pr_cXceQx1WCXylvQiv1lCgSGNJIno,2608
 imio/smartweb/common/subscribers.zcml,sha256=WZNhGtbTux2DoWHhLCQd1uJY27VhVLsibf0bdsclHOU,860
 imio/smartweb/common/testing.py,sha256=fjNzFXCZpT6xtE3oSb7R5dW1n4bILtpv9LA3FugI1Zw,1964
-imio/smartweb/common/utils.py,sha256=mC1VA-N7t6wAKU8JkFeh6lzCgzT8vWxuyPwja_UK8m4,5841
-imio/smartweb/common/vocabularies.py,sha256=QRIOWLOALzZDM92o1iUTWgDBBcrdd9BYz7miNjpYCDA,3835
+imio/smartweb/common/utils.py,sha256=sdj2oYwlJ_AXuqTotLoJYv74lNKWSqm6_iVztcAUj94,6774
+imio/smartweb/common/vocabularies.py,sha256=g15ykmmsbcGsHHdef26MDFUf5ZIzGMyRFitf_fuFjSo,4050
 imio/smartweb/common/vocabularies.zcml,sha256=iFJer5q3wabBp_EZivPPVUqI1_9w5P_Ft1RGJB5Yqxs,940
 imio/smartweb/common/behaviors/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
 imio/smartweb/common/behaviors/configure.zcml,sha256=RfGH8DIybHpxxe2HUsjH2QKSiWYpV7lCZhGN6KLFwCw,531
 imio/smartweb/common/behaviors/iam.py,sha256=17ON7M6FHXOM_8NOHT_QnJJuAIs4diWCrguHP6Lh5oA,825
-imio/smartweb/common/behaviors/topics.py,sha256=CallVa_wB-QZMGboxGARcBihW5VzwitIlcYNzwSk80Q,824
+imio/smartweb/common/behaviors/topics.py,sha256=mguoFXN5XjcGXvA5HeV_l7-gJ5eR0hfjN1nbXYogcWw,832
 imio/smartweb/common/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/browser/configure.zcml,sha256=Ph2JGC7VX_Oy4nIJ9z8GDAF9pWZRmk4yDosAzpDRJxA,2667
 imio/smartweb/common/browser/cropping.py,sha256=uB0UiCUVMD1YT4a1rBmRzmhtnbatrPAXZztkSypiE6s,2676
@@ -68,6 +68,7 @@ imio/smartweb/common/profiles/testing/types/Folder.xml,sha256=RPxIPgViAK0GGGTPKb
 imio/smartweb/common/profiles/uninstall/browserlayer.xml,sha256=glaCGlITwc36-1Fi2z0VCbLcoQ5GddkAhuW-SGYeZy8,130
 imio/smartweb/common/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/rest/configure.zcml,sha256=8hQGCvo1EMGFe9cNUpGOcH7spKhUkglFRnRkd9IJ2eE,301
+imio/smartweb/common/rest/odwb.py,sha256=36g6Hs_i6FfliKWA63ELlE3_89B_zp-p99Zo_BKGYhM,2072
 imio/smartweb/common/rest/search_filters.py,sha256=uiNdTF0P9oW_VpSgL8qV9q015BUe9Xigs3K1DNbK7uI,3349
 imio/smartweb/common/rest/utils.py,sha256=9zc5ge_DmVuexxN09c3U6QAITAI1s2hc0m6eZuylSxM,1269
 imio/smartweb/common/sharing/__init__.py,sha256=I_cdzTAnsdb8tEO2kg2lzRkeA7wIGPqHKzu7LBxDwtk,56
@@ -83,7 +84,7 @@ imio/smartweb/common/tests/test_indexes.py,sha256=3dzPAEbqnRqthKX9YUXM_dSbuZzWV-
 imio/smartweb/common/tests/test_local_roles.py,sha256=4cwVdtrkeecp3HRM26db6AJHJ7HvIzqtYkBzgfOeeH4,3370
 imio/smartweb/common/tests/test_permissions.py,sha256=LCz7Ixpd1IrzJeTV6Ov5GXjWNVz7h5UbpS9-DD4SjmE,1578
 imio/smartweb/common/tests/test_privacy.py,sha256=ObnquDYgd29P9hxnpF6VxuOtyVgxvW8HQnf8ZBDGnXk,2953
-imio/smartweb/common/tests/test_rest.py,sha256=xLJTJVf0Ebxs7d4-BEKqcnsM99KevjLgaSbzPMzAPEQ,3799
+imio/smartweb/common/tests/test_rest.py,sha256=KbT8gVHym1GhUMVNhSKXNjdRWmbnktg7twex5LiLIAQ,4366
 imio/smartweb/common/tests/test_robot.py,sha256=0Qdn5A8lXoVxQ9zE9IIhekSqfJJF003KiYqLVuDrros,955
 imio/smartweb/common/tests/test_setup.py,sha256=TxoQZrESFOgGRBN9uO8FzEOx57G550YICBd-NzaGHvY,2102
 imio/smartweb/common/tests/test_subscribers.py,sha256=AiJ5LTqGP2JKGJFYNeCCAMJL53DWO41iYQ9VYiA7DIA,1699
@@ -96,8 +97,8 @@ imio/smartweb/common/tests/resources/image_1400x800.png,sha256=Iy3bWGH4NBlgYC5Bo
 imio/smartweb/common/tests/resources/image_1800x700.png,sha256=aQcMisSFQO78c6QX4mO7qIfDb9SDRmfzTuPjxMJ_0HM,32643
 imio/smartweb/common/tests/robot/test_example.robot,sha256=3ClbWps1Pfr6-RHT4FmmzGWGmtJrNnDW53bJGP69Nz4,2011
 imio/smartweb/common/upgrades/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-imio/smartweb/common/upgrades/configure.zcml,sha256=uuqS7V08MgqI2vMTBc-W1VpXS8SK999CxIJVDhwB5Fc,12591
-imio/smartweb/common/upgrades/upgrades.py,sha256=3hfYLIupp_1Js0D1N5hO3A4vdeN_TWIJacfEjCBig9c,5297
+imio/smartweb/common/upgrades/configure.zcml,sha256=IASXLaJj1kgXzDiPQFxzqCGKBt4vuWhb4aulFGbMkKk,12785
+imio/smartweb/common/upgrades/upgrades.py,sha256=NObmvdWPUrfgaPJhTB_tIZsmLawxg5jbui-TRLhS2NE,5474
 imio/smartweb/common/upgrades/profiles/1007_to_1008/rolemap.xml,sha256=dKUuBq-2pO4dGtHshBisISSTBP8aWfbwTGHj_pJvY5A,1346
 imio/smartweb/common/upgrades/profiles/1008_to_1009/actions.xml,sha256=D41gp1PDVINobhCM8L11IMXABYatjmoUuW-EQkPT804,721
 imio/smartweb/common/upgrades/profiles/1009_to_1010/registry/tiny_nonbreakingspace.xml,sha256=u3qd6CPmX52ITUUayJW28m578LP1Nw6wsM2r8B03nTo,587
@@ -121,12 +122,12 @@ imio/smartweb/common/viewlets/colophon.py,sha256=Rt3ZPj2F0kcVG-vhl8JIyAHlVVJ8pkt
 imio/smartweb/common/viewlets/configure.zcml,sha256=uDHHrOeEGhrYYkvhasor_tXpHfdq1IT766h4T7H5kdQ,1758
 imio/smartweb/common/viewlets/privacy.pt,sha256=bAD-I6s3LUgkh30vyTbP3pNUZQYua1Kx4aZpPGZaJVE,1212
 imio/smartweb/common/viewlets/privacy.py,sha256=H752etTTIFCM0wTwjESQFl0PStJfCoSRfcePSUQOp8E,449
-imio/smartweb/common/viewlets/skip_to_content.pt,sha256=f5_ZURM6khQbavEzKh7yaFxYhlg1BKxSCZNLP1gonUA,181
+imio/smartweb/common/viewlets/skip_to_content.pt,sha256=FFfTxvRl8V52FzFE6In6B34ApgShNntvMp6F1qwfL0g,376
 imio/smartweb/common/viewlets/skip_to_content.py,sha256=wm22NUf8Qh5uzz8p4vkLCdFNiDv9zUGAueRyXAIXQDo,496
-imio.smartweb.common-1.2.8.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.common-1.2.8.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio.smartweb.common-1.2.8.dist-info/METADATA,sha256=IQh71Egcsy1h6FWC4EkCxH4sQ0nYnVX3km_J3O-9xBI,13418
-imio.smartweb.common-1.2.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-imio.smartweb.common-1.2.8.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.common-1.2.8.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.common-1.2.8.dist-info/RECORD,,
+imio.smartweb.common-1.2.12.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.common-1.2.12.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio.smartweb.common-1.2.12.dist-info/METADATA,sha256=IARR82taBusp5de_TiQWYX7J90DP3ercwb50ZMi5Zlg,13991
+imio.smartweb.common-1.2.12.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+imio.smartweb.common-1.2.12.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.common-1.2.12.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.common-1.2.12.dist-info/RECORD,,

{imio.smartweb.common-1.2.8.dist-info → imio.smartweb.common-1.2.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any