imio.smartweb.core 1.1.27__tar.gz → 1.1.29__tar.gz

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/CHANGES.rst

@@ -2,6 +2,27 @@ Changelog
 =========
 
 
+1.1.29 (2023-10-18)
+-------------------
+
+- SUP-32814 : Add new external content plugins : GiveADayPlugin
+  see : https://github.com/IMIO/imio.smartweb.core/commit/a4dfca2
+  [boulch]
+
+- WEB-4000 : Add display_map Bool field on directory and events views
+  [boulch]
+
+
+1.1.28 (2023-10-13)
+-------------------
+
+- WEB-3803 : Add upgrade step : collective.pivot.Family content type can be add in an imio.smartweb.Folder
+  [boulch]
+
+- WEB-3998 : Set requests timeout to 8'' when we populate RemoteContacts vocabulary
+  [boulch]
+
+
 1.1.27 (2023-10-11)
 -------------------
 

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.1.27
+Version: 1.1.29
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -158,6 +158,27 @@ Changelog
 =========
 
 
+1.1.29 (2023-10-18)
+-------------------
+
+- SUP-32814 : Add new external content plugins : GiveADayPlugin
+  see : https://github.com/IMIO/imio.smartweb.core/commit/a4dfca2
+  [boulch]
+
+- WEB-4000 : Add display_map Bool field on directory and events views
+  [boulch]
+
+
+1.1.28 (2023-10-13)
+-------------------
+
+- WEB-3803 : Add upgrade step : collective.pivot.Family content type can be add in an imio.smartweb.Folder
+  [boulch]
+
+- WEB-3998 : Set requests timeout to 8'' when we populate RemoteContacts vocabulary
+  [boulch]
+
+
 1.1.27 (2023-10-11)
 -------------------
 

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.core",
-    version="1.1.27",
+    version="1.1.29",
     description="Core product for iMio websites",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/rest/directory/content.py

@@ -25,6 +25,13 @@ class IDirectoryView(model.Schema):
         title=_("Number of items to display"), default=20, required=True
     )
 
+    display_map = schema.Bool(
+        title=_("Display map"),
+        description=_("If selected, map will be displayed"),
+        required=False,
+        default=True,
+    )
+
 
 @implementer(IDirectoryView)
 class DirectoryView(Container):

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/rest/directory/view.pt

@@ -8,7 +8,8 @@
                                        query-filter-url view/local_filters_query_url;
                                        batch-size view/batch_size;
                                        propose-url view/propose_url;
-                                       current-language view/get_current_language;"></smartweb-annuaire>
+                                       current-language view/get_current_language;
+                                       display_map view/display_map;"></smartweb-annuaire>
   </div>
 </metal:main>
 </body>

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/rest/directory/view.py

@@ -10,3 +10,7 @@ class DirectoryViewView(BaseRestView):
     @property
     def propose_url(self):
         return api.portal.get_registry_record("smartweb.propose_directory_url")
+
+    @property
+    def display_map(self):
+        return self.context.display_map

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/rest/events/content.py

@@ -30,6 +30,13 @@ class IEventsView(model.Schema):
         title=_("Number of items to display"), default=20, required=True
     )
 
+    display_map = schema.Bool(
+        title=_("Display map"),
+        description=_("If selected, map will be displayed"),
+        required=False,
+        default=True,
+    )
+
 
 @implementer(IEventsView)
 class EventsView(Container):

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/rest/events/view.pt

@@ -9,7 +9,8 @@
                                        query-filter-url view/local_filters_query_url;
                                        batch-size view/batch_size;
                                        propose-url view/propose_url;
-                                       current-language view/get_current_language;"></smartweb-events>
+                                       current-language view/get_current_language;
+                                       display_map view/display_map;"></smartweb-events>
     </div>
     </metal:main>
   </body>

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/rest/events/view.py

@@ -10,3 +10,7 @@ class EventsViewView(BaseRestView):
     @property
     def propose_url(self):
         return api.portal.get_registry_record("smartweb.propose_events_url")
+
+    @property
+    def display_map(self):
+        return self.context.display_map

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/sections/external_content/view.pt

