Split 'error' on three different fields; do not unset form-wide submit error if persistentSubmitErrors is true

src/__tests__/helpers/reducer.change.js

@@ -280,7 +280,7 @@ const describeChange = (reducer, expect, { fromJS }) => () => {
           submitErrors: {
             myField: 'submit error'
           },
-          error: 'some global error'
+          submitFormWideError: 'some global error'
         }
       }),
       change('foo', 'myField', 'different', false, true)
@@ -293,7 +293,8 @@ const describeChange = (reducer, expect, { fromJS }) => () => {
         submitErrors: {
           myField: 'submit error'
         },
-        error: 'some global error'
+        submitFormWideError: 'some global error',
+        submitErrorsUpToDate: false
       }
     })
   })

src/__tests__/helpers/reducer.clearFields.js

@@ -79,7 +79,7 @@ const describeClearFields = (reducer, expect, { fromJS }) => () => {
             }
           },
           anyTouched: true,
-          error: 'some global error'
+          submitFormWideError: 'some global error'
         }
       }),
       clearFields('foo', false, true, 'myField', 'myOtherField')
@@ -98,7 +98,8 @@ const describeClearFields = (reducer, expect, { fromJS }) => () => {
           myField: 'submit error',
           myOtherField: 'submit error'
         },
-        error: 'some global error'
+        submitErrorsUpToDate: false,
+        submitFormWideError: 'some global error'
       }
     })
   })
@@ -266,7 +267,8 @@ const describeClearFields = (reducer, expect, { fromJS }) => () => {
               touched: true
             }
           },
-          error: 'some global error',
+          submitErrorsUpToDate: true,
+          submitFormWideError: 'some global error',
           anyTouched: true
         }
       }),
@@ -296,7 +298,8 @@ const describeClearFields = (reducer, expect, { fromJS }) => () => {
           myField: 'submit error',
           myOtherField: 'submit error'
         },
-        error: 'some global error',
+        submitErrorsUpToDate: false,
+        submitFormWideError: 'some global error',
         anyTouched: true
       }
     })

src/__tests__/helpers/reducer.clearSubmitErrors.js

@@ -29,7 +29,7 @@ const describeClearSubmitErrors = (reducer, expect, { fromJS }) => () => {
           submitErrors: {
             some: 'error'
           },
-          error: 'form-wide error',
+          submitFormWideError: 'form-wide error',
           active: 'otherField',
           triggerSubmit: true
         }

src/__tests__/helpers/reducer.initialize.js

@@ -398,7 +398,7 @@ const describeInitialize = (reducer, expect, { fromJS }) => () => {
           initial: {
             myField: 'initialValue'
           },
-          error: 'form wide error',
+          syncFormWideError: 'form wide error',
           syncErrors: {
             myField: 'field error'
           }
@@ -415,7 +415,7 @@ const describeInitialize = (reducer, expect, { fromJS }) => () => {
         initial: {
           myField: 'newValue'
         },
-        error: 'form wide error',
+        syncFormWideError: 'form wide error',
         syncErrors: {
           myField: 'field error'
         }

src/__tests__/helpers/reducer.stopAsyncValidation.js

@@ -171,7 +171,7 @@ const describeStopAsyncValidation = (reducer, expect, { fromJS }) => () => {
             }
           },
           asyncValidating: true,
-          error: 'Previous global error'
+          asyncFormWideError: 'Previous global error'
         }
       }),
       stopAsyncValidation('foo')
@@ -219,7 +219,7 @@ const describeStopAsyncValidation = (reducer, expect, { fromJS }) => () => {
             touched: true
           }
         },
-        error: 'This is a global error'
+        asyncFormWideError: 'This is a global error'
       }
     })
   })

src/__tests__/helpers/reducer.stopSubmit.js

@@ -78,6 +78,7 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
             myOtherField: 'Error about myOtherField'
           }
         },
+        submitErrorsUpToDate: true,
         fields: {
           bar: {
             myField: {
@@ -131,6 +132,7 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
         submitErrors: {
           bar: ['Error about myField', 'Error about myOtherField']
         },
+        submitErrorsUpToDate: true,
         fields: {
           bar: [
             {
@@ -180,6 +182,7 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
           cat: ['Not funny', 'Sleeps too much'],
           dog: ['Unhelpful', 'Not house trained']
         },
+        submitErrorsUpToDate: true,
         fields: {
           cat: {
             touched: true
@@ -274,7 +277,8 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
             touched: true
           }
         },
-        error: 'some global error',
+        submitFormWideError: 'some global error',
+        submitErrorsUpToDate: true,
         submitFailed: true
       }
     })
@@ -293,7 +297,8 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
             }
           },
           submitting: true,
