imio.smartweb.common 1.2.23__py3-none-any.whl → 1.2.25__py3-none-any.whl

imio/smartweb/common/browser/collective_taxonomy_controlpanel.py

@@ -1,67 +1,45 @@
 # -*- coding: utf-8 -*-
 
 from collective.taxonomy.interfaces import ITaxonomy
-from collective.taxonomy.jsonimpl import ImportJson as baseImportJson
+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.i18n import translate
+from zope.component import queryUtility
+from plone import api
+from Products.Five import BrowserView
+
 
 import json
 
 
-class ImportJson(baseImportJson):
-    """Update taxonomy using json data."""
+class EditTaxonomyData(baseEditTaxonomyData, BrowserView):
+    """Edit taxonomy data."""
+
+
+class DeleteTaxonomyData(BrowserView):
 
-    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()
+    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>',
+                        }
                     )
-                    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__()
+        return json.dumps({"status": "success", "message": "Suppression autorisée"})

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/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;
+
+                    }
+                    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/tests/test_taxonomy.py

@@ -71,70 +71,3 @@ class TestTaxonomy(unittest.TestCase):
             result,
             '{"status": "info", "message": "Your taxonomy has been saved with success."}',
         )
-
-    def test_removing_used_taxonomy_term(self):
-        self.page.taxonomy_test = ["1", "2"]
-        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": "error", "message": "Term \\"Information Science \\u00bb Book Collecting\\" can\'t be removed because it is used (at least) here : http://nohost/plone/test-page"}',
-        )
-
-    def test_removing_used_parent_taxonomy_term(self):
-        self.page.taxonomy_test = ["2"]
-        self.page.reindexObject()
-        catalog = api.portal.get_tool("portal_catalog")
-        brain = api.content.find(UID=self.page.UID())[0]
-        indexes = catalog.getIndexDataForRID(brain.getRID())
-        index = indexes.get("taxonomy_test")
-        self.assertListEqual(sorted(index), ["1", "2"])
-        body_data = {
-            "languages": ["fr", "en", "nl", "ru", "da", "de"],
-            "tree": {
-                "key": "0",
-                "title": "Test vocabulary",
-                "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": "error", "message": "Term \\"Information Science\\" can\'t be removed because it is used (at least) here : http://nohost/plone/test-page"}',
-        )

{imio.smartweb.common-1.2.23.dist-info → imio.smartweb.common-1.2.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: imio.smartweb.common
-Version: 1.2.23
+Version: 1.2.25
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -174,6 +174,21 @@ Changelog
 =========
 
 
+1.2.25 (2025-03-10)
+-------------------
+
+- WEB-4232 : Fix JQuery.
+  Version 1.2.24 contained issues affecting the smooth running of the preventing deletion of a taxonomy term
+  [boulch]
+
+
+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)
 -------------------
 

