#123 use the correct icon for the endpoints on diagrams; based on the…

… kinds of endpoint it is
hawtio · Jun 18, 2013 · 8f880cc · 8f880cc
1 parent 125b735
commit 8f880cc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/hawtio-web/src/main/webapp/app/camel/js/endpointChooser.ts b/hawtio-web/src/main/webapp/app/camel/js/endpointChooser.ts
@@ -132,6 +132,16 @@ module Camel {
     }
   };
 
+  export function getEndpointIcon(endpointName) {
+    var value = Camel.getEndpointConfig(endpointName, null);
+    var answer = Core.pathGet(value, ["icon"]);
+    if (!answer) {
+      var category = getEndpointCategory(endpointName);
+      answer = Core.pathGet(category, ["endpointIcon"]);
+    }
+    return answer || endpointIcon;
+  }
+
   export function getEndpointConfig(endpointName, category) {
     var answer = endpointConfigurations[endpointName];
     if (!answer) {

diff --git a/hawtio-web/src/main/webapp/app/camel/js/helpers.ts b/hawtio-web/src/main/webapp/app/camel/js/helpers.ts
@@ -827,8 +827,21 @@ module Camel {
         if (uri) {
           label += " " + uri;
         }
-        var tooltip = nodeSettings["tooltip"] || nodeSettings["description"] || name;
+        var tooltip = nodeSettings["tooltip"] || nodeSettings["description"] || label;
         var imageUrl = getRouteNodeIcon(nodeSettings);
+        if ((nodeId === "from" || nodeId === "to") && uri) {
+          var idx = uri.indexOf(":");
+          if (idx > 0) {
+            var componentScheme = uri.substring(0, idx);
+            //console.log("lets find the endpoint icon for " + componentScheme);
+            if (componentScheme) {
+              var value = Camel.getEndpointIcon(componentScheme);
+              if (value) {
+                imageUrl = url(value);
+              }
+            }
+          }
+        }
 
         //console.log("Image URL is " + imageUrl);
         var cid = route.getAttribute("_cid") || route.getAttribute("id");