imio.smartweb.core 1.2.11__py3-none-any.whl → 1.2.19__py3-none-any.whl

imio/smartweb/core/browser/configure.zcml

@@ -57,7 +57,7 @@
       for="*"
       class=".utils.UtilsView"
       permission="zope2.View"
-      allowed_attributes="is_previewable_content map_configuration"
+      allowed_attributes="is_previewable_content map_configuration is_plausible_set"
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
 

imio/smartweb/core/browser/dashboards/configure.zcml

@@ -5,9 +5,7 @@
   <include package="plone.app.contentmenu" />
   <browser:page
       name="stats"
-      title="Plausible dashboard"
       template="plausible.pt"
-      menu="plone_displayviews"
       for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       class=".plausible.PlausibleView"
       permission="cmf.ModifyPortalContent"

imio/smartweb/core/browser/dashboards/plausible.py

@@ -1,18 +1,18 @@
 from Products.Five.browser import BrowserView
-from imio.smartweb.core.browser.utils import get_plausible_vars
+from imio.smartweb.core.utils import get_plausible_vars
 
 
 class PlausibleView(BrowserView):
     @property
     def is_plausible_set(self):
-        return True if get_plausible_vars(self) else False
+        return True if get_plausible_vars() else False
 
     @property
     def get_embedhostjs_src(self):
-        vars = get_plausible_vars(self)
+        vars = get_plausible_vars()
         return f"https://{vars['plausible_url']}/js/embed.host.js"
 
     @property
     def get_iframe_src(self):
-        vars = get_plausible_vars(self)
+        vars = get_plausible_vars()
         return f"https://{vars['plausible_url']}/share/{vars['plausible_site']}?auth={vars['plausible_token']}&embed=true&theme=light&background=transparent"

imio/smartweb/core/browser/static/smartweb-edit-compiled.js

@@ -1 +1 @@
-(()=>{"use strict";jQuery(document).ready((function(e){e("#contentview-preview a").click((function(o){e(".hide-in-preview, #section-byline, #global_statusmessage").toggle("fast"),o.preventDefault()})),e("#formfield-form-widgets-svg_icon input").click((function(o){var s=e(this);e(this).attr("checked")?(e(this).prop("checked",!1),e(this).removeAttr("checked"),e(this).css("box-shadow","none"),e(this).css("border-color","#DEE2ED")):e("#formfield-form-widgets-svg_icon input").each((function(o,t){s[0]===t?(e(this).prop("checked",!0),e(this).attr("checked","checked"),e(this).css("border-color","#007a99"),e(this).css("box-shadow","0 0 0 0.25rem rgb(0 122 153 / 25%)")):(e(this).prop("checked",!1),e(this).removeAttr("checked"),e(this).css("box-shadow","none"),e(this).css("border-color","#DEE2ED"))}))}))})),jQuery(window).on("load",(function(e){var o=$("#plone-authentic-sources-menu").wrap("<ul class='plonetoolbar-authentic-sources-menu'>").parent();$(".personaltools-wrapper").prepend(o);var s=$("#plone-smartweb-help-menu").wrap("<ul class='plonetoolbar-smartweb-help-menu'>").parent();$(".personaltools-wrapper").prepend(s)}))})();
+(()=>{"use strict";jQuery(document).ready((function(e){e("#contentview-preview a").click((function(o){e(".hide-in-preview, #section-byline, #global_statusmessage").toggle("fast"),o.preventDefault()})),e("#formfield-form-widgets-svg_icon input").click((function(o){var s=e(this);e(this).attr("checked")?(e(this).prop("checked",!1),e(this).removeAttr("checked"),e(this).css("box-shadow","none"),e(this).css("border-color","#DEE2ED")):e("#formfield-form-widgets-svg_icon input").each((function(o,t){s[0]===t?(e(this).prop("checked",!0),e(this).attr("checked","checked"),e(this).css("border-color","#007a99"),e(this).css("box-shadow","0 0 0 0.25rem rgb(0 122 153 / 25%)")):(e(this).prop("checked",!1),e(this).removeAttr("checked"),e(this).css("box-shadow","none"),e(this).css("border-color","#DEE2ED"))}))}));var o=e("li:has(a[href*='@@stats'])");e("#collapse-personaltools li:eq(0)").after(o)})),jQuery(window).on("load",(function(e){var o=$("#plone-authentic-sources-menu").wrap("<ul class='plonetoolbar-authentic-sources-menu'>").parent();$(".personaltools-wrapper").prepend(o);var s=$("#plone-smartweb-help-menu").wrap("<ul class='plonetoolbar-smartweb-help-menu'>").parent();$(".personaltools-wrapper").prepend(s)}))})();

