undoing changes to deleteModal actions

Author: Nathan219

client/services/serviceHelperInstanceActionsModal.js

@@ -176,13 +176,21 @@ function HelperInstanceActionsModal(
         var deletedInstanceName = data.instance.attrs.name;
         data.instance.destroy(function (err) {
           $rootScope.safeApply();
-          if (err) {
-            throw err;
-          }
-          if ($stateParams.instanceName === deletedInstanceName) {
-            $state.go('instance.instance', {
-              userName: $stateParams.userName,
-              instanceName: ''
+          if (err) { throw err; }
+          // redirect to next instance or new
+          if (data.instances.models.length) {
+            data.instances.models = $filter('orderBy')(data.instances.models, 'attrs.name');
+            // Only change the location if we're still on the page
+            // If the user switched to a different instance in between, we shouldn't move
+            if ($stateParams.instanceName === deletedInstanceName) {
+              $state.go('instance.instance', {
+                userName: $stateParams.userName,
+                instanceName: data.instances.models[0].attrs.name
+              });
+            }
+          } else {
+            $state.go('instance.new', {
+              userName: $stateParams.userName
             });
           }
         });

test/unit/services/serviceHelperInstanceActionsModal.unit.js

@@ -307,9 +307,8 @@ describe('serviceHelperInstanceActionsModal'.bold.underline.blue, function() {
 
           sinon.assert.called(fakeGo);
           sinon.assert.called($scope.instance.destroy);
-          sinon.assert.calledWith(fakeGo,'instance.instance', {
-            userName: 'username',
-            instanceName: ''
+          sinon.assert.calledWith(fakeGo,'instance.new', {
+            userName: 'username'
           });
           done();
         });
@@ -327,7 +326,7 @@ describe('serviceHelperInstanceActionsModal'.bold.underline.blue, function() {
             sinon.assert.called($scope.instance.destroy);
             sinon.assert.calledWith(fakeGo,'instance.instance', {
               userName: 'username',
-              instanceName: ''
+              instanceName: 'other'
             });
             done();
           });
@@ -362,7 +361,7 @@ describe('serviceHelperInstanceActionsModal'.bold.underline.blue, function() {
               sinon.assert.called($scope.instance.destroy);
               sinon.assert.neverCalledWith(fakeGo,'instance.instance', {
                 userName: 'username',
-                instanceName: ''
+                instanceName: 'other'
               });
               done();
             }, 50);