imio.smartweb.core 1.2.12__py3-none-any.whl → 1.2.68__py3-none-any.whl

imio/smartweb/core/contents/folder/block_view.pt

@@ -15,18 +15,18 @@
                          orientation_class python:images_orientation and f'display-{images_orientation}' or '';
                          thumb_scale view/get_thumb_scale_summary">
 
-        <div class="" id="block-menu"
+        <ul class="" id="block-menu"
              tal:attributes="class string:row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-xl-4 g-4 ${orientation_class}">
-            <div class="block-menu-element col" tal:repeat="item res/results">
+            <li class="block-menu-element col" tal:repeat="item res/results">
                 <metal:macro use-macro="context/@@folder_macros/block" />
-            </div>
-        </div>
-        <div class="" id="block-quickaccess"
+            </li>
+        </ul>
+        <ul class="" id="block-quickaccess"
              tal:attributes="class string:row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-xl-4 g-4 ${orientation_class}">
-            <div class="block-menu-element col" tal:repeat="item res/quick_access">
+            <li class="block-menu-element col" tal:repeat="item res/quick_access">
                 <metal:macro use-macro="context/@@folder_macros/block" />
-            </div>
-        </div>
+            </li>
+        </ul>
     </tal:def>
 </metal:content-core>
 </metal:main>

imio/smartweb/core/contents/folder/summary_view.pt

@@ -17,12 +17,12 @@
                          images_orientation context/orientation | nothing;
                          orientation_class python:images_orientation and f'display-{images_orientation}' or ''">
 
-        <div class="" id="block-menu"
+        <ul class="" id="block-menu"
              tal:attributes="class string:row ${orientation_class}">
-            <div class="list-menu-element col-12" tal:repeat="item batch">
+            <li class="list-menu-element col-12" tal:repeat="item batch">
                 <metal:macro use-macro="context/@@folder_macros/summary" />
-            </div>
-        </div>
+            </li>
+        </ul>
 
     </tal:def>
 

imio/smartweb/core/contents/pages/cirkwi/content.py

@@ -18,6 +18,11 @@ class ICirkwiView(IPages):
         required=True,
     )
 
+    cirkwi_widget_mb_key = schema.TextLine(
+        title=_("Cirkwi widget mb_key"),
+        required=True,
+    )
+
 
 @implementer(ICirkwiView)
 class CirkwiView(Pages):

imio/smartweb/core/contents/pages/cirkwi/view.py

@@ -10,7 +10,8 @@ class CirkwiViewView(BrowserView):
 
     def get_cirkwi_html(self):
         cirkwi_widget_id = self.context.cirkwi_widget_id
-        url = f"{self.cirwki_api_uri}{cirkwi_widget_id}"
+        cirkwi_widget_mb_key = self.context.cirkwi_widget_mb_key
+        url = f"{self.cirwki_api_uri}{cirkwi_widget_id}?mb_key={cirkwi_widget_mb_key}&{self.request.get('QUERY_STRING')}"
         response = requests.get(url)
         if response.status_code != 200:
             return response.status_code

imio/smartweb/core/contents/pages/portal_page/view.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.core.interfaces import IHtmxViewUtils
 from Products.Five.browser import BrowserView
+from zope.interface import implementer
 
 
+@implementer(IHtmxViewUtils)
 class NoTitleView(BrowserView):
     def __call__(self):
         return ""

imio/smartweb/core/contents/pages/views.py

@@ -2,6 +2,7 @@
 
 from Acquisition import aq_inner
 from imio.smartweb.core.utils import get_scale_url
+from imio.smartweb.core.interfaces import IHtmxViewUtils
 from imio.smartweb.core.interfaces import IViewWithoutLeadImage
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from Products.CMFPlone.resources import add_bundle_on_request
@@ -17,10 +18,11 @@ from zope.interface import implementer
 
 
 @implementer(IViewWithoutLeadImage)
+@implementer(IHtmxViewUtils)
 class PagesView(FolderView):
     """Pages view"""
 
