HAWKULAR-458 Deployments Detail Screen: Hook up New Agent Operations

using web sockets
hawkular · Jul 29, 2015 · cef7d2e · cef7d2e
1 parent 28d4f4b
commit cef7d2e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/console/src/main/scripts/bower.json b/console/src/main/scripts/bower.json
@@ -21,7 +21,7 @@
     "angular-toastr": "1.4.1",
     "bootstrap-select": "1.6",
     "hawkular-charts": "0.4.11",
-    "hawkular-ui-services": "0.5.4",
+    "hawkular-ui-services": "0.6.0",
     "hawtio-core-navigation": "2.0.51",
     "hawtio-core": "2.0.16",
     "hawtio-template-cache": "2.0.3",

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
@@ -69,11 +69,10 @@ <h3>Deployments</h3>
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu disabled" role="menu" aria-labelledby="dropdownMenu1">
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Enable</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Disable</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Redeploy</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Undeploy</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Delete</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperationMulti('Deploy', vm.resourceList)">Enable</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperationMulti('Redeploy', vm.resourceList)">Redeploy</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperationMulti('Undeploy', vm.resourceList)">Disable</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperationMulti('Remove', vm.resourceList)">Remove</a></li>
           </ul>
         </div>
       </div>
@@ -119,11 +118,10 @@ <h3>Deployments</h3>
                     <span class="caret"></span>
                   </button>
                   <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
-                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Enable</a></li>
-                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Disable</a></li>
-                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Redeploy</a></li>
-                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Undeploy</a></li>
-                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Delete</a></li>
+                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Deploy', res.id)">Enable</a></li>
+                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Redeploy', res.id)">Redeploy</a></li>
+                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Undeploy', res.id)">Disable</a></li>
+                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#" ng-click="vm.performOperation('Remove', res.id)">Remove</a></li>
                   </ul>
                 </div>
               </td>

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
@@ -24,8 +24,8 @@ module HawkularMetrics {
   export class AppServerDeploymentsDetailsController {
     /// this is for minification purposes
     public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$routeParams',
-      '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager',
-      '$q', 'md5'];
+      '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularOps', 'HawkularAlertsManager',
+      'HawkularErrorManager', '$q', 'md5', 'NotificationService', '$resource'];
 
     private autoRefreshPromise: ng.IPromise<number>;
     private resourceList;
@@ -43,14 +43,17 @@ module HawkularMetrics {
       private HawkularInventory: any,
       private HawkularMetric: any,
       private HawkularAlert: any,
+      private HawkularOps: any,
       private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
       private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
       private $q: ng.IQService,
       private md5: any,
+      private NotificationService: INotificationService,
       public startTimeStamp:TimestampInMillis,
       public endTimeStamp:TimestampInMillis,
       public resourceUrl: string) {
         $scope.vm = this;
+        HawkularOps.init(this.NotificationService);
 
         this.startTimeStamp = +moment().subtract(1, 'hours');
         this.endTimeStamp = +moment();
@@ -115,6 +118,19 @@ module HawkularMetrics {
       });
     }
 
+    public performOperation(operationName: string, resourceId: string): any {
+      this.$log.info('performOperation ', operationName, resourceId);
+      var operation = {operationName: operationName, resourceId: resourceId};
+      this.HawkularOps.performOperation(operation);
+    }
+
+    public performOperationMulti(operationName: string, resourceList: any): any {
+      this.$log.info('performOperationMulti ', operationName, resourceList);
+      angular.forEach(aResourceList, function(res, idx) {
+        var operation = {operationName: operationName, resourceId: res.id};
+        this.HawkularOps.performOperation(operation);
+      });
+    }
   }
 
   _module.controller('HawkularMetrics.AppServerDeploymentsDetailsController', AppServerDeploymentsDetailsController);