Merge pull request #1124 from flexion/962-close-modals

962: globally close modals when backend errors occur

web-client/src/presenter/sequences/notFoundErrorSequence.js

@@ -1,9 +1,11 @@
+import { clearModalAction } from '../actions/clearModalAction';
 import { setAlertFromExceptionAction } from '../actions/setAlertFromExceptionAction';
 import { setCurrentPageAction } from '../actions/setCurrentPageAction';
 import { unsetFormSubmittingAction } from '../actions/unsetFormSubmittingAction';
 
 export const notFoundErrorSequence = [
   unsetFormSubmittingAction,
   setAlertFromExceptionAction,
+  clearModalAction,
   setCurrentPageAction('Error'),
 ];

web-client/src/presenter/sequences/setCurrentPageErrorSequence.js

@@ -1,8 +1,10 @@
 import { set } from 'cerebral/factories';
 import { state } from 'cerebral';
 import { setAlertFromExceptionAction } from '../actions/setAlertFromExceptionAction';
+import { clearModalAction } from '../actions/clearModalAction';
 
 export const setCurrentPageErrorSequence = [
   set(state.submitting, false),
   setAlertFromExceptionAction,
+  clearModalAction,
 ];

web-client/src/presenter/sequences/unauthorizedErrorSequence.js

@@ -1,9 +1,11 @@
+import { clearModalAction } from '../actions/clearModalAction';
+import { redirectToCognitoAction } from '../actions/redirectToCognitoAction';
 import { setAlertFromExceptionAction } from '../actions/setAlertFromExceptionAction';
 import { unsetFormSubmittingAction } from '../actions/unsetFormSubmittingAction';
-import { redirectToCognitoAction } from '../actions/redirectToCognitoAction';
 
 export const unauthorizedErrorSequence = [
   unsetFormSubmittingAction,
   setAlertFromExceptionAction,
+  clearModalAction,
   redirectToCognitoAction,
 ];

web-client/src/presenter/sequences/unidentifiedUserErrorSequence.js

@@ -1,9 +1,11 @@
+import { clearModalAction } from '../actions/clearModalAction';
 import { redirectToCognitoAction } from '../actions/redirectToCognitoAction';
 import { setAlertFromExceptionAction } from '../actions/setAlertFromExceptionAction';
 import { unsetFormSubmittingAction } from '../actions/unsetFormSubmittingAction';
 
 export const unidentifiedUserErrorSequence = [
   unsetFormSubmittingAction,
   setAlertFromExceptionAction,
+  clearModalAction,
   redirectToCognitoAction,
 ];