From 0cdebea961154b62203333883f8ecd5b16a36c35 Mon Sep 17 00:00:00 2001
From: Petr Stefan <ptr.stef@gmail.com>
Date: Fri, 2 Feb 2018 10:54:51 +0100
Subject: [PATCH] Optionally skip mail when resolving failure

---
 .../ResolveFailure/ResolveFailure.js                | 13 ++++++++++++-
 src/pages/SubmissionFailures/SubmissionFailures.js  |  5 +++--
 src/redux/modules/submissionFailures.js             |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/SubmissionFailures/ResolveFailure/ResolveFailure.js b/src/components/SubmissionFailures/ResolveFailure/ResolveFailure.js
index ac6a4eeef..85325591d 100644
--- 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
index dcb862b9e..a43a690ac 100644
--- 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
index db262bae8..429bb9eea 100644
--- 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 }
   });