Merge pull request #76 from ammendonca/HWK-DELETE-MODAL

Console: Add confirmation modal for deleting a resource
hawkular · Apr 2, 2015 · c92a49b · c92a49b
2 parents 1a49b7d + eda076a
commit c92a49b
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 17 deletions.
diff --git a/dist/hawkular-ui-components-metrics.js b/dist/hawkular-ui-components-metrics.js
diff --git a/plugins/metrics/plugins/metrics/html/modals/delete-resource.html b/plugins/metrics/plugins/metrics/html/modals/delete-resource.html
@@ -0,0 +1,16 @@
+<div class="modal-header">
+  <button type="button" class="close" ng-click="cancel()">
+    <span class="pficon pficon-close"></span>
+  </button>
+  <h4 class="modal-title">Delete Resource</h4>
+</div>
+<div class="modal-body">
+  <div class="form-group">
+    <p class="primary-message">Are you sure you want to stop monitoring and delete the data for the site <strong>{{ vm.resource.parameters.url }}</strong> (Resource ID: {{ vm.resource.id }}) ?</p>
+    <p>This action can't be undone.</p>
+  </div>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-default" ng-click="vm.cancel()">Cancel</button>
+  <button type="button" class="btn btn-danger" ng-click="vm.deleteResource()">Delete</button>
+</div>
diff --git a/plugins/metrics/plugins/metrics/ts/addUrlPage.ts b/plugins/metrics/plugins/metrics/ts/addUrlPage.ts
@@ -22,7 +22,7 @@ module HawkularMetrics {
 
   export class AddUrlController {
     /// this is for minification purposes
-    public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager','HawkularErrorManager','$q'];
+    public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager','HawkularErrorManager','$q'];
 
     private httpUriPart = 'http://';
     public addProgress: boolean = false;
@@ -34,6 +34,7 @@ module HawkularMetrics {
                 private $interval:ng.IIntervalService,
                 private $log:ng.ILogService,
                 private $filter:ng.IFilterService,
+                private $modal:any,
                 private HawkularInventory:any,
                 private HawkularMetric:any,
                 private HawkularAlert:any,
@@ -184,18 +185,40 @@ module HawkularMetrics {
     }
 
     deleteResource(resource:any):any {
-      // TODO: use modal to confirm delete...
+      this.$modal.open({
+        templateUrl: 'plugins/metrics/html/modals/delete-resource.html',
+        controller: DeleteResourceModalController,
+        resolve: {
+          resource: () => resource
+        }
+      }).result.then(result => this.getResourceList());
+    }
+  }
+
+  _module.controller('HawkularMetrics.AddUrlController', AddUrlController);
+
+  class DeleteResourceModalController {
+
+    static $inject = ['$scope', '$modalInstance', 'HawkularInventory', 'resource'];
+
+    constructor(private $scope, private $modalInstance: any, private HawkularInventory, public resource) {
+      $scope.vm = this;
+    }
+
+    deleteResource() {
       this.HawkularInventory.Resource.delete({
         tenantId: globalTenantId,
-        resourceId: resource.id
+        resourceId: this.resource.id
       }).$promise.then((res) => {
-          toastr.info('The site ' + resource.parameters.url + ' is no longer being monitored.');
-          this.resourceList = this.getResourceList();
+          toastr.info('The site ' + this.resource.parameters.url + ' is no longer being monitored.');
+          this.$modalInstance.close(res);
         });
     }
 
-  }
+    cancel() {
+      this.$modalInstance.dismiss('cancel');
+    }
 
-  _module.controller('HawkularMetrics.AddUrlController', AddUrlController);
+  }
 
 }