-          error: 'Previous global error'
+          submitFormWideError: 'Previous global error',
+          submitErrorsUpToDate: true
         }
       }),
       stopSubmit('foo')
@@ -326,7 +331,8 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
             }
           },
           submitting: true,
-          error: 'some global error'
+          submitFormWideError: 'Previous global error',
+          submitErrorsUpToDate: true
         }
       }),
       stopSubmit('foo', { myField: 'some submit error' })
@@ -339,6 +345,7 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
         submitErrors: {
           myField: 'some submit error'
         },
+        submitErrorsUpToDate: true,
         fields: {
           myField: {
             touched: true
@@ -412,6 +419,7 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
           myField: 'Error about myField',
           myOtherField: 'Error about myOtherField'
         },
+        submitErrorsUpToDate: true,
         fields: {
           myField: {
             touched: true
@@ -454,7 +462,8 @@ const describeStopSubmit = (reducer, expect, { fromJS }) => () => {
             touched: true
           }
         },
-        error: 'This is a global error',
+        submitFormWideError: 'This is a global error',
+        submitErrorsUpToDate: true,
         submitFailed: true
       }
     })

src/__tests__/helpers/reducer.updateSyncErrors.js

@@ -62,8 +62,7 @@ const describeUpdateSyncErrors = (reducer, expect, { fromJS, setIn }) => () => {
               myField: 'value',
               myOtherField: 'otherValue'
             },
-            syncError: true,
-            error: 'form wide error'
+            syncFormWideError: 'form wide error'
           }
         }),
         'foo.syncErrors',

src/createReducer.js

@@ -222,8 +222,11 @@ function createReducer<M, L>(structure: Structure<M, L>) {
         result = setIn(result, `values.${field}`, payload)
       }
       result = deleteInWithCleanUp(result, `asyncErrors.${field}`)
