Merge pull request #142 from calblueprint/julian/click-out

Click out of submission modal if it errors
calblueprint · May 11, 2020 · e719caf · e719caf
2 parents 36b9074 + 42e548f
commit e719caf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/app/javascript/components/ActionItemCreationPage/index.js b/app/javascript/components/ActionItemCreationPage/index.js
@@ -58,12 +58,18 @@ class ActionItemCreationPage extends React.Component {
     this.handleOpenModal = this.handleOpenModal.bind(this);
     this.editActionItem = this.editActionItem.bind(this);
     this.reloadPage = this.reloadPage.bind(this);
+    this.handleExitSubmitModal = this.handleExitSubmitModal.bind(this);
   }
 
   reloadPage() {
     window.location.href = '/assignments';
   }
 
+  // Only passed to LoadModal if submissionStatus == 'error'
+  handleExitSubmitModal() {
+    this.setState({ submissionStatus: null });
+  }
+
   checkActionItemsEqual(actionItem1, actionItem2) {
     return (
       actionItem1.title === actionItem2.title &&
@@ -589,6 +595,11 @@ class ActionItemCreationPage extends React.Component {
               ? this.reloadPage
               : this.handleSubmit
           }
+          handleClose={
+            this.state.submissionStatus === 'error'
+              ? this.handleExitSubmitModal
+              : null
+          }
         />
         <Snackbar
           open={this.state.submitFailed}

diff --git a/app/javascript/components/ActionItemSearchParticipants/index.js b/app/javascript/components/ActionItemSearchParticipants/index.js
@@ -217,7 +217,7 @@ class ActionItemSearchParticipants extends React.Component {
 ActionItemSearchParticipants.propTypes = {
   classes: PropTypes.object.isRequired,
   participants: PropTypes.array.isRequired,
-  statuses: PropTypes.array.isRequired,
+  statuses: PropTypes.object.isRequired,
   selectedParticipants: PropTypes.array.isRequired,
   addUser: PropTypes.func.isRequired,
   removeUser: PropTypes.func.isRequired,

diff --git a/app/javascript/components/LoadModal/index.js b/app/javascript/components/LoadModal/index.js
@@ -15,7 +15,7 @@ import {
 } from '@material-ui/core';
 import styles from './styles';
 
-function LoadModal({ classes, open, status, handleClick }) {
+function LoadModal({ classes, open, status, handleClick, handleClose }) {
   const getText = () => {
     let titleText;
     let buttonText;
@@ -58,6 +58,7 @@ function LoadModal({ classes, open, status, handleClick }) {
       open={open}
       fullWidth
       classes={{ paper: classes.modalStyle }}
+      onClose={handleClose}
       onExited={() =>
         // Avoid blurring document.body on IE9 since it blurs the entire window
         document.activeElement !== document.body
@@ -112,5 +113,6 @@ LoadModal.propTypes = {
   status: PropTypes.string,
   open: PropTypes.bool.isRequired,
   handleClick: PropTypes.func.isRequired,
+  handleClose: PropTypes.func,
 };
 export default withStyles(styles)(LoadModal);