imio.smartweb.common 1.2.22__tar.gz → 1.2.24__tar.gz

{imio_smartweb_common-1.2.22 → imio_smartweb_common-1.2.24}/CHANGES.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+1.2.24 (2025-03-10)
+-------------------
+
+- WEB-4232 : Refactoring of the code that prevents the deletion of a taxonomy term if it is used in at least one object
+  [boulch]
+
+
+1.2.23 (2025-02-24)
+-------------------
+
+- WEB-3718 : Accessibility : Add aria-label for consent buttons
+  [boulch]
+
+
 1.2.22 (2025-02-14)
 -------------------
 

{imio_smartweb_common-1.2.22 → imio_smartweb_common-1.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: imio.smartweb.common
-Version: 1.2.22
+Version: 1.2.24
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -51,6 +51,18 @@ Requires-Dist: plone.app.robotframework[debug]; extra == "test"
 Requires-Dist: plone.restapi[test]; extra == "test"
 Requires-Dist: freezegun; extra == "test"
 Requires-Dist: mock; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -162,6 +174,20 @@ Changelog
 =========
 
 
+1.2.24 (2025-03-10)
+-------------------
+
+- WEB-4232 : Refactoring of the code that prevents the deletion of a taxonomy term if it is used in at least one object
+  [boulch]
+
+
+1.2.23 (2025-02-24)
+-------------------
+
+- WEB-3718 : Accessibility : Add aria-label for consent buttons
+  [boulch]
+
+
 1.2.22 (2025-02-14)
 -------------------
 

{imio_smartweb_common-1.2.22 → imio_smartweb_common-1.2.24}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.common",
-    version="1.2.22",
+    version="1.2.24",
     description="Common utilities, vocabularies, taxonomies for imio.smartweb & co products",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

imio_smartweb_common-1.2.24/src/imio/smartweb/common/browser/collective_taxonomy_controlpanel.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+from collective.taxonomy.interfaces import ITaxonomy
+from collective.taxonomy.jsonimpl import EditTaxonomyData as baseEditTaxonomyData
+from imio.smartweb.locales import SmartwebMessageFactory as _
+from plone import api
+from zope.component import queryUtility
+from zope.component import queryUtility
+from plone import api
+from Products.Five import BrowserView
+
+
+import json
+
+
+class EditTaxonomyData(baseEditTaxonomyData, BrowserView):
+    """Edit taxonomy data."""
+
+
+class DeleteTaxonomyData(BrowserView):
+
+    def check_delete_taxonomy(self):
+        body = self.request.get("BODY", b"{}")  # Récupération du corps de la requête
+        data = json.loads(body)  # Décodage du JSON
+        term_id = data.get("termId")  # Extraction de l'ID
+        result = {term_id} if term_id else set()
+        taxonomy = queryUtility(ITaxonomy, name="collective.taxonomy.contact_category")
+        catalog = api.portal.get_tool("portal_catalog")
+        brains = catalog.searchResults(object_provides=taxonomy.getGeneratedName())
+        # On parcours tous les brains pour lesquels la taxonomie est utilisée
+        for brain in brains:
+            index_key = f"taxonomy_{taxonomy.getShortName()}"
+            if hasattr(brain, index_key):
+                set2 = set(getattr(brain, index_key))
+                if result & set2:
+                    obj = brain.getObject()
+                    url = obj.absolute_url()
+                    title = obj.Title()
+                    return json.dumps(
+                        {
+                            "status": "error",
+                            "message": f'<h2>Impossible de supprimer ce terme.</h2><p>Ce terme est au moins utilisé ici : <a href="{url}" target="_blank" title="{title}">{url}</a></p>',
+                        }
+                    )
+        return json.dumps({"status": "success", "message": "Suppression autorisée"})

{imio_smartweb_common-1.2.22 → imio_smartweb_common-1.2.24}/src/imio/smartweb/common/browser/configure.zcml

@@ -91,9 +91,19 @@
       />
 
   <browser:page
-      name="taxonomy-import"
+      name="taxonomy-edit-data"
       for="Products.CMFCore.interfaces.ISiteRoot"
-      class=".collective_taxonomy_controlpanel.ImportJson"
+      class=".collective_taxonomy_controlpanel.EditTaxonomyData"
+      template="edit_taxonomy_data.pt"
+      permission="collective.taxonomy.ManageTaxonomies"
+      layer="imio.smartweb.common.interfaces.IImioSmartwebCommonLayer"
+      />
+
+  <browser:page
+      name="check_delete_taxonomy"
+      attribute="check_delete_taxonomy"
+      for="*"
+      class=".collective_taxonomy_controlpanel.DeleteTaxonomyData"
       permission="collective.taxonomy.ManageTaxonomies"
       layer="imio.smartweb.common.interfaces.IImioSmartwebCommonLayer"
       />

imio_smartweb_common-1.2.24/src/imio/smartweb/common/browser/edit_taxonomy_data.pt

@@ -0,0 +1,190 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/main_template/macros/master"
+>
+
+  <head>
+    <metal:block fill-slot="style_slot">
+      <link rel="stylesheet"
+            type="text/css"
+            tal:attributes="
+              href string:$portal_url/++resource++taxonomy/icons/css/taxonomy.css;
+            "
+      />
+      <link rel="stylesheet"
+            type="text/css"
+            tal:attributes="
+              href string:$portal_url/++resource++taxonomy/js/css/react-treeview.css;
+            "
+      />
+      <link rel="stylesheet"
+            type="text/css"
+            tal:attributes="
+              href string:$portal_url/++resource++taxonomy/css/collective.taxonomy.css;
+            "
+      />
+    </metal:block>
+  </head>
+
+  <body>
+    <metal:block fill-slot="main">
+      <style>
+        /* Modale en arrière-plan */
+        .modal {
+            display: none; /* Caché par défaut */
+            position: fixed;
+            z-index: 1000;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,0.5); /* Fond semi-transparent */
+        }
+
+        /* Contenu de la modale */
+        .modal-content {
+            background-color: white;
+            margin: 15% auto;
+            padding: 20px;
+            border-radius: 8px;
+            width: 50%;
+            box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.2);
+        }
+
+        /* Bouton de fermeture */
+        .close {
+            color: #aaa;
+            float: right;
+            font-size: 28px;
+            font-weight: bold;
+            cursor: pointer;
+        }
+
+        .close:hover {
+            color: black;
+        }
+      </style>    
+      <div id="content-core">
+        <script type="text/javascript">
+        <!--
+        document.addEventListener("DOMContentLoaded", function() {
+            var rootDiv = document.getElementById("root");
+            var portalUrl = rootDiv ? rootDiv.dataset.portalUrl : window.location.origin + "/Plone"; // Fallback
+
+            // Sélection des éléments de la modale
+            const modal = document.getElementById("error-modal");
+            const modalMessage = document.getElementById("error-message");
+            const closeModalBtn = document.querySelector(".close");
+
+            // Fonction pour afficher la modale avec un message d'erreur
+            function showModal(message) {
+                modalMessage.innerHTML = message;
+                modal.style.display = "block";
+            }
+
+            // Fonction pour fermer la modale
+            function closeModal() {
+                modal.style.display = "none";
+            }
+
+            // Écouteur d'événement pour fermer la modale avec "X"
+            closeModalBtn.addEventListener("click", closeModal);
+
+            // Fermer la modale si on clique en dehors du contenu
+            window.addEventListener("click", function(event) {
+                if (event.target === modal) {
+                    closeModal();
+                }
+            });
+
+            document.querySelectorAll(".taxonomy-icon-minus").forEach(button => {
+                button.addEventListener("click", function(event) {
+                    event.preventDefault(); // Empêche le comportement par défaut            
+                    event.stopPropagation(); // Empêche l'événement de se propager                    
+                    var nodeElement = this.closest(".info");
+                    if (nodeElement == null) {
+                        showModal("Impossible de supprimer cet élément car il contient d'autres termes .");
+                        return;from zope.schema.interfaces import IVocabularyFactory
+
+                    }
+                    var identifierInput = nodeElement.querySelector(".identifier-input");
+                    var termTitle = nodeElement.querySelector("input").value; // Récupération du titre du terme
+                    if (!identifierInput) {
+                        console.error("Impossible de trouver l'identifiant du nœud.");
+                        return;
+                    }
+
+                    var termId = identifierInput.value; // Récupération de l'ID du terme
+
+                    // Confirmation avant suppression
+                    if (!confirm(`Voulez-vous vraiment supprimer le terme "${termTitle}" ?`)) {
+                        return;
+                    }
+                    var deleteUrl = `${portalUrl}/@@check_delete_taxonomy`;
+                    
+                    // Annulation de la suppression de l'élément de l'UI ici
+                    var buttonDelete = this; // Le bouton "supprimer"
+                    buttonDelete.disabled = true; // Désactive temporairement le bouton "supprimer"
+
+                    // Envoie une requête AJAX pour vérifier si la suppression est possible
+                    fetch(deleteUrl, {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify({ termId: termId })
+                    })
+                    .then(response => response.json())
+                    .then(data => {
+                        handleDeleteResponse(data, event, buttonDelete, nodeElement);
+                    })
+                    .catch(error => {
+                        console.error('Erreur lors de la suppression:', error);
+                        alert('Une erreur est survenue.');
+                        buttonDelete.disabled = false; // Réactive le bouton "supprimer" si erreur AJAX
+                    });        
+                });
+            });
+
+            function handleDeleteResponse(data, event, buttonDelete, nodeElement) {
+                if (data.status === 'error') {
+                    showModal(data.message);
+                    buttonDelete.disabled = false;
+                    event.stopPropagation();
+                } else {
+                    alert("Terme supprimé avec succès !");
+                    nodeElement.remove();
+                }
+            }
+        });
+        -->
+        </script>
+
+        <div id="root"
+             tal:attributes="
+               data-taxonomy view/get_data;
+               data-languages view/get_languages_mapping;
+               data-portal-url context/absolute_url
+             "
+        >
+        </div>
+
+      </div>
+
+      <script type="text/javascript"
+              tal:attributes="
+                src view/get_resource_url;
+              "
+      ></script>
+      <div id="error-modal" class="modal">
+        <div class="modal-content">
+            <span class="close">&times;</span>
+            <p id="error-message"></p>
+        </div>
+      </div>
+    </metal:block>
+
+  </body>
+</html>

