imio.smartweb.core 1.2.33__py3-none-any.whl → 1.2.37__py3-none-any.whl

imio/smartweb/core/contents/sections/external_content/views.py

@@ -2,6 +2,8 @@
 
 from embeddify import Embedder
 from embeddify import Plugin
+
+from imio.smartweb.core.interfaces import IOdwbViewUtils
 from imio.smartweb.core.contents.sections.views import SectionView
 from imio.smartweb.core.interfaces import IArcgisViewUtils
 from imio.smartweb.locales import SmartwebMessageFactory as _
@@ -11,12 +13,22 @@ from plone.app.contenttypes.behaviors.leadimage import ILeadImage
 from Products.Five.browser import BrowserView
 from zope.i18n import translate
 from zope.interface import implementer
+from zope.interface import Interface
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
 import json
+import logging
+import requests
+
+logger = logging.getLogger("imio.smartweb.core")
 
 
 class ExternalContentView(SectionView):
-    def get_embed_external_content(self, width="100%", height=600):
+
+    plugin_config = {}
+
+    def __init__(self, context, request):
+        width = "100%"
         current_lang = api.portal.get_current_language()[:2]
         plugins = [
             EaglebePlugin(),
@@ -24,10 +36,13 @@ class ExternalContentView(SectionView):
             CognitoformPlugin(),
             ArcgisPlugin(),
             GiveADayPlugin(),
+            IdeluxWastePlugin(),
+            InbwContainersAffluencePlugin(),
+            OdwbWidgetPlugin(),
             UnknowServicePlugin(),
         ]
