fixes #123 improve the rendering; so the diagram only includes the co…

…re endpoint path for the endpoints; and uses tooltips for the full URI
hawtio · Jul 18, 2013 · 00e0875 · 00e0875
1 parent 4dfbcde
commit 00e0875
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/hawtio-web/src/main/webapp/app/camel/js/helpers.ts b/hawtio-web/src/main/webapp/app/camel/js/helpers.ts
@@ -445,6 +445,11 @@ module Camel {
         // Don't use from/to as it gets odd if you drag/drop and reorder
         // label += " " + uri;
         label = uri;
+        var split = uri.split("?");
+        if (split && split.length > 1) {
+          label = split[0];
+        }
+        tooltip += " " + uri;
       } else {
         var children = $(routeXmlNode).children("*");
         if (children && children.length) {
@@ -825,9 +830,12 @@ module Camel {
         var label = nodeSettings["title"] || nodeId;
         var uri = getRouteNodeUri(route);
         if (uri) {
-          label += " " + uri;
+          label += " " + uri.split("?")[0];
         }
         var tooltip = nodeSettings["tooltip"] || nodeSettings["description"] || label;
+        if (uri) {
+          tooltip += " " + uri;
+        }
         var imageUrl = getRouteNodeIcon(nodeSettings);
         if ((nodeId === "from" || nodeId === "to") && uri) {
           var idx = uri.indexOf(":");

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/camelCanvas.ts b/hawtio-web/src/main/webapp/app/wiki/js/camelCanvas.ts
@@ -459,7 +459,7 @@ module Wiki {
               $scope.endpointPath = endpointPath;
               $scope.endpointParameters = endpointParameters;
 
-              console.log("===== endpoint " + endpointScheme + " path " + endpointPath + " and parameters " + JSON.stringify(endpointParameters));
+              console.log("endpoint " + endpointScheme + " path " + endpointPath + " and parameters " + JSON.stringify(endpointParameters));
               $scope.loadEndpointSchema(endpointScheme);
               $scope.selectedEndpoint = {
                 endpointScheme: endpointScheme,