#123 moved Metrics link to the Fabric page

hawtio · Jun 10, 2013 · f5acdf6 · f5acdf6
1 parent 31ecec0
commit f5acdf6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/html/layoutFabric.html b/hawtio-web/src/main/webapp/app/fabric/html/layoutFabric.html
@@ -16,6 +16,9 @@
   <li ng-show="kibanaHref">
     <a ng-href="{{kibanaHref}}">Logs</a>
   </li>
+  <li ng-show="hasMetrics">
+    <a ng-href="#/insight/all">Metrics</a>
+  </li>
   <li ng-class='{active : isActive("#/fabric/map")}'>
     <a ng-href="#/fabric/map{{hash}}">Map</a>
   </li>

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/navbar.ts b/hawtio-web/src/main/webapp/app/fabric/js/navbar.ts
@@ -16,6 +16,8 @@ module Fabric {
       var profileId = "kibana";
       var versionId = null;
       Fabric.profileWebAppURL(jolokia, "org.fusesource.insight.insight-kibana3", profileId, versionId, onWebAppUrl, onWebAppUrl);
+
+      $scope.hasMetrics = workspace.treeContainsDomainAndProperties('org.elasticsearch', {service: 'restjmx'});
     }
 
     function onWebAppUrl(response) {

diff --git a/hawtio-web/src/main/webapp/app/insight/js/insightPlugin.ts b/hawtio-web/src/main/webapp/app/insight/js/insightPlugin.ts
@@ -14,13 +14,16 @@ module Insight {
 
         viewRegistry["insight"] = "app/insight/html/layoutInsight.html";
 
+        // instead lets add the Metrics link on the Fabric sub nav bar
+/*
         // Set up top-level link to our plugin
         workspace.topLevelTabs.push({
           content: "Insight",
           title: "View Insight metrics",
           isValid: (workspace:Workspace) => workspace.treeContainsDomainAndProperties('org.elasticsearch', {service: 'restjmx'}),
           href: () => "#/insight/all"
         });
+*/
 
     });