@@ -24,7 +24,7 @@
   <p tal:replace="structure context/@@description" />
 
   <div tal:define="collapse_klass python: 'collapse' if context.collapsible_section else ''"
-       tal:attributes="class string:body-section ratio ratio-16x9 ${collapse_klass};
+       tal:attributes="class string:body-section ratio ${collapse_klass};
                        id string:body-section-${context/id}"
        tal:content="structure view/get_embed_external_content" />
 

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/contents/sections/external_content/views.py

@@ -23,6 +23,7 @@ class ExternalContentView(SectionView):
             EllohaPlugin(),
             CognitoformPlugin(),
             ArcgisPlugin(),
+            GiveADayPlugin(),
             UnknowServicePlugin(),
         ]
         extra_params = self.context.external_content_params
@@ -44,6 +45,7 @@ class ExternalContentView(SectionView):
                 "current_lang": current_lang,
                 "extra_params": extra_params,
             },
+            "giveadayplugin": {},
             "unknowserviceplugin": {"width": width, "current_lang": current_lang},
         }
         embedder = Embedder(plugins=plugins, plugin_config=plugin_config)
@@ -63,11 +65,11 @@ class ExternalContentView(SectionView):
 
 class EaglebePlugin(Plugin):
     def __call__(self, parts, config={}):
-        if "app.eaglebe.com" in parts.netloc:
-            return f'<iframe class="eaglebe" src="{parts.geturl()}" scrolling="no" width="{config["width"]}">'
-        #
         return None
 
+        # if "app.eaglebe.com" in parts.netloc:
+        #    return f'<iframe class="eaglebe" src="{parts.geturl()}" scrolling="no" width="{config["width"]}">'
+
 
 class EllohaPlugin(Plugin):
     def __call__(self, parts, config={}):
@@ -193,6 +195,22 @@ class ArcgisPlugin(Plugin):
         return None
 
 
+class GiveADayPlugin(Plugin):
+    def __call__(self, parts, config={}):
+        if "www.giveaday.be" in parts.netloc:
+            return (
+                '<div id="giveaday-widget"></div>'
+                "<script src=https://www.giveaday.be/assets/giveaday_v1.js></script>"
+                "<script>"
+                "function renderWidget() {"
+                'giveADayWidget.initialize("giveaday-widget", 2924, "organization", "large", "fr","#34B78F");}'
+                "renderWidget();"
+                "</script>"
+            )
+        #
+        return None
+
+
 class UnknowServicePlugin(Plugin):
     def __call__(self, parts, config={}):
         current_lang = config["current_lang"]

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <metadata>
-  <version>1046</version>
+  <version>1047</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-plone.app.imagecropping:default</dependency>

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/profiles/default/types/imio.smartweb.Folder.xml

@@ -29,6 +29,7 @@
     <element value="imio.smartweb.Page" />
     <element value="imio.smartweb.PortalPage" />
     <element value="imio.smartweb.Procedure" />
+    <element value="collective.pivot.Family" />
   </property>
   <!-- Schema, class and security -->
   <property name="add_permission">imio.smartweb.core.AddFolder</property>

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/tests/test_rest.py

@@ -347,3 +347,22 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             self.assertEqual(
                 patch_selected_news_folders, response_selected_news_folders
             )
+
+    def test_display_map(self):
+        self.rest_directory = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.DirectoryView",
+            title="directory view",
+        )
+        self.rest_directory.display_map = True
+        view = queryMultiAdapter((self.rest_directory, self.request), name="view")
+        self.assertIn('display_map="True"', view())
+
+        self.rest_events = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.EventsView",
+            title="events view",
+        )
+        self.rest_events.display_map = True
+        view = queryMultiAdapter((self.rest_events, self.request), name="view")
+        self.assertIn('display_map="True"', view())

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/tests/test_section_external_content.py

@@ -32,24 +32,24 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
             '<p class="unknow_service">Unknow service</p>',
         )
 
-    def test_eaglebe_plugin(self):
-        sec = api.content.create(
-            container=self.page, type="imio.smartweb.SectionExternalContent", id="sec"
-        )
+    # def test_eaglebe_plugin(self):
+    #     sec = api.content.create(
+    #         container=self.page, type="imio.smartweb.SectionExternalContent", id="sec"
+    #     )
 
