imio.smartweb.common 1.2.16__py3-none-any.whl → 1.2.18__py3-none-any.whl

imio/smartweb/common/behaviors/topics.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectFieldWidget
 from imio.smartweb.locales import SmartwebMessageFactory as _
-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=AjaxSelectFieldWidget)
+    directives.widget(topics=TranslatedAjaxSelectFieldWidget)

imio/smartweb/common/rest/odwb.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.utils import activate_sending_data_to_odwb_for_staging
 from imio.smartweb.common.utils import is_staging_or_local
 from plone import api
 from plone.restapi.services import Service
@@ -30,6 +31,8 @@ class OdwbService(Service):
     def available(self):
         staging_or_local = is_staging_or_local()
         if staging_or_local:
+            if activate_sending_data_to_odwb_for_staging() is True:
+                return True
             logger.info(
                 "Don't send odwb data when we are in staging or local environment"
             )

imio/smartweb/common/tests/test_widgets.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
+from plone.api import portal as portal_api
+from zope.publisher.browser import TestRequest
+
+import mock
+import unittest
+
+
+class TestVocabulary(unittest.TestCase):
+    layer = IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+
+    def setUp(self):
+        """Custom shared utility setup for tests"""
+        self.request = TestRequest()
+
+    def test_translated_ajax_select(self):
+        portal_api.get_current_language = mock.Mock(return_value="fr")
+        widget = TranslatedAjaxSelectWidget(self.request)
+        widget.update()
+        self.assertEqual(
+            {
+                "name": None,
+                "value": "",
+                "pattern": "select2",
+                "pattern_options": {"separator": ";"},
+            },
+            widget._base_args(),
+        )
+
+        widget.vocabulary = "imio.smartweb.vocabulary.Topics"
+        self.assertEqual(
+            widget._base_args(),
+            {
+                "name": None,
+                "value": "",
+                "pattern": "select2",
+                "pattern_options": {
+                    "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                    "separator": ";",
+                },
+            },
+        )
+        widget.value = "entertainment"
+        self.assertEqual(
+            widget._base_args(),
+            {
+                "name": None,
+                "value": "entertainment",
+                "pattern": "select2",
+                "pattern_options": {
+                    "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                    "initialValues": {
+                        "entertainment": "Activités et divertissement",
+                    },
+                    "separator": ";",
+                },
+            },
+        )

imio/smartweb/common/utils.py

@@ -184,8 +184,6 @@ def is_staging_or_local():
     if scheme == "http" and re.search(pattern, netloc):
         return True
     elif scheme == "https" and "staging" in netloc:
-        if activate_sending_data_to_odwb_for_staging() is True:
-            return False
         return True
     else:
         return False

imio/smartweb/common/widgets/select.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+from plone import api
+from plone.app.z3cform.widget import AjaxSelectWidget
+from z3c.form.interfaces import IFieldWidget
+from z3c.form.widget import FieldWidget
+from zope.interface import implementer
+from zope.i18n import translate
+
+
+class TranslatedAjaxSelectWidget(AjaxSelectWidget):
+    """Translated Ajax select widget for z3c.form."""
+
+    def _ajaxselect_options(self):
+        options = super(TranslatedAjaxSelectWidget, self)._ajaxselect_options()
+        current_lang = api.portal.get_current_language()[:2]
+        translated_initial_values = {}
+        for token, value in list(options.get("initialValues", {}).items()):
+            translated_initial_values[token] = translate(
+                value, domain="imio.smartweb", target_language=current_lang
+            )
+        if translated_initial_values:
+            options["initialValues"] = translated_initial_values
+        return options
+
+
+@implementer(IFieldWidget)
+def TranslatedAjaxSelectFieldWidget(field, request, extra=None):
+    if extra is not None:
+        request = extra
+    return FieldWidget(field, TranslatedAjaxSelectWidget(request))

imio.smartweb.common-1.2.18-py3.10-nspkg.pth

