imio.smartweb.common 1.2.16__tar.gz → 1.2.18__tar.gz

{imio_smartweb_common-1.2.16 → imio.smartweb.common-1.2.18}/CHANGES.rst

@@ -2,6 +2,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 → imio.smartweb.common-1.2.18}/PKG-INFO

@@ -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,38 +18,14 @@ 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
+Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
-Requires-Dist: setuptools
-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: plone.restapi
-Requires-Dist: plone.app.dexterity
-Requires-Dist: plone.app.imagecropping
-Requires-Dist: plone.app.lockingbehavior
-Requires-Dist: plone.formwidget.geolocation
-Requires-Dist: plone.schema
-Requires-Dist: eea.facetednavigation
-Requires-Dist: imio.gdpr
-Requires-Dist: collective.privacy
-Requires-Dist: collective.taxonomy
-Requires-Dist: iaweb.privacy
-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.app.robotframework[debug]; extra == "test"
-Requires-Dist: plone.restapi[test]; extra == "test"
-Requires-Dist: freezegun; extra == "test"
-Requires-Dist: mock; 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
@@ -161,6 +137,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 → imio.smartweb.common-1.2.18}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.common",
-    version="1.2.16",
+    version="1.2.18",
     description="Common utilities, vocabularies, taxonomies for imio.smartweb & co products",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/
@@ -29,6 +29,8 @@ setup(
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],

{imio_smartweb_common-1.2.16 → imio.smartweb.common-1.2.18}/src/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-1.2.16 → imio.smartweb.common-1.2.18}/src/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-1.2.18/src/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-1.2.16 → imio.smartweb.common-1.2.18}/src/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-1.2.18/src/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.16 → imio.smartweb.common-1.2.18}/src/imio.smartweb.common.egg-info/PKG-INFO

@@ -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,38 +18,14 @@ 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
+Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
-Requires-Dist: setuptools
-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: plone.restapi
-Requires-Dist: plone.app.dexterity
-Requires-Dist: plone.app.imagecropping
-Requires-Dist: plone.app.lockingbehavior
-Requires-Dist: plone.formwidget.geolocation
-Requires-Dist: plone.schema
-Requires-Dist: eea.facetednavigation
-Requires-Dist: imio.gdpr
-Requires-Dist: collective.privacy
-Requires-Dist: collective.taxonomy
-Requires-Dist: iaweb.privacy
-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.app.robotframework[debug]; extra == "test"
-Requires-Dist: plone.restapi[test]; extra == "test"
-Requires-Dist: freezegun; extra == "test"
-Requires-Dist: mock; 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
@@ -161,6 +137,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 → imio.smartweb.common-1.2.18}/src/imio.smartweb.common.egg-info/SOURCES.txt

@@ -117,6 +117,7 @@ src/imio/smartweb/common/tests/test_utils.py
 src/imio/smartweb/common/tests/test_viewlets.py
 src/imio/smartweb/common/tests/test_vocabularies.py
 src/imio/smartweb/common/tests/test_vocabulary.py
+src/imio/smartweb/common/tests/test_widgets.py
 src/imio/smartweb/common/tests/resources/image.png
 src/imio/smartweb/common/tests/resources/image_1400x800.png
 src/imio/smartweb/common/tests/resources/image_1800x700.png
@@ -151,4 +152,6 @@ src/imio/smartweb/common/viewlets/configure.zcml
 src/imio/smartweb/common/viewlets/privacy.pt
 src/imio/smartweb/common/viewlets/privacy.py
 src/imio/smartweb/common/viewlets/skip_to_content.pt
-src/imio/smartweb/common/viewlets/skip_to_content.py
+src/imio/smartweb/common/viewlets/skip_to_content.py
+src/imio/smartweb/common/widgets/__init__.py
+src/imio/smartweb/common/widgets/select.py