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

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

Browse Source 
* [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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/process-services/task-list/components/task-list.component.html
View File

@@ -4,7 +4,7 @@
[data]="data"
[rows]="rows"
[columns]="columns"
[sorting]="dataSort"
[sorting]="sorting"
[loading]="isLoading"
[selectFirstRow]="selectFirstRow"
[multiselect]="multiselect"

6
lib/process-services/task-list/components/task-list.component.spec.ts
View File

@@ -230,12 +230,6 @@ describe('TaskListComponent', () => {
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 id for the selected task', () => {
component.rows = [
{ id: '999', name: 'Fake-name' },

16
lib/process-services/task-list/components/task-list.component.ts
View File

@@ -183,10 +183,18 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
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 = true;
@@ -262,14 +270,6 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
}
}
/**
* Return the sorting order
* Sort the tasks based on current value of 'sort' property
*/
get dataSort(): any[] {
return this.sort ? this.sort.split('-') : this.sorting;
}
/**
* Return the current id
*/