FIX: no need to handle async/sync separately

smartprocure · Oct 18, 2024 · 65d4311 · 65d4311
1 parent 10b205f
commit 65d4311
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/index.js b/src/index.js
@@ -39,13 +39,6 @@ let defaultGetSnapshot = form => F.flattenObject(toJS(gatherFormValues(form)))
 
 let defaultGetNestedSnapshot = form => F.unflattenObject(form.getSnapshot())
 
-const handleSubmitErr = (state, err) => {
-  if (err instanceof ValidationError) {
-    state.errors = err.cause
-  }
-  throw err
-}
-
 export default ({
   submit: configSubmit,
   value = {},
@@ -185,16 +178,16 @@ export default ({
       return F.getOrReturn('message', form.submit.state.error)
     },
   })
-  let submit = Command(() => {
+  let submit = Command(async () => {
     if (_.isEmpty(form.validate())) {
       form.submit.state.error = null
       try {
-        // Handle both sync and sync configSubmit
-        return Promise.resolve(configSubmit(form.getSnapshot(), form)).catch(
-          err => handleSubmitErr(state, err)
-        )
+        return await configSubmit(form.getSnapshot(), form)
       } catch (err) {
-        handleSubmitErr(state, err)
+        if (err instanceof ValidationError) {
+          state.errors = { '': err.message, ...err.cause }
+        }
+        throw err
       }
     }
     throw 'Validation Error'

diff --git a/src/index.test.js b/src/index.test.js
@@ -421,6 +421,7 @@ describe('submit()', () => {
       'location.addresses.0.tenants.0': ['invalid format'],
     })
     expect(form.errors).toEqual({
+      '': 'My submit failed',
       'location.addresses.0.tenants.0': ['invalid format'],
     })
     expect(form.submitError).toBe('My submit failed')
@@ -440,6 +441,7 @@ describe('submit()', () => {
       'location.addresses.0.tenants.0': ['invalid format'],
     })
     expect(form.errors).toEqual({
+      '': 'My submit failed',
       'location.addresses.0.tenants.0': ['invalid format'],
     })
     expect(form.submitError).toBe('My submit failed')