#835: Partly fixed Camel tracer to highlight correct node when select…

…ed in table.
hawtio · Dec 12, 2013 · 372cecf · 372cecf
1 parent bb3cb1c
commit 372cecf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/hawtio-web/src/main/webapp/app/camel/js/camelHelpers.ts b/hawtio-web/src/main/webapp/app/camel/js/camelHelpers.ts
@@ -919,7 +919,7 @@ module Camel {
         //console.log("Image URL is " + imageUrl);
         var cid = route.getAttribute("_cid") || route.getAttribute("id");
         node = { "name": name, "label": label, "labelSummary": labelSummary, "group": 1, "id": id, "elementId": elementID,
-          "x": x, "y:": y, "imageUrl": imageUrl, "cid": cid, "tooltip": tooltip};
+          "x": x, "y:": y, "imageUrl": imageUrl, "cid": cid, "tooltip": tooltip, "type": nodeId};
         if (rid) {
           node["rid"] = rid;
           if (!$scope.routeNodes) $scope.routeNodes = {};

diff --git a/hawtio-web/src/main/webapp/app/camel/js/trace.ts b/hawtio-web/src/main/webapp/app/camel/js/trace.ts
@@ -12,6 +12,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',
@@ -132,6 +133,13 @@ module Camel {
               if (item) {
                 var cid = item["cid"];
                 var rid = item["rid"];
+                var type = item["type"];
+
+                // if its from then match on rid
+                if ("from" === type) {
+                  return toNode === rid;
+                }
+
                 if (cid) {
                   // we should match cid if defined
                   return toNode === cid;