fix(xform): fix MeasureField writeValue method for null values (#42)

ESSS · Nov 23, 2018 · 19a0faf · 19a0faf
1 parent 9248068
commit 19a0faf
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/src/ng-xform/measure-field/measure-field.component.ts b/src/ng-xform/measure-field/measure-field.component.ts
@@ -77,10 +77,11 @@ export class MeasureFieldComponent extends BaseDynamicFieldComponent<MeasureFiel
   }
 
   writeValue(obj: Measure): void {
-    if (!obj) {
-      return;
+    if (!!obj) {
+      this.quantity = math.unit(obj.value, obj.unit).to(this.field.modelUnit);
+    } else {
+      this.quantity = undefined;
     }
-    this.quantity = math.unit(obj.value, obj.unit).to(this.field.modelUnit);
     this.updateInputValue();
   }
   registerOnChange(fn: any): void {
@@ -109,8 +110,14 @@ export class MeasureFieldComponent extends BaseDynamicFieldComponent<MeasureFiel
   }
 
   private updateInputValue() {
-    if (this.input) {
+    if (!this.input) {
+      return;
+    }
+
+    if (this.quantity) {
       this.input.value = this.quantity.toNumber(this.viewUnit).toString();
+    } else {
+      this.input.value = undefined;
     }
   }
 

diff --git a/src/ng-xform/ng-xform.component.spec.ts b/src/ng-xform/ng-xform.component.spec.ts
@@ -264,6 +264,39 @@ describe('NgXformComponent - Fields setup', () => {
 
   });
 
+  it('should reset null measure field values', () => {
+    const fixture = createTestingModule();
+    expect(fixture.componentInstance).toBeTruthy();
+
+    let component: NgXformComponent = fixture.debugElement.componentInstance.form;
+
+    fixture.componentInstance.setFields([
+      new MeasureField({ key: 'field1', label: 'Field 1', modelUnit: 'm' }),
+    ]);
+    fixture.detectChanges();
+
+    fixture.componentInstance.setModel({field1: {value: 10, unit: 'm'}});
+    fixture.detectChanges();
+
+    let el = fixture.debugElement.query(By.css('#field1-div .text-muted'));
+    expect(el).toBeTruthy();
+    expect(el.nativeElement.textContent).toEqual(' 10 m ');
+
+    fixture.componentInstance.setModel({field1: null});
+    fixture.detectChanges();
+
+    el = fixture.debugElement.query(By.css('#field1-div .text-muted'));
+    expect(el).toBeTruthy();
+    expect(el.nativeElement.textContent).toEqual(' - ');
+
+    fixture.componentInstance.editing = true;
+    fixture.detectChanges();
+
+    el = fixture.debugElement.query(By.css('#field1-div input'));
+    expect(el).toBeTruthy();
+    expect(el.nativeElement.value).toEqual('');
+  });
+
 });
 
 function createTestingModule(): ComponentFixture<any> {