Fix false values (#417)

adopted-ember-addons · Jan 20, 2020 · dafac44 · dafac44
1 parent 657b8b1
commit dafac44
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/addon/-private/validated-changeset.ts b/addon/-private/validated-changeset.ts
@@ -765,7 +765,7 @@ export class BufferedChangeset implements IChangeset {
       let c: Change = changes[baseKey];
       let result = this.getDeep(normalizeObject(c), remaining.join('.'));
       // just b/c top level key exists doesn't mean it has the nested key we are looking for
-      if (result) {
+      if (typeof result !== 'undefined') {
         return result;
       }
     }
@@ -822,7 +822,7 @@ export class BufferedChangeset implements IChangeset {
       // find leaf and delete from map
       while (isObject(currentNode) && currentKey) {
         let curr: { [key: string]: unknown } = currentNode
-        if (curr.value || curr.validation) {
+        if (typeof curr.value !== 'undefined' || curr.validation) {
           delete previousNode[currentKey];
         }
 
@@ -849,14 +849,14 @@ export class BufferedChangeset implements IChangeset {
       if (remaining.length > 0) {
         let c = changes[baseKey];
         result = this.getDeep(normalizeObject(c), remaining.join('.'));
-        if (result) {
+        if (typeof result !== 'undefined') {
           return result;
         }
       } else {
         result = changes[baseKey];
       }
 
-      if (result && isObject(result)) {
+      if ((result !== undefined && result !== null) && isObject(result)) {
         result = normalizeObject(result);
         let content: Content = this[CONTENT];
 

diff --git a/tests/unit/changeset-test.js b/tests/unit/changeset-test.js
@@ -33,6 +33,9 @@ let dummyValidations = {
     return isPresent(value);
   },
   org: {
+    isCompliant(value) {
+      return !!value;
+    },
     usa: {
       ny(value) {
         return isPresent(value) || "must be present";
@@ -682,6 +685,32 @@ module('Unit | Utility | changeset', function(hooks) {
     assert.notOk(get(dummyChangeset, 'isInvalid'), 'should be valid');
   });
 
+  test('it clears errors when setting to original value when nested', async function(assert) {
+    set(dummyModel, 'org', {
+      usa: { ny: 'vaca' }
+    });
+    let dummyChangeset = new Changeset(dummyModel, dummyValidator);
+    dummyChangeset.set('org.usa.ny', '');
+
+    assert.ok(get(dummyChangeset, 'isInvalid'), 'should be invalid');
+    dummyChangeset.set('org.usa.ny', 'vaca');
+    assert.ok(get(dummyChangeset, 'isValid'), 'should be valid');
+    assert.notOk(get(dummyChangeset, 'isInvalid'), 'should be valid');
+  });
+
+  test('it clears errors when setting to original value when nested Booleans', async function(assert) {
+    set(dummyModel, 'org', {
+      isCompliant: true
+    });
+    let dummyChangeset = new Changeset(dummyModel, dummyValidator);
+    dummyChangeset.set('org.isCompliant', false);
+
+    assert.ok(get(dummyChangeset, 'isInvalid'), 'should be invalid');
+    dummyChangeset.set('org.isCompliant', true);
+    assert.ok(get(dummyChangeset, 'isValid'), 'should be valid');
+    assert.notOk(get(dummyChangeset, 'isInvalid'), 'should be valid');
+  });
+
   test('#set should delete nested changes when equal', async function(assert) {
     set(dummyModel, 'org', {
       usa: { ny: 'i need a vacation' }