imio/smartweb/core/browser/static/src/edit.js

@@ -32,6 +32,11 @@ jQuery(document).ready(function ($) {
       })
     }
   });
+
+  // Move statistics action menu entry as the first element in personaltools menu
+  var $stat_link = $("li:has(a[href*='@@stats'])");
+  $("#collapse-personaltools li:eq(0)").after($stat_link);
+
 });
 
 jQuery(window).on("load", function(e) {

imio/smartweb/core/browser/utils.py

@@ -2,6 +2,7 @@
 from Products.Five.browser import BrowserView
 from imio.smartweb.core.contents import IPages
 from imio.smartweb.core.contents.pages.procedure.utils import sign_url
+from imio.smartweb.core.utils import get_plausible_vars
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
 from plone.api.portal import get_registry_record
@@ -75,33 +76,6 @@ class UtilsView(BrowserView):
             }
         )
 
-
-def get_plausible_vars(self):
-    env_plausible_url = os.getenv("SMARTWEB_PLAUSIBLE_URL", "")
-    env_plausible_site = os.getenv("SMARTWEB_PLAUSIBLE_SITE", "")
-    env_plausible_token = os.getenv("SMARTWEB_PLAUSIBLE_TOKEN", "")
-
-    plausible_url = (
-        env_plausible_url
-        if (env_plausible_url and env_plausible_url != "")
-        else api.portal.get_registry_record("smartweb.plausible_url")
-    )
-    plausible_site = (
-        env_plausible_site
-        if (env_plausible_site and env_plausible_site != "")
-        else api.portal.get_registry_record("smartweb.plausible_site")
-    )
-    plausible_token = (
-        env_plausible_token
-        if (env_plausible_token and env_plausible_token != "")
-        else api.portal.get_registry_record("smartweb.plausible_token")
-    )
-    if all([plausible_site, plausible_url, plausible_token]):
-        plausible_vars = {
-            "plausible_url": plausible_url,
-            "plausible_site": plausible_site,
-            "plausible_token": plausible_token,
-        }
-        return plausible_vars
-    else:
-        return None
+    def is_plausible_set(self):
+        """ """
+        return True if get_plausible_vars() else False

imio/smartweb/core/contents/__init__.py

@@ -17,6 +17,8 @@ from .pages.portal_page.content import IPortalPage  # NOQA
 from .pages.portal_page.content import PortalPage  # NOQA
 from .pages.procedure.content import IProcedure  # NOQA
 from .pages.procedure.content import Procedure  # NOQA
+from .rest.base import RestView  # NOQA
+from .rest.base import IRestView  # NOQA
 from .rest.directory.content import DirectoryView  # NOQA
 from .rest.directory.content import IDirectoryView  # NOQA
 from .rest.events.content import EventsView  # NOQA

imio/smartweb/core/contents/rest/base.py

@@ -2,7 +2,10 @@
 
 from imio.smartweb.core.utils import get_json
 from plone import api
+from plone.dexterity.content import Container
 from plone.rest import Service
+from zope.interface import implementer
+from zope.interface import Interface
 
 import json
 
@@ -71,3 +74,12 @@ class BaseService(Service):
             indent=2,
             separators=(", ", ": "),
         )
+
+
+class IRestView(Interface):
+    """"""
+
+
+@implementer(IRestView)
+class RestView(Container):
+    """Shared base class for REST views contents"""

imio/smartweb/core/contents/rest/configure.zcml

@@ -6,4 +6,11 @@
   <include package=".news" />
   <include package=".search" />
 
+  <adapter
+      for="imio.smartweb.core.contents.IRestView
+           zope.publisher.interfaces.http.IHTTPRequest"
+      provides="zope.publisher.interfaces.IPublishTraverse"
+      factory=".traversal.RestViewTraversable"
+      />
+
 </configure>

imio/smartweb/core/contents/rest/directory/content.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.core.contents import RestView
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives
-from plone.dexterity.content import Container
 from plone.supermodel import model
 from zope import schema
 from zope.interface import implementer
@@ -34,5 +34,5 @@ class IDirectoryView(model.Schema):
 
 
 @implementer(IDirectoryView)
-class DirectoryView(Container):
+class DirectoryView(RestView):
     """DirectoryView class"""

imio/smartweb/core/contents/rest/directory/view.pt

@@ -10,7 +10,8 @@
                                        propose-url view/propose_url;
                                        orientation view/orientation;
                                        current-language view/current_language;