-    b_size = 40
+    b_size = 70
 
     def __call__(self):
         # get gallery sections and sections with gallery

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

@@ -0,0 +1,5 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser">
+
+</configure>

imio/smartweb/core/contents/publication/content.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.locales import SmartwebMessageFactory as _
+from plone.dexterity.content import Item
+from zope import schema
+from zope.interface import implementer
+from zope.interface import Interface
+
+
+class IPublication(Interface):
+    """ """
+
+    linked_publication = schema.Choice(
+        vocabulary="imio.smartweb.vocabulary.IADeliberationsPublications",
+        title=_("I.A. Deliberation publication"),
+        required=True,
+        default=None,
+    )
+
+
+@implementer(IPublication)
+class Publication(Item):
+    """Publication class"""

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

@@ -2,7 +2,11 @@
 
 from imio.smartweb.core.utils import get_json
 from plone import api
+from plone.dexterity.content import Container
 from plone.rest import Service
+from urllib.parse import urlencode
+from zope.interface import implementer
+from zope.interface import Interface
 
 import json
 
@@ -16,7 +20,7 @@ class BaseEndpoint(object):
         self.request = request
 
     def __call__(self):
-        results = get_json(self.query_url)
+        results = get_json(self.query_url, timeout=20)
         return results
 
     @property
@@ -39,26 +43,27 @@ class BaseEndpoint(object):
                 f"{item['@id']}/@@images/{field}/{scale_name}?cache_key={modified_hash}"
             )
             item[f"{field}_{scale}_scale"] = cached_scale_url
-        item[
-            f"{field}_full_scale"
-        ] = f"{item['@id']}/@@images/{field}/?cache_key={modified_hash}"
+        item[f"{field}_full_scale"] = (
+            f"{item['@id']}/@@images/{field}/?cache_key={modified_hash}"
+        )
         del item[field]
 
-    def get_extra_params(self, params):
+    def construct_query_string(self, params):
+        params = "&".join(params)
         form = self.request.form
         extra_params = []
         for k, v in form.items():
             if isinstance(v, list):
                 # handles multiple metadata_fields
                 for value in v:
-                    extra_params.append("{}={}".format(k, value))
+                    extra_params.append((k, value))
             else:
-                extra_params.append("{}={}".format(k, v))
+                extra_params.append((k, v))
         current_lang = api.portal.get_current_language()[:2]
         if current_lang != "fr":
-            extra_params.append("translated_in_{}=1".format(current_lang))
-        params = params + extra_params
-        return params
+            extra_params.append(("translated_in_{}".format(current_lang), 1))
+        extra_params = urlencode(extra_params)
+        return "&".join(filter(None, [params, extra_params]))
 
 
 class BaseService(Service):
@@ -71,3 +76,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/endpoint.py

@@ -53,8 +53,8 @@ class BaseDirectoryEndpoint(BaseEndpoint):
             for category in self.context.selected_categories:
                 params.append(f"taxonomy_contact_category.query={category}")
             params.append("taxonomy_contact_category.operator=or")
-        params = self.get_extra_params(params)
-        url = f"{DIRECTORY_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{DIRECTORY_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

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

@@ -10,7 +10,9 @@
                                        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;
+                                       context-authenticated-user view/context_authenticated_user;"></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
@@ -37,7 +37,20 @@ class IEventsView(model.Schema):
         default=True,
     )
 
+    display_agendas_titles = schema.Bool(
+        title=_("Display agendas titles"),
+        description=_("If checked, display agendas titles"),
+        required=False,
+    )
+
+    only_past_events = schema.Bool(
+        title=_("Display only past events"),
+        description=_("If selected, only past events will be displayed"),
+        required=False,
+        default=False,
+    )
+
 
 @implementer(IEventsView)
-class EventsView(Container):
+class EventsView(RestView):
     """EventsView class"""

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

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from datetime import date
 from imio.smartweb.core.config import EVENTS_URL
 from imio.smartweb.core.contents.rest.base import BaseEndpoint
 from imio.smartweb.core.contents.rest.base import BaseService
