fix(Time Value Validators): Propagate valueRequiredValidator to child component (DSP-1218)

projects/dsp-ui/src/lib/viewer/values/date-value/date-input/date-input.component.spec.ts

@@ -331,7 +331,7 @@ describe('NoValueRequiredTestHostComponent', () => {
         expect(testHostComponent).toBeTruthy();
     });
 
-    it('should recieve the propagated valueRequiredValidator from the parent component', () => {
+    it('should receive the propagated valueRequiredValidator from the parent component', () => {
         expect(testHostComponent.dateInputComponent.valueRequiredValidator).toBe(false);
     });
 

projects/dsp-ui/src/lib/viewer/values/interval-value/interval-input/interval-input.component.spec.ts

@@ -183,7 +183,7 @@ describe('InvertalInputComponent', () => {
         expect(testHostComponent).toBeTruthy();
     });
 
-    it('should recieve the propagated valueRequiredValidator from the parent component', () => {
+    it('should receive the propagated valueRequiredValidator from the parent component', () => {
         expect(testHostComponent.intervalInputComponent.valueRequiredValidator).toBe(false);
     });
 

projects/dsp-ui/src/lib/viewer/values/time-value/time-input/time-input.component.html

@@ -1,11 +1,11 @@
 <div [formGroup]="form">
-    <mat-form-field class="child-input-component">
-      <dsp-jdn-datepicker [activeCalendar]="'Gregorian'">
-        <input matInput class="time-input-element date" [matDatepicker]="picker" [formControlName]="'date'" (dateChange)="_handleInput()" aria-label="Date" [placeholder]="dateLabel" readonly>
-        <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-        <mat-datepicker #picker></mat-datepicker>
-      </dsp-jdn-datepicker>
-    </mat-form-field>
+    <dsp-jdn-datepicker [activeCalendar]="'Gregorian'">
+        <mat-form-field class="child-input-component">
+            <input matInput class="time-input-element date" [matDatepicker]="picker" [formControlName]="'date'" (dateChange)="_handleInput()" aria-label="Date" [placeholder]="dateLabel" readonly>
+            <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+            <mat-datepicker #picker></mat-datepicker>
+        </mat-form-field>
+    </dsp-jdn-datepicker>
     <mat-form-field class="child-input-component">
         <input matInput class="time-input-element time" [formControlName]="'time'" type="time" aria-label="Time" (input)="_handleInput()" [placeholder]="timeLabel" [errorStateMatcher]="matcher">
         <mat-error *ngIf="form.controls.time.hasError('required')">
@@ -15,4 +15,10 @@
             <span class="custom-error-message">Time should be given in precision HH:MM.</span>
         </mat-error>
     </mat-form-field>
+    <div class="date-form-error">
+        <mat-error *ngIf="((dateFormControl.value !== null || timeFormControl.value !== null)) &&
+                            (dateFormControl.hasError('validDateTimeRequired') || timeFormControl.hasError('validDateTimeRequired'))">
+            <span class="custom-error-message">A time value must have a <strong>date</strong> and <strong>time</strong>.</span>
+        </mat-error>
+      </div>
   </div>

projects/dsp-ui/src/lib/viewer/values/time-value/time-input/time-input.component.spec.ts

@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TimeInputComponent, DateTime } from './time-input.component';
 import { Component, OnInit, ViewChild, DebugElement } from '@angular/core';
-import { FormGroup, FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { FormGroup, FormBuilder, ReactiveFormsModule, FormControl } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -42,6 +42,35 @@ class TestHostComponent implements OnInit {
     }
 }
 
+/**
+ * Test host component to simulate parent component.
+ */
+@Component({
+    template: `
+    <div [formGroup]="form">
+      <mat-form-field>
+        <dsp-time-input #timeInput [formControlName]="'time'" [valueRequiredValidator]="false"></dsp-time-input>
+      </mat-form-field>
+    </div>`
+})
+class NoValueRequiredTestHostComponent implements OnInit {
+
+    @ViewChild('timeInput') timeInputComponent: TimeInputComponent;
+
+    form: FormGroup;
+
+    constructor(private _fb: FormBuilder) {
+    }
+
+    ngOnInit(): void {
+
+        this.form = this._fb.group({
+            time: new FormControl(null)
+        });
+
+    }
+}
+
 describe('TimeInputComponent', () => {
     let testHostComponent: TestHostComponent;
     let testHostFixture: ComponentFixture<TestHostComponent>;
@@ -132,4 +161,62 @@ describe('TimeInputComponent', () => {
         expect(dateTime.time).toEqual('12:00');
 
     });
+
+    it('should mark the form\'s validity correctly', () => {
+        expect(testHostComponent.timeInputComponent.valueRequiredValidator).toBe(true);
+        expect(testHostComponent.timeInputComponent.form.valid).toBe(true);
+
+        testHostComponent.timeInputComponent.timeFormControl.setValue(null);
+
+        testHostComponent.timeInputComponent._handleInput();
+
+        expect(testHostComponent.timeInputComponent.form.valid).toBe(false);
+
+        testHostComponent.timeInputComponent.timeFormControl.setValue("");
+
+        testHostComponent.timeInputComponent._handleInput();
+
+        expect(testHostComponent.timeInputComponent.form.valid).toBe(false);
+    });
+});
+
+describe('TimeInputComponent no value required', () => {
+    let testHostComponent: NoValueRequiredTestHostComponent;
+    let testHostFixture: ComponentFixture<NoValueRequiredTestHostComponent>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                ReactiveFormsModule,
+                MatFormFieldModule,
+                MatInputModule,
+                MatDatepickerModule,
+                MatJDNConvertibleCalendarDateAdapterModule,
+                BrowserAnimationsModule],
+            declarations: [TimeInputComponent, NoValueRequiredTestHostComponent, JDNDatepickerDirective]
+        })
+            .compileComponents();
+    }));
+
+    beforeEach(() => {
+        testHostFixture = TestBed.createComponent(NoValueRequiredTestHostComponent);
+        testHostComponent = testHostFixture.componentInstance;
+        testHostFixture.detectChanges();
+
+        expect(testHostComponent).toBeTruthy();
+    });
+
+    it('should receive the propagated valueRequiredValidator from the parent component', () => {
+        expect(testHostComponent.timeInputComponent.valueRequiredValidator).toBe(false);
+    });
+
+    it('should mark the form\'s validity correctly', () => {
+        expect(testHostComponent.timeInputComponent.form.valid).toBe(true);
+
+        testHostComponent.timeInputComponent.timeFormControl.setValue('2019-08-06T12:00:00Z');
+
+        testHostComponent.timeInputComponent._handleInput();
+
+        expect(testHostComponent.timeInputComponent.form.valid).toBe(false);
+    });
 });

