Merge pull request #605 from ammendonca/HAWKULAR-668

HAWKULAR-668 : Improve Delete URL interaction
hawkular · Oct 22, 2015 · 86f5d41 · 86f5d41
2 parents 4685529 + 2a9618c
commit 86f5d41
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/console/src/main/scripts/bower.json b/console/src/main/scripts/bower.json
@@ -12,20 +12,22 @@
     "plugins"
   ],
   "dependencies": {
+    "angular-animate": "~1.4.4",
     "angular-bootstrap": "0.11.0",
     "angular-md5": "0.1.7",
     "angular-momentjs": "0.1.9",
     "angular-patternfly": "2.3.1",
     "angular-scroll": "0.6.5",
     "angular-ui-select": "0.11.2",
     "angular-toastr": "1.4.1",
+    "animate.css": "3.0.0",
     "ngInfiniteScroll": "1.2.1",
     "bootstrap-select": "1.6",
     "hawkular-charts": "hawkular/hawkular-charts#master",
     "hawkular-ui-services": "hawkular/hawkular-ui-services#master",
     "hawtio-core-navigation": "2.0.51",
     "hawtio-core": "2.0.18",
-    "hawtio-template-cache": "2.0.3",
+    "hawtio-template-cache": "2.0.4",
     "hawtio-utilities": "2.0.22",
     "hawtio-extension-service": "2.0.2",
     "hawtio-oauth": "2.0.29",

diff --git a/console/src/main/scripts/plugins/metrics/html/modals/delete-resource.html b/console/src/main/scripts/plugins/metrics/html/modals/delete-resource.html
@@ -6,7 +6,7 @@ <h4 class="modal-title">Delete URL</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 URL <strong>{{ vm.resource.properties.url }}</strong> (Resource ID: {{ vm.resource.id }}) ?</p>
+    <p class="primary-message">Are you sure you want to delete <strong>{{ vm.resource.properties.url }}</strong> ?</p>
     <p>This action can't be undone.</p>
   </div>
 </div>

diff --git a/console/src/main/scripts/plugins/metrics/less/metrics.less b/console/src/main/scripts/plugins/metrics/less/metrics.less
@@ -1867,6 +1867,14 @@ td .fa-comment-o {
     top: @grid-gutter-width/4*3;
     z-index: 1000;
   }
+
+  // Animations
+  &.ng-leave {
+    -webkit-animation: flipOutX 1s;
+    -moz-animation: flipOutX 1s;
+    -ms-animation: flipOutX 1s;
+    animation: flipOutX 1s;
+  }
 }
 
 .hk-url-info .row-table:first-child {
@@ -2091,4 +2099,4 @@ section {
   .navbar-pf .navbar-utility li.dropdown:first-child > .dropdown-toggle {
     padding-left: 15px;
   }
-}
+}
diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts b/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
@@ -20,9 +20,9 @@
 
 module HawkularMetrics {
 
-  export let _module = angular.module(HawkularMetrics.pluginName, ['ngResource', 'ui.select', 'hawkular.charts',
+  export let _module = angular.module(HawkularMetrics.pluginName, ['ngResource', 'ngAnimate', 'ui.select',
     'hawkular.services', 'ui.bootstrap', 'topbar', 'patternfly.select', 'angular-momentjs', 'angular-md5', 'toastr',
-    'infinite-scroll', 'mgo-angular-wizard', 'truncate', '500tech.smart-truncate']);
+    'infinite-scroll', 'mgo-angular-wizard', 'truncate', '500tech.smart-truncate', 'hawkular.charts']);
 
   _module.config(['$compileProvider', function ($compileProvider) {
     //disable debug info

diff --git a/console/src/main/scripts/plugins/metrics/ts/urlList.ts b/console/src/main/scripts/plugins/metrics/ts/urlList.ts
@@ -463,8 +463,6 @@ module HawkularMetrics {
         this.HawkularAlertsManager.deleteTrigger(triggerIds[1])])
         .then(removeResource)
         .then((res) => {
-          this.NotificationsService.success('The URL ' + this.resource.properties.url +
-            ' is no longer being monitored.');
           this.$modalInstance.close(res);
         });
     }