inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Readded column key as key parameter (#5960)

Browse Source 
* Readded column key as key parameter

* Fixed failing unit test
This commit is contained in:
Vito 2020-08-07 09:37:40 +01:00 committed by GitHub
parent c559898f02
commit 61cac20ab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo-shell/src/app/components/files/filtered-search.component.ts
View File

@ -48,7 +48,7 @@ export class FilteredSearchComponent {
} }
onSortingChanged(event) { onSortingChanged(event) {
this.filterSorting = event.detail.column + '-' + event.detail.direction; this.filterSorting = event.detail.key + '-' + event.detail.direction;
} }
} }

2
lib/content-services/src/lib/document-list/components/document-list.component.ts
View File

@ -702,7 +702,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
} }
onSortingChanged(event: CustomEvent) { onSortingChanged(event: CustomEvent) {
this.orderBy = this.buildOrderByArray(event.detail.key, event.detail.direction); this.orderBy = this.buildOrderByArray(event.detail.sortingKey, event.detail.direction);
this.reload(); this.reload();
} }

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

@ -290,7 +290,8 @@ describe('DataTable', () => {
dataTable.data.setSorting(new DataSorting('name', 'desc')); dataTable.data.setSorting(new DataSorting('name', 'desc'));
fixture.nativeElement.addEventListener('sorting-changed', (event: CustomEvent) => { fixture.nativeElement.addEventListener('sorting-changed', (event: CustomEvent) => {
expect(event.detail.key).toBe('displayName'); expect(event.detail.key).toBe('name');
expect(event.detail.sortingKey).toBe('displayName');
expect(event.detail.direction).toBe('asc'); expect(event.detail.direction).toBe('asc');
done(); done();
}); });

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

@ -771,11 +771,11 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
this.elementRef.nativeElement.dispatchEvent(domEvent); this.elementRef.nativeElement.dispatchEvent(domEvent);
} }
private emitSortingChangedEvent(column: string, key: string, direction: string) { private emitSortingChangedEvent(key: string, sortingKey: string, direction: string) {
const domEvent = new CustomEvent('sorting-changed', { const domEvent = new CustomEvent('sorting-changed', {
detail: { detail: {
column,
key, key,
sortingKey,
direction direction
}, },
bubbles: true bubbles: true