projects/dsp-ui/src/lib/viewer/values/time-value/time-input/time-input.component.ts

@@ -2,15 +2,17 @@ import { FocusMonitor } from '@angular/cdk/a11y';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { DatePipe } from '@angular/common';
 import { ValueErrorStateMatcher } from '../../value-error-state-matcher';
-import { Component, DoCheck, ElementRef, HostBinding, Input, OnDestroy, Optional, Self } from '@angular/core';
+import { Component, DoCheck, ElementRef, HostBinding, Input, OnDestroy, OnInit, Optional, Self } from '@angular/core';
 import {
+    AbstractControl,
     ControlValueAccessor,
     FormBuilder,
     FormControl,
     FormGroup,
     FormGroupDirective,
     NgControl,
     NgForm,
+    ValidatorFn,
     Validators
 } from '@angular/forms';
 import { CanUpdateErrorState, CanUpdateErrorStateCtor, ErrorStateMatcher, mixinErrorState } from '@angular/material/core';
@@ -19,6 +21,17 @@ import { CalendarDate, CalendarPeriod, GregorianCalendarDate } from 'jdnconverti
 import { Subject } from 'rxjs';
 import { CustomRegex } from '../../custom-regex';
 
+/** A valid time value must have both a date and a time, or both inputs must be null */
+export function dateTimeValidator(otherControl: FormControl): ValidatorFn {
+    return (control: AbstractControl): { [key: string]: any } | null => {
+
+        // valid if both date and time are null or have values, excluding empty strings
+        const invalid = !(control.value === null && otherControl.value === null ||
+                        ((control.value !== null && control.value !== '') && (otherControl.value !== null && otherControl.value !== '')));
+
+        return invalid ? { 'validDateTimeRequired': { value: control.value } } : null;
+    };
+}
 
 class MatInputBase {
     constructor(public _defaultErrorStateMatcher: ErrorStateMatcher,
@@ -43,7 +56,7 @@ export class DateTime {
     styleUrls: ['./time-input.component.scss'],
     providers: [{ provide: MatFormFieldControl, useExisting: TimeInputComponent }]
 })
-export class TimeInputComponent extends _MatInputMixinBase implements ControlValueAccessor, MatFormFieldControl<string>, DoCheck, CanUpdateErrorState, OnDestroy {
+export class TimeInputComponent extends _MatInputMixinBase implements ControlValueAccessor, MatFormFieldControl<string>, DoCheck, CanUpdateErrorState, OnDestroy, OnInit {
 
     static nextId = 0;
 
@@ -59,6 +72,7 @@ export class TimeInputComponent extends _MatInputMixinBase implements ControlVal
 
     @Input() dateLabel = 'Date';
     @Input() timeLabel = 'Time';
+    @Input() valueRequiredValidator = true;
 
     dateFormControl: FormControl;
     timeFormControl: FormControl;
@@ -144,6 +158,10 @@ export class TimeInputComponent extends _MatInputMixinBase implements ControlVal
         } else {
             this.form.setValue({ date: null, time: null });
         }
+
+        this.dateFormControl.updateValueAndValidity();
+        this.timeFormControl.updateValueAndValidity();
+
         this.stateChanges.next();
     }
 
@@ -159,9 +177,9 @@ export class TimeInputComponent extends _MatInputMixinBase implements ControlVal
 
         super(_defaultErrorStateMatcher, _parentForm, _parentFormGroup, ngControl);
 
-        this.dateFormControl = new FormControl(null, [Validators.required]);
+        this.dateFormControl = new FormControl(null);
 
-        this.timeFormControl = new FormControl(null, [Validators.required, Validators.pattern(CustomRegex.TIME_REGEX)]);
+        this.timeFormControl = new FormControl(null);
 
         this.form = fb.group({
             date: this.dateFormControl,
@@ -178,6 +196,19 @@ export class TimeInputComponent extends _MatInputMixinBase implements ControlVal
         }
     }
 
+    ngOnInit() {
+        if (this.valueRequiredValidator) {
+            this.dateFormControl.setValidators([Validators.required, dateTimeValidator(this.timeFormControl)]);
+            this.timeFormControl.setValidators([Validators.required, dateTimeValidator(this.dateFormControl), Validators.pattern(CustomRegex.TIME_REGEX)]);
+        } else {
+            this.dateFormControl.setValidators(dateTimeValidator(this.timeFormControl));
+            this.timeFormControl.setValidators([dateTimeValidator(this.dateFormControl), Validators.pattern(CustomRegex.TIME_REGEX)]);
+        }
+
+        this.dateFormControl.updateValueAndValidity();
+        this.timeFormControl.updateValueAndValidity();
+    }
+
     ngDoCheck() {
         if (this.ngControl) {
             this.updateErrorState();
@@ -211,6 +242,8 @@ export class TimeInputComponent extends _MatInputMixinBase implements ControlVal
     }
 
     _handleInput(): void {
+        this.dateFormControl.updateValueAndValidity();
+        this.timeFormControl.updateValueAndValidity();
         this.onChange(this.value);
     }
 

projects/dsp-ui/src/lib/viewer/values/time-value/time-value.component.html

@@ -6,7 +6,7 @@
 <ng-template #showForm>
   <span [formGroup]="form" class="parent-component-wrapper">
       <mat-form-field class="large-field child-value-component" floatLabel="never">
-        <dsp-time-input #timeInput [formControlName]="'value'" class="value" [errorStateMatcher]="matcher"></dsp-time-input>
+        <dsp-time-input #timeInput [formControlName]="'value'" class="value" [errorStateMatcher]="matcher" [valueRequiredValidator]="valueRequiredValidator"></dsp-time-input>
           <mat-error *ngIf="valueFormControl.hasError('valueNotChanged') &&
                 (valueFormControl.touched || valueFormControl.dirty)">
             <span class="custom-error-message">New value must be different than the current value.</span>