inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sort by file size (#2514)

Browse Source
This commit is contained in:
Cilibiu Bogdan
2017-10-20 10:17:23 +01:00
committed by Eugenio Romano
parent 9116c54f4c
commit 834a61eda4
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts
+36
View File
@@ -343,6 +343,42 @@ describe('ShareDataTableAdapter', () => {
expect((<ShareDataRow> rows[1]).node).toBe(file1);
});
it('should sort by file size', () => {
let file1 = new FileNode('file1');
let file2 = new FileNode('file2');
let file3 = new FileNode('file3');
let file4 = new FileNode('file4');
file1.entry.content.sizeInBytes = 146; // 146 bytes
file2.entry.content.sizeInBytes = 10075; // 9.84 KB
file3.entry.content.sizeInBytes = 4224120; // 4.03 MB
file4.entry.content.sizeInBytes = 2852791665; // 2.66 GB
let col = <DataColumn> {key: 'content.sizeInBytes'};
let adapter = new ShareDataTableAdapter(documentListService, [col]);
adapter.setRows([
new ShareDataRow(file3, documentListService, null),
new ShareDataRow(file4, documentListService, null),
new ShareDataRow(file1, documentListService, null),
new ShareDataRow(file2, documentListService, null)
]);
adapter.sort('content.sizeInBytes', 'asc');
let rows = adapter.getRows();
expect((<ShareDataRow> rows[0]).node).toBe(file1);
expect((<ShareDataRow> rows[1]).node).toBe(file2);
expect((<ShareDataRow> rows[2]).node).toBe(file3);
expect((<ShareDataRow> rows[3]).node).toBe(file4);
adapter.sort('content.sizeInBytes', 'desc');
expect((<ShareDataRow> rows[0]).node).toBe(file4);
expect((<ShareDataRow> rows[1]).node).toBe(file3);
expect((<ShareDataRow> rows[2]).node).toBe(file2);
expect((<ShareDataRow> rows[3]).node).toBe(file1);
});
});
describe('ShareDataRow', () => {
ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
+11 -4
View File
@@ -145,8 +145,15 @@ export class ShareDataTableAdapter implements DataTableAdapter {
}
setSorting(sorting: DataSorting): void {
const options: Intl.CollatorOptions = {};
this.sorting = sorting;
this.sortRows(this.rows, this.sorting);
if (sorting.key && sorting.key.includes('sizeInBytes')) {
options.numeric = true;
}
this.sortRows(this.rows, this.sorting, options);
}
sort(key?: string, direction?: string): void {
@@ -166,7 +173,7 @@ export class ShareDataTableAdapter implements DataTableAdapter {
this.imageResolver = resolver;
}
private sortRows(rows: DataRow[], sorting: DataSorting) {
private sortRows(rows: DataRow[], sorting: DataSorting, options?: Intl.CollatorOptions) {
if (sorting && sorting.key && rows && rows.length > 0) {
rows.sort((a: ShareDataRow, b: ShareDataRow) => {
if (a.node.entry.isFolder !== b.node.entry.isFolder) {
@@ -188,8 +195,8 @@ export class ShareDataTableAdapter implements DataTableAdapter {
}
return sorting.direction === 'asc'
? left.localeCompare(right)
: right.localeCompare(left);
? left.localeCompare(right, undefined, options)
: right.localeCompare(left, undefined, options);
});
}
}