Reuse some code between Camel tracer and debugger

hawtio · Dec 13, 2013 · 8b906d0 · 8b906d0
1 parent e3c94c2
commit 8b906d0
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 53 deletions.
diff --git a/hawtio-web/src/main/webapp/app/camel/js/camelHelpers.ts b/hawtio-web/src/main/webapp/app/camel/js/camelHelpers.ts
@@ -1175,4 +1175,46 @@ module Camel {
     }
     return value;
   }
+
+  /**
+   * Function to highlight the selected toNode in the nodes graph
+   *
+   * @param nodes the nodes
+   * @param toNode the node to highlight
+   */
+  export function highlightSelectedNode(nodes, toNode) {
+    // lets clear the selected node first
+    nodes.attr("class", "node");
+
+    nodes.filter(function (item) {
+      if (item) {
+        var cid = item["cid"];
+        var rid = item["rid"];
+        var type = item["type"];
+        var elementId = item["elementId"];
+
+        // if its from then match on rid
+        if ("from" === type) {
+          return toNode === rid;
+        }
+
+        // okay favor using element id as the cids can become
+        // undefined or mangled with mbean object names, causing this to not work
+        // where as elementId when present works fine
+        if (elementId) {
+          // we should match elementId if defined
+          return toNode === elementId;
+        }
+        // then fallback to cid
+        if (cid) {
+          return toNode === cid;
+        } else {
+          // and last rid
+          return toNode === rid;
+        }
+      }
+      return null;
+    }).attr("class", "node selected");
+  }
+
 }
diff --git a/hawtio-web/src/main/webapp/app/camel/js/debug.ts b/hawtio-web/src/main/webapp/app/camel/js/debug.ts
@@ -91,6 +91,7 @@ module Camel {
     $scope.gridOptions = Camel.createBrowseGridOptions();
     $scope.gridOptions.selectWithCheckboxOnly = false;
     $scope.gridOptions.showSelectionCheckbox = false;
+    $scope.gridOptions.multiSelect = false;
     $scope.gridOptions.afterSelectionChange = onSelectionChanged;
     $scope.gridOptions.columnDefs.push({
       field: 'toNode',
@@ -121,33 +122,14 @@ module Camel {
       }
       onSelectionChanged();
     };
-
-
     // END
 
-
     function onSelectionChanged() {
       var toNode = getStoppedBreakpointId();
       if (toNode) {
         // lets highlight the node in the diagram
         var nodes = getDiagramNodes();
-
-        // lets clear the selected node first
-        nodes.attr("class", "node");
-
-        nodes.filter(function (item) {
-          if (item) {
-            var cid = item["cid"];
-            var rid = item["rid"];
-            if (cid) {
-              // we should match cid if defined
-              return toNode === cid;
-            } else {
-              return toNode === rid;
-            }
-          }
-          return null;
-        }).attr("class", "node selected");
+        Camel.highlightSelectedNode(nodes, toNode);
       }
     }
 

diff --git a/hawtio-web/src/main/webapp/app/camel/js/trace.ts b/hawtio-web/src/main/webapp/app/camel/js/trace.ts
@@ -125,39 +125,7 @@ module Camel {
           if (toNode) {
             // lets highlight the node in the diagram
             var nodes = d3.select("svg").selectAll("g .node");
-
-            // lets clear the selected node first
-            nodes.attr("class", "node");
-
-            nodes.filter(function (item) {
-              if (item) {
-                var cid = item["cid"];
-                var rid = item["rid"];
-                var type = item["type"];
-                var elementId = item["elementId"];
-
-                // if its from then match on rid
-                if ("from" === type) {
-                  return toNode === rid;
-                }
-
-                // okay favor using element id as the cids can become
-                // undefined or mangled with mbean object names, causing this to not work
-                // where as elementId when present works fine
-                if (elementId) {
-                  // we should match elementId if defined
-                  return toNode === elementId;
-                }
-                // then fallback to cid
-                if (cid) {
-                  return toNode === cid;
-                } else {
-                  // and last rid
-                  return toNode === rid;
-                }
-              }
-              return null;
-            }).attr("class", "node selected");
+            Camel.highlightSelectedNode(nodes, toNode);
           }
         }
       });