-        sec.external_content_url = ""
-        section_view = queryMultiAdapter((sec, self.request), name="view")
-        self.assertEqual(
-            section_view.get_embed_external_content(),
-            '<p class="unknow_service">Unknow service</p>',
-        )
+    #     sec.external_content_url = ""
+    #     section_view = queryMultiAdapter((sec, self.request), name="view")
+    #     self.assertEqual(
+    #         section_view.get_embed_external_content(),
+    #         '<p class="unknow_service">Unknow service</p>',
+    #     )
 
-        sec.external_content_url = "https://app.eaglebe.com/auth/start"
-        section_view = queryMultiAdapter((sec, self.request), name="view")
-        self.assertEqual(
-            section_view.get_embed_external_content(),
-            '<iframe class="eaglebe" src="https://app.eaglebe.com/auth/start" scrolling="no" width="100%">',
-        )
+    #     sec.external_content_url = "https://app.eaglebe.com/auth/start"
+    #     section_view = queryMultiAdapter((sec, self.request), name="view")
+    #     self.assertEqual(
+    #         section_view.get_embed_external_content(),
+    #         '<iframe class="eaglebe" src="https://app.eaglebe.com/auth/start" scrolling="no" width="100%">',
+    #     )
 
     def test_elloha_plugin(self):
         sec = api.content.create(

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/tests/test_sections.py

@@ -125,17 +125,17 @@ class TestSections(ImioSmartwebTestCase):
             type="imio.smartweb.SectionExternalContent",
             title="Section External Content",
         )
-        section.external_content_url = (
-            "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re"
-        )
-        view = queryMultiAdapter((section, self.request), name="view")
-        embedded_content = view.get_embed_external_content()
-        self.assertIn("iframe", embedded_content)
-        self.assertIn('class="eaglebe"', embedded_content)
-        self.assertIn('scrolling="no"', embedded_content)
-        self.assertIn(
-            "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re", embedded_content
-        )
+        # section.external_content_url = (
+        #     "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re"
+        # )
+        # view = queryMultiAdapter((section, self.request), name="view")
+        # embedded_content = view.get_embed_external_content()
+        # self.assertIn("iframe", embedded_content)
+        # self.assertIn('class="eaglebe"', embedded_content)
+        # self.assertIn('scrolling="no"', embedded_content)
+        # self.assertIn(
+        #     "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re", embedded_content
+        # )
 
         section.external_content_url = "http://www.perdu.com"
         view = queryMultiAdapter((section, self.request), name="view")

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/upgrades/configure.zcml

@@ -171,6 +171,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1046_to_1047"
+      title="Upgrade core from 1046 to 1047"
+      directory="profiles/1046_to_1047"
+      description="Allow collective.pivot.Family content type in imio.smartweb.Folder"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed profiles steps and reindex catalog"
@@ -650,4 +658,14 @@
         import_profile="imio.smartweb.core.upgrades:upgrade_1045_to_1046"
         />
   </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeSteps
+      source="1046"
+      destination="1047"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Allow collective.pivot.Family content type in imio.smartweb.Folder"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1046_to_1047"
+        />
+  </genericsetup:upgradeSteps>
 </configure>

imio.smartweb.core-1.1.29/src/imio/smartweb/core/upgrades/profiles/1046_to_1047/types/imio.smartweb.Folder.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.Folder"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <property name="allowed_content_types">
+    <element value="Collection" />
+    <element value="Message" />
+    <element value="Link" />
+    <element value="imio.smartweb.CirkwiView" />
+    <element value="imio.smartweb.DirectoryView" />
+    <element value="imio.smartweb.EventsView" />
+    <element value="imio.smartweb.Folder" />
+    <element value="imio.smartweb.NewsView" />
+    <element value="imio.smartweb.Page" />
+    <element value="imio.smartweb.PortalPage" />
+    <element value="imio.smartweb.Procedure" />
+    <element value="collective.pivot.Family" />
+  </property>
+
+</object>

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/utils.py

@@ -16,9 +16,12 @@ from zope.component import queryMultiAdapter
 
 import hashlib
 import json
+import logging
 import os
 import requests
 
+logger = logging.getLogger("imio.smartweb.core")
+
 
 def get_category(context):
     if not base_hasattr(context, "category_name"):
