fix(core/modal): avoid throwing errors on modal $dismiss (#4233)

app/scripts/modules/amazon/src/pipeline/stages/bake/awsBakeStage.js

@@ -132,7 +132,7 @@ module.exports = angular.module('spinnaker.amazon.pipeline.stage.bakeStage', [
         }
       }).result.then(function(extendedAttribute) {
           $scope.stage.extendedAttributes[extendedAttribute.key] = extendedAttribute.value;
-      });
+      }).catch(() => {});
     };
 
     this.removeExtendedAttribute = function (key) {

app/scripts/modules/appengine/pipeline/stages/editLoadBalancer/appengineEditLoadBalancerStage.ts

@@ -25,7 +25,7 @@ class AppengineEditLoadBalancerStageCtrl implements IController {
       }
     }).result.then((newLoadBalancer: ILoadBalancer) => {
       this.$scope.stage.loadBalancers.push(newLoadBalancer);
-    });
+    }).catch(() => {});
   }
 
   public editLoadBalancer(index: number) {
@@ -42,7 +42,7 @@ class AppengineEditLoadBalancerStageCtrl implements IController {
       }
     }).result.then((updatedLoadBalancer: ILoadBalancer) => {
       this.$scope.stage.loadBalancers[index] = updatedLoadBalancer;
-    });
+    }).catch(() => {});
   }
 
   public removeLoadBalancer(index: number): void {

app/scripts/modules/azure/pipeline/stages/bake/azureBakeStage.js

@@ -122,7 +122,7 @@ module.exports = angular.module('spinnaker.azure.pipeline.stage.bakeStage', [
         }
       }).result.then(function(extendedAttribute) {
           $scope.stage.extendedAttributes[extendedAttribute.key] = extendedAttribute.value;
-      });
+      }).catch(() => {});
     };
 
     this.removeExtendedAttribute = function (key) {

app/scripts/modules/canary/canary/canaryStage.js

@@ -412,7 +412,7 @@ module.exports = angular.module('spinnaker.canary.canaryStage', [
           cleanupClusterConfig(baselineCluster, 'baseline');
           cleanupClusterConfig(canaryCluster, 'canary');
           $scope.stage.clusterPairs.push({baseline: baselineCluster, canary: canaryCluster});
-        });
+        }).catch(() => {});
       });
     };
 
@@ -447,7 +447,7 @@ module.exports = angular.module('spinnaker.canary.canaryStage', [
         var stageCluster = awsServerGroupTransformer.convertServerGroupCommandToDeployConfiguration(command);
         cleanupClusterConfig(stageCluster, type);
         $scope.stage.clusterPairs[index][type.toLowerCase()] = stageCluster;
-      });
+      }).catch(() => {});
     };
 
     this.deleteClusterPair = function(index) {

app/scripts/modules/core/src/application/applications.component.ts

@@ -53,7 +53,7 @@ export class ApplicationsController implements IController {
             templateUrl: this.overrideRegistry.getTemplate('createApplicationModal', require('./modal/newapplication.html')),
             controller: this.overrideRegistry.getController('CreateApplicationModalCtrl'),
             controllerAs: 'newAppModal'
-          }).result.then((app) => this.routeToApplication(app));
+          }).result.then((app) => this.routeToApplication(app)).catch(() => {});
         }
       }
     ];

app/scripts/modules/core/src/application/config/applicationAttributes.directive.js

@@ -86,6 +86,6 @@ module.exports = angular
           this.application.attributes = newAttributes;
           setHealthMessage();
           setPermissions();
-        });
+        }).catch(() => {});
     };
   });

app/scripts/modules/core/src/application/config/applicationAttributes.directive.spec.js

