Action: display html message if given

3liz · Oct 1, 2024 · 2bd04d5 · 2bd04d5
1 parent 44a5636
commit 2bd04d5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/assets/src/components/ActionSelector.js b/assets/src/components/ActionSelector.js
@@ -71,7 +71,7 @@ export default class ActionSelector extends HTMLElement {
 
     onActionSelectChange(event) {
         // Remove previous digitizing tool if any
-        document.querySelector('#project-action-selector-container lizmap-digitizing')?.remove();
+        document.getElementById('action-digitizing')?.remove();
 
         // Get the host component
         let host = event.target.closest("lizmap-action-selector");
@@ -97,8 +97,8 @@ export default class ActionSelector extends HTMLElement {
                 description = action.description;
             }
             if (action?.geometry) {
-                this._digitizingElement = `<lizmap-digitizing context="action" selected-tool="${action.geometry}" available-tools="${action.geometry}"></lizmap-digitizing>`;
-                document.querySelector('.action-selector-container').insertAdjacentHTML('afterend', this._digitizingElement);
+                const actionDigitizing = `<div id="action-digitizing"><lizmap-digitizing context="action" selected-tool="${action.geometry}" available-tools="${action.geometry}"></lizmap-digitizing><div id="action-message-html"></div></div>`;
+                document.querySelector('.action-selector-container').insertAdjacentHTML('afterend', actionDigitizing);
                 mainLizmap.digitizing.context = "action";
                 mainLizmap.digitizing.toggleVisibility(true);
             } else {

diff --git a/assets/src/modules/Action.js b/assets/src/modules/Action.js
@@ -456,6 +456,12 @@ export default class Action {
                     if (message) {
                         mainLizmap.lizmap3.addMessage(message, 'info', true).attr('id', 'lizmap-action-message');
                     }
+
+                    // Display the HTML message if given
+                    const message_html = featureProperties?.message_html?.trim();
+                    if (message_html) {
+                        document.getElementById('action-message-html').innerHTML = message_html;
+                    }
                 }
             }
 

diff --git a/tests/qgis-projects/tests/set_tests_module_action.sql b/tests/qgis-projects/tests/set_tests_module_action.sql
@@ -125,7 +125,8 @@ BEGIN
                         ST_GeomFromText('%2$s', 4326)::geography,
                         %3$s
                     )::geometry(POLYGON, 4326) AS geom,
-                    'The displayed geometry represents the buffer %3$s m of the point drawn by the user' AS message
+                    'The displayed geometry represents the buffer %3$s m of the point drawn by the user' AS message,
+                    '<p>The displayed geometry represents the buffer <strong>%3$s m</strong> of the point drawn by the user</p>' AS message_html
                 $$,
                 lizmap_project,
                 wkt,