fix: foxhound87#324

houdiniproject · Sep 14, 2017 · 616ce5e · 616ce5e
1 parent a613349
commit 616ce5e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/src/Form.js b/src/Form.js
@@ -95,7 +95,7 @@ export default class Form extends Base {
   }
 
   @computed get hasError() {
-    return this.validator.error
+    return !!this.validator.error
      || this.check('hasError', true);
   }
 

diff --git a/src/shared/Actions.js b/src/shared/Actions.js
@@ -181,13 +181,8 @@ export default {
         delete obj[field.key]; // eslint-disable-line
         if (removeValue) return obj;
 
-
-        const data = utils.hasUnifiedProps({ fields: [value] })
-            ? value[prop]
-            : value;
-
         return Object.assign(obj, {
-          [field.key]: parser.parseCheckArray(field, data, prop),
+          [field.key]: parser.parseCheckArray(field, value, prop),
         });
       }
 

diff --git a/tests/data/forms/fixes/form.q.js b/tests/data/forms/fixes/form.q.js
@@ -6,6 +6,13 @@ const fields = [
   'incident[].type',
   'incident[].value',
   'incident[].options',
+  'arrayFieldA[]',
+  'arrayFieldA[].id',
+  'arrayFieldA[].name',
+  'arrayFieldB[]',
+  'arrayFieldB[].id',
+  'arrayFieldB[].name',
+  'arrayFieldB[].value',
 ];
 
 class NewForm extends Form {
@@ -15,6 +22,10 @@ class NewForm extends Form {
       onInit() {
         // FIX: #282 (reserved keywords)
         this.$('incident').add();
+
+        // TO FIX #324
+        this.update({ arrayFieldA: [{ id: 1, name: 'name' }] });
+        this.update({ arrayFieldB: [{ id: 1, name: 'name', value: 'some val' }] });
       },
     };
   }

diff --git a/tests/fixes.values.js b/tests/fixes.values.js
@@ -208,6 +208,23 @@ describe('Check Fixes $P values', () => {
     expect($.$P.$('address').labels()).to.be.deep.equal(labels));
 });
 
+describe('Check Fixes $Q values', () => {
+  const a = [{ id: 1, name: 'name' }];
+  const b = [{ id: 1, name: 'name', value: 'some val' }];
+
+  it('$Q arrayFieldA values() check', () =>
+    expect($.$Q.$('arrayFieldA').values()).to.be.deep.equal(a));
+
+  it('$Q arrayFieldB values() check', () =>
+    expect($.$Q.$('arrayFieldB').values()).to.be.deep.equal(b));
+
+  it('$Q arrayFieldA value check', () =>
+    expect($.$Q.$('arrayFieldA').value).to.be.deep.equal(a));
+
+  it('$Q arrayFieldB value check', () =>
+    expect($.$Q.$('arrayFieldB').value).to.be.deep.equal(b));
+});
+
 describe('Check Fixes $R values', () => {
   const a = $.$R.values().organization;
   const b = $.$R.$('organization').value;