mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-09-17 14:21:29 +00:00
[ADF-1815] sort options (#2545)
This commit is contained in:
committed by
Denys Vuika
parent
e242628b65
commit
2ce0441048
@@ -380,6 +380,44 @@ describe('ShareDataTableAdapter', () => {
|
|||||||
expect((<ShareDataRow> rows[3]).node).toBe(file1);
|
expect((<ShareDataRow> rows[3]).node).toBe(file1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should sort by name', () => {
|
||||||
|
let file1 = new FileNode('file1');
|
||||||
|
let file2 = new FileNode('file11');
|
||||||
|
let file3 = new FileNode('file20');
|
||||||
|
let file4 = new FileNode('file11-1'); // auto rename
|
||||||
|
let file5 = new FileNode('a');
|
||||||
|
let file6 = new FileNode('b');
|
||||||
|
|
||||||
|
let col = <DataColumn> {key: 'name'};
|
||||||
|
let adapter = new ShareDataTableAdapter(documentListService, [col]);
|
||||||
|
|
||||||
|
adapter.setRows([
|
||||||
|
new ShareDataRow(file4, documentListService, null),
|
||||||
|
new ShareDataRow(file6, documentListService, null),
|
||||||
|
new ShareDataRow(file3, documentListService, null),
|
||||||
|
new ShareDataRow(file1, documentListService, null),
|
||||||
|
new ShareDataRow(file2, documentListService, null),
|
||||||
|
new ShareDataRow(file5, documentListService, null)
|
||||||
|
]);
|
||||||
|
|
||||||
|
adapter.sort('name', 'asc');
|
||||||
|
let rows = adapter.getRows();
|
||||||
|
|
||||||
|
expect((<ShareDataRow> rows[0]).node).toBe(file5);
|
||||||
|
expect((<ShareDataRow> rows[1]).node).toBe(file6);
|
||||||
|
expect((<ShareDataRow> rows[2]).node).toBe(file1);
|
||||||
|
expect((<ShareDataRow> rows[3]).node).toBe(file2);
|
||||||
|
expect((<ShareDataRow> rows[4]).node).toBe(file4);
|
||||||
|
expect((<ShareDataRow> rows[5]).node).toBe(file3);
|
||||||
|
|
||||||
|
adapter.sort('name', 'desc');
|
||||||
|
expect((<ShareDataRow> rows[0]).node).toBe(file3);
|
||||||
|
expect((<ShareDataRow> rows[1]).node).toBe(file4);
|
||||||
|
expect((<ShareDataRow> rows[2]).node).toBe(file2);
|
||||||
|
expect((<ShareDataRow> rows[3]).node).toBe(file1);
|
||||||
|
expect((<ShareDataRow> rows[4]).node).toBe(file6);
|
||||||
|
expect((<ShareDataRow> rows[5]).node).toBe(file5);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('ShareDataRow', () => {
|
describe('ShareDataRow', () => {
|
||||||
|
@@ -156,7 +156,7 @@ export class ShareDataTableAdapter implements DataTableAdapter {
|
|||||||
options.numeric = true;
|
options.numeric = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.sortRows(this.rows, this.sorting, options);
|
this.sortRows(this.rows, this.sorting);
|
||||||
}
|
}
|
||||||
|
|
||||||
sort(key?: string, direction?: string): void {
|
sort(key?: string, direction?: string): void {
|
||||||
@@ -176,8 +176,15 @@ export class ShareDataTableAdapter implements DataTableAdapter {
|
|||||||
this.imageResolver = resolver;
|
this.imageResolver = resolver;
|
||||||
}
|
}
|
||||||
|
|
||||||
private sortRows(rows: DataRow[], sorting: DataSorting, options?: Intl.CollatorOptions) {
|
private sortRows(rows: DataRow[], sorting: DataSorting) {
|
||||||
|
const options: Intl.CollatorOptions = {};
|
||||||
|
|
||||||
if (sorting && sorting.key && rows && rows.length > 0) {
|
if (sorting && sorting.key && rows && rows.length > 0) {
|
||||||
|
|
||||||
|
if (sorting.key.includes('sizeInBytes') || sorting.key === 'name') {
|
||||||
|
options.numeric = true;
|
||||||
|
}
|
||||||
|
|
||||||
rows.sort((a: ShareDataRow, b: ShareDataRow) => {
|
rows.sort((a: ShareDataRow, b: ShareDataRow) => {
|
||||||
if (a.node.entry.isFolder !== b.node.entry.isFolder) {
|
if (a.node.entry.isFolder !== b.node.entry.isFolder) {
|
||||||
return a.node.entry.isFolder ? -1 : 1;
|
return a.node.entry.isFolder ? -1 : 1;
|
||||||
|
Reference in New Issue
Block a user