imio.smartweb.core 1.2.35__tar.gz → 1.2.37__tar.gz

{imio.smartweb.core-1.2.35 → imio.smartweb.core-1.2.37}/CHANGES.rst

@@ -2,6 +2,26 @@ Changelog
 =========
 
 
+1.2.37 (2024-03-18)
+-------------------
+
+- Add new plugin in external content section / refactor some code in external content section
+  [boulch]
+
+- Add figcaption content in alt attribute for images in section text
+  [thomlamb]
+
+
+1.2.36 (2024-02-22)
+-------------------
+
+- WEB-4072, WEB-4073 : Enable solr.fields behavior on some content types
+  [remdub]
+
+- WEB-4001 : Refactoring the generation of sitemap.xml.gz
+  [boulch]
+
+
 1.2.35 (2024-02-21)
 -------------------
 

{imio.smartweb.core-1.2.35 → imio.smartweb.core-1.2.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.35
+Version: 1.2.37
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -158,6 +158,26 @@ Changelog
 =========
 
 
+1.2.37 (2024-03-18)
+-------------------
+
+- Add new plugin in external content section / refactor some code in external content section
+  [boulch]
+
+- Add figcaption content in alt attribute for images in section text
+  [thomlamb]
+
+
+1.2.36 (2024-02-22)
+-------------------
+
+- WEB-4072, WEB-4073 : Enable solr.fields behavior on some content types
+  [remdub]
+
+- WEB-4001 : Refactoring the generation of sitemap.xml.gz
+  [boulch]
+
+
 1.2.35 (2024-02-21)
 -------------------
 

{imio.smartweb.core-1.2.35 → imio.smartweb.core-1.2.37}/setup.py

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

{imio.smartweb.core-1.2.35 → imio.smartweb.core-1.2.37}/src/imio/smartweb/core/browser/sitemap.py

@@ -2,6 +2,8 @@ from BTrees.OOBTree import OOBTree
 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.utils import get_auth_sources_response
+from imio.smartweb.core.contents.rest.utils import get_entity_id
 from imio.smartweb.core.utils import get_json
 from plone import api
 from plone.base.interfaces import IPloneSiteRoot
@@ -86,50 +88,54 @@ class CustomSiteMapView(SiteMapView):
                 "lastmod": lastmod,
             }
 
