Readded column key as key parameter (#5960)

* 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

View File

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

View File

@ -702,7 +702,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
}
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();
}

View File

@ -290,7 +290,8 @@ describe('DataTable', () => {
dataTable.data.setSorting(new DataSorting('name', 'desc'));
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');
done();
});

View File

@ -771,11 +771,11 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
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', {
detail: {
column,
key,
sortingKey,
direction
},
bubbles: true