Merge pull request #66 from 18F/fixes

Added confirmation dialogs for destructive app actions
cloud-gov · Aug 13, 2015 · 9c135e2 · 9c135e2
2 parents bcd0b9b + 61b0c90
commit 9c135e2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -20,6 +20,8 @@
     "angular-route": "~1.4.3",
     "angular-mocks": "~1.4.3",
     "angularjs": "~1.4.3",
-    "bootstrap": "~3.3.5"
+    "bootstrap": "~3.3.5",
+    "angular-bootstrap-confirm": "~0.3.0",
+    "angular-sanitize": "~1.4.3"
   }
 }
diff --git a/karma.conf.js b/karma.conf.js
@@ -21,6 +21,9 @@ module.exports = function(config) {
             'static/bower_components/ladda/dist/spin.min.js',
             'static/bower_components/ladda/dist/ladda.min.js',
             'static/bower_components/angular-ladda/dist/angular-ladda.min.js',
+            'static/bower_components/angular-sanitize/angular-sanitize.js',
+            'static/bower_components/angular-bootstrap-confirm/src/ui-bootstrap-position.js',
+            'static/bower_components/angular-bootstrap-confirm/dist/angular-bootstrap-confirm.min.js',
             'static/app/main.js',
             'static/app/filters.js',
             'static/app/cloudfoundry.js',

diff --git a/static/app/main.js b/static/app/main.js
@@ -1,5 +1,5 @@
 (function() {
-    var app = angular.module('cfdeck', ['ngRoute', 'angular-ladda']);
+    var app = angular.module('cfdeck', ['ngRoute', 'angular-ladda', 'ngSanitize', 'mwl.confirm']);
 
     app.config(function($routeProvider) {
         $routeProvider

diff --git a/static/app/views/app.html b/static/app/views/app.html
@@ -39,9 +39,15 @@ <h3 class="panel-title">Actions</h3>
                 <div ng-switch="appSummary.state">
                     <div ng-switch-when='STARTED'>
                         <button type="button" ladda="restarting" class="btn btn-warning" ng-disabled="stopping"
-                        ng-click="restartApp(appSummary)">Restart</button>
+                            mwl-confirm title="Warning!" message="Are you sure you want to interrupt connectivity to the application?"
+                            on-confirm="restartApp(appSummary)" confirm-button-type="danger" cancel-button-type="default">
+                            Restart
+                        </button>
                         <button type="button" ladda="stopping" class="btn btn-danger" ng-disabled="restarting"
-                        ng-click="stopApp(appSummary)">Stop</button>
+                            mwl-confirm title="Warning!" message="Are you sure you want to stop connectivity to the application?"
+                            on-confirm="stopApp(appSummary)" confirm-button-type="danger" cancel-button-type="default">
+                            Stop
+                        </button>
                     </div>
                     <div ng-switch-when='STOPPED'>
                         <button type="button" ladda="starting" class="btn btn-success" ng-disabled="restarting"

diff --git a/static/index.html b/static/index.html
@@ -18,6 +18,9 @@
 		<script src="bower_components/ladda/dist/spin.min.js"></script>
 		<script src="bower_components/ladda/dist/ladda.min.js"></script>
 		<script src="bower_components/angular-ladda/dist/angular-ladda.min.js"></script>
+		<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
+		<script src="bower_components/angular-bootstrap-confirm/src/ui-bootstrap-position.js"></script>
+		<script src="bower_components/angular-bootstrap-confirm/dist/angular-bootstrap-confirm.min.js"></script>
 
 		<script src="app/main.js"></script>
 		<script src="app/cloudfoundry.js"></script>