Use a connect button per container, route that button to the JMX runt…

…ime mbean attribute of the remote container
hawtio · May 3, 2013 · e125f5b · e125f5b
1 parent 2209717
commit e125f5b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/html/containers.html b/hawtio-web/src/main/webapp/app/fabric/html/containers.html
@@ -5,7 +5,6 @@
         <fieldset>
           <div class="control-group inline-block">
             <div class="btn-group">
-              <button ng-disabled="!anySelectionHasJolokia()" class="btn" ng-click="connect()"><i class="icon-signin"></i> Connect</button>
               <button ng-disabled="selectedContainers.length == 0 || !anySelectionAlive(false)" class="btn" ng-click="start()"><i class="icon-play-circle"></i> Start</button>
               <button ng-disabled="selectedContainers.length == 0 || !anySelectionAlive(true)" class="btn" ng-click="stop()"><i class="icon-off"></i> Stop</button>
               <button ng-disabled="selectedContainers.length == 0" class="btn" ng-click="delete()"><i class="icon-remove"></i> Delete</button>

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/containers.ts b/hawtio-web/src/main/webapp/app/fabric/js/containers.ts
@@ -74,14 +74,12 @@ module Fabric {
       });
     };
 
-    $scope.connect = () => {
-      var selected = $scope.selectedContainers || [];
-      var row = selected.find((s) => s.jolokiaUrl);
+    $scope.connect = (row) => {
       if (row) {
         // TODO lets find these from somewhere! :)
         var userName = "admin";
         var password = "admin";
-        Fabric.connect($scope.row, userName, password, true);
+        Fabric.connect(row, userName, password, true);
       }
     };
 
@@ -90,11 +88,6 @@ module Fabric {
       return selected.length && selected.any((s) => s.alive === state);
     };
 
-    $scope.anySelectionHasJolokia = () => {
-      var selected = $scope.selectedContainers || [];
-      return selected.length && selected.any((s) => s.jolokiaUrl);
-    };
-
     $scope.everySelectionAlive = (state) => {
       var selected = $scope.selectedContainers || [];
       return selected.length && selected.every((s) => s.alive === state);
@@ -188,7 +181,7 @@ module Fabric {
         filterText: ''
       },
       selectedItems: $scope.selectedContainers,
-      rowHeight: 32,
+      rowHeight: 42,
       showSelectionCheckbox: true,
       selectWithCheckboxOnly: true,
       keepLastSelected: false,
@@ -201,6 +194,13 @@ module Fabric {
           width: 56,
           resizable: false
         },
+        {
+          field: 'jolokiaUrl',
+          displayName: 'Connect',
+          headerCellTemplate: '<div ng-click="col.sort()" class="ngHeaderSortColumn {{col.headerClass}}" ng-style="{\'cursor\': col.cursor}" ng-class="{ \'ngSorted\': !noSortVisible }"><div class="ngHeaderText colt{{$index}} pagination-centered" title="Connect to container"><i class="icon-cloud"></i></div><div class="ngSortButtonDown" ng-show="col.showSortButtonDown()"></div><div class="ngSortButtonUp" ng-show="col.showSortButtonUp()"></div></div>',
+          cellTemplate: '<div class="ngCellText centered"><button class="btn" ng-disabled="!row.entity.jolokiaUrl" title="Open a new window and connect to this container" ng-click="connect(row.entity)"><i class="icon-signin"></i></button></div>',
+          width: 48
+        },
         {
           field: 'name',
           displayName: 'Name',
@@ -260,7 +260,7 @@ module Fabric {
       if (!Object.equal($scope.result, response.value)) {
 
         $scope.result = response.value;
-        
+
         $scope.containers = [];
         $scope.profiles = empty();
         $scope.versions = empty();
@@ -278,7 +278,8 @@ module Fabric {
             version: container.versionId,
             status: $scope.statusIcon(container),
             services: services,
-            profileIds: container.profileIds
+            profileIds: container.profileIds,
+            jolokiaUrl: container.jolokiaUrl
           });
         });
 

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/helpers.ts b/hawtio-web/src/main/webapp/app/fabric/js/helpers.ts
@@ -245,7 +245,7 @@ module Fabric {
       if (password) {
         full += "&_pwd=" + password;
       }
-      window.open(full);
+      window.open(full + "/#/jmx/attributes?nid=root-java.lang-Runtime" );
     }
   }
 }