[ADF-3120] fixed sorting for tasklist and process list (#3435)

* [ADF-3120] fixed sorting for tasklist and process list

* [ADF-3120] removed commented code

* [ADF-3120] fixing another randomly failing test
This commit is contained in:
Vito
2018-06-07 14:25:57 +01:00
committed by Eugenio Romano
parent 581867ad66
commit e988691d0a
7 changed files with 19 additions and 31 deletions

View File

@@ -1,6 +1,6 @@
<adf-datatable #dataTable
[data]="data"
[sorting]="dataSort"
[sorting]="sorting"
[loading]="isLoading"
[selectionMode]="selectionMode"
[multiselect]="multiselect"

View File

@@ -253,12 +253,6 @@ describe('ProcessInstanceListComponent', () => {
expect(component.getCurrentId()).toBeNull();
});
it('should return the sorting order if sort is defined', () => {
component.sort = 'fakeKey-fakeOrder';
fixture.detectChanges();
expect(component.dataSort).toEqual(['fakeKey', 'fakeOrder']);
});
it('should return selected true for the selected process', () => {
component.data = new ObjectDataTableAdapter(
[

View File

@@ -174,10 +174,18 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
ngOnChanges(changes: SimpleChanges) {
if (this.isPropertyChanged(changes)) {
if (this.isSortChanged(changes)) {
this.sorting = this.sort ? this.sort.split('-') : this.sorting;
}
this.reload();
}
}
private isSortChanged(changes: SimpleChanges): boolean {
const actualSort = changes['sort'];
return actualSort && actualSort.currentValue && actualSort.currentValue !== actualSort.previousValue;
}
private isPropertyChanged(changes: SimpleChanges): boolean {
let changed: boolean = false;
@@ -293,14 +301,6 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit
}
}
/**
* Sort the process based on current value of 'sort' property
* Return the sorting order
*/
get dataSort(): any[] {
return this.sort ? this.sort.split('-') : this.sorting;
}
/**
* Return the current id
*/