@@ -34,13 +34,16 @@ describe('Controller: Config', function () {
 
     it('should copy attributes when edit application is successful', function() {
       var newAttributes = { foo: 'bar' };
-      spyOn($uibModal, 'open').and.returnValue({
+      const modalStub = {
         result: {
           then: function(method) {
             method(newAttributes);
-          }
+            return modalStub.result;
+          },
+          catch: () => {}
         }
-      });
+      };
+      spyOn($uibModal, 'open').and.returnValue(modalStub);
 
       configController.editApplication();
       expect(application.attributes).toBe(newAttributes);

app/scripts/modules/core/src/application/config/links/applicationLinks.component.js

@@ -88,7 +88,7 @@ module.exports = angular
         }).result.then(newSections => {
           this.sections = newSections;
           this.configChanged();
-        });
+        }).catch(() => {});
       };
 
       this.sortOptions = {

app/scripts/modules/core/src/delivery/executionGroup/ExecutionGroup.tsx

@@ -113,7 +113,7 @@ export class ExecutionGroup extends React.Component<IExecutionGroupProps, IExecu
         application: () => this.props.application,
         currentlyRunningExecutions: () => this.props.group.runningExecutions,
       }
-    }).result.then((command) => this.startPipeline(command));
+    }).result.then((command) => this.startPipeline(command)).catch(() => {});
   }
 
   public componentDidMount(): void {

app/scripts/modules/core/src/delivery/executions/executions.controller.js

@@ -174,6 +174,6 @@ module.exports = angular.module('spinnaker.core.delivery.executions.controller',
           pipeline: () => null,
           application: () => this.application,
         }
-      }).result.then(startPipeline);
+      }).result.then(startPipeline).catch(() => {});
     };
   });

app/scripts/modules/core/src/modal/dismiss.decorator.ts

@@ -0,0 +1,24 @@
+import { module } from 'angular';
+import IProvideService = angular.auto.IProvideService;
+
+import { IModalStackService } from 'angular-ui-bootstrap';
+
+export const DISMISS_DECORATOR = 'spinnaker.core.modal.dismiss.decorator';
+module(DISMISS_DECORATOR, [])
+  .config(($provide: IProvideService) => {
+    // Prevents an error from escaping when the user dismisses a modal created via the ReactInjector
+    // (error looks like: "Possibly unhandled rejection: undefined undefined")
+    $provide.decorator('$uibModalStack', ($delegate: IModalStackService) => {
+      const originalDismiss: Function = $delegate.dismiss;
+      $delegate.dismiss = (...args: any[]) => {
+        originalDismiss.apply(this, args);
+        const [ modalInstance ] = args;
+        if (modalInstance && modalInstance.result) {
+          modalInstance.result
+            .catch(() => {});
+        }
+      };
+
+      return $delegate;
+    });
+  });

app/scripts/modules/core/src/modal/modal.module.js

@@ -2,10 +2,11 @@
 
 const angular = require('angular');
 
-import {V2_MODAL_WIZARD_COMPONENT} from './wizard/v2modalWizard.component';
-import {V2_MODAL_WIZARD_SERVICE} from './wizard/v2modalWizard.service';
-import {MODAL_CLOSE_COMPONENT} from './buttons/modalClose.component';
-import {SUBMIT_BUTTON_COMPONENT} from './buttons/submitButton.component';
+import { DISMISS_DECORATOR } from './dismiss.decorator';
+import { V2_MODAL_WIZARD_COMPONENT } from './wizard/v2modalWizard.component';
+import { V2_MODAL_WIZARD_SERVICE } from './wizard/v2modalWizard.service';
+import { MODAL_CLOSE_COMPONENT } from './buttons/modalClose.component';
+import { SUBMIT_BUTTON_COMPONENT } from './buttons/submitButton.component';
 
 import './modals.less';
 
@@ -15,6 +16,7 @@ module.exports = angular
     require('./modalPage.directive.js').name,
     require('./wizard/wizardSubFormValidation.service').name,
     require('./closeable/closeable.modal.controller').name,
+    DISMISS_DECORATOR,
     MODAL_CLOSE_COMPONENT,
     SUBMIT_BUTTON_COMPONENT,
     V2_MODAL_WIZARD_SERVICE,