HAWKULAR-519 : Send event instead of Notification on ExecuteOperation

hawkular · Dec 17, 2015 · 503e3f3 · 503e3f3
1 parent 5ae4dd5
commit 503e3f3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/dist/hawkular-ui-service.js b/dist/hawkular-ui-service.js
@@ -781,7 +781,6 @@ var hawkularRest;
                         prefix: 'GenericSuccessResponse=',
                         handle: function (operationResponse, binaryData) {
                             $log.log('Execution Operation request delivery: ', operationResponse.message);
-                            NotificationService.info('Execution Ops request delivery: ' + operationResponse.message);
                         }
                     },
                     {
@@ -795,13 +794,16 @@ var hawkularRest;
                         prefix: 'ExecuteOperationResponse=',
                         handle: function (operationResponse, binaryData) {
                             $log.log('Handling ExecuteOperationResponse');
+                            var message;
                             if (operationResponse.status === "OK") {
-                                NotificationService.success('Operation "' + operationResponse.operationName + '" on resource "'
-                                    + operationResponse.resourcePath + '" succeeded.');
+                                message = 'Operation "' + operationResponse.operationName + '" on resource "'
+                                    + operationResponse.resourcePath + '" succeeded.';
+                                $rootScope.$broadcast('ExecuteOperationSuccess', message, operationResponse.resourcePath, operationResponse.operationName);
                             }
                             else if (operationResponse.status === "ERROR") {
-                                NotificationService.error('Operation "' + operationResponse.operationName + '" on resource "'
-                                    + operationResponse.resourcePath + '" failed: ' + operationResponse.message);
+                                message = 'Operation "' + operationResponse.operationName + '" on resource "'
+                                    + operationResponse.resourcePath + '" failed: ' + operationResponse.message;
+                                $rootScope.$broadcast('ExecuteOperationError', message, operationResponse.resourcePath, operationResponse.operationName);
                             }
                             else {
                                 $log.log('Unexpected operationResponse: ', operationResponse);

diff --git a/dist/hawkular-ui-service.min.js b/dist/hawkular-ui-service.min.js
@@ -781,7 +781,6 @@ var hawkularRest;
                         prefix: 'GenericSuccessResponse=',
                         handle: function (operationResponse, binaryData) {
                             $log.log('Execution Operation request delivery: ', operationResponse.message);
-                            NotificationService.info('Execution Ops request delivery: ' + operationResponse.message);
                         }
                     },
                     {
@@ -795,13 +794,16 @@ var hawkularRest;
                         prefix: 'ExecuteOperationResponse=',
                         handle: function (operationResponse, binaryData) {
                             $log.log('Handling ExecuteOperationResponse');
+                            var message;
                             if (operationResponse.status === "OK") {
-                                NotificationService.success('Operation "' + operationResponse.operationName + '" on resource "'
-                                    + operationResponse.resourcePath + '" succeeded.');
+                                message = 'Operation "' + operationResponse.operationName + '" on resource "'
+                                    + operationResponse.resourcePath + '" succeeded.';
+                                $rootScope.$broadcast('ExecuteOperationSuccess', message, operationResponse.resourcePath, operationResponse.operationName);
                             }
                             else if (operationResponse.status === "ERROR") {
-                                NotificationService.error('Operation "' + operationResponse.operationName + '" on resource "'
-                                    + operationResponse.resourcePath + '" failed: ' + operationResponse.message);
+                                message = 'Operation "' + operationResponse.operationName + '" on resource "'
+                                    + operationResponse.resourcePath + '" failed: ' + operationResponse.message;
+                                $rootScope.$broadcast('ExecuteOperationError', message, operationResponse.resourcePath, operationResponse.operationName);
                             }
                             else {
                                 $log.log('Unexpected operationResponse: ', operationResponse);

diff --git a/src/rest/hawkRest-ops-factory.ts b/src/rest/hawkRest-ops-factory.ts
@@ -119,8 +119,6 @@ module hawkularRest {
         prefix: 'GenericSuccessResponse=',
         handle: (operationResponse, binaryData:Blob) => {
           $log.log('Execution Operation request delivery: ', operationResponse.message);
-          // Probably makes no sense to show this in the UI
-          NotificationService.info('Execution Ops request delivery: ' + operationResponse.message);
         }
       },
         {
@@ -134,13 +132,18 @@ module hawkularRest {
         prefix: 'ExecuteOperationResponse=',
         handle: (operationResponse:IExecutionOperationResponse, binaryData:Blob) => {
           $log.log('Handling ExecuteOperationResponse');
-          if (operationResponse.status === "OK") {
 
-            NotificationService.success('Operation "' + operationResponse.operationName + '" on resource "'
-              + operationResponse.resourcePath + '" succeeded.');
+          let message;
+          if (operationResponse.status === "OK") {
+            message = 'Operation "' + operationResponse.operationName + '" on resource "'
+              + operationResponse.resourcePath + '" succeeded.';
+            $rootScope.$broadcast('ExecuteOperationSuccess', message, operationResponse.resourcePath,
+              operationResponse.operationName);
           } else if (operationResponse.status === "ERROR") {
-            NotificationService.error('Operation "' + operationResponse.operationName + '" on resource "'
-              + operationResponse.resourcePath + '" failed: ' + operationResponse.message);
+            message = 'Operation "' + operationResponse.operationName + '" on resource "'
+              + operationResponse.resourcePath + '" failed: ' + operationResponse.message;
+            $rootScope.$broadcast('ExecuteOperationError', message, operationResponse.resourcePath,
+              operationResponse.operationName);
           } else {
             $log.log('Unexpected operationResponse: ', operationResponse);
           }