@@ -0,0 +1,3 @@
+import sys, types, os;has_mfs = sys.version_info > (3, 5);p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio',));importlib = has_mfs and __import__('importlib.util');has_mfs and __import__('importlib.machinery');m = has_mfs and sys.modules.setdefault('imio', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio', types.ModuleType('imio'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
+import sys, types, os;has_mfs = sys.version_info > (3, 5);p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio',));importlib = has_mfs and __import__('importlib.util');has_mfs and __import__('importlib.machinery');m = has_mfs and sys.modules.setdefault('imio', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio', types.ModuleType('imio'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
+import sys, types, os;has_mfs = sys.version_info > (3, 5);p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio', 'smartweb'));importlib = has_mfs and __import__('importlib.util');has_mfs and __import__('importlib.machinery');m = has_mfs and sys.modules.setdefault('imio.smartweb', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio.smartweb', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio.smartweb', types.ModuleType('imio.smartweb'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p);m and setattr(sys.modules['imio'], 'smartweb', m)

{imio.smartweb.common-1.2.16.dist-info → imio.smartweb.common-1.2.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.16
+Version: 1.2.18
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -18,6 +18,8 @@ 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: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.8
@@ -28,8 +30,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
@@ -45,7 +47,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'
@@ -161,6 +163,24 @@ Changelog
 =========
 
 
+1.2.18 (2024-07-01)
+-------------------
+
+- WEB-4088 : Refactor code for odwb staging availability
+  [boulch]
+
+- GHA tests on Python 3.8 3.9 and 3.10
+  [remdub]
+
+
+1.2.17 (2024-06-06)
+-------------------
+
+- WEB-4113 : Add `TranslatedAjaxSelectFieldWidget` to fix translations of initial
+  values in select2 fields
+  [laulaz]
+
+
 1.2.16 (2024-05-30)
 -------------------
 

{imio.smartweb.common-1.2.16.dist-info → imio.smartweb.common-1.2.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.common-1.2.16-py3.11-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.common-1.2.18-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
@@ -18,13 +18,13 @@ imio/smartweb/common/subscribers.py,sha256=pbPQJ1YrfPlYCfxLAJ5sOy_5OToAfs2egX68z
 imio/smartweb/common/subscribers.zcml,sha256=8v2lqNNVAHlrh2G3jtjVgr3Asrw8WJLS9jSX5U6juFg,971
 imio/smartweb/common/testing.py,sha256=GKlYMHJUSxZFVX0o_R_c_Au1VYlkd-GjykQqfONHv7I,1985
 imio/smartweb/common/testing.zcml,sha256=7N-ALtklyWeLSzZmlxN2Tp-aZe_3An--w_6BGl1991E,172
-imio/smartweb/common/utils.py,sha256=jzNLR41JVehAxqqQV2WaUiYkB1V6xpMpPGE-G3JJ7Pc,7041
+imio/smartweb/common/utils.py,sha256=S4Kygk-ukllxNdNOLX6D0Zl5SDVoWaS2JqV7MbGuBkA,6952
 imio/smartweb/common/vocabularies.py,sha256=QRIOWLOALzZDM92o1iUTWgDBBcrdd9BYz7miNjpYCDA,3835
 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=mguoFXN5XjcGXvA5HeV_l7-gJ5eR0hfjN1nbXYogcWw,832
+imio/smartweb/common/behaviors/topics.py,sha256=K9XkhTBxxp_nBBeQ-ovUpmOc6raXIiYqmzJtlKVdhbI,863
 imio/smartweb/common/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/browser/collective_taxonomy_controlpanel.py,sha256=QngrsXOIjOt0xHEt2r0W66CPg5msY4H7mDkRaAEGQdg,3044
 imio/smartweb/common/browser/configure.zcml,sha256=1cDR2cy7O6WX33cFmbJU971wxg22LkLJYiMKCmBTWrA,3177
@@ -71,7 +71,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/odwb.py,sha256=zRZxowUaE76xlW_blc92vRCzToUpnzw3O5mxFXaeScU,2249
 imio/smartweb/common/rest/search_filters.py,sha256=upZAZ6h50qiSXo0q22lUgNlcmX5elFtrIQs_jFBl1-s,3832
 imio/smartweb/common/rest/utils.py,sha256=9zc5ge_DmVuexxN09c3U6QAITAI1s2hc0m6eZuylSxM,1269
 imio/smartweb/common/sharing/__init__.py,sha256=I_cdzTAnsdb8tEO2kg2lzRkeA7wIGPqHKzu7LBxDwtk,56
@@ -97,6 +97,7 @@ imio/smartweb/common/tests/test_utils.py,sha256=S4QrNVvkHv3Oxp45fWQ65dmGsk7POgUn
 imio/smartweb/common/tests/test_viewlets.py,sha256=NVEZWEmYo4K_-81Q6w-JTx2nT_3NBcJCl3946MAUnhU,1738
 imio/smartweb/common/tests/test_vocabularies.py,sha256=C-78USTvOHljuMSLkNb9onSRxLEJmBQLpktetAO74RE,848
 imio/smartweb/common/tests/test_vocabulary.py,sha256=4E5i5znt_hLhnnRay1iBaOZRmQyFJs8-OMdPm4iSGSg,1638
+imio/smartweb/common/tests/test_widgets.py,sha256=FQ2FphLRZQ1yuMngQ6cu4LxDaLVTAg1VyIUILV0XRUI,2009
 imio/smartweb/common/tests/resources/image.png,sha256=GBnPJt2ALEefn8GJAY1Lh8o9L6l6G77GJSyS0uveHvQ,1185
 imio/smartweb/common/tests/resources/image_1400x800.png,sha256=Iy3bWGH4NBlgYC5BolZiNYFTKmCm0_I9MZDZo4sw_V4,30604
 imio/smartweb/common/tests/resources/image_1800x700.png,sha256=aQcMisSFQO78c6QX4mO7qIfDb9SDRmfzTuPjxMJ_0HM,32643
@@ -132,10 +133,12 @@ imio/smartweb/common/viewlets/privacy.pt,sha256=bAD-I6s3LUgkh30vyTbP3pNUZQYua1Kx
 imio/smartweb/common/viewlets/privacy.py,sha256=H752etTTIFCM0wTwjESQFl0PStJfCoSRfcePSUQOp8E,449
 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.16.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.common-1.2.16.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio.smartweb.common-1.2.16.dist-info/METADATA,sha256=bBz92b0w6IdWYYo6S7iK0SrTqpBx454D-WwWXFNEuYw,14991
-imio.smartweb.common-1.2.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-imio.smartweb.common-1.2.16.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.common-1.2.16.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.common-1.2.16.dist-info/RECORD,,
+imio/smartweb/common/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+imio/smartweb/common/widgets/select.py,sha256=vfVdbecH7qDfJvWV6TfkpqocD6AA5G4yIq7XqSOuVNw,1142
+imio.smartweb.common-1.2.18.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.common-1.2.18.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio.smartweb.common-1.2.18.dist-info/METADATA,sha256=P5mFU_mOorocwaR_kfMvdIOmohdXTlxFNG5yuMdbwFk,15423
+imio.smartweb.common-1.2.18.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+imio.smartweb.common-1.2.18.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.common-1.2.18.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.common-1.2.18.dist-info/RECORD,,

{imio.smartweb.common-1.2.16.dist-info → imio.smartweb.common-1.2.18.dist-info}/WHEEL

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

imio.smartweb.common-1.2.16-py3.11-nspkg.pth

@@ -1,2 +0,0 @@
-import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio',));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('imio', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio', types.ModuleType('imio'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
-import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio', 'smartweb'));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('imio.smartweb', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio.smartweb', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio.smartweb', types.ModuleType('imio.smartweb'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p);m and setattr(sys.modules['imio'], 'smartweb', m)