@@ -51,6 +51,8 @@ export class OrgSettingsUsersComponent implements OnInit, OnDestroy {
5151 nbTotalUsers = 0 ;
5252 filteredTableData : TableData [ ] = [ ] ;
5353
54+ private readonly defaultOrder = 'firstname,lastname,displayName,email,id,reference' ;
55+
5456 private unsubscribe$ : Subject < boolean > = new Subject < boolean > ( ) ;
5557
5658 // Create filters stream
@@ -68,7 +70,7 @@ export class OrgSettingsUsersComponent implements OnInit, OnDestroy {
6870 // Init filters stream with state params
6971 const initialSearchValue = this . activatedRoute . snapshot . queryParams . q ?? '' ;
7072 const initialPageNumber = this . activatedRoute . snapshot . queryParams . page ? Number ( this . activatedRoute . snapshot . queryParams . page ) : 1 ;
71- const initialOrder = this . activatedRoute . snapshot . queryParams . order ?? 'firstname,lastname,displayName,email,id,reference' ;
73+ const initialOrder = this . activatedRoute . snapshot . queryParams . order ?? this . defaultOrder ;
7274 this . filters = {
7375 searchTerm : initialSearchValue ,
7476 sort : { active : initialOrder , direction : 'asc' } ,
@@ -131,7 +133,8 @@ export class OrgSettingsUsersComponent implements OnInit, OnDestroy {
131133 }
132134
133135 onFiltersChanged ( filters : GioTableWrapperFilters ) {
134- this . filtersStream . next ( filters ) ;
136+ const ensuredSort = filters . sort ?? this . filters ?. sort ?? { active : this . defaultOrder , direction : 'asc' } ;
137+ this . filtersStream . next ( { ...filters , sort : ensuredSort } ) ;
135138 }
136139
137140 private setDataSourceFromUsersList ( users : PagedResult < User > ) {
0 commit comments