@@ -14,7 +13,7 @@ from zope.interface import Interface
 class BaseEventsEndpoint(BaseEndpoint):
     def __call__(self):
         results = super(BaseEventsEndpoint, self).__call__()
-        if not results.get("items"):
+        if not results or not results.get("items"):
             return results
         orientation = self.context.orientation
         for result in results["items"]:
@@ -33,17 +32,16 @@ class BaseEventsEndpoint(BaseEndpoint):
 
     @property
     def query_url(self):
-        today = date.today().isoformat()
         params = [
             "selected_agendas={}".format(self.context.selected_agenda),
             "metadata_fields=category",
+            "metadata_fields=local_category",
+            "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",
             "metadata_fields=has_leadimage",
             "metadata_fields=UID",
-            "event_dates.query={}".format(today),
-            "event_dates.range=min",
             "sort_on=event_dates",
             "fullobjects=1",
             "b_size={}".format(self.context.nb_results),
@@ -51,8 +49,8 @@ class BaseEventsEndpoint(BaseEndpoint):
         if self.context.selected_event_types is not None:
             for event_type in self.context.selected_event_types:
                 params.append(f"event_type={event_type}")
-        params = self.get_extra_params(params)
-        url = f"{EVENTS_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{EVENTS_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

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

@@ -11,7 +11,12 @@
                                        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;
+                                       only-past-events view/only_past_events;
+                                       view-path view/view_path;
+                                       display_agendas_titles view/display_agendas_titles;
+                                       show-categories-or-topics view/show_categories_or_topics;
+                                       context-authenticated-user view/context_authenticated_user;"></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"""
 
@@ -14,3 +17,15 @@ class EventsViewView(BaseRestView):
     @property
     def display_map(self):
         return self.context.display_map
+
+    @property
+    def only_past_events(self):
+        return self.context.only_past_events
+
+    @property
+    def display_agendas_titles(self):
+        return self.context.display_agendas_titles
+
+    @property
+    def show_categories_or_topics(self):
+        return self.context.show_categories_or_topics

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
@@ -21,7 +21,13 @@ class INewsView(model.Schema):
         title=_("Number of items to display"), default=20, required=True
     )
 
+    display_newsfolders_titles = schema.Bool(
+        title=_("Display news folders titles"),
+        description=_("If checked, display news folders titles"),
+        required=False,
+    )
+
 
 @implementer(INewsView)
-class NewsView(Container):
+class NewsView(RestView):
     """NewsView class"""

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

@@ -39,6 +39,8 @@ class BaseNewsEndpoint(BaseEndpoint):
             "selected_news_folders={}".format(self.context.selected_news_folder),
             "portal_type=imio.news.NewsItem",
             "metadata_fields=category",
+            "metadata_fields=local_category",
+            "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=has_leadimage",
             "metadata_fields=UID",
@@ -47,8 +49,8 @@ class BaseNewsEndpoint(BaseEndpoint):
             "b_size={}".format(self.context.nb_results),
             "fullobjects=1",
         ]
-        params = self.get_extra_params(params)
-        url = f"{NEWS_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{NEWS_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

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

@@ -10,7 +10,11 @@
                                          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;
+                                         display_newsfolders_titles view/display_newsfolders_titles;
+                                         show-categories-or-topics view/show_categories_or_topics;
+                                         context-authenticated-user view/context_authenticated_user;"></smartweb-news>
       </div>
     </metal:main>
   </body>

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

@@ -1,12 +1,23 @@
 # -*- 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"""
 
     @property
     def propose_url(self):
         return api.portal.get_registry_record("smartweb.propose_news_url")
+
+    @property
+    def display_newsfolders_titles(self):
+        return self.context.display_newsfolders_titles
+
+    @property
+    def show_categories_or_topics(self):
+        return self.context.show_categories_or_topics

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

@@ -153,15 +153,15 @@ 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"],
         )
         item["_source_url"] = self._get_source_url(item["path_string"], core)
         modified_hash = hash_md5(item["modified"])
