[activemq-artemis] branch master updated: ARTEMIS-3132 Inhibit context menu and dblclick handler of broker diagram

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 11f4403  ARTEMIS-3132 Inhibit context menu and dblclick handler of broker diagram
     new af9e50d  This closes #3474
11f4403 is described below

commit 11f4403cc7605ef11fb119a07c23c27939e96297
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Wed Mar 3 20:39:17 2021 +0100

    ARTEMIS-3132 Inhibit context menu and dblclick handler of broker diagram
---
 .../src/main/webapp/plugin/js/components/diagram.js               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/diagram.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/diagram.js
index ba28182..c065031 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/diagram.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/diagram.js
@@ -27,7 +27,9 @@ var Artemis;
                         <span class="pficon pficon-help"></span>
                     </button>
                 </h1>
-                <pf-topology items="$ctrl.data.items" relations="$ctrl.data.relations" kinds="$ctrl.kinds" icons="$ctrl.data.icons" nodes="$ctrl.nodes" item-selected="$ctrl.itemSelected(item)" search-text="searchText" show-labels="$ctrl.showLabels" tooltip-function="$ctrl.tooltip(node)">
+                <!-- Inhibit the context menu of pf-topology for the its items -->
+                <style type="text/css">pf-topology .popup { visibility: hidden; }</style>
+                <pf-topology items="$ctrl.data.items" relations="$ctrl.data.relations" kinds="$ctrl.kinds" icons="$ctrl.data.icons" nodes="$ctrl.nodes" item-selected="$ctrl.itemSelected(item)" search-text="searchText" show-labels="$ctrl.showLabels" tooltip-function="$ctrl.tooltip(node)" chart-rendered="$ctrl.chartRendered(vertices, added)">
 
                 <label style="margin-right: 1em">Show labels:
                     <input type="checkbox" ng-model="$ctrl.showLabels">
@@ -354,6 +356,10 @@ var Artemis;
             ];
             return status;
         }
+        ctrl.chartRendered = function (vertices, added) {
+            // Inhibit the dblclick handler of pf-topology for the its items.
+            added.each(function (d) { d.url = "javascript:void(0)"; });
+        }
         ctrl.refresh = function () {
             ctrl.datasets = [];
             load();