-        auth_sources = [
-            {"directory": {"path": DIRECTORY_URL, "type": "imio.directory.Contact"}},
-            {"news": {"path": NEWS_URL, "type": "imio.news.NewsItem"}},
-            {"events": {"path": EVENTS_URL, "type": "imio.events.Event"}},
-        ]
-        for auth_source in auth_sources:
-            for auth_source_key, auth_source_value in auth_source.items():
-                entity_uid = api.portal.get_registry_record(
-                    f"smartweb.{auth_source_key}_entity_uid", default=None
-                )
-                auth_source_uid = api.portal.get_registry_record(
-                    f"smartweb.default_{auth_source_key}_view", default=None
+        auth_sources = {
+            "directory": {
+                "entity_reg_var": "smartweb.directory_entity_uid",
+                "main_rest_view": "smartweb.default_directory_view",
+                "vocabulary": "imio.smartweb.vocabulary.RemoteDirectoryEntities",
+                "url": DIRECTORY_URL,
+            },
+            "events": {
+                "entity_reg_var": "smartweb.events_entity_uid",
+                "main_rest_view": "smartweb.default_events_view",
+                "vocabulary": "imio.smartweb.vocabulary.RemoteEventsEntities",
+                "url": EVENTS_URL,
+            },
+            "news": {
+                "entity_reg_var": "smartweb.news_entity_uid",
+                "main_rest_view": "smartweb.default_news_view",
+                "vocabulary": "imio.smartweb.vocabulary.RemoteNewsEntities",
+                "url": NEWS_URL,
+            },
+        }
+        for auth_source_key, auth_source_value in auth_sources.items():
+            entity_uid = api.portal.get_registry_record(
+                auth_source_value.get("entity_reg_var")
+            )
+            if entity_uid is None:
+                return self.request.response.setStatus(404, "No entity found")
+            entity_id = get_entity_id(auth_source_value.get("vocabulary"), entity_uid)
+            auth_source_uid = api.portal.get_registry_record(
+                f"smartweb.default_{auth_source_key}_view", default=None
+            )
+            if auth_source_uid is None:
+                return self.request.response.setStatus(
+                    404, "No default authentic source found"
                 )
-                if entity_uid is None or auth_source_uid is None:
-                    continue
-                brains = api.content.find(UID=auth_source_uid)
-                obj = brains[0].getObject()
-                auth_source_view_url = obj.absolute_url()
-                endpoint = "@search"
-                if auth_source_key == "directory":
-                    selected_container = f"selected_entities={entity_uid}"
-                if auth_source_key == "news":
-                    selected_container = (
-                        f"selected_news_folders={obj.selected_news_folder}"
-                    )
-                if auth_source_key == "events":
-                    selected_container = f"selected_agendas={obj.selected_agenda}"
-                    endpoint = "@events"
-                params = [
-                    selected_container,
-                    f"portal_type={auth_source_value.get('type')}",
-                    "fullobjects=0",
-                    "sort_on=sortable_title",
-                ]
-                url = f"{auth_source_value.get('path')}/{endpoint}?{'&'.join(params)}"
-                results = get_json(url)
-                if results is None:
-                    continue
-                for item in results.get("items"):
-                    item_id = normalizeString(item.get("title"))
-                    item_uid = item.get("id")
-                    loc = f"{auth_source_view_url}/{item_id}?u={item_uid}"
-                    lastmod = item.get("modified")
-                    yield {
-                        "loc": loc,
-                        "lastmod": lastmod,
-                    }
+            brains = api.content.find(UID=auth_source_uid)
+            obj = brains[0].getObject()
+            auth_source_view_url = obj.absolute_url()
+            results = get_auth_sources_response(
+                auth_source_key, normalizeString(entity_id), (60 * 60 * 24)
+            ).json()
+            if results is None or results.get("type") == "ValueError":
+                continue
+            for item in results.get("items"):
+                item_id = normalizeString(item.get("title"))
+                item_uid = item.get("id")
+                loc = f"{auth_source_view_url}/{item_id}?u={item_uid}"
+                lastmod = item.get("modified")
+                yield {
+                    "loc": loc,
+                    "lastmod": lastmod,
+                }

imio.smartweb.core-1.2.37/src/imio/smartweb/core/contents/rest/utils.py

@@ -0,0 +1,99 @@
+# # -*- 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 plone.memoize.view import memoize
+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-1.2.37/src/imio/smartweb/core/contents/sections/external_content/configure.zcml

@@ -0,0 +1,51 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser">
+
+  <browser:page
+      name="view"
+      for="imio.smartweb.core.contents.ISectionExternalContent"
+      class="imio.smartweb.core.contents.sections.external_content.views.ExternalContentView"
+      template="view.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+  <browser:page
+      name="view_arcgis"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.ArcgisView"
+      template="view_arcgis.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+  <browser:page
+      name="view_idelux_waste"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.IdeluxWasteView"
+      template="view_idelux_waste.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+  <browser:page
+      name="view_inbw_container_affluence"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.InbwContainersAffluenceView"
+      template="view_inbw_containers_affluence.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+
+  <browser:page
+      name="view_odwb_widget"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.OdwbWidgetView"
+      template="view_odwb_widget.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+</configure>

imio.smartweb.core-1.2.37/src/imio/smartweb/core/contents/sections/external_content/view.pt

@@ -0,0 +1,54 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      metal:use-macro="context/@@main_template/macros/master"
+      i18n:domain="plone">
+<body>
+
+<metal:main fill-slot="content-core">
+<metal:content-core define-macro="content-core">
+<metal:macro use-macro="context/@@sections_macros/section_edition" />
+<div class="container section-container section-external-content"
+     id=""
+     define="datas view/get_datas"
+     tal:attributes="id string:container-section-${context/id}">
+
+
+  <tal:check tal:condition="view/has_leadimage">
+      <img tal:attributes="src view/image" />
+  </tal:check>
+
+  <metal:macro use-macro="context/@@sections_macros/section_title" />
+
+  <p tal:replace="structure context/@@description" />
+  <div tal:define="which_plugin view/which_plugin">
+
+    <div tal:condition="not:which_plugin"
+         tal:define="collapse_klass python: 'collapse' if context.collapsible_section else ''"
+         tal:attributes="class string:body-section ratio ${collapse_klass};
+                         id string:body-section-${context/id}"
+         tal:content="structure view/contents" />
+
+    <div tal:condition="python:which_plugin == 'ideluxwasteplugin'">
+        <metal:block use-macro="context/@@view_idelux_waste/embeded_datas" tal:define="datas view/contents">
+    </div>
+
+    <div tal:condition="python:which_plugin == 'inbwcontainersaffluenceplugin'">
+        <metal:block use-macro="context/@@view_inbw_container_affluence/embeded_datas" tal:define="datas view/contents">
+    </div>
+
+    <div tal:condition="python:which_plugin == 'odwbwidgetplugin'">
+        <metal:block use-macro="context/@@view_odwb_widget/embeded_datas" tal:define="datas view/contents">
+    </div>
+
+  </div>
+
+
+</div>
+</metal:content-core>
+</metal:main>
+
+</body>
+</html>

imio.smartweb.core-1.2.37/src/imio/smartweb/core/contents/sections/external_content/view_idelux_waste.pt

@@ -0,0 +1,50 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      i18n:domain="imio.smartweb">
+
+  <metal:macro define-macro="embeded_datas">
+    <script>
+          $(document).ready(function() {
+        $('#searchInput').on('input', function() {
+            var searchTerm = $(this).val().toLowerCase();
+
+            // Loop through each item in the results
+            $('.result-item').each(function() {
+                var searchable = $(this).data('searchable').toLowerCase();
+
+                // If the keyword is found in the consignes_de_tri, show the item, otherwise hide it
+                if (searchable.includes(searchTerm)) {
+                    $(this).show(); // Show the matching item
+                } else {
+                    $(this).hide(); // Hide the non-matching item
+                }
+            });
+        });
+    });
+    </script>
+    <input type="text" id="searchInput" class="form-control" placeholder="Search Consignes de Tri">
+    <div id="results">
+        <!-- Results will be populated here -->
+    </div>
+
+    <div tal:define="results datas/results">
+      <ul tal:repeat="res results">
+        <tal:def define="filiere res/filiere;
+                            dechet res/dechet;
+                            infoparc res/infoparc;
+                            consignes_de_tri res/consignes_de_tri;
+                            searchable string:${filiere} ${dechet} ${infoparc} ${consignes_de_tri}">
+          <li class="result-item" data-searchable="${searchable}" >
+            <h3 tal:content="string:${filiere} - ${dechet}" />
+            <p tal:content="infoparc"></p>
+            <p tal:content="consignes_de_tri"></p>
+          </li>
+
+        </tal:def>
+      </ul>
+    </div>
+  </metal:macro>
+</html>

imio.smartweb.core-1.2.37/src/imio/smartweb/core/contents/sections/external_content/view_inbw_containers_affluence.pt

@@ -0,0 +1,91 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      i18n:domain="imio.smartweb">
+
+  <metal:macro define-macro="embeded_datas">
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+    <script>
+$(document).ready(function () {
+    var today = new Date().getDay();
+    var hours = new Date().getHours(); // Get current hour
+    var daysOfWeek = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+    var currentDay = daysOfWeek[today];
+    var jsonDataString = $('#json-data').attr("data");
+
+    var jsonData = JSON.parse(jsonDataString);
+    var todayData = JSON.parse(jsonData.results[0][currentDay]);
+    var current_affluence = jsonData.results[0].current_affluence;
+
+    var keys = [];
+    var dataset1 = [];
+    var dataset2 = [];
+
+    Object.entries(todayData).forEach(function([key, value]) {
+        keys.push(key + "h00");
+        console.log('key' + key + 'hours' + hours);
+        if (key == hours) {
+            dataset2.push(current_affluence);
+        }
+        else {dataset2.push(0);}
+        dataset1.push(value);
+    });
+
+
+    // Define the Chart.js data and options
+    var chartData = {
+        labels: keys,  // Hours
+        datasets: [{
+            label: currentDay + ' average affluence',
+            data: dataset1,
+            backgroundColor: 'rgba(54, 162, 235, 0.2)',
+            borderColor: 'rgba(54, 162, 235, 1)',
+            borderWidth: 1
+        },
+        {
+            label: 'Current affluence',
+            data: dataset2,
+            backgroundColor: 'rgba(255, 99, 132, 0.2)', // Specify the desired color
+            borderColor: 'rgba(255, 99, 132, 1)', // Specify the desired color
+            borderWidth: 1
+        }]
+    };
+
+    var chartOptions = {
+        scales: {
+            x: {
+                title: {
+                    display: true,
+                    text: 'Hours'
+                }
+            },
+            y: {
+                title: {
+                    display: true,
+                    text: 'Values'
+                },
+                ticks: {
+                    stepSize: 1
+                }
+            }
+        }
+    };
+
+    // Get the canvas element
+    var ctx = document.getElementById('myChart').getContext('2d');
+    // Create the Chart.js chart
+    var myChart = new Chart(ctx, {
+        type: 'bar',
+        data: chartData,
+        options: chartOptions
+    });
+});
+
+    </script>
+    <div id="json-data" tal:attributes="data datas"></div>
+    <canvas id="myChart" width="60%" height="" ></canvas>
+
+  </metal:macro>
+</html>

imio.smartweb.core-1.2.37/src/imio/smartweb/core/contents/sections/external_content/view_odwb_widget.pt

@@ -0,0 +1,20 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      i18n:domain="imio.smartweb">
+  <metal:macro define-macro="embeded_datas">
+
+    <div class="container">
+      <div ng-cloak ng-app="ods-widgets">
+          <div tal:content="structure datas"></div>
+          <!--script type="text/javascript">
+            angular.module('ods-widgets').config(function($locationProvider) {
+              $locationProvider.html5Mode(true);
+            });
+          </script-->
+      </div>
+    </div>
+  </metal:macro>
+</html>