-        item[
-            "image_url"
-        ] = f'{item["_source_url"]}/@@images/image/paysage_vignette?cache_key={modified_hash}'
+        item["image_url"] = (
+            f'{item["_source_url"]}/@@images/image/paysage_vignette?cache_key={modified_hash}'
+        )
         return item
 
     @property

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/utils.py

@@ -0,0 +1,98 @@
+# # -*- coding: utf-8 -*-
+
+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.utils import get_wca_token
+from plone.memoize import ram
+from time import time
+from zope.component import getUtility
+from zope.schema.interfaces import IVocabularyFactory
+
+import json
+import os
+import requests
+
+
+def get_entity_id(vocabulary_name, uid):
+    vocabulary = getUtility(IVocabularyFactory, name=vocabulary_name)()
+    for term in vocabulary:
+        if term.token == uid:
+            return term.title or term.id
+    return None
+
+
+def get_auth_sources_response(
+    sources_name, entity_id, wf_status=["published"], time_to_cache=60
+):
+    """_summary_
+
+    Args:
+        sources_name (_type_): 3 values are possible: "directory", "news", "events"
+        entity_id (_type_): _description_
+
+    Returns:
+        _type_: json response
+    """
+    url = ""
+    if sources_name == "directory":
+        url = DIRECTORY_URL
+        portaltype = "imio.directory.Contact"
+        client_id_varname = "RESTAPI_DIRECTORY_CLIENT_ID"
+        client_secret_varname = "RESTAPI_DIRECTORY_CLIENT_SECRET"
+    elif sources_name == "events":
+        url = EVENTS_URL
+        portaltype = "imio.events.Event"
+        client_id_varname = "RESTAPI_EVENTS_CLIENT_ID"
+        client_secret_varname = "RESTAPI_EVENTS_CLIENT_SECRET"
+    elif sources_name == "news":
+        url = NEWS_URL
+        portaltype = "imio.news.NewsItem"
+        client_id_varname = "RESTAPI_NEWS_CLIENT_ID"
+        client_secret_varname = "RESTAPI_NEWS_CLIENT_SECRET"
+
+    payload = {
+        "query": [
+            {
+                "i": "portal_type",
+                "o": "plone.app.querystring.operation.selection.is",
+                "v": [portaltype],
+            },
+            {
+                "i": "path",
+                "o": "plone.app.querystring.operation.string.absolutePath",
+                "v": f"/{entity_id}",
+            },
+            {
+                "i": "review_state",
+                "o": "plone.app.querystring.operation.selection.any",
+                "v": wf_status,
+            },
+        ],
+        "metadata_fields": ["title", "modified"],
+        "sort_on": "effective",
+        "sort_order": "descending",
+        "fullobjects": True,
+        "b_start": 0,
+        "b_size": 4000,
+    }
+    client_id = os.environ.get(client_id_varname)
+    client_secret = os.environ.get(client_secret_varname)
+    auth = get_wca_token(client_id, client_secret)
+    headers = {
+        "Accept": "application/json",
+        "Content-Type": "text/plain",
+        "Authorization": auth,
+    }
+    url = f"{url}/@querystring-search"
+    response = get_cached_data(url, headers, payload, time_to_cache)
+    return response
+
+
+def _cache_key(func, url, headers, payload, time_to_cache):
+    return (url, time() // time_to_cache)
+
+
+@ram.cache(_cache_key)
+def get_cached_data(url, headers, payload, time_to_cache):
+    return requests.request("POST", url, headers=headers, data=json.dumps(payload))

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,13 @@ class BaseRestView(BrowserView):
     @property
     def current_language(self):
         return api.portal.get_current_language()[:2]
+
+    @property
+    def context_authenticated_user(self):
+        return api.user.is_anonymous()
+
+    @property
+    def view_path(self):
+        url = self.context.absolute_url()
+        parsed = urlsplit(url)
+        return url.replace(f"{parsed.scheme}://{parsed.netloc}", "")