{imio.smartweb.common-1.2.23.dist-info → imio.smartweb.common-1.2.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.common-1.2.23-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.common-1.2.25-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
 imio/smartweb/common/__init__.py,sha256=Na9XBfEQUMrm2c5jbqQgwWeg40ih0aXVG1vT8NeAjMQ,2709
 imio/smartweb/common/adapters.py,sha256=rLlObjqZm3hs2hgUT-LmJytwhT-E1rTvbpIi0mmKQqY,610
 imio/smartweb/common/adapters.zcml,sha256=ndYNj0J_BFfVpX_7JhY2asSwLzXG-WmjLdfwL9hX_No,254
@@ -27,11 +27,12 @@ imio/smartweb/common/behaviors/configure.zcml,sha256=RfGH8DIybHpxxe2HUsjH2QKSiWY
 imio/smartweb/common/behaviors/iam.py,sha256=17ON7M6FHXOM_8NOHT_QnJJuAIs4diWCrguHP6Lh5oA,825
 imio/smartweb/common/behaviors/topics.py,sha256=K9XkhTBxxp_nBBeQ-ovUpmOc6raXIiYqmzJtlKVdhbI,863
 imio/smartweb/common/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-imio/smartweb/common/browser/collective_taxonomy_controlpanel.py,sha256=QngrsXOIjOt0xHEt2r0W66CPg5msY4H7mDkRaAEGQdg,3044
-imio/smartweb/common/browser/configure.zcml,sha256=1cDR2cy7O6WX33cFmbJU971wxg22LkLJYiMKCmBTWrA,3177
+imio/smartweb/common/browser/collective_taxonomy_controlpanel.py,sha256=PVeXOr0cDYpg7g695wtrhsuSc6MSO0d_JGvcQUaDWRM,1908
+imio/smartweb/common/browser/configure.zcml,sha256=agEY6fPCePV2UnzvVMUF-Wft0nU6HaHnMwv_lCk4_dQ,3534
 imio/smartweb/common/browser/cropping.py,sha256=7xkTvs_0qUo9tC2tAIj77ZQn2RClKOgAwE0L6WhGGxg,2720
 imio/smartweb/common/browser/description.pt,sha256=ZXKpsMQDJGC0dxVUg5v1W6LsG1_OWuYuWevZuF-Zn2Y,151
 imio/smartweb/common/browser/description.py,sha256=BRpHkVzwyeM-SUzkEbtHn2fm8pQREtcHIW7feoQlBPQ,517
+imio/smartweb/common/browser/edit_taxonomy_data.pt,sha256=PWM7SGaWAkrPZ7jxVRBry8ed5_1PD7fucCMgmMCx9tg,6937
 imio/smartweb/common/browser/forms.py,sha256=UK72J9cEadVU4DqQ3OHqv2Jo_Qff9iFSoRv2gsWpZps,4168
 imio/smartweb/common/browser/scaling.py,sha256=aBmuMyzy2s_5PCfkyvxJiARHowpck1BOva8RKEJSVso,297
 imio/smartweb/common/browser/vocabulary.py,sha256=XXFuV1nYvu7s8j7tufrg33AmpaNgTIHl13VzEK0ro34,905
@@ -92,7 +93,7 @@ imio/smartweb/common/tests/test_rest.py,sha256=cXbiQjXXHCaXBMCCVk_PjnjG6Z4A_EfVU
 imio/smartweb/common/tests/test_robot.py,sha256=0Qdn5A8lXoVxQ9zE9IIhekSqfJJF003KiYqLVuDrros,955
 imio/smartweb/common/tests/test_setup.py,sha256=TxoQZrESFOgGRBN9uO8FzEOx57G550YICBd-NzaGHvY,2102
 imio/smartweb/common/tests/test_subscribers.py,sha256=AiJ5LTqGP2JKGJFYNeCCAMJL53DWO41iYQ9VYiA7DIA,1699
-imio/smartweb/common/tests/test_taxonomy.py,sha256=uuxotczXg3So3OPp-U8HwjDxXQYwa_mdjxf2l7pKsCQ,5401
+imio/smartweb/common/tests/test_taxonomy.py,sha256=z4WawTa_hIsW7kVqQSlGBDWSnkeHAa2CPYFkfjZ0oRg,2600
 imio/smartweb/common/tests/test_text.py,sha256=Ll6TYnYxEBtpYe3T0yTOVT9wXWJaWGWW23eUV2jK92A,1570
 imio/smartweb/common/tests/test_utils.py,sha256=S4QrNVvkHv3Oxp45fWQ65dmGsk7POgUn_d3kB8DPdBk,9314
 imio/smartweb/common/tests/test_viewlets.py,sha256=NVEZWEmYo4K_-81Q6w-JTx2nT_3NBcJCl3946MAUnhU,1738
@@ -136,10 +137,10 @@ imio/smartweb/common/viewlets/skip_to_content.pt,sha256=FFfTxvRl8V52FzFE6In6B34A
 imio/smartweb/common/viewlets/skip_to_content.py,sha256=wm22NUf8Qh5uzz8p4vkLCdFNiDv9zUGAueRyXAIXQDo,496
 imio/smartweb/common/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/widgets/select.py,sha256=vfVdbecH7qDfJvWV6TfkpqocD6AA5G4yIq7XqSOuVNw,1142
-imio.smartweb.common-1.2.23.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.common-1.2.23.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio.smartweb.common-1.2.23.dist-info/METADATA,sha256=z0JOHqfCPhaWl3D01XVoNG4Mt0TBDP3wQfN8EI18XYg,16326
-imio.smartweb.common-1.2.23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-imio.smartweb.common-1.2.23.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.common-1.2.23.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.common-1.2.23.dist-info/RECORD,,
+imio.smartweb.common-1.2.25.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.common-1.2.25.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio.smartweb.common-1.2.25.dist-info/METADATA,sha256=erKRZIiCdIBfIi7dAriMOhaKDzlZ-shH-LIQ1wHxeyQ,16688
+imio.smartweb.common-1.2.25.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+imio.smartweb.common-1.2.25.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.common-1.2.25.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.common-1.2.25.dist-info/RECORD,,