inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-30 18:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3196] [Task list / Process list] - The 'Task details' are not diplayed for the selected Task (#3483)

Browse Source 
* [ADF-3196] [Task list / Process list] - The 'Task details' are not displayed for the selected Task

* * After rebase
This commit is contained in:
siva kumar 2018-06-15 17:32:23 +05:30 committed by Maurizio Vitale
parent c4132b920a
commit d914115f82
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/core/datatable/components/datatable/datatable.component.spec.ts
View File

@ -261,35 +261,19 @@ describe('DataTable', () => {
expect(rows[1].getValue('name')).toEqual('test2');
});
it('should set sort order if sorting is defined', () => {
const dataSortObj = new DataSorting('created', 'desc');
const sort = [ 'created', 'desc' ];
dataTable.data = new ObjectDataTableAdapter([],
[new ObjectDataColumn({ key: 'name' })]
);
dataTable.ngOnChanges({
sorting: new SimpleChange(null, sort, false)
});
fixture.detectChanges();
const dataSort = dataTable.data.getSorting();
expect(dataSort).toEqual(dataSortObj);
});
it('should set custom sort order', () => {
const dataSortObj = new DataSorting('dummayName', 'asc');
const sort = [ 'dummayName', 'asc' ];
dataTable.data = new ObjectDataTableAdapter([],
[new ObjectDataColumn({ key: 'name' })]
);
dataTable.data.setSorting(new DataSorting('created', 'desc'));
const dataRows =
[
{ name: 'test1' },
{ name: 'test2' },
{ name: 'test3' },
{ name: 'test4' }
];
dataTable.sorting = [ 'dummayName', 'asc' ];
dataTable.ngOnChanges({
sorting: new SimpleChange(null, sort, false)
rows: new SimpleChange(null, dataRows, false)
});
fixture.detectChanges();
const dataSort = dataTable.data.getSorting();
expect(dataSort).toEqual(dataSortObj);

1
lib/core/datatable/components/datatable/datatable.component.ts
View File

@ -296,6 +296,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
private initTable() {
this.data = new ObjectDataTableAdapter(this.rows, this.columns);
this.setTableSorting(this.sorting);
this.resetSelection();
this.rowMenuCache = {};
}