From d905aaa0cf6bcfe218d13eb7499c4c59365224b5 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Thu, 17 Nov 2016 16:43:23 +0000 Subject: [PATCH] Fix remove default sorting on the fist column --- .../src/data/object-datatable-adapter.spec.ts | 9 ++------- .../src/data/object-datatable-adapter.ts | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.spec.ts index 9a5d287cd6..58b9b74460 100644 --- a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.spec.ts +++ b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.spec.ts @@ -229,7 +229,7 @@ describe('ObjectDataTableAdapter', () => { expect(rows[1].getValue('id')).toBe(1); }); - it('should sort by first column if no sortable found', () => { + it('should be sorting undefined if no sortable found', () => { let adapter = new ObjectDataTableAdapter( [ { id: 2, name: 'abs' }, @@ -241,12 +241,7 @@ describe('ObjectDataTableAdapter', () => { ] ); - expect(adapter.getSorting()).toEqual( - jasmine.objectContaining({ - key: 'id', - direction: 'asc' - }) - ); + expect(adapter.getSorting()).toBeUndefined(); }); it('should sort asc and desc', () => { diff --git a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts index e6ef6159c9..2209ee9c14 100644 --- a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts @@ -74,8 +74,6 @@ export class ObjectDataTableAdapter implements DataTableAdapter { let sortable = this._columns.filter(c => c.sortable); if (sortable.length > 0) { this.sort(sortable[0].key, 'asc'); - } else { - this.sort(this._columns[0].key, 'asc'); } } }