[ADF-2984] Show date invalid message on search date range picker (#3323)

* [ADF-2984] Show date invalid message on search date range picker

* [ADF-2984] test that required format is displayed when date input is invalid

* [ADF-2984] More space above buttons

lib/content-services/i18n/en.json

@@ -189,6 +189,7 @@
         "REQUIRED-VALUE": "Required value",
         "NO-DAYS": "No days selected.",
         "INVALID-FORMAT": "Invalid Format",
+        "INVALID-DATE": "Invalid date. Please enter the date in the format '{{ requiredFormat }}'",
         "BEYOND-MAX-DATE": "Date is too late."
       }
     },

lib/content-services/search/components/search-date-range/search-date-range.component.html

@@ -7,12 +7,15 @@
                 (focusout)="onChangedHandler($event, from)">
         <mat-datepicker-toggle matSuffix [for]="fromDatepicker"></mat-datepicker-toggle>
         <mat-datepicker #fromDatepicker></mat-datepicker>
-        <mat-error *ngIf="from.hasError('required')">
+        <mat-error *ngIf="from.hasError('required') && !from.hasError('matDatepickerParse')">
             {{ 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE' | translate }}
         </mat-error>
         <mat-error *ngIf="from.hasError('matDatepickerMax')">
             {{ 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE' | translate }}
         </mat-error>
+        <mat-error *ngIf="from.hasError('matDatepickerParse')">
+            {{ 'SEARCH.FILTER.VALIDATION.INVALID-DATE' | translate: { requiredFormat: datePickerDateFormat } }}
+        </mat-error>
     </mat-form-field>
 
     <mat-form-field>
@@ -24,7 +27,7 @@
                 (focusout)="onChangedHandler($event, to)">
         <mat-datepicker-toggle matSuffix [for]="toDatepicker"></mat-datepicker-toggle>
         <mat-datepicker #toDatepicker></mat-datepicker>
-        <mat-error *ngIf="to.hasError('required')">
+        <mat-error *ngIf="to.hasError('required') && !to.hasError('matDatepickerParse')">
                 {{ 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE' | translate }}
         </mat-error>
         <mat-error *ngIf="to.hasError('matDatepickerMin')">
@@ -33,9 +36,12 @@
         <mat-error *ngIf="to.hasError('matDatepickerMax')">
             {{ 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE' | translate }}
         </mat-error>
+        <mat-error *ngIf="to.hasError('matDatepickerParse')">
+            {{ 'SEARCH.FILTER.VALIDATION.INVALID-DATE' | translate: { requiredFormat: datePickerDateFormat } }}
+        </mat-error>
     </mat-form-field>
 
-    <div class="facet-buttons">
+    <div class="facet-buttons facet-buttons--topSpace">
         <button mat-button color="primary" type="button" (click)="reset()">
             {{ 'SEARCH.FILTER.ACTIONS.CLEAR' | translate }}
         </button>

lib/content-services/search/components/search-date-range/search-date-range.component.spec.ts

@@ -17,10 +17,16 @@
 
 import { CustomMomentDateAdapter, SearchDateRangeComponent } from './search-date-range.component';
 import { Observable } from 'rxjs/Observable';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ContentTestingModule } from '../../../testing/content.testing.module';
+import { setupTestBed } from '@alfresco/adf-core';
+import { By } from '@angular/platform-browser';
+import { TranslateService } from '@ngx-translate/core';
 
 declare let moment: any;
 
 describe('SearchDateRangeComponent', () => {
+    describe('component class', () => {
 
         let component: SearchDateRangeComponent;
         let fromDate = '2016-10-16';
@@ -78,7 +84,7 @@ describe('SearchDateRangeComponent', () => {
             expect(momentFromInput.isValid()).toBeTruthy();
 
             component.onChangedHandler({srcElement: {value: inputString}}, component.from);
-        expect(component.from.value).toEqual(momentFromInput);
+            expect(component.from.value.toString()).toEqual(momentFromInput.toString());
         });
 
         it('should NOT setup form control with invalid date on change', () => {
@@ -90,7 +96,7 @@ describe('SearchDateRangeComponent', () => {
             expect(momentFromInput.isValid()).toBeFalsy();
 
             component.onChangedHandler({srcElement: {value: inputString}}, component.from);
-        expect(component.from.value).not.toEqual(momentFromInput);
+            expect(component.from.value.toString()).not.toEqual(momentFromInput.toString());
         });
 
         it('should reset form', () => {
@@ -152,5 +158,43 @@ describe('SearchDateRangeComponent', () => {
             expect(context.queryFragments[component.id]).toEqual(expectedQuery);
             expect(context.update).toHaveBeenCalled();
         });
-
+    });
+
+    describe('component DOM', () => {
+        let component: SearchDateRangeComponent;
+        let fixture: ComponentFixture<SearchDateRangeComponent>;
+        let translateService: TranslateService;
+        let translationSpy: jasmine.Spy;
+        const dateFormatFixture = 'DD MMM YYYY';
+
+        setupTestBed({
+            imports: [ContentTestingModule]
+        });
+
+        beforeEach(() => {
+            fixture = TestBed.createComponent(SearchDateRangeComponent);
+            component = fixture.componentInstance;
+
+            translateService = TestBed.get(TranslateService);
+            translationSpy = spyOn(translateService, 'get').and.callFake((key) => {
+                return Observable.of(key);
+            });
+
+            component.settings = {'dateFormat': dateFormatFixture, field: 'cm:created'};
+            fixture.detectChanges();
+        });
+
+        it('should display the required format when input date is invalid', () => {
+            const inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
+
+            inputEl.value = 'invalid-date';
+            inputEl.dispatchEvent(new Event('input'));
+            fixture.detectChanges();
+            inputEl.dispatchEvent(new Event('blur'));
+            fixture.detectChanges();
+
+            expect(translationSpy.calls.mostRecent().args)
+                .toEqual(['SEARCH.FILTER.VALIDATION.INVALID-DATE', {requiredFormat: dateFormatFixture}]);
+        });
+    });
 });

lib/content-services/search/components/search-date-range/search-date-range.component.ts

@@ -127,8 +127,7 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit {
         const inputValue = event.srcElement.value;
 
         if (inputValue) {
-            const formatDate = moment(inputValue, this.datePickerDateFormat);
+            const formatDate = this.dateAdapter.parse(inputValue, this.datePickerDateFormat);
-
             if (formatDate.isValid()) {
                 formControl.setValue(formatDate);
             }

lib/content-services/search/components/search-filter/search-filter.component.scss

@@ -24,6 +24,10 @@
         .mat-button {
             text-transform: uppercase;
         }
+
+        &--topSpace {
+            padding-top: 15px;
+        }
     }
 
 }