-        extra_params = self.context.external_content_params
-        plugin_config = {
+        extra_params = context.external_content_params
+        self.plugin_config = {
             "eaglebeplugin": {"width": width},
             "ellohaplugin": {
                 "width": width,
@@ -41,16 +56,39 @@ class ExternalContentView(SectionView):
             },
             "arcgisplugin": {
                 "width": width,
-                "url": self.context.absolute_url(),
+                "url": context.absolute_url(),
                 "current_lang": current_lang,
                 "extra_params": extra_params,
             },
             "giveadayplugin": {},
+            "ideluxwasteplugin": {
+                "url": context.absolute_url(),
+                "extra_params": extra_params,
+            },
+            "inbwcontainersaffluenceplugin": {
+                "url": context.absolute_url(),
+                "extra_params": extra_params,
+            },
+            "odwbwidgetplugin": {
+                "url": context.absolute_url(),
+                "extra_params": extra_params,
+            },
             "unknowserviceplugin": {"width": width, "current_lang": current_lang},
         }
-        embedder = Embedder(plugins=plugins, plugin_config=plugin_config)
-        url = self.context.external_content_url
-        return embedder(url, config={"width": width})
+        embedder = Embedder(plugins=plugins, plugin_config=self.plugin_config)
+        url = context.external_content_url
+        self.plugin = embedder(url, config={"width": width})
+        super(ExternalContentView, self).__init__(context, request)
+
+    @property
+    def contents(self):
+        return self.plugin.contents
+
+    def display_odwb_widget_viewlet(self):
+        return self.plugin.is_odwb_widget_plugins
+
+    def render_viewlet(self):
+        return self.index()
 
     def has_leadimage(self):
         if ILeadImage.providedBy(self.context) and getattr(
@@ -59,161 +97,279 @@ class ExternalContentView(SectionView):
             return True
         return False
 
+    def get_plugin(self):
+        return self.plugin
+
+    def which_plugin(self):
+        if IOdwbWidgetPlugin.providedBy(self.plugin):
+            return "odwbwidgetplugin"
+        elif IIdeluxWastePlugin.providedBy(self.plugin):
+            return "ideluxwasteplugin"
+        elif IInbwContainersAffluencePlugin.providedBy(self.plugin):
+            return "inbwcontainersaffluenceplugin"
+        else:
+            return None
+
     def image(self):
         return f"{self.context.absolute_url()}/@@download/image"
 
 
-class EaglebePlugin(Plugin):
+class BasePlugin(Plugin):
+    """ """
+
+    is_odwb_widget_plugins = False
+
+    @property
+    def contents(self):
+        return ""
+
+
+class EaglebePlugin(BasePlugin):
     def __call__(self, parts, config={}):
+        self.parts = parts
+        self.config = config
         if "app.eaglebe.com" in parts.netloc:
-            return f'<iframe class="eaglebe" src="{parts.geturl()}" scrolling="no" width="{config["width"]}">'
-        #
+            return self
         return None
 
+    @property
+    def contents(self):
+        return f'<iframe class="eaglebe" src="{self.parts.geturl()}" scrolling="no" width="{self.config["width"]}">'
+
 
-class EllohaPlugin(Plugin):
+class EllohaPlugin(BasePlugin):
     def __call__(self, parts, config={}):
         if "reservation.elloha.com" in parts.netloc:
-            # sample :
-            # {
-            #     "ConstellationWidgetContainer": "917c4c52-c997-4077-9135-873a0b2e0c85",
-            #     "Idoi": "195ea849-1732-4a69-a051-e7911001cd09"
-            # }
-            current_lang = config["current_lang"]
-            extra_params = config["extra_params"]
-
-            error_message = _(
-                "With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi"
-            )
-            error_message = translate(error_message, target_language=current_lang)
-            error_message = f'<div class="elloha elloha_error">{error_message}</div>'
-
-            if (
-                extra_params is None
-                or extra_params[0] != "{"
-                or extra_params[-1] != "}"
-            ):
+            self.parts = parts
+            self.config = config
+            return self
+        return None
+
+    @property
+    def contents(self):
+        # sample :
+        # {
+        #     "ConstellationWidgetContainer": "917c4c52-c997-4077-9135-873a0b2e0c85",
+        #     "Idoi": "195ea849-1732-4a69-a051-e7911001cd09"
+        # }
+        current_lang = self.config["current_lang"]
+        extra_params = self.config["extra_params"]
+        error_message = _(
+            "With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi"
+        )
+        error_message = translate(error_message, target_language=current_lang)
+        error_message = f'<div class="elloha elloha_error">{error_message}</div>'
+
+        if extra_params is None or extra_params[0] != "{" or extra_params[-1] != "}":
+            return error_message
+        try:
+            res = json.loads(extra_params.lower())
+        except JSONDecodeError:
+            return error_message
+
+        if res.get("constellationwidgetcontainer") is None or res.get("idoi") is None:
+            return error_message
+
+        cw1 = res.get("constellationwidgetcontainer")
+        cw2 = cw1.replace("-", "")
+        idoi = res.get("idoi")
+        return (
+            f'<div class="elloha">'
+            f'<div id="ConstellationWidgetContainer{cw1}" '
+            f'style="width:100%" data-id-projet="{cw2}">...</div></div>'
+            f'<script type="text/javascript" src="{self.parts.geturl()}/Scripts/widget-loader.min.js?v=42"></script>'
+            f'<script type="text/javascript">var constellationWidgetUrl{cw2}, '
+            f"constellationTypeModule{cw2};"
+            f'constellationWidgetUrl{cw2} = "https://reservation.elloha.com/Widget/BookingEngine/{cw1}?idoi={idoi}&culture=fr-FR";'
+            f'constellationTypeModule{cw2}=1; constellationWidgetLoad("ConstellationWidgetContainer{cw1}");'
+            f'constellationWidgetAddEvent(window, "resize", function () {{constellationWidgetSetAppearance("ConstellationWidgetContainer{cw1}");}});</script>'
+        )
+
+
+class CognitoformPlugin(BasePlugin):
+    def __call__(self, parts, config={}):
+        if "cognitoforms" in parts.netloc:
+            self.parts = parts
+            self.config = config
+            return self
+        return None
+
+    @property
+    def contents(self):
+        current_lang = self.config["current_lang"]
+        extra_params = self.config["extra_params"]
+
+        error_message = _(
+            "With a cognitoform plugin, extra params can be void but if you complete it you must specify : scrolling:(yes/no) and overflow:(hidden/scroll/auto)"
+        )
+        error_message = translate(error_message, target_language=current_lang)
+        error_message = (
+            f'<div class="cognitoform cognitoform_error">{error_message}</div>'
+        )
+
+        if extra_params is None:
+            return f'<iframe src="{self.parts.geturl()}" style="border: 0px none; width: {self.config["width"]}%; overflow: auto;" scrolling="yes"></iframe>'
+        else:
+            if extra_params[0] != "{" or extra_params[-1] != "}":
                 return error_message
             try:
                 res = json.loads(extra_params.lower())
             except JSONDecodeError:
                 return error_message
 
-            if (
-                res.get("constellationwidgetcontainer") is None
-                or res.get("idoi") is None
-            ):
+            if res.get("overflow") is None or res.get("scrolling") is None:
                 return error_message
 
-            cw1 = res.get("constellationwidgetcontainer")
-            cw2 = cw1.replace("-", "")
-            idoi = res.get("idoi")
-            return (
-                f'<div class="elloha">'
-                f'<div id="ConstellationWidgetContainer{cw1}" '
-                f'style="width:100%" data-id-projet="{cw2}">...</div></div>'
-                f'<script type="text/javascript" src="{parts.geturl()}/Scripts/widget-loader.min.js?v=42"></script>'
-                f'<script type="text/javascript">var constellationWidgetUrl{cw2}, '
-                f"constellationTypeModule{cw2};"
-                f'constellationWidgetUrl{cw2} = "https://reservation.elloha.com/Widget/BookingEngine/{cw1}?idoi={idoi}&culture=fr-FR";'
-                f'constellationTypeModule{cw2}=1; constellationWidgetLoad("ConstellationWidgetContainer{cw1}");'
-                f'constellationWidgetAddEvent(window, "resize", function () {{constellationWidgetSetAppearance("ConstellationWidgetContainer{cw1}");}});</script>'
-            )
-        #
-        return None
+            overflow = res.get("overflow")
+            scrolling = res.get("scrolling")
+            return f'<iframe src="{self.parts.geturl()}" style="border: 0px none; width: {self.config["width"]}%; overflow: {overflow};" scrolling="{scrolling}"></iframe>'
 
 
-class CognitoformPlugin(Plugin):
+class ArcgisPlugin(BasePlugin):
     def __call__(self, parts, config={}):
-        if "cognitoforms" in parts.netloc:
-            current_lang = config["current_lang"]
-            extra_params = config["extra_params"]
+        if "arcgis" in parts.netloc:
+            self.parts = parts
+            self.config = config
+        return None
+
+    @property
+    def contents(self):
+        # url : https://developers.arcgis.com/
+        # extra_params : {"portal_item_id":"27a432b0835149e6acd3ac39d0e4349c"}
+        current_lang = self.config["current_lang"]
+        extra_params = self.config["extra_params"]
+        url = self.config["url"]
+
+        error_message = _(
+            "With arcgis plugin, extra params must contain a dictionary with one key : portal_item_id"
+        )
+        error_message = translate(error_message, target_language=current_lang)
+        error_message = f'<div class="arcgis arcgis_error">{error_message}</div>'
+
+        if extra_params is None or extra_params[0] != "{" or extra_params[-1] != "}":
+            return error_message
+        try:
+            res = json.loads(extra_params.lower())
+        except JSONDecodeError:
+            return error_message
+        if res.get("portal_item_id") is None:
+            return error_message
+
+        portal_item_id = res.get("portal_item_id")
+        msg = _("Consult the map")
+        msg = translate(msg, target_language=current_lang)
+        return f'<a href="{url}/view_arcgis?portal_item_id={portal_item_id}">{msg}</a>'
 
-            error_message = _(
-                "With a cognitoform plugin, extra params can be void but if you complete it you must specify : scrolling:(yes/no) and overflow:(hidden/scroll/auto)"
-            )
-            error_message = translate(error_message, target_language=current_lang)
-            error_message = (
-                f'<div class="cognitoform cognitoform_error">{error_message}</div>'
-            )
 
-            if extra_params is None:
-                return f'<iframe src="{parts.geturl()}" style="border: 0px none; width: {config["width"]}%; overflow: auto;" scrolling="yes"></iframe>'
-            else:
-                if extra_params[0] != "{" or extra_params[-1] != "}":
-                    return error_message
-                try:
-                    res = json.loads(extra_params.lower())
-                except JSONDecodeError:
-                    return error_message
-
-                if res.get("overflow") is None or res.get("scrolling") is None:
-                    return error_message
-
-                overflow = res.get("overflow")
-                scrolling = res.get("scrolling")
-                return f'<iframe src="{parts.geturl()}" style="border: 0px none; width: {config["width"]}%; overflow: {overflow};" scrolling="{scrolling}"></iframe>'
+class GiveADayPlugin(BasePlugin):
+    def __call__(self, parts, config={}):
+        if "www.giveaday.be" in parts.netloc:
+            self.parts = parts
+            self.config = config
+            return self
         #
         return None
 
+    @property
+    def contents(self):
+        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>"
+        )
+
+
+class IIdeluxWastePlugin(Interface):
+    """"""
 
-class ArcgisPlugin(Plugin):
+
+@implementer(IIdeluxWastePlugin)
+class IdeluxWastePlugin(BasePlugin):
     def __call__(self, parts, config={}):
-        if "arcgis" in parts.netloc:
-            # url : https://developers.arcgis.com/
-            # extra_params : {"portal_item_id":"27a432b0835149e6acd3ac39d0e4349c"}
-            current_lang = config["current_lang"]
-            extra_params = config["extra_params"]
-            url = config["url"]
-
-            error_message = _(
-                "With arcgis plugin, extra params must contain a dictionary with one key : portal_item_id"
-            )
-            error_message = translate(error_message, target_language=current_lang)
-            error_message = f'<div class="arcgis arcgis_error">{error_message}</div>'
-
-            if (
-                extra_params is None
-                or extra_params[0] != "{"
-                or extra_params[-1] != "}"
-            ):
-                return error_message
-            try:
-                res = json.loads(extra_params.lower())
-            except JSONDecodeError:
-                return error_message
-            if res.get("portal_item_id") is None:
-                return error_message
+        # https://www.odwb.be/api/explore/v2.1/catalog/datasets/guide-de-tri1/records
+        if "www.odwb.be" in parts.netloc and "guide-de-tri1" in parts.path:
+            self.parts = parts
+            self.config = config
+            return self
+        return None
 
-            portal_item_id = res.get("portal_item_id")
-            msg = _("Consult the map")
-            msg = translate(msg, target_language=current_lang)
-            return (
-                f'<a href="{url}/view_arcgis?portal_item_id={portal_item_id}">{msg}</a>'
+    # url = config["url"]
+    # return (f'<a href="{url}/view_idelux_waste?portal_item_id={portal_item_id}">{msg}</a>')
+    @property
+    def contents(self):
+        headers = {"Accept": "application/json"}
+        try:
+            # ?limit=-1 to get all records from an odwb table.
+            response = requests.get(
+                f"{self.parts.geturl()}?limit=-1", headers=headers, timeout=5
             )
-        #
-        return None
+            self.config["extra_params"] = response.json()
+            return self.config["extra_params"]
+
+        except requests.exceptions.Timeout:
+            logger.warning(f"Timeout raised for requests : {self.url}")
+            return None
+
 
+class IInbwContainersAffluencePlugin(Interface):
+    """"""
 
-class GiveADayPlugin(Plugin):
+
+@implementer(IInbwContainersAffluencePlugin)
+class InbwContainersAffluencePlugin(BasePlugin):
     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>"
-            )
-        #
+        if "www.odwb.be" in parts.netloc and "affluence" in parts.path:
+            self.parts = parts
+            self.config = config
+            return self
         return None
 
+    @property
+    def contents(self):
+        headers = {"Accept": "application/json"}
+        try:
+            response = requests.get(
+                f"{self.parts.geturl()}&limit=-1", headers=headers, timeout=5
+            )
+            self.config["extra_params"] = json.dumps(response.json())
+            return self.config["extra_params"]
+        except requests.exceptions.Timeout:
+            logger.warning(f"Timeout raised for requests : {self.url}")
+            return None
+
+
+class IOdwbWidgetPlugin(Interface):
+    """"""
 
-class UnknowServicePlugin(Plugin):
+
+@implementer(IOdwbWidgetPlugin)
+class OdwbWidgetPlugin(BasePlugin):
     def __call__(self, parts, config={}):
-        current_lang = config["current_lang"]
+        # https://static.opendatasoft.com/ods-widgets
+        if "static.opendatasoft.com" in parts.netloc:
+            self.is_odwb_widget_plugins = True
+            self.parts = parts
+            self.config = config
+            return self
+
+    @property
+    def contents(self):
+        return self.config["extra_params"]
+
+
+class UnknowServicePlugin(BasePlugin):
+    def __call__(self, parts, config={}):
+        self.parts = parts
+        self.config = config
+        return self
+
+    @property
+    def contents(self):
+        current_lang = self.config["current_lang"]
         msg = _("Unknow service")
         msg = translate(msg, target_language=current_lang)
         return f'<p class="unknow_service">{msg}</p>'
@@ -226,3 +382,26 @@ class ArcgisView(BrowserView):
     @property
     def get_portal_item_id(self):
         return self.request.portal_item_id
+
+
+class IdeluxWasteView(BrowserView):
+
+    def __init__(self, context, request):
+        """ """
+
+
+class InbwContainersAffluenceView(BrowserView):
+
+    def __init__(self, context, request):
+        """ """
+
+
+class IOdwbWidgetLayer(IDefaultBrowserLayer):
+    """ """
+
+
+@implementer(IOdwbViewUtils, IOdwbWidgetLayer)
+class OdwbWidgetView(BrowserView):
+
+    def __init__(self, context, request):
+        """ """

imio/smartweb/core/contents/sections/macros.pt

@@ -56,15 +56,19 @@
         <tal:dates define="modified context/ModificationDate">
           <span class="documentModified"
                 tal:condition="modified">
-            <span i18n:translate="">
-              Modified
-            </span>
-            <span class="pat-display-time"
-                  data-pat-display-time="from-now: true"
-                  tal:attributes="datetime modified"
-                  tal:content="modified">
-              Modified
-            </span>
+            <a class="documentModified"
+               tal:attributes="href string:${context/absolute_url}/@@historyview"
+               tal:omit-tag="python:context.portal_type != 'imio.smartweb.SectionText'">
+              <span i18n:translate="">
+                Modified
+              </span>
+              <span class="pat-display-time"
+                    data-pat-display-time="from-now: true"
+                    tal:attributes="datetime modified"
+                    tal:content="modified">
+                Modified
+              </span>
+            </a>
           </span>
         </tal:dates>
 

imio/smartweb/core/contents/sections/text/view.pt

@@ -22,7 +22,7 @@
                          id string:body-section-${context/id}">
       <tal:cond condition="image">
         <figure>
-          <img alt="" tal:attributes="src python:view.get_scale_url(context);" />
+          <img tal:attributes="src python:view.get_scale_url(context); alt python:context.image_caption if context.image_caption else ''" />
           <figcaption tal:condition="context/image_caption" tal:content="context/image_caption"></figcaption>
         </figure>
       </tal:cond>

imio/smartweb/core/interfaces.py

@@ -35,3 +35,10 @@ class IArcgisViewUtils(Interface):
 
 class IOgpViewUtils(Interface):
     """ """
+
+
+class IOdwbViewUtils(Interface):
+    """ """
+
+    def is_odwb_widget_plugins():
+        """Return True if we are in the generic odwb widget plugins"""

imio/smartweb/core/profiles/default/diff_tool.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object>
+ <difftypes>
+  <type portal_type="imio.smartweb.SectionText">
+   <field name="any" difftype="Compound Diff for Dexterity types"/>
+  </type>
+ </difftypes>
+</object>

imio/smartweb/core/profiles/default/metadata.xml

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

imio/smartweb/core/profiles/default/registry/plone.xml

@@ -19,17 +19,34 @@
             interface="Products.CMFPlone.interfaces.controlpanel.ISearchSchema"
             field="types_not_searched">
       <value purge="false">
+        <element>News Item</element>
+        <element>imio.smartweb.HeroBanner</element>
+        <element>Discussion Item</element>
+        <element>MessagesConfig</element>
+        <element>Folder</element>
         <element>imio.smartweb.BlockLink</element>
+        <element>Message</element>
+        <element>Document</element>
         <element>imio.smartweb.Footer</element>
-        <element>imio.smartweb.HeroBanner</element>
+        <element>imio.smartweb.SectionHTML</element>
+        <element>imio.smartweb.SectionSendinblue</element>
+        <element>imio.smartweb.SectionNews</element>
+        <element>imio.smartweb.SectionCollection</element>
         <element>imio.smartweb.SectionContact</element>
+        <element>imio.smartweb.SectionExternalContent</element>
+        <element>imio.smartweb.SectionSelections</element>
         <element>imio.smartweb.SectionFiles</element>
-        <element>imio.smartweb.SectionGallery</element>
         <element>imio.smartweb.SectionLinks</element>
-        <element>imio.smartweb.SectionSelections</element>
-        <element>imio.smartweb.SectionSlide</element>
         <element>imio.smartweb.SectionText</element>
+        <element>imio.smartweb.SectionGallery</element>
+        <element>imio.smartweb.SectionMap</element>
+        <element>imio.smartweb.SectionPostit</element>
+        <element>imio.smartweb.SectionSlide</element>
         <element>imio.smartweb.SectionVideo</element>
+        <element>imio.smartweb.SectionEvents</element>
+        <element>Plone Site</element>
+        <element>TempFolder</element>
+        <element>Event</element>
       </value>
     </record>
 

imio/smartweb/core/profiles/default/repositorytool.xml

@@ -2,6 +2,7 @@
 <repositorytool>
   <policymap>
     <type name="imio.smartweb.SectionText">
+      <policy name="at_edit_autoversion" />
       <policy name="version_on_revert"/>
     </type>
   </policymap>

imio/smartweb/core/profiles/default/types/Collection.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="Collection"
+        i18n:domain="plone"
+>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="solr.fields" />
+  </property>
+
+</object>

imio/smartweb/core/profiles/default/types/File.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="File"
+        i18n:domain="plone"
+>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="solr.fields" />
+  </property>
+
+</object>