Optionally skip mail when resolving failure

ReCodEx · Feb 2, 2018 · 0cdebea · 0cdebea
1 parent a25d180
commit 0cdebea
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/components/SubmissionFailures/ResolveFailure/ResolveFailure.js b/src/components/SubmissionFailures/ResolveFailure/ResolveFailure.js
@@ -4,8 +4,8 @@ import { Modal, Button } from 'react-bootstrap';
 import { CloseIcon } from '../../icons';
 import { FormattedMessage } from 'react-intl';
 import { Field, reduxForm } from 'redux-form';
-import TextField from '../../forms/Fields/TextField';
 import SubmitButton from '../../forms/SubmitButton';
+import { TextField, CheckboxField } from '../../forms/Fields';
 
 const maxNoteLength = value =>
   value && value.length >= 255
@@ -47,6 +47,17 @@ const ResolveFailure = ({
         }
         validate={maxNoteLength}
       />
+      <Field
+        name="sendEmail"
+        component={CheckboxField}
+        onOff
+        label={
+          <FormattedMessage
+            id="app.submissionFailures.sendEmail"
+            defaultMessage="Send email"
+          />
+        }
+      />
     </Modal.Body>
     <Modal.Footer>
       <SubmitButton

diff --git a/src/pages/SubmissionFailures/SubmissionFailures.js b/src/pages/SubmissionFailures/SubmissionFailures.js
@@ -125,9 +125,10 @@ class SubmissionFailures extends Component {
                   onClose={() =>
                     this.setState({ isOpen: false, activeId: null })}
                   onSubmit={data =>
-                    resolveFailure(this.state.activeId, data.note).then(() =>
+                    resolveFailure(this.state.activeId, data).then(() =>
                       this.setState({ isOpen: false, activeId: null })
                     )}
+                  initialValues={{ sendEmail: true }}
                 />
               </div>
             </Box>
@@ -151,6 +152,6 @@ export default connect(
   }),
   dispatch => ({
     loadAsync: () => SubmissionFailures.loadAsync({}, dispatch),
-    resolveFailure: (id, note) => dispatch(resolveFailure(id, note))
+    resolveFailure: (id, data) => dispatch(resolveFailure(id, data))
   })
 )(SubmissionFailures);
diff --git a/src/redux/modules/submissionFailures.js b/src/redux/modules/submissionFailures.js
@@ -20,12 +20,12 @@ export const fetchAllFailures = actions.fetchMany({
   endpoint: fetchManyEndpoint
 });
 
-export const resolveFailure = (id, note) =>
+export const resolveFailure = (id, data) =>
   createApiAction({
     type: additionalActionTypes.RESOLVE,
     method: 'POST',
     endpoint: `/submission-failures/${id}/resolve`,
-    body: { note },
+    body: { ...data },
     meta: { id }
   });