Making sure submitFailed, submitted propagates to fields. Fixes #222

Author: davidkpiano

src/actions/model-actions.js

@@ -57,7 +57,7 @@ const push = (model, item = null) => (dispatch, getState) => {
   });
 };
 
-const toggle = model => (dispatch, getState) => {
+const toggle = (model) => (dispatch, getState) => {
   const value = !_get(getState(), model);
 
   dispatch({
@@ -78,7 +78,7 @@ const filter = (model, iteratee = identity) => (dispatch, getState) => {
   });
 };
 
-const reset = model => ({
+const reset = (model) => ({
   type: actionTypes.RESET,
   model,
 });

src/reducers/form-reducer.js

@@ -400,23 +400,43 @@ function _createFormReducer(model, initialState) {
           untouched: true, // will be deprecated
         });
 
-      case actionTypes.SET_SUBMITTED:
-        return setField(state, localPath, {
+      case actionTypes.SET_SUBMITTED: {
+        const submittedState = {
           pending: false,
           submitted: !!action.submitted,
           submitFailed: false,
           touched: true,
           untouched: false, // will be deprecated
-        });
+        };
 
-      case actionTypes.SET_SUBMIT_FAILED:
-        return setField(state, localPath, {
+        if (!localPath.length) {
+          return icepick.merge(state, {
+            ...submittedState,
+            fields: mapValues(state.fields, (field) => icepick.merge(field, submittedState)),
+          });
+        }
+
+        return setField(state, localPath, submittedState);
+      }
+
+      case actionTypes.SET_SUBMIT_FAILED: {
+        const submitFailedState = {
           pending: false,
           submitted: false,
           submitFailed: true,
           touched: true,
-          untouched: false, // will be deprecated
-        });
+          untouched: false,
+        };
+
+        if (!localPath.length) {
+          return icepick.merge(state, {
+            ...submitFailedState,
+            fields: mapValues(state.fields, (field) => icepick.merge(field, submitFailedState)),
+          });
+        }
+
+        return setField(state, localPath, submitFailedState);
+      }
 
       case actionTypes.SET_INITIAL:
       case actionTypes.RESET:

test/form-reducer-spec.js

@@ -259,4 +259,54 @@ describe('formReducer()', () => {
       actions.remove('test.items', 0)(dispatch, getState);
     });
   });
+
+  describe('SET_SUBMIT_FAILED action', () => {
+    it('should set all fields to submitFailed = true when form submitFailed = true', () => {
+      const reducer = formReducer('test', { foo: '', bar: '' });
+
+      const actual = reducer(undefined, actions.setSubmitFailed('test'));
+
+      assert.containSubset(actual, {
+        submitFailed: true,
+        submitted: false,
+        fields: {
+          foo: {
+            submitFailed: true,
+            touched: true,
+            submitted: false,
+          },
+          bar: {
+            submitFailed: true,
+            touched: true,
+            submitted: false,
+          },
+        },
+      });
+    });
+
+    it('should set all fields to submitFailed = false when form submitFailed = false', () => {
+      const reducer = formReducer('test', { foo: '', bar: '' });
+
+      const submitFailed = reducer(undefined, actions.setSubmitFailed('test', false));
+
+      const actual = reducer(submitFailed, actions.setSubmitted('test'));
+
+      assert.containSubset(actual, {
+        submitFailed: false,
+        submitted: true,
+        fields: {
+          foo: {
+            submitFailed: false,
+            touched: true,
+            submitted: true,
+          },
+          bar: {
+            submitFailed: false,
+            touched: true,
+            submitted: true,
+          },
+        },
+      });
+    });
+  });
 });