Merge branch 'tiagoefmoraes-validation_x_load'

Author: davidkpiano

src/reducers/form/change-action-reducer.js

@@ -9,7 +9,7 @@ import { createInitialState } from '../form-reducer';
 import initialFieldState from '../../constants/initial-field-state';
 import updateParentForms from '../../utils/update-parent-forms';
 
-function updateFieldValue(field, action) {
+function updateFieldValue(field, action, parentModel = undefined) {
   const { value, removeKeys, silent, load, model } = action;
 
   const fieldState = (field && field.$form)
@@ -70,13 +70,18 @@ function updateFieldValue(field, action) {
   }
 
   const updatedField = mapValues(value, (subValue, index) => {
-    const subField = field[index] || createInitialState(`${model}.${index}`, subValue);
+    // TODO: refactor
+    const subField = field[index]
+      || createInitialState(`${`${(parentModel
+        ? `${parentModel}.`
+        : '')
+      }${model}`}.${index}`, subValue);
 
     if (Object.hasOwnProperty.call(subField, '$form')) {
       return updateFieldValue(subField, {
         model: index,
         value: subValue,
-      });
+      }, parentModel ? `${parentModel}.${model}` : model);
     }
 
     if (shallowEqual(subValue, subField.value)) {

test/model-actions-spec.js

@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import { combineReducers } from 'redux';
 import Immutable from 'immutable';
-import { actions, modelReducer, formReducer, track } from '../src';
+import { actions, modelReducer, formReducer, track, combineForms } from '../src';
 import {
   actions as immutableActions,
   modelReducer as immutableModelReducer,
@@ -22,6 +22,85 @@ describe('model actions', () => {
       assert.deepEqual(actual, { bar: 'string' });
     });
 
+    it('should load array values and form values', () => {
+      const reducer = combineForms({
+        user: {
+          username: '',
+          items: [{ name: 'item 1', subitems: [{ name: 'subitem 1' }] }],
+        },
+      });
+      const DATA = {
+        username: 'loaded',
+        items: [
+          { name: 'item 1', subitems: [
+            { name: 'subitem 1' },
+            { name: 'subitem 2' },
+          ] },
+          { name: 'item 2', subitems: [
+            { name: 'subitem 1' },
+          ] }],
+      };
+      // const initial = reducer(undefined, {});
+      const actual = reducer({}, actions.load('user', DATA));
+
+      assert.equal(
+        actual.forms.user.items.$form.model,
+        'user.items'
+      );
+
+      assert.equal(
+        actual.forms.user.items[0].$form.model,
+        'user.items.0'
+      );
+      assert.equal(
+        actual.forms.user.items[0].name.model,
+        'user.items.0.name'
+      );
+      assert.equal(
+        actual.forms.user.items[0].subitems.$form.model,
+        'user.items.0.subitems'
+      );
+
+      // assert.equal(actual.forms.user.items[0].subitems, "user.items.0.subitems.0");
+      assert.equal(
+        actual.forms.user.items[0].subitems[0].$form.model,
+        'user.items.0.subitems.0'
+      );
+      assert.equal(
+        actual.forms.user.items[0].subitems[0].name.model,
+        'user.items.0.subitems.0.name'
+      );
+      assert.equal(
+        actual.forms.user.items[0].subitems[1].$form.model,
+        'user.items.0.subitems.1'
+      );
+      assert.equal(
+        actual.forms.user.items[0].subitems[1].name.model,
+        'user.items.0.subitems.1.name'
+      );
+
+      assert.equal(
+        actual.forms.user.items[1].$form.model,
+        'user.items.1'
+      );
+      assert.equal(
+        actual.forms.user.items[1].name.model,
+        'user.items.1.name'
+      );
+      assert.equal(
+        actual.forms.user.items[1].subitems.$form.model,
+        'user.items.1.subitems'
+      );
+      assert.equal(
+        actual.forms.user.items[1].subitems[0].$form.model,
+        'user.items.1.subitems.0'
+      );
+      assert.equal(
+        actual.forms.user.items[1].subitems[0].name.model,
+        'user.items.1.subitems.0.name'
+      );
+    });
+
     it('should load model and form stay untouched', () => {
       const reducer = combineReducers({
         foo: modelReducer('foo'),