inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-4313] - Sort order doesn't work correctly (#8892)

Browse Source 
[ACA-4313] - Sort order doesn't work correctly
This commit is contained in:
DominikIwanek
2023-09-12 16:07:16 +02:00
committed by GitHub
parent 13b6bf37ff
commit e14e489d2d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -742,6 +742,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
onSortingChanged(event: CustomEvent) { onSortingChanged(event: CustomEvent) {
this.orderBy = this.buildOrderByArray(event.detail.sortingKey, event.detail.direction); this.orderBy = this.buildOrderByArray(event.detail.sortingKey, event.detail.direction);
this.sorting = [event.detail.sortingKey, event.detail.direction];
this.sortingSubject.next([this.additionalSorting, event.detail]); this.sortingSubject.next([this.additionalSorting, event.detail]);
if (this.sortingMode === 'server') { if (this.sortingMode === 'server') {

8
lib/core/src/lib/datatable/components/datatable/datatable.component.ts
View File

@@ -742,7 +742,7 @@ export class DataTableComponent implements OnInit, AfterContentInit, OnChanges,
isColumnSorted(col: DataColumn, direction: string): boolean { isColumnSorted(col: DataColumn, direction: string): boolean {
if (col && direction) { if (col && direction) {
const sorting = this.data.getSorting(); const sorting = this.data.getSorting();
return sorting && sorting.key === col.key && sorting.direction.toLocaleLowerCase() === direction; return this.isSortingEqual(col, direction, sorting);
} }
return false; return false;
} }
@@ -1018,6 +1018,12 @@ export class DataTableComponent implements OnInit, AfterContentInit, OnChanges,
this.columnsWidthChanged.emit(allColumns); this.columnsWidthChanged.emit(allColumns);
} }
private isSortingEqual(col: DataColumn, direction: string, sorting: DataSorting): boolean {
return sorting &&
(sorting.key === col.key || sorting.key === col.sortingKey) &&
sorting.direction?.toLocaleLowerCase() === direction;
};
} }
export interface DataTableDropEvent { export interface DataTableDropEvent {