-      if (!persistentSubmitErrors) {
+      if (persistentSubmitErrors) {
+        result = setIn(result, `submitErrorsUpToDate`, false)
+      } else {
         result = deleteInWithCleanUp(result, `submitErrors.${field}`)
+        result = deleteIn(result, `submitErrorsUpToDate`)
       }
       result = deleteInWithCleanUp(result, `fields.${field}.autofilled`)
       if (touch) {
@@ -238,7 +241,8 @@ function createReducer<M, L>(structure: Structure<M, L>) {
     [CLEAR_SUBMIT_ERRORS](state) {
       let result = state
       result = deleteInWithCleanUp(result, 'submitErrors')
-      result = deleteIn(result, 'error')
+      result = deleteIn(result, 'submitFormWideError')
+      result = deleteIn(result, `submitErrorsUpToDate`)
       return result
     },
     [CLEAR_ASYNC_ERROR](state, { meta: { field } }) {
@@ -252,8 +256,11 @@ function createReducer<M, L>(structure: Structure<M, L>) {
       fields.forEach(field => {
         result = deleteInWithCleanUp(result, `values.${field}`)
         result = deleteInWithCleanUp(result, `asyncErrors.${field}`)
-        if (!persistentSubmitErrors) {
+        if (persistentSubmitErrors) {
+          result = setIn(result, `submitErrorsUpToDate`, false)
+        } else {
           result = deleteInWithCleanUp(result, `submitErrors.${field}`)
+          result = deleteIn(result, `submitErrorsUpToDate`)
         }
         result = deleteInWithCleanUp(result, `fields.${field}.autofilled`)
         if (!keepTouched) {
@@ -277,7 +284,13 @@ function createReducer<M, L>(structure: Structure<M, L>) {
       result = setIn(result, 'active', field)
       return result
     },
-    [INITIALIZE](state, { payload, meta: { keepDirty, keepSubmitSucceeded, updateUnregisteredFields } }) {
+    [INITIALIZE](
+      state,
+      {
+        payload,
+        meta: { keepDirty, keepSubmitSucceeded, updateUnregisteredFields }
+      }
+    ) {
       const mapData = fromJS(payload)
       let result = empty // clean all field state
 
@@ -292,10 +305,22 @@ function createReducer<M, L>(structure: Structure<M, L>) {
       }
 
       // persist old errors, they will get recalculated if the new form values are different from the old values
-      const error = getIn(state, 'error')
-      if (error) {
-        result = setIn(result, 'error', error)
+      const syncFormWideError = getIn(state, 'syncFormWideError')
+      if (syncFormWideError) {
+        result = setIn(result, 'syncFormWideError', syncFormWideError)
+      }
+
+      // Might not be needed, but test coverage relies on it
+      const asyncFormWideError = getIn(state, 'asyncFormWideError')
+      if (asyncFormWideError) {
+        result = setIn(result, 'asyncFormWideError', asyncFormWideError)
       }
+
+      const submitFormWideError = getIn(state, 'submitFormWideError')
+      if (submitFormWideError) {
+        result = setIn(result, 'submitFormWideError', submitFormWideError)
+      }
+
       const syncErrors = getIn(state, 'syncErrors')
       if (syncErrors) {
         result = setIn(result, 'syncErrors', syncErrors)
@@ -345,7 +370,9 @@ function createReducer<M, L>(structure: Structure<M, L>) {
           }
 
           if (!updateUnregisteredFields) {
-            forEach(keys(registeredFields), name => overwritePristineValue(name))
+            forEach(keys(registeredFields), name =>
+              overwritePristineValue(name)
+            )
           }
 
           forEach(keys(newInitialValues), name => {
@@ -411,13 +438,13 @@ function createReducer<M, L>(structure: Structure<M, L>) {
       if (payload && Object.keys(payload).length) {
         const { _error, ...fieldErrors } = payload
         if (_error) {
-          result = setIn(result, 'error', _error)
+          result = setIn(result, 'asyncFormWideError', _error)
         }
         if (Object.keys(fieldErrors).length) {
           result = setIn(result, 'asyncErrors', fromJS(fieldErrors))
         }
       } else {
-        result = deleteIn(result, 'error')
+        result = deleteIn(result, 'asyncFormWideError')
       }
       return result
     },
@@ -426,23 +453,32 @@ function createReducer<M, L>(structure: Structure<M, L>) {
       result = deleteIn(result, 'submitting')
       result = deleteIn(result, 'submitFailed')
       result = deleteIn(result, 'submitSucceeded')
+
       if (payload && Object.keys(payload).length) {
         const { _error, ...fieldErrors } = payload
+        const isFieldErrorsPresent = !!Object.keys(fieldErrors).length
         if (_error) {
-          result = setIn(result, 'error', _error)
+          result = setIn(result, 'submitFormWideError', _error)
+          result = setIn(result, `submitErrorsUpToDate`, true)
         } else {
-          result = deleteIn(result, 'error')
+          result = deleteIn(result, 'submitFormWideError')
         }
-        if (Object.keys(fieldErrors).length) {
+        if (isFieldErrorsPresent) {
           result = setIn(result, 'submitErrors', fromJS(fieldErrors))
+          result = setIn(result, `submitErrorsUpToDate`, true)
         } else {
           result = deleteIn(result, 'submitErrors')
         }
+        if (!_error && !isFieldErrorsPresent) {
+          result = deleteIn(result, `submitErrorsUpToDate`)
+        }
+        result = setIn(result, `submitErrorsUpToDate`, true)
         result = setIn(result, 'submitFailed', true)
       } else {
         result = setIn(result, 'submitSucceeded', true)
-        result = deleteIn(result, 'error')
+        result = deleteIn(result, 'submitFormWideError')
         result = deleteIn(result, 'submitErrors')
+        result = deleteIn(result, `submitErrorsUpToDate`)
       }
       return result
     },
@@ -530,11 +566,9 @@ function createReducer<M, L>(structure: Structure<M, L>) {
     [UPDATE_SYNC_ERRORS](state, { payload: { syncErrors, error } }) {
       let result = state
       if (error) {
-        result = setIn(result, 'error', error)
-        result = setIn(result, 'syncError', true)
+        result = setIn(result, 'syncFormWideError', error)
       } else {
-        result = deleteIn(result, 'error')
-        result = deleteIn(result, 'syncError')
+        result = deleteIn(result, 'syncFormWideError')
       }
       if (Object.keys(syncErrors).length) {
         result = setIn(result, 'syncErrors', syncErrors)