fixes #753 so we now reliably show the metrics again (I think its the…

… loading of the tree of processor nodes that maybe broke this sometimes)
hawtio · Nov 20, 2013 · 01b848e · 01b848e
1 parent ed7143a
commit 01b848e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/hawtio-web/src/main/webapp/app/camel/js/camel.ts b/hawtio-web/src/main/webapp/app/camel/js/camel.ts
@@ -1,6 +1,8 @@
-
 module Camel {
+
   export function CamelController($scope, $element, workspace:Workspace, jolokia, localStorage) {
+    var log:Logging.Logger = Logger.get("Camel");
+
     $scope.routes = [];
     $scope.routeNodes = {};
 
@@ -175,7 +177,15 @@ module Camel {
         var completed = stat.getAttribute("exchangesCompleted");
         var tooltip = "";
         if (id && completed) {
-          var node = isRoute ? $scope.routeNodes[id]: $scope.nodes[id];
+          var container = isRoute ? $scope.routeNodes: $scope.nodes;
+          var node = container[id];
+          if (!node) {
+            angular.forEach(container, (value, key) => {
+              if (!node && id === value.elementId) {
+                node = value;
+              }
+            });
+          }
           if (node) {
             var total = 0 + parseInt(completed);
             var failed = stat.getAttribute("exchangesFailed");
@@ -196,7 +206,10 @@ module Camel {
             node["tooltip"] = tooltip;
           } else {
             // we are probably not showing the route for these stats
-            //console.log("Warning, could not find " + id);
+/*
+            var keys = Object.keys(container).sort();
+            log.info("Warning, could not find node for " + id + " when keys were: " + keys);
+*/
           }
         }
       }

diff --git a/hawtio-web/src/main/webapp/app/camel/js/helpers.ts b/hawtio-web/src/main/webapp/app/camel/js/helpers.ts
@@ -839,7 +839,8 @@ 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, "x": x, "y:": y, "imageUrl": imageUrl, "cid": cid, "tooltip": tooltip};
+        node = { "name": name, "label": label, "labelSummary": labelSummary, "group": 1, "id": id, "elementId": elementID,
+          "x": x, "y:": y, "imageUrl": imageUrl, "cid": cid, "tooltip": tooltip};
         if (rid) {
           node["rid"] = rid;
           if (!$scope.routeNodes) $scope.routeNodes = {};