imio.smartweb.common 1.2.9__tar.gz → 1.2.11__tar.gz

{imio.smartweb.common-1.2.9 → imio.smartweb.common-1.2.11}/CHANGES.rst

@@ -2,6 +2,24 @@ Changelog
 =========
 
 
+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)
 ------------------
 

{imio.smartweb.common-1.2.9 → imio.smartweb.common-1.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.9
+Version: 1.2.11
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -10,6 +10,7 @@ Project-URL: PyPI, https://pypi.python.org/pypi/imio.smartweb.common
 Project-URL: Source, https://github.com/imio/imio.smartweb.common
 Project-URL: Tracker, https://github.com/imio/imio.smartweb.common/issues
 Keywords: Python Plone CMS
+Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Plone
@@ -135,6 +136,24 @@ Changelog
 =========
 
 
+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)
 ------------------
 
@@ -552,3 +571,5 @@ Changelog
 
 - Initial release.
   [boulch]
+
+

{imio.smartweb.common-1.2.9 → imio.smartweb.common-1.2.11}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.common",
-    version="1.2.9",
+    version="1.2.11",
     description="Common utilities, vocabularies, taxonomies for imio.smartweb & co products",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

{imio.smartweb.common-1.2.9 → imio.smartweb.common-1.2.11}/src/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-1.2.11/src/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-1.2.9 → imio.smartweb.common-1.2.11}/src/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-1.2.9 → imio.smartweb.common-1.2.11}/src/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-1.2.9 → imio.smartweb.common-1.2.11}/src/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.9 → imio.smartweb.common-1.2.11}/src/imio.smartweb.common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.9
+Version: 1.2.11
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -10,6 +10,7 @@ Project-URL: PyPI, https://pypi.python.org/pypi/imio.smartweb.common
 Project-URL: Source, https://github.com/imio/imio.smartweb.common
 Project-URL: Tracker, https://github.com/imio/imio.smartweb.common/issues
 Keywords: Python Plone CMS
+Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Plone
@@ -135,6 +136,24 @@ Changelog
 =========
 
 
+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)
 ------------------
 
@@ -552,3 +571,5 @@ Changelog
 
 - Initial release.
   [boulch]
+
+

{imio.smartweb.common-1.2.9 → imio.smartweb.common-1.2.11}/src/imio.smartweb.common.egg-info/SOURCES.txt

@@ -88,6 +88,7 @@ src/imio/smartweb/common/profiles/testing/types/Folder.xml
 src/imio/smartweb/common/profiles/uninstall/browserlayer.xml
 src/imio/smartweb/common/rest/__init__.py
 src/imio/smartweb/common/rest/configure.zcml
+src/imio/smartweb/common/rest/odwb.py
 src/imio/smartweb/common/rest/search_filters.py
 src/imio/smartweb/common/rest/utils.py
 src/imio/smartweb/common/sharing/__init__.py