imio_smartweb_common-1.2.24/src/imio/smartweb/common/tests/test_taxonomy.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_FUNCTIONAL_TESTING
+from plone import api
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from plone.app.testing.interfaces import SITE_OWNER_NAME
+from plone.app.testing.interfaces import SITE_OWNER_PASSWORD
+from plone.testing.z2 import Browser
+from transaction import commit
+
+import json
+import unittest
+
+
+class TestTaxonomy(unittest.TestCase):
+    layer = IMIO_SMARTWEB_COMMON_FUNCTIONAL_TESTING
+
+    def setUp(self):
+        """Custom shared utility setup for tests"""
+        self.request = self.layer["request"]
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        self.browser = Browser(self.layer["app"])
+        self.browser.handleErrors = False
+        self.browser.addHeader(
+            "Authorization",
+            "Basic {0}:{1}".format(SITE_OWNER_NAME, SITE_OWNER_PASSWORD),
+        )
+        commit()
+        self.page = api.content.create(
+            container=self.portal,
+            type="Document",
+            title="Test page",
+        )
+
+    def test_removing_unused_taxonomy_term(self):
+        body_data = {
+            "languages": ["fr", "en", "nl", "ru", "da", "de"],
+            "tree": {
+                "key": "0",
+                "title": "Test vocabulary",
+                "subnodes": [
+                    {
+                        "key": "1",
+                        "translations": {
+                            "da": "Informationsvidenskab",
+                            "de": "Informatik",
+                            "en": "Information Science",
+                            "ru": "Информатику",
+                        },
+                        "subnodes": [
+                            {
+                                "key": "3",
+                                "translations": {"da": "Kronologi", "en": "Chronology"},
+                                "subnodes": [],
+                            }
+                        ],
+                    }
+                ],
+                "default_language": "da",
+            },
+            "taxonomy": "collective.taxonomy.test",
+        }
+        json_str = json.dumps(body_data)
+        bytes_data = json_str.encode("utf-8")
+        self.request.set("BODY", bytes_data)
+        self.request.method = "POST"
+        result = self.portal.restrictedTraverse("@@taxonomy-import")()
+        self.assertEqual(
+            result,
+            '{"status": "info", "message": "Your taxonomy has been saved with success."}',
+        )

