Condensing clearIntents into field/model actions handled by forms action reducer to reduce action dispatching noise

Author: davidkpiano

src/actions/field-actions.js

@@ -64,10 +64,11 @@ function createFieldActions(s = defaultStrategies) {
     model,
   });
 
-  const setPending = (model, pending = true) => ({
+  const setPending = (model, pending = true, options) => ({
     type: actionTypes.SET_PENDING,
     model,
     pending,
+    ...options,
   });
 
   const setValidating = (model, validating = true) => ({
@@ -153,10 +154,11 @@ function createFieldActions(s = defaultStrategies) {
     submitted,
   });
 
-  const setSubmitFailed = (model, submitFailed = true) => ({
+  const setSubmitFailed = (model, submitFailed = true, options) => ({
     type: actionTypes.SET_SUBMIT_FAILED,
     model,
     submitFailed,
+    ...options,
   });
 
   const submit = (model, promise, options = {}) => {

src/actions/model-actions.js

@@ -147,9 +147,10 @@ export function createModelActions(s = defaultStrategies) {
     return newValue;
   }, {}, 2, (_, props) => ({ removeKeys: props }));
 
-  const load = (model, values) => change(model, values, {
+  const load = (model, values, options) => change(model, values, {
     silent: true,
     load: true,
+    ...options,
   });
 
   return mapValues({

src/components/control-component.js

@@ -48,9 +48,10 @@ function getToggleValue(props) {
   }
 }
 
-function mergeOrSetErrors(model, errors) {
+function mergeOrSetErrors(model, errors, options) {
   return actions.setErrors(model, errors, {
     merge: isPlainObject(errors),
+    ...options,
   });
 }
 
@@ -399,15 +400,13 @@ function createControlClass(s = defaultStrategy) {
           }
           case 'validate':
             if (containsEvent(validateOn, 'change')) {
-              dispatch(actions.clearIntents(model, intent));
-              this.validate();
+              this.validate({ clearIntents: intent });
             }
             return;
 
           case 'load':
             if (!shallowEqual(modelValue, fieldValue.value)) {
-              dispatch(actions.clearIntents(model, intent));
-              dispatch(actions.load(model, fieldValue.value));
+              dispatch(actions.load(model, fieldValue.value, { clearIntents: intent }));
             }
             return;
 
@@ -563,7 +562,7 @@ function createControlClass(s = defaultStrategy) {
       if (node) this.node = node;
     }
 
-    validate() {
+    validate(options) {
       const {
         model,
         modelValue,
@@ -584,7 +583,9 @@ function createControlClass(s = defaultStrategy) {
         : fieldErrors;
 
       if (!shallowEqual(errors, fieldValue.errors)) {
-        dispatch(mergeOrSetErrors(model, errors));
+        dispatch(mergeOrSetErrors(model, errors, options));
+      } else if (options.clearIntents) {
+        dispatch(actions.clearIntents(options.clearIntents));
       }
 
       return modelValue;

src/components/form-component.js

@@ -268,27 +268,27 @@ function createFormClass(s = defaultStrategy) {
       }
     }
 
-    handleValidSubmit() {
+    handleValidSubmit(options) {
       const {
         dispatch,
         model,
         modelValue,
         onSubmit,
       } = this.props;
 
-      dispatch(s.actions.setPending(model));
+      dispatch(s.actions.setPending(model, true, options));
 
       if (onSubmit) onSubmit(modelValue);
     }
 
-    handleInvalidSubmit() {
+    handleInvalidSubmit(options) {
       const { onSubmitFailed, formValue, dispatch } = this.props;
 
       if (onSubmitFailed) {
         onSubmitFailed(formValue);
       }
 
-      dispatch(s.actions.setSubmitFailed(this.props.model));
+      dispatch(s.actions.setSubmitFailed(this.props.model, true, options));
     }
 
     handleReset(e) {
@@ -307,12 +307,10 @@ function createFormClass(s = defaultStrategy) {
       formValue.$form.intents.forEach((intent) => {
         switch (intent.type) {
           case 'submit': {
-            dispatch(s.actions.clearIntents(model, intent));
-
             if (isValid(formValue, { async: false })) {
-              this.handleValidSubmit();
+              this.handleValidSubmit({ clearIntents: intent });
             } else {
-              this.handleInvalidSubmit();
+              this.handleInvalidSubmit({ clearIntents: intent });
             }
 
             return;

src/reducers/form-actions-reducer.js

@@ -381,6 +381,10 @@ export function createFormActionsReducer(options) {
         return state;
     }
 
+    if (action.clearIntents) {
+      fieldUpdates.intents = clearIntents(intents, action.clearIntents);
+    }
+
     const updatedField = updateField(state, localPath, fieldUpdates);
     const updatedSubFields = Object.keys(subFieldUpdates).length
       ? updateSubFields(updatedField, localPath, subFieldUpdates)