-                                       display-map view/display_map;"></smartweb-annuaire>
+                                       display-map view/display_map;
+                                       view-path view/view_path;"></smartweb-annuaire>
   </div>
 </metal:main>
 </body>

imio/smartweb/core/contents/rest/directory/view.py

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 
 from imio.smartweb.core.contents.rest.view import BaseRestView
+from imio.smartweb.core.interfaces import IOgpViewUtils
 from plone import api
+from zope.interface import implementer
 
 
+@implementer(IOgpViewUtils)
 class DirectoryViewView(BaseRestView):
     """DirectoryView view"""
 

imio/smartweb/core/contents/rest/events/content.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.core.contents import RestView
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone.autoform import directives
-from plone.dexterity.content import Container
 from plone.supermodel import model
 from z3c.form.browser.checkbox import CheckBoxFieldWidget
 from zope import schema
@@ -39,5 +39,5 @@ class IEventsView(model.Schema):
 
 
 @implementer(IEventsView)
-class EventsView(Container):
+class EventsView(RestView):
     """EventsView class"""

imio/smartweb/core/contents/rest/events/view.pt

@@ -11,7 +11,8 @@
                                        propose-url view/propose_url;
                                        orientation view/orientation;
                                        current-language view/current_language;
-                                       display-map view/display_map;"></smartweb-events>
+                                       display-map view/display_map;
+                                       view-path view/view_path;"></smartweb-events>
     </div>
     </metal:main>
   </body>

imio/smartweb/core/contents/rest/events/view.py

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 
 from imio.smartweb.core.contents.rest.view import BaseRestView
+from imio.smartweb.core.interfaces import IOgpViewUtils
 from plone import api
+from zope.interface import implementer
 
 
+@implementer(IOgpViewUtils)
 class EventsViewView(BaseRestView):
     """EventsView view"""
 

imio/smartweb/core/contents/rest/news/content.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.core.contents import RestView
 from imio.smartweb.locales import SmartwebMessageFactory as _
-from plone.dexterity.content import Container
 from plone.supermodel import model
 from zope import schema
 from zope.interface import implementer
@@ -23,5 +23,5 @@ class INewsView(model.Schema):
 
 
 @implementer(INewsView)
-class NewsView(Container):
+class NewsView(RestView):
     """NewsView class"""

imio/smartweb/core/contents/rest/news/view.pt

@@ -10,7 +10,8 @@
                                          batch-size view/batch_size;
                                          propose-url view/propose_url;
                                          orientation view/orientation;
-                                         current-language view/current_language;"></smartweb-news>
+                                         current-language view/current_language;
+                                         view-path view/view_path;"></smartweb-news>
       </div>
     </metal:main>
   </body>

imio/smartweb/core/contents/rest/news/view.py

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 
 from imio.smartweb.core.contents.rest.view import BaseRestView
+from imio.smartweb.core.interfaces import IOgpViewUtils
 from plone import api
+from zope.interface import implementer
 
 
+@implementer(IOgpViewUtils)
 class NewsViewView(BaseRestView):
     """NewsView view"""
 

imio/smartweb/core/contents/rest/search/endpoint.py

@@ -153,7 +153,7 @@ class ExtendedSearchHandler(SearchHandler):
                     del item[fname]
         type_mapping = mapping[item["@type"]]
         base_url = type_mapping.get(item["container_uid"], type_mapping["default"])
-        item["_url"] = "{base}#/content?u={item_uid}".format(
+        item["_url"] = "{base}/content?u={item_uid}".format(
             base=base_url,
             item_uid=item["UID"],
         )

imio/smartweb/core/contents/rest/traversal.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.core.contents import IRestView
+from ZPublisher.BaseRequest import DefaultPublishTraverse
+from zope.component import adapts
+from zope.publisher.interfaces.http import IHTTPRequest
+
+
+class RestViewTraversable(DefaultPublishTraverse):
+    """ """
+
+    adapts(IRestView, IHTTPRequest)
+
+    def publishTraverse(self, request, name):
+        if "u" in self.request.form and name != "view":
+            return self.context
+
+        return super(RestViewTraversable, self).publishTraverse(request, name)

imio/smartweb/core/contents/rest/view.py

@@ -3,6 +3,7 @@
 from imio.smartweb.core.interfaces import IViewWithoutLeadImage
 from plone import api
 from Products.Five import BrowserView
+from urllib.parse import urlsplit
 from zope.interface import implementer
 
 
@@ -29,3 +30,9 @@ class BaseRestView(BrowserView):
     @property
     def current_language(self):
         return api.portal.get_current_language()[:2]
+
+    @property
+    def view_path(self):
+        url = self.context.absolute_url()
+        parsed = urlsplit(url)
+        return url.replace(f"{parsed.scheme}://{parsed.netloc}", "")

imio/smartweb/core/contents/sections/events/view.py

@@ -68,7 +68,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
                 "description": item["description"],
                 "category": item["category_title"],
                 "event_date": date_dict,
-                "url": f"{linking_view_url}#/{item_id}?u={item_uid}",
+                "url": f"{linking_view_url}/{item_id}?u={item_uid}",
                 "has_image": item["has_leadimage"],
                 "image": f"{item_url}/@@images/image/{orientation}_{image_scale}?cache_key={modified_hash}",
             }

