mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[AAE-4241] Fix date and date time not being populated when node metadata is retrieved (#7025)
* AAE-4241 Fix date and date time not being populated when node metadata is retrieved * AAE-4241 Fix unit tests * [AAE-4241] Fix validation messages * [AAE-4241] Fix unit tests * [AAE-4241] Fix error log messages * [AAE-4241] Fix unit tests * [AAE-4241] Fix e2e tests
This commit is contained in:
committed by
GitHub
parent
a4c3f3a95b
commit
8be6bbaf3c
@@ -3,14 +3,10 @@
|
||||
<label class="adf-label" [attr.for]="field.id">{{field.name | translate }} ({{field.dateDisplayFormat}})<span *ngIf="isRequired()">*</span></label>
|
||||
<input matInput
|
||||
[id]="field.id"
|
||||
[matDatepicker]="datePicker"
|
||||
[(ngModel)]="displayDate"
|
||||
[value]="field.value"
|
||||
[required]="isRequired()"
|
||||
[disabled]="field.readOnly"
|
||||
[min]="minDate"
|
||||
[max]="maxDate"
|
||||
(focusout)="onDateChanged($any($event).srcElement.value)"
|
||||
(dateChange)="onDateChanged($event)"
|
||||
(change)="onDateChanged($any($event).srcElement.value)"
|
||||
[placeholder]="field.placeholder"
|
||||
[matTooltip]="field.tooltip"
|
||||
matTooltipPosition="above"
|
||||
@@ -19,5 +15,13 @@
|
||||
</mat-form-field>
|
||||
<error-widget [error]="field.validationSummary"></error-widget>
|
||||
<error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
|
||||
<mat-datepicker #datePicker [touchUi]="true" [startAt]="displayDate" ></mat-datepicker>
|
||||
<mat-datepicker #datePicker [touchUi]="true" [startAt]="field.value | adfMomentDate: field.dateDisplayFormat" [disabled]="field.readOnly"></mat-datepicker>
|
||||
<input
|
||||
type="hidden"
|
||||
[matDatepicker]="datePicker"
|
||||
[value]="field.value | adfMomentDate: field.dateDisplayFormat"
|
||||
[min]="minDate"
|
||||
[max]="maxDate"
|
||||
[disabled]="field.readOnly"
|
||||
(dateInput)="onDateChanged($any($event).targetElement.value)">
|
||||
</div>
|
||||
|
@@ -21,7 +21,6 @@ import { setupTestBed, FormFieldModel, FormModel } from '@alfresco/adf-core';
|
||||
import moment from 'moment-es6';
|
||||
import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { SimpleChanges } from '@angular/core';
|
||||
|
||||
describe('DateWidgetComponent', () => {
|
||||
|
||||
@@ -221,17 +220,8 @@ describe('DateWidgetComponent', () => {
|
||||
const dateElement: any = element.querySelector('#date-field-id');
|
||||
expect(dateElement.value).toContain('12-30-9999');
|
||||
|
||||
const newField = { ...field, value: '03-02-2020' };
|
||||
widget.field.value = '03-02-2020';
|
||||
|
||||
const changes: SimpleChanges = {
|
||||
'field': {
|
||||
previousValue: field,
|
||||
currentValue: newField,
|
||||
firstChange: false,
|
||||
isFirstChange(): boolean { return this.firstChange; }
|
||||
}
|
||||
};
|
||||
widget.ngOnChanges(changes);
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable()
|
||||
.then(() => {
|
||||
@@ -240,70 +230,4 @@ describe('DateWidgetComponent', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('should not call on change when is first change or field is not set or the field value does not change', () => {
|
||||
const field = new FormFieldModel(new FormModel(), {
|
||||
id: 'date-field-id',
|
||||
name: 'date-name',
|
||||
value: '12-30-9999',
|
||||
type: 'date',
|
||||
readOnly: 'false'
|
||||
});
|
||||
field.isVisible = true;
|
||||
field.dateDisplayFormat = 'MM-DD-YYYY';
|
||||
widget.field = field;
|
||||
widget.ngOnInit();
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable()
|
||||
.then(() => {
|
||||
expect(element.querySelector('#date-field-id')).toBeDefined();
|
||||
expect(element.querySelector('#date-field-id')).not.toBeNull();
|
||||
const dateElement: any = element.querySelector('#date-field-id');
|
||||
expect(dateElement.value).toContain('12-30-9999');
|
||||
|
||||
const newField = { ...field, value: '03-02-2020' };
|
||||
|
||||
let changes: SimpleChanges = {
|
||||
'field': {
|
||||
previousValue: field,
|
||||
currentValue: newField,
|
||||
firstChange: true,
|
||||
isFirstChange(): boolean { return this.firstChange; }
|
||||
}
|
||||
};
|
||||
widget.ngOnChanges(changes);
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable()
|
||||
.then(() => {
|
||||
expect(dateElement.value).toContain('12-30-9999');
|
||||
changes = {};
|
||||
widget.ngOnChanges(changes);
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable()
|
||||
.then(() => {
|
||||
expect(dateElement.value).toContain('12-30-9999');
|
||||
changes = {
|
||||
'field': {
|
||||
previousValue: field,
|
||||
currentValue: field,
|
||||
firstChange: false,
|
||||
isFirstChange(): boolean { return this.firstChange; }
|
||||
}
|
||||
};
|
||||
widget.ngOnChanges(changes);
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable()
|
||||
.then(() => {
|
||||
expect(dateElement.value).toContain('12-30-9999');
|
||||
changes = null;
|
||||
widget.ngOnChanges(changes);
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable()
|
||||
.then(() => {
|
||||
expect(dateElement.value).toContain('12-30-9999');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
@@ -17,14 +17,16 @@
|
||||
|
||||
/* tslint:disable:component-selector */
|
||||
|
||||
import { Component, OnInit, ViewEncapsulation, OnDestroy, OnChanges, SimpleChanges } from '@angular/core';
|
||||
import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
|
||||
import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
|
||||
import moment from 'moment-es6';
|
||||
import { Moment } from 'moment';
|
||||
import { Subject } from 'rxjs';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { MOMENT_DATE_FORMATS, MomentDateAdapter, WidgetComponent,
|
||||
UserPreferencesService, UserPreferenceValues, FormService } from '@alfresco/adf-core';
|
||||
import {
|
||||
MOMENT_DATE_FORMATS, MomentDateAdapter, WidgetComponent,
|
||||
UserPreferencesService, UserPreferenceValues, FormService
|
||||
} from '@alfresco/adf-core';
|
||||
|
||||
@Component({
|
||||
selector: 'date-widget',
|
||||
@@ -46,14 +48,13 @@ import { MOMENT_DATE_FORMATS, MomentDateAdapter, WidgetComponent,
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
})
|
||||
export class DateCloudWidgetComponent extends WidgetComponent implements OnInit, OnDestroy, OnChanges {
|
||||
export class DateCloudWidgetComponent extends WidgetComponent implements OnInit, OnDestroy {
|
||||
|
||||
typeId = 'DateCloudWidgetComponent';
|
||||
DATE_FORMAT_CLOUD = 'YYYY-MM-DD';
|
||||
|
||||
minDate: Moment;
|
||||
maxDate: Moment;
|
||||
displayDate: Moment;
|
||||
|
||||
private onDestroy$ = new Subject<boolean>();
|
||||
|
||||
@@ -81,13 +82,6 @@ export class DateCloudWidgetComponent extends WidgetComponent implements OnInit,
|
||||
this.maxDate = moment(this.field.maxValue, this.DATE_FORMAT_CLOUD);
|
||||
}
|
||||
}
|
||||
this.displayDate = moment(this.field.value, this.field.dateDisplayFormat);
|
||||
}
|
||||
|
||||
ngOnChanges(changes: SimpleChanges): void {
|
||||
if (changes && changes.field && !changes.field.firstChange && changes.field.currentValue.value !== changes.field.previousValue.value) {
|
||||
this.displayDate = moment(changes.field.currentValue.value, this.field.dateDisplayFormat);
|
||||
}
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
@@ -96,12 +90,11 @@ export class DateCloudWidgetComponent extends WidgetComponent implements OnInit,
|
||||
}
|
||||
|
||||
onDateChanged(newDateValue) {
|
||||
if (newDateValue && newDateValue.value) {
|
||||
this.field.value = newDateValue.value.format(this.field.dateDisplayFormat);
|
||||
} else if (newDateValue) {
|
||||
this.field.value = newDateValue;
|
||||
const date = moment(newDateValue, this.field.dateDisplayFormat, true);
|
||||
if (date.isValid()) {
|
||||
this.field.value = date.format(this.field.dateDisplayFormat);
|
||||
} else {
|
||||
this.field.value = null;
|
||||
this.field.value = newDateValue;
|
||||
}
|
||||
this.onFieldChanged(this.field);
|
||||
}
|
||||
|
Reference in New Issue
Block a user