inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4921] TaskListCloud - fix lastModifiedTo date filter (#4577)

Browse Source 
* [ADF-4921] - fix lastModifiedTo date

* [ADF-4291] - fix build

* [ADF-4291] - fix build

* [ADF-4291] - move lastModifiedTo function from task-list-cloud in edit-task-filter-cloud
This commit is contained in:
Silviu Popa 2019-04-10 21:45:41 +03:00 committed by Eugenio Romano
parent 1bda3c914c
commit 3f8ca56405
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filter-cloud.component.spec.ts
View File

@ -31,6 +31,8 @@ import { EditTaskFilterCloudComponent } from './edit-task-filter-cloud.component
import { TaskFilterCloudService } from '../services/task-filter-cloud.service';
import { TaskFilterDialogCloudComponent } from './task-filter-dialog-cloud.component';
import { fakeFilter } from '../mock/task-filters-cloud.mock';
import { AbstractControl } from '@angular/forms';
import moment from 'moment-es6';
describe('EditTaskFilterCloudComponent', () => {
let component: EditTaskFilterCloudComponent;
@ -392,6 +394,29 @@ describe('EditTaskFilterCloudComponent', () => {
expect(deleteButton.disabled).toBe(false);
});
}));
it('should set the correct lastModifiedTo date', (done) => {
component.appName = 'fake';
component.filterProperties = ['appName', 'processInstanceId', 'priority', 'lastModified'];
const taskFilterIDchange = new SimpleChange(undefined, 'mock-task-filter-id', true);
component.ngOnChanges({ 'id': taskFilterIDchange});
fixture.detectChanges();
const lastModifiedToControl: AbstractControl = component.editTaskFilterForm.get('lastModifiedTo');
lastModifiedToControl.setValue('Tue Apr 09 2019 00:00:00 GMT+0300 (Eastern European Summer Time)');
const lastModifiedToFilter = moment(lastModifiedToControl.value);
lastModifiedToFilter.set({
hour: 23,
minute: 59,
second: 59
});
component.filterChange.subscribe( (res) => {
expect(component.changedTaskFilter.lastModifiedTo.toISOString()).toEqual(lastModifiedToFilter.toISOString());
done();
});
component.onFilterChange();
});
});
describe('edit filter actions', () => {

12
lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filter-cloud.component.ts
View File

@ -161,12 +161,24 @@ export class EditTaskFilterCloudComponent implements OnInit, OnChanges {
.pipe(debounceTime(500),
filter(() => this.isFormValid()))
.subscribe((formValues: TaskFilterCloudModel) => {
this.setLastModifiedToFilter(formValues);
this.changedTaskFilter = new TaskFilterCloudModel(Object.assign({}, this.taskFilter, formValues));
this.formHasBeenChanged = !this.compareFilters(this.changedTaskFilter, this.taskFilter);
this.filterChange.emit(this.changedTaskFilter);
});
}
private setLastModifiedToFilter(formValues: TaskFilterCloudModel) {
if (formValues.lastModifiedTo && Date.parse(formValues.lastModifiedTo.toString())) {
const lastModifiedToFilterValue = moment(formValues.lastModifiedTo);
lastModifiedToFilterValue.set({
hour: 23,
minute: 59,
second: 59
});
formValues.lastModifiedTo = lastModifiedToFilterValue.toDate();
}
}
createAndFilterProperties(): TaskFilterProperties[] {
this.checkMandatoryFilterProperties();

1
lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts
View File

@ -26,6 +26,7 @@ import { fakeGlobalTask, fakeCustomSchema } from '../mock/fakeTaskResponseMock';
import { of } from 'rxjs';
import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module';
import { TaskListCloudModule } from '../task-list-cloud.module';
@Component({
template: `
<adf-cloud-task-list #taskListCloud>

1
lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts
View File

@ -271,5 +271,4 @@ export class TaskListCloudComponent extends DataTableSchema implements OnChanges
};
return new TaskQueryCloudRequestModel(requestNode);
}
}