Skip to content
This repository was archived by the owner on Aug 23, 2022. It is now read-only.

Commit de625f0

Browse files
committed
Linting
1 parent 6856b2a commit de625f0

File tree

2 files changed

+72
-21
lines changed

2 files changed

+72
-21
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,18 @@ function updateFieldValue(field, action, parentModel = undefined) {
7070
}
7171

7272
const updatedField = mapValues(value, (subValue, index) => {
73-
const subField = field[index] || createInitialState(`${(parentModel ? parentModel + '.' : '') + model}.${index}`, subValue);
73+
// TODO: refactor
74+
const subField = field[index]
75+
|| createInitialState(`${`${(parentModel
76+
? `${parentModel}.`
77+
: '')
78+
}${model}`}.${index}`, subValue);
7479

7580
if (Object.hasOwnProperty.call(subField, '$form')) {
7681
return updateFieldValue(subField, {
7782
model: index,
7883
value: subValue,
79-
}, (parentModel ? parentModel + '.' : '') + model);
84+
}, parentModel ? `${parentModel}.${model}` : model);
8085
}
8186

8287
if (shallowEqual(subValue, subField.value)) {

test/model-actions-spec.js

Lines changed: 65 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,79 @@ describe('model actions', () => {
2626
const reducer = combineForms({
2727
user: {
2828
username: '',
29-
items: [{name: 'item 1', subitems: [{name: 'subitem 1'}]}]
29+
items: [{ name: 'item 1', subitems: [{ name: 'subitem 1' }] }],
3030
},
31-
})
31+
});
3232
const DATA = {
3333
username: 'loaded',
34-
items: [{name: 'item 1', subitems: [{name: 'subitem 1'}, {name: 'subitem 2'}]}, {name: 'item 2', subitems: [{name: 'subitem 1'}]}],
34+
items: [
35+
{ name: 'item 1', subitems: [
36+
{ name: 'subitem 1' },
37+
{ name: 'subitem 2' },
38+
] },
39+
{ name: 'item 2', subitems: [
40+
{ name: 'subitem 1' },
41+
] }],
3542
};
36-
const initial = reducer(undefined, {});
43+
// const initial = reducer(undefined, {});
3744
const actual = reducer({}, actions.load('user', DATA));
3845

39-
assert.equal(actual.forms.user.items.$form.model, "user.items");
40-
41-
assert.equal(actual.forms.user.items[0].$form.model, "user.items.0");
42-
assert.equal(actual.forms.user.items[0].name.model, "user.items.0.name");
43-
assert.equal(actual.forms.user.items[0].subitems.$form.model, "user.items.0.subitems");
46+
assert.equal(
47+
actual.forms.user.items.$form.model,
48+
'user.items'
49+
);
50+
51+
assert.equal(
52+
actual.forms.user.items[0].$form.model,
53+
'user.items.0'
54+
);
55+
assert.equal(
56+
actual.forms.user.items[0].name.model,
57+
'user.items.0.name'
58+
);
59+
assert.equal(
60+
actual.forms.user.items[0].subitems.$form.model,
61+
'user.items.0.subitems'
62+
);
4463

4564
// assert.equal(actual.forms.user.items[0].subitems, "user.items.0.subitems.0");
46-
assert.equal(actual.forms.user.items[0].subitems[0].$form.model, "user.items.0.subitems.0");
47-
assert.equal(actual.forms.user.items[0].subitems[0].name.model, "user.items.0.subitems.0.name");
48-
assert.equal(actual.forms.user.items[0].subitems[1].$form.model, "user.items.0.subitems.1");
49-
assert.equal(actual.forms.user.items[0].subitems[1].name.model, "user.items.0.subitems.1.name");
50-
51-
assert.equal(actual.forms.user.items[1].$form.model, "user.items.1");
52-
assert.equal(actual.forms.user.items[1].name.model, "user.items.1.name");
53-
assert.equal(actual.forms.user.items[1].subitems.$form.model, "user.items.1.subitems");
54-
assert.equal(actual.forms.user.items[1].subitems[0].$form.model, "user.items.1.subitems.0");
55-
assert.equal(actual.forms.user.items[1].subitems[0].name.model, "user.items.1.subitems.0.name");
65+
assert.equal(
66+
actual.forms.user.items[0].subitems[0].$form.model,
67+
'user.items.0.subitems.0'
68+
);
69+
assert.equal(
70+
actual.forms.user.items[0].subitems[0].name.model,
71+
'user.items.0.subitems.0.name'
72+
);
73+
assert.equal(
74+
actual.forms.user.items[0].subitems[1].$form.model,
75+
'user.items.0.subitems.1'
76+
);
77+
assert.equal(
78+
actual.forms.user.items[0].subitems[1].name.model,
79+
'user.items.0.subitems.1.name'
80+
);
81+
82+
assert.equal(
83+
actual.forms.user.items[1].$form.model,
84+
'user.items.1'
85+
);
86+
assert.equal(
87+
actual.forms.user.items[1].name.model,
88+
'user.items.1.name'
89+
);
90+
assert.equal(
91+
actual.forms.user.items[1].subitems.$form.model,
92+
'user.items.1.subitems'
93+
);
94+
assert.equal(
95+
actual.forms.user.items[1].subitems[0].$form.model,
96+
'user.items.1.subitems.0'
97+
);
98+
assert.equal(
99+
actual.forms.user.items[1].subitems[0].name.model,
100+
'user.items.1.subitems.0.name'
101+
);
56102
});
57103

58104
it('should load model and form stay untouched', () => {

0 commit comments

Comments
 (0)