imio/smartweb/core/contents/sections/news/view.py

@@ -61,7 +61,7 @@ class NewsView(CarouselOrTableSectionView, HashableJsonSectionView):
                 "description": item["description"],
                 "category": item["category_title"],
                 "effective": item["effective"],
-                "url": f"{linking_view_url}#/{item_id}?u={item_uid}",
+                "url": f"{linking_view_url}/{item_id}?u={item_uid}",
                 "has_image": item["has_leadimage"],
                 "image": f"{item_url}/@@images/image/{orientation}_{image_scale}?cache_key={modified_hash}",
             }

imio/smartweb/core/interfaces.py

@@ -31,3 +31,7 @@ class IArcgisViewUtils(Interface):
 
     def get_portal_item_id():
         """Return id of a map"""
+
+
+class IOgpViewUtils(Interface):
+    """ """

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

@@ -88,6 +88,21 @@
     </object>
   </object>
 
+  <object meta_type="CMF Action Category" name="user">
+    <object meta_type="CMF Action" name="dashboard" i18n:domain="plone" remove="True" />
+    <object meta_type="CMF Action" name="statistics" i18n:domain="imio.smartweb">
+      <property name="title" i18n:translate="">Statistics</property>
+      <property name="description" i18n:translate=""/>
+      <property name="url_expr">string:$portal_url/@@stats</property>
+      <property name="icon_expr">string:activity</property>
+      <property name="available_expr">portal/@@utils/is_plausible_set</property>
+      <property name="permissions">
+        <element value="Add portal content"/>
+      </property>
+      <property name="visible">True</property>
+    </object>
+  </object>
+
   <object name="header_actions" meta_type="CMF Action Category">
     <object name="account" meta_type="CMF Action" i18n:domain="imio.smartweb">
       <property name="title" i18n:translate="">My account</property>

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

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

imio/smartweb/core/rest/authentic_sources.py

@@ -4,11 +4,15 @@ from imio.smartweb.core.config import DIRECTORY_URL
 from imio.smartweb.core.config import EVENTS_URL
 from imio.smartweb.core.config import NEWS_URL
 from imio.smartweb.core.contents.rest.search.endpoint import get_default_view_url
+from imio.smartweb.core.utils import get_wca_token
+from plone.protect.interfaces import IDisableCSRFProtection
 from plone.restapi.deserializer import json_body
 from plone.restapi.services import Service
+from zope.interface import alsoProvides
 from zope.interface import implementer
 from zope.publisher.interfaces import IPublishTraverse
 
+import os
 import requests
 
 
@@ -19,6 +23,7 @@ class BaseRequestForwarder(Service):
         self.traversal_stack = []
 
     def reply(self):
+        alsoProvides(self.request, IDisableCSRFProtection)
         url = "/".join(self.traversal_stack)
         auth_source_url = f"{self.base_url}/{url}"
         response = self.forward_request(auth_source_url)
@@ -31,46 +36,78 @@ class BaseRequestForwarder(Service):
 
     def forward_request(self, url):
         method = self.request.method
-        headers = {"Accept": "application/json"}
+        token = get_wca_token(self.client_id, self.client_secret)
+        headers = {"Accept": "application/json", "Authorization": token}
         params = self.request.form
+        if method == "GET":
+            params = self.add_missing_metadatas(params)
         data = json_body(self.request)
 
         # Forward the request to the authentic source
         auth_source_response = requests.request(
-            method, url, params=params, headers=headers, data=data
+            method, url, params=params, headers=headers, json=data
         )
-
         response = self.request.response
         # Set the status code and headers from the authentic source server response
         response.setStatus(auth_source_response.status_code)
         for header, value in auth_source_response.headers.items():
             response.setHeader(header, value)
 
