[qpid-dispatch] branch master updated: DISPATCH-1602: Fix fomatting of console's topology traffic utilization legend. Fixed traffic utilization animation

[ea...@apache.org]

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

eallen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new 2882078  DISPATCH-1602: Fix fomatting of console's topology traffic utilization legend. Fixed traffic utilization animation
2882078 is described below

commit 288207873eeed49ffdcdcf5c0792b19c188966ce
Author: Ernest Allen <ea...@redhat.com>
AuthorDate: Fri Mar 13 14:39:33 2020 -0400

    DISPATCH-1602: Fix fomatting of console's topology traffic utilization legend. Fixed traffic utilization animation
---
 console/react/src/App.css             |  3 +++
 console/react/src/topology/traffic.js | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/console/react/src/App.css b/console/react/src/App.css
index 8feecbe..3e02330 100644
--- a/console/react/src/App.css
+++ b/console/react/src/App.css
@@ -632,6 +632,9 @@ div.qdrChord {
   text-align: center;
 }
 
+#traffic-congestion-svg text {
+  text-anchor: start;
+}
 #arrows-expand label,
 #traffic-dots label,
 #traffic-congestion label,
diff --git a/console/react/src/topology/traffic.js b/console/react/src/topology/traffic.js
index ca613a3..f1dbcf5 100644
--- a/console/react/src/topology/traffic.js
+++ b/console/react/src/topology/traffic.js
@@ -224,9 +224,7 @@ class Congestion extends TrafficAnimation {
             let little = Math.min(f, t);
             let big = Math.max(f, t);
             if (little >= 0) {
-              let key = ["#hitpath", nodes[little].uid(srv), nodes[big].uid(srv)].join(
-                "-"
-              );
+              let key = ["#hitpath", nodes[little].uid(), nodes[big].uid()].join("-");
               if (!links[key]) links[key] = [];
               links[key].push(link);
             }
@@ -237,8 +235,15 @@ class Congestion extends TrafficAnimation {
     // accumulate the colors/directions to be used
     for (let key in links) {
       let congestion = self.congestion(links[key]);
-      let pathId = CSS.escape(key); //key.replace(/\./g, "\\.").replace(/ /g, "\\ ");
-      let path = d3.select(pathId);
+      let path;
+      d3.selectAll("path.hittarget").each(function(l) {
+        if (
+          key === `#hitpath-${l.suid}-${l.tuid}` ||
+          key === `#hitpath-${l.tuid}-${l.suid}`
+        ) {
+          path = d3.select(this);
+        }
+      });
       if (path && !path.empty()) {
         // start the path with transparent white
         if (!path.attr("style")) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org