Some improvements in multi assign form

ReCodEx · Feb 26, 2018 · 5cff300 · 5cff300
1 parent d1fb9a5
commit 5cff300
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/components/forms/MultiAssignForm/MultiAssignForm.js b/src/components/forms/MultiAssignForm/MultiAssignForm.js
@@ -15,8 +15,8 @@ const MultiAssignForm = ({
   handleSubmit,
   submitFailed: hasFailed,
   submitSucceeded: hasSucceeded,
-  asyncValidating,
   invalid,
+  reset,
   firstDeadline,
   allowSecondDeadline,
   groups,
@@ -175,8 +175,7 @@ const MultiAssignForm = ({
         dirty={anyTouched}
         hasSucceeded={hasSucceeded}
         hasFailed={hasFailed}
-        handleSubmit={handleSubmit}
-        asyncValidating={asyncValidating}
+        handleSubmit={data => handleSubmit(data).then(() => reset())}
         messages={{
           submit: (
             <FormattedMessage
@@ -209,8 +208,8 @@ MultiAssignForm.propTypes = {
   submitting: PropTypes.bool,
   submitFailed: PropTypes.bool,
   submitSucceeded: PropTypes.bool,
-  asyncValidating: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
   invalid: PropTypes.bool,
+  reset: PropTypes.func.isRequired,
   firstDeadline: PropTypes.oneOfType([PropTypes.number, PropTypes.object]), // object == moment.js instance
   allowSecondDeadline: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
   groups: PropTypes.array.isRequired,
@@ -344,7 +343,6 @@ const validate = ({
 
 export default reduxForm({
   form: 'multiAssign',
-  validate,
   enableReinitialize: true,
-  keepDirtyOnReinitialize: false
+  validate
 })(MultiAssignForm);
diff --git a/src/pages/Exercise/Exercise.js b/src/pages/Exercise/Exercise.js
@@ -135,7 +135,9 @@ class Exercise extends Component {
     let actions = [];
 
     for (const groupId of groups) {
-      assignExercise(groupId).then(({ value: assigment }) => {
+      const groupPromise = assignExercise(
+        groupId
+      ).then(({ value: assigment }) => {
         let assignmentData = Object.assign({}, assigment, formData, {
           firstDeadline: moment(formData.firstDeadline).unix(),
           secondDeadline: moment(formData.secondDeadline).unix(),
@@ -150,6 +152,7 @@ class Exercise extends Component {
 
         return editAssignment(assigment.id, assignmentData);
       });
+      actions.push(groupPromise);
     }
 
     return Promise.all(actions);