+        if auth_source_response.status_code == 204 or auth_source_response.text == "":
+            # Empty response
+            return ""
+
         return auth_source_response.json()
 
+    def construct_url(self, view_url, item):
+        # we can construct a Smartweb-related URL for item
+        # TODO: handle other views & translations (use/refactor code in
+        # search endpoint)
+        item_uid = item["UID"]
+        item_id = item.get("id", "content")
+        item["smartweb_url"] = f"{view_url}/{item_id}?u={item_uid}"
+
     def add_smartweb_urls(self, json_data):
+        if "items" not in json_data and "@id" not in json_data:
+            return json_data
+        default_view_url = get_default_view_url(self.request_type)
+        if "@id" in json_data and "UID" in json_data:
+            self.construct_url(default_view_url, json_data)
+            return json_data
         for item in json_data.get("items", []):
             if "@id" in item and "UID" in item:
-                # we can construct a Smartweb-related URL for item
-                # TODO: handle other views & translations (use/refactor code in
-                # search endpoint)
-                # TODO 2: always get UID and ID to construct URL ?
-                default_view_url = get_default_view_url(self.request_type)
-                item_uid = item["UID"]
-                item["smartweb_url"] = f"{default_view_url}/#content?u={item_uid}"
+                self.construct_url(default_view_url, item)
         return json_data
 
+    def add_missing_metadatas(self, params):
+        if "fullobjects" in params:
+            return params
+        if "metadata_fields" not in params:
+            params["metadata_fields"] = ["id", "UID"]
+        else:
+            if "id" not in params["metadata_fields"]:
+                params["metadata_fields"].append("id")
+            if "UID" not in params["metadata_fields"]:
+                params["metadata_fields"].append("UID")
+        return params
+
 
 class DirectoryRequestForwarder(BaseRequestForwarder):
     request_type = "directory"
+    client_id = os.environ.get("RESTAPI_DIRECTORY_CLIENT_ID")
+    client_secret = os.environ.get("RESTAPI_DIRECTORY_CLIENT_SECRET")
     base_url = DIRECTORY_URL
 
 
 class EventsRequestForwarder(BaseRequestForwarder):
     request_type = "events"
+    client_id = os.environ.get("RESTAPI_EVENTS_CLIENT_ID")
+    client_secret = os.environ.get("RESTAPI_EVENTS_CLIENT_SECRET")
     base_url = EVENTS_URL
 
 
 class NewsRequestForwarder(BaseRequestForwarder):
     request_type = "news"
+    client_id = os.environ.get("RESTAPI_NEWS_CLIENT_ID")
+    client_secret = os.environ.get("RESTAPI_NEWS_CLIENT_SECRET")
     base_url = NEWS_URL

imio/smartweb/core/rest/configure.zcml

@@ -22,6 +22,24 @@
       name="@directory_request_forwarder"
       />
 
+  <plone:service
+      method="PATCH"
+      accept="application/json"
+      factory=".authentic_sources.DirectoryRequestForwarder"
+      for="*"
+      permission="zope2.View"
+      name="@directory_request_forwarder"
+      />
+
+  <plone:service
+      method="DELETE"
+      accept="application/json"
+      factory=".authentic_sources.DirectoryRequestForwarder"
+      for="*"
+      permission="zope2.View"
+      name="@directory_request_forwarder"
+      />
+
 
   <!-- Events  -->
   <plone:service
@@ -42,6 +60,24 @@
       name="@events_request_forwarder"
       />
 
+  <plone:service
+      method="PATCH"
+      accept="application/json"
+      factory=".authentic_sources.EventsRequestForwarder"
+      for="*"
+      permission="zope2.View"
+      name="@events_request_forwarder"
+      />
+
+  <plone:service
+      method="DELETE"
+      accept="application/json"
+      factory=".authentic_sources.EventsRequestForwarder"
+      for="*"
+      permission="zope2.View"
+      name="@events_request_forwarder"
+      />
+
 
   <!-- News  -->
   <plone:service
@@ -62,4 +98,22 @@
       name="@news_request_forwarder"
       />
 
+  <plone:service
+      method="PATCH"
+      accept="application/json"
+      factory=".authentic_sources.NewsRequestForwarder"
+      for="*"
+      permission="zope2.View"
+      name="@news_request_forwarder"
+      />
+
+  <plone:service
+      method="DELETE"
+      accept="application/json"
+      factory=".authentic_sources.NewsRequestForwarder"
+      for="*"
+      permission="zope2.View"
+      name="@news_request_forwarder"
+      />
+
 </configure>