fix(forms): fix dependsOn

cerebral · Nov 11, 2016 · c06f614 · c06f614
1 parent 37a6c53
commit c06f614
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/packages/cerebral-forms/src/factories/validateField.js b/packages/cerebral-forms/src/factories/validateField.js
@@ -23,8 +23,9 @@ export default function validateFieldFactory (path) {
     const formPath = fieldPath.slice().splice(0, fieldPath.length - 1)
     const field = state.get(fieldPath)
     const form = state.get(formPath)
+    const validationResult = runValidation(fieldPath, field, form)
 
-    state.merge(fieldPath, runValidation(fieldPath, field, form))
+    state.merge(fieldPath, validationResult)
 
     let dependentFields = []
     if (Array.isArray(field.dependsOn)) {
@@ -33,7 +34,7 @@ export default function validateFieldFactory (path) {
       dependentFields = [field.dependsOn]
     }
 
-    dependentFields.forEach((stringPath) => {
+    const depententOfValidationResult = dependentFields.reduce((currentValidationResult, stringPath) => {
       const dependentFieldPath = stringPath.split('.')
       const dependentFormPath = dependentFieldPath.slice().splice(0, dependentFieldPath.length - 1)
       const field = state.get(dependentFieldPath)
@@ -43,8 +44,17 @@ export default function validateFieldFactory (path) {
         throw new Error(`The path ${stringPath} used with "dependsOn" on field ${fieldPath.join('.')} is not correct, please check it`)
       }
 
-      state.merge(fieldPath, runValidation(dependentFieldPath, field, form))
-    })
+      const dependentValidationResult = runValidation(dependentFieldPath, field, form)
+      state.merge(dependentFieldPath, dependentValidationResult)
+
+      if (currentValidationResult.isValid && !dependentValidationResult.isValid) {
+        return dependentValidationResult
+      }
+
+      return currentValidationResult
+    }, validationResult)
+
+    state.merge(fieldPath, depententOfValidationResult)
   }
 
   return validateField

diff --git a/packages/cerebral-forms/src/field.test.js b/packages/cerebral-forms/src/field.test.js
@@ -63,7 +63,6 @@ describe('field', () => {
           password: {
             value: '',
             isRequired: true,
-            isValueRules: ['isValue'],
             requiredMessage: 'Password is required.',
             validationRules: [
               'minLength:15'
@@ -76,7 +75,6 @@ describe('field', () => {
           repeatPassword: {
             value: '',
             isRequired: true,
-            isValueRules: ['isValue'],
             validationRules: [
               'equalsField:password'
             ],
@@ -93,8 +91,10 @@ describe('field', () => {
       }
     })
     controller.getSignal('fieldChanged')({field: 'form.password', value: 'abcdefghijklmnopqrstuvxyz'})
+    assert.equal(controller.getState('form.password.isValid'), false)
+    assert.equal(controller.getState('form.repeatPassword.isValid'), false)
     controller.getSignal('fieldChanged')({field: 'form.repeatPassword', value: 'abcdefghijklmnopqrstuvxyz'})
-    let state = controller.getState()
-    assert(state.form.password.isValid, true)
+    assert.equal(controller.getState('form.password.isValid'), true)
+    assert.equal(controller.getState('form.repeatPassword.isValid'), true)
   })
 })