@@ -52,12 +55,15 @@ def concat_voca_title(title1, title2):
     return "{0} - {1}".format(title1, title2)
 
 
-def get_json(url, auth=None):
+def get_json(url, auth=None, timeout=5):
     headers = {"Accept": "application/json"}
     if auth is not None:
         headers["Authorization"] = auth
     try:
-        response = requests.get(url, headers=headers, timeout=5)
+        response = requests.get(url, headers=headers, timeout=timeout)
+    except requests.exceptions.Timeout:
+        logger.warning(f"Timeout raised for requests : {url}")
+        return None
     except Exception:
         return None
     if response.status_code != 200:

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/vocabularies.py

@@ -185,7 +185,7 @@ class RemoteContactsVocabularyFactory:
             "metadata_fields=breadcrumb",
         ]
         url = "{}/@search?{}".format(DIRECTORY_URL, "&".join(params))
-        json_contacts = get_json(url)
+        json_contacts = get_json(url, None, 8)
         if json_contacts is None or len(json_contacts.get("items", [])) == 0:
             return SimpleVocabulary([])
         return SimpleVocabulary(

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/webcomponents/package.json

@@ -20,6 +20,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.14.6",
+    "@babel/plugin-proposal-async-generator-functions": "^7.20.7",
     "@babel/plugin-transform-react-jsx": "^7.14.5",
     "@babel/preset-env": "^7.14.7",
     "@fullhuman/postcss-purgecss": "^4.0.3",
@@ -27,6 +28,7 @@
     "autoprefixer": "^10.3.3",
     "babel-loader": "^8.2.2",
     "clean-webpack-plugin": "^4.0.0",
+    "core-js": "^3.33.0",
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.0.2",
     "eslint": "^7.32.0",

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio/smartweb/core/webcomponents/webpack.config.js

@@ -12,7 +12,7 @@ module.exports = (env, argv) => {
     const mode = argv.mode ? argv.mode : "development";
     return {
         mode: mode,
-        entry: ["@babel/polyfill", path.resolve(__dirname, "./src/index.jsx")],
+        entry: ["core-js/stable", path.resolve(__dirname, "./src/index.jsx")],
         output: {
             path: path.resolve(__dirname, "./build"),
             filename: "js/smartweb-webcomponents-compiled.js",

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio.smartweb.core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.1.27
+Version: 1.1.29
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -158,6 +158,27 @@ Changelog
 =========
 
 
+1.1.29 (2023-10-18)
+-------------------
+
+- SUP-32814 : Add new external content plugins : GiveADayPlugin
+  see : https://github.com/IMIO/imio.smartweb.core/commit/a4dfca2
+  [boulch]
+
+- WEB-4000 : Add display_map Bool field on directory and events views
+  [boulch]
+
+
+1.1.28 (2023-10-13)
+-------------------
+
+- WEB-3803 : Add upgrade step : collective.pivot.Family content type can be add in an imio.smartweb.Folder
+  [boulch]
+
+- WEB-3998 : Set requests timeout to 8'' when we populate RemoteContacts vocabulary
+  [boulch]
+
+
 1.1.27 (2023-10-11)
 -------------------
 

{imio.smartweb.core-1.1.27 → imio.smartweb.core-1.1.29}/src/imio.smartweb.core.egg-info/SOURCES.txt

@@ -535,6 +535,7 @@ src/imio/smartweb/core/upgrades/profiles/1041_to_1042/types/imio.smartweb.Sectio
 src/imio/smartweb/core/upgrades/profiles/1041_to_1042/types/imio.smartweb.SectionSendinblue.xml
 src/imio/smartweb/core/upgrades/profiles/1041_to_1042/types/imio.smartweb.SectionVideo.xml
 src/imio/smartweb/core/upgrades/profiles/1045_to_1046/types/imio.smartweb.SectionExternalContent.xml
+src/imio/smartweb/core/upgrades/profiles/1046_to_1047/types/imio.smartweb.Folder.xml
 src/imio/smartweb/core/viewlets/__init__.py
 src/imio/smartweb/core/viewlets/actions.py
 src/imio/smartweb/core/viewlets/arcgis_header.pt