{imio_smartweb_common-1.2.22 → imio_smartweb_common-1.2.24}/src/imio/smartweb/common/viewlets/privacy.pt

@@ -12,13 +12,15 @@
                           data-json-url string:${navigation_root_url}/@@consent-json">
         <input name="came_from" type="hidden" value="" tal:attributes="value view/rebuild_url">
         <div class="gdpr-actions">
-            <input type="submit" name="consent" value="Accept all" i18n:attributes="value"/>
-            <a href=""
+            <input type="submit" name="consent" aria-label="Accept all cookies" value="Accept all" i18n:attributes="aria-label;value"/>
+            <a href=""             
                class="pat-plone-modal"
+               aria-label="Read more and manage cookies settings"
                data-pat-plone-modal='{"prependContent": ""}'
-               tal:attributes="href string:${navigation_root_url}/@@consent"
+               tal:attributes="href string:${navigation_root_url}/@@consent"               
+               i18n:attributes="aria-label"
                i18n:translate="">Read more and manage settings</a>
-            <input type="submit" name="refuse" value="Refuse all" i18n:attributes="value"/>
+            <input type="submit" name="refuse" aria-label="Refuse all cookies" value="Refuse all" i18n:attributes="aria-label;value"/>
         </div>
     </form>
 </div>

{imio_smartweb_common-1.2.22 → imio_smartweb_common-1.2.24}/src/imio.smartweb.common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: imio.smartweb.common
-Version: 1.2.22
+Version: 1.2.24
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -51,6 +51,18 @@ Requires-Dist: plone.app.robotframework[debug]; extra == "test"
 Requires-Dist: plone.restapi[test]; extra == "test"
 Requires-Dist: freezegun; extra == "test"
 Requires-Dist: mock; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -162,6 +174,20 @@ Changelog
 =========
 
 
+1.2.24 (2025-03-10)
+-------------------
+
+- WEB-4232 : Refactoring of the code that prevents the deletion of a taxonomy term if it is used in at least one object
+  [boulch]
+
+
+1.2.23 (2025-02-24)
+-------------------
+
+- WEB-3718 : Accessibility : Add aria-label for consent buttons
+  [boulch]
+
+
 1.2.22 (2025-02-14)
 -------------------
 

{imio_smartweb_common-1.2.22 → imio_smartweb_common-1.2.24}/src/imio.smartweb.common.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ src/imio/smartweb/common/browser/configure.zcml
 src/imio/smartweb/common/browser/cropping.py
 src/imio/smartweb/common/browser/description.pt
 src/imio/smartweb/common/browser/description.py
+src/imio/smartweb/common/browser/edit_taxonomy_data.pt
 src/imio/smartweb/common/browser/forms.py
 src/imio/smartweb/common/browser/scaling.py
 src/imio/smartweb/common/browser/vocabulary.py

imio_smartweb_common-1.2.22/src/imio/smartweb/common/browser/collective_taxonomy_controlpanel.py

@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from collective.taxonomy.interfaces import ITaxonomy
-from collective.taxonomy.jsonimpl import ImportJson as baseImportJson
-from imio.smartweb.locales import SmartwebMessageFactory as _
-from plone import api
-from zope.component import queryUtility
-from zope.i18n import translate
-
-import json
-
-
-class ImportJson(baseImportJson):
-    """Update taxonomy using json data."""
-
-    def __call__(self):
-        request = self.request
-        if request.method == "POST":
-            data = json.loads(request.get("BODY", ""))
-            taxonomy = queryUtility(ITaxonomy, name=data["taxonomy"])
-            languages = data["languages"]
-            items_to_check = []
-            nodes = data["tree"]["subnodes"]
-            for language in languages:
-                for node in nodes:
-                    if node["translations"].get(language):
-                        items_to_check.append(
-                            {node["key"]: node["translations"][language]}
-                        )
-                ids_remaining = [key for data in items_to_check for key in data.keys()]
-                if not taxonomy.inverted_data.get(language):
-                    continue
-                initial_taxonomy_ids = [k for k in taxonomy.inverted_data[language]]
-                for id in initial_taxonomy_ids:
-                    if id in ids_remaining:
-                        continue
-                    # This is a removed term
-                    catalog = api.portal.get_tool("portal_catalog")
-                    brains = catalog.searchResults(
-                        object_provides=taxonomy.getGeneratedName()
-                    )
-                    for brain in brains:
-                        index_key = f"taxonomy_{taxonomy.getShortName()}"
-                        if hasattr(brain, index_key) and id in getattr(
-                            brain, index_key
-                        ):
-                            obj = brain.getObject()
-                            here = obj.absolute_url()
-                            term_title = taxonomy.translate(
-                                id, context=obj, target_language=language
-                            )
-                            return json.dumps(
-                                {
-                                    "status": "error",
-                                    "message": translate(
-                                        _(
-                                            'Term "${term_title}" can\'t be removed because it is used (at least) here : ${here}',
-                                            mapping={
-                                                "term_title": term_title,
-                                                "here": here,
-                                            },
-                                        ),
-                                        context=request,
-                                    ),
-                                }
-                            )
-        return super(ImportJson, self).__call__()