Removing unused (and hacky) callback functions in actions.setFieldsValidity()

Author: davidkpiano

src/actions/field-actions.js

@@ -10,7 +10,6 @@ import invertValidity from '../utils/invert-validity';
 import { trackable } from '../utils/track';
 import getForm from '../utils/get-form';
 import getFieldFromState from '../utils/get-field-from-state';
-import isValid from '../form/is-valid';
 import NULL_ACTION from '../constants/null-action';
 import omit from 'lodash/omit';
 import isNative from '../utils/is-native';
@@ -236,27 +235,6 @@ function createFieldActions(s = defaultStrategies) {
     dispatch(setValidity(model, errors, { errors: true }));
   };
 
-  function isFormValidWithoutFields(form, fieldsValidity) {
-    if (Object.keys(form.$form.validity).length
-      && !isValidityValid(form.$form.validity)) {
-      return false;
-    }
-
-    // TODO: map through form keys without $form
-    const valid = Object.keys(form)
-      .every((fieldKey) => {
-        if (fieldKey === '$form') return true;
-
-        if (fieldsValidity.hasOwnProperty(fieldKey)) {
-          return true;
-        }
-
-        return isValid(form[fieldKey]);
-      });
-
-    return valid;
-  }
-
   const validateFields =
     (model, fieldValidators, options = {}) => (dispatch, getState) => {
       const modelValue = s.get(getState(), model);
@@ -271,26 +249,6 @@ function createFieldActions(s = defaultStrategies) {
         return fieldValidity;
       });
 
-      const validCB = options.onValid;
-      const invalidCB = options.onInvalid;
-
-      if (validCB || invalidCB) {
-        const form = s.getForm(getState(), model);
-        const formValid = (form && !fieldsValidity.hasOwnProperty(''))
-          ? isFormValidWithoutFields(form, fieldsValidity)
-          : true;
-
-        const fieldsValid = options.errors
-          ? !isValidityInvalid(fieldsValidity)
-          : isValidityValid(fieldsValidity);
-
-        if (validCB && formValid && fieldsValid) {
-          validCB();
-        } else if (invalidCB) {
-          invalidCB();
-        }
-      }
-
       const fieldsValiditySetter = options.errors
         ? setFieldsErrors
         : setFieldsValidity;

test/field-actions-spec.js

@@ -2,7 +2,6 @@ import { assert } from 'chai';
 import configureMockStore from 'redux-mock-store';
 import createTestStore from 'redux-test-store';
 import thunk from 'redux-thunk';
-import sinon from 'sinon';
 import _get from 'lodash/get';
 import toPath from 'lodash/toPath';
 import i from 'icepick';
@@ -1602,64 +1601,6 @@ Object.keys(testContexts).forEach((testKey) => {
 
         store.dispatch(action);
       });
-
-      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' } }),
-          [{
-            model: 'test',
-            type: actionTypes.SET_FIELDS_VALIDITY,
-            fieldsValidity: {
-              foo: true,
-            },
-            options: {},
-          }],
-          () => {
-            assert.isTrue(callback.calledOnce);
-            done();
-          });
-
-        const action = actions.validateFields('test', {
-          foo: (val) => val === 'bar',
-        }, 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' } }),
-          [{
-            model: 'test',
-            type: actionTypes.SET_FIELDS_VALIDITY,
-            fieldsValidity: {
-              foo: false,
-            },
-            options: {},
-          }],
-          () => {
-            assert.isTrue(callback.notCalled);
-            done();
-          });
-
-        const action = actions.validateFields('test', {
-          foo: (val) => val === 'invalid',
-        }, validationOptions);
-
-        store.dispatch(action);
-      });
     });
 
     describe('validateFieldsErrors() (thunk)', () => {
@@ -1702,68 +1643,6 @@ Object.keys(testContexts).forEach((testKey) => {
 
         store.dispatch(action);
       });
-
-      it('should call a callback if validation passes', (done) => {
-        const callback = sinon.spy((val) => val);
-
-        const validationOptions = {
-          onValid: callback,
-        };
-
-        const store = mockStore(
-          () => ({ test: { foo: 'valid' } }),
-          [{
-            model: 'test',
-            type: actionTypes.SET_FIELDS_VALIDITY,
-            fieldsValidity: {
-              foo: false, // false = not an error
-            },
-            options: {
-              errors: true,
-            },
-          }],
-          () => {
-            assert.isTrue(callback.calledOnce);
-            done();
-          });
-
-        const action = actions.validateFieldsErrors('test', {
-          foo: (val) => val === 'invalid',
-        }, 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: 'invalid' } }),
-          [{
-            model: 'test',
-            type: actionTypes.SET_FIELDS_VALIDITY,
-            fieldsValidity: {
-              foo: true, // true = error
-            },
-            options: {
-              errors: true,
-            },
-          }],
-          () => {
-            assert.isTrue(callback.notCalled);
-            done();
-          });
-
-        const action = actions.validateFieldsErrors('test', {
-          foo: (val) => val === 'invalid',
-        }, validationOptions);
-
-        store.dispatch(action);
-      });
     });
 
     describe('validSubmit() (thunk)', () => {