Adding setFieldsErrors action thunk creator and reducing argument length for validateFields()

Author: davidkpiano

src/actions/field-actions.js

@@ -43,17 +43,24 @@ const setValidity = (model, validity, options = {}) => ({
   [options.errors ? 'errors' : 'validity']: validity,
 });
 
-const setFieldsValidity = (model, fieldsValidity) => ({
+const setFieldsValidity = (model, fieldsValidity, options = {}) => ({
   type: actionTypes.SET_FIELDS_VALIDITY,
   model,
   fieldsValidity,
+  options,
 });
 
-// will be deprecated
-const setErrors = (model, errors, options = {}) => setValidity(model, errors, {
-  errors: true,
-  ...options,
-});
+const setErrors = (model, errors, options = {}) =>
+  setValidity(model, errors, {
+    ...options,
+    errors: true,
+  });
+
+const setFieldsErrors = (model, fieldsErrors, options) =>
+  setFieldsValidity(model, fieldsErrors, {
+    ...options,
+    errors: true,
+  });
 
 const resetValidity = (model) => ({
   type: actionTypes.RESET_VALIDITY,
@@ -133,7 +140,7 @@ const validateErrors = (model, errorValidators) => (dispatch, getState) => {
   dispatch(setValidity(model, errors, { errors: true }));
 };
 
-const validateFields = (model, fieldValidators, validCB, invalidCB) => (dispatch, getState) => {
+const validateFields = (model, fieldValidators, options = {}) => (dispatch, getState) => {
   const value = _get(getState(), model);
 
   const fieldsValidity = mapValues(fieldValidators, (validator, field) => {
@@ -146,6 +153,9 @@ const validateFields = (model, fieldValidators, validCB, invalidCB) => (dispatch
     return fieldValidity;
   });
 
+  const validCB = options.onValid;
+  const invalidCB = options.onInvalid;
+
   if (validCB || invalidCB) {
     const form = getForm(getState(), model);
     const formValid = form ? form.valid : true;
@@ -175,6 +185,8 @@ export default {
   setTouched,
   setUntouched,
   setValidity,
+  setFieldsValidity,
+  setFieldsErrors,
   resetValidity,
   resetErrors,
   setViewValue,

src/components/form-component.js

@@ -96,14 +96,15 @@ class Form extends Component {
       return modelValue;
     }
 
-    const validCallback = dispatchValidCallback(modelValue, onSubmit);
-    const invalidCallback = dispatchInvalidCallback(model, dispatch);
+    const validationOptions = {
+      onValid: dispatchValidCallback(modelValue, onSubmit),
+      onInvalid: dispatchInvalidCallback(model, dispatch),
+    };
 
     dispatch(actions.validateFields(
       model,
       validators,
-      validCallback,
-      invalidCallback));
+      validationOptions));
 
     return modelValue;
   }

src/reducers/form-reducer.js

@@ -210,6 +210,7 @@ function _createFormReducer(model, initialState) {
           type: actionTypes.SET_VALIDITY,
           model: `${model}.${field}`,
           validity: fieldValidity,
+          options: action.options,
         })).reduce(formReducer, state);
 
       case actionTypes.SET_ERRORS: {

test/field-actions-spec.js

@@ -1303,6 +1303,7 @@ describe('field actions', () => {
             },
             model: 'test',
             type: actionTypes.SET_FIELDS_VALIDITY,
+            options: {},
           },
         ],
         done);
@@ -1324,6 +1325,10 @@ describe('field actions', () => {
     it('should call a callback if validation passes', (done) => {
       const callback = sinon.spy((val) => val);
 
+      const validationOptions = {
+        onValid: callback,
+      };
+
       const store = mockStore(
         () => ({ test: { foo: 'bar' } }),
         [{
@@ -1332,6 +1337,7 @@ describe('field actions', () => {
           fieldsValidity: {
             foo: true,
           },
+          options: {},
         }],
         () => {
           assert.isTrue(callback.calledOnce);
@@ -1340,14 +1346,18 @@ describe('field actions', () => {
 
       const action = actions.validateFields('test', {
         foo: (val) => val === 'bar',
-      }, callback);
+      }, validationOptions);
 
       store.dispatch(action);
     });
 
     it('should NOT call a callback if validation fails', (done) => {
       const callback = sinon.spy((val) => val);
 
+      const validationOptions = {
+        onValid: callback,
+      };
+
       const store = mockStore(
         () => ({ test: { foo: 'bar' } }),
         [{
@@ -1356,6 +1366,7 @@ describe('field actions', () => {
           fieldsValidity: {
             foo: false,
           },
+          options: {},
         }],
         () => {
           assert.isTrue(callback.notCalled);
@@ -1364,7 +1375,7 @@ describe('field actions', () => {
 
       const action = actions.validateFields('test', {
         foo: (val) => val === 'invalid',
-      }, callback);
+      }, validationOptions);
 
       store.dispatch(action);
     });