diff --git a/src/frontend/app/administration/action/actions-administration.component.html b/src/frontend/app/administration/action/actions-administration.component.html
index b5faa1bdd6a211a4eec02504d2d44fb2d212f114..6c8835a01bb8438e88a17c7b4e03f74d7ae41520 100755
--- a/src/frontend/app/administration/action/actions-administration.component.html
+++ b/src/frontend/app/administration/action/actions-administration.component.html
@@ -40,7 +40,7 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSort matSortDisableClear>
<ng-container matColumnDef="id">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()">{{lang.id}}</mat-header-cell>
diff --git a/src/frontend/app/administration/administration.service.ts b/src/frontend/app/administration/administration.service.ts
index e1f5db2f4e866d99f228f9693b2f8241f7b5f91a..3639062fdbf5b340404c837b0229485140858c1f 100644
--- a/src/frontend/app/administration/administration.service.ts
+++ b/src/frontend/app/administration/administration.service.ts
@@ -1,10 +1,10 @@
-import { Injectable } from '@angular/core';
+import { Injectable, ChangeDetectorRef, OnInit, OnDestroy } from '@angular/core';
import { LocalStorageService } from '../../service/local-storage.service';
import { HeaderService } from '../../service/header.service';
import { FunctionsService } from '../../service/functions.service';
import { MatTableDataSource } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
+import { MatSort, Sort, MatSortable } from '@angular/material/sort';
import { merge } from 'rxjs/internal/observable/merge';
import { startWith } from 'rxjs/internal/operators/startWith';
import { tap } from 'rxjs/internal/operators/tap';
@@ -53,6 +53,12 @@ export class AdministrationService {
page: 0,
field: ''
},
+ admin_indexing_models: {
+ sort: 'label',
+ sortDirection: 'asc',
+ page: 0,
+ field: ''
+ },
};
dataSource: MatTableDataSource<any>;
filterColumns: string[];
@@ -104,12 +110,19 @@ export class AdministrationService {
);
}
- sort.active = this.getFilter('sort');
- sort.direction = this.getFilter('sortDirection');
+ // sort.active = this.getFilter('sort');
+ // sort.direction = this.getFilter('sortDirection');
paginator.pageIndex = this.getFilter('page');
this.dataSource.sort = sort;
+ // WORKAROUND TO SHOW ARROW DEFAULT FILTER
+ const element: HTMLElement = document.getElementsByClassName('mat-column-' + this.getFilter('sort'))[0] as HTMLElement;
+ element.click();
+ if (this.getFilter('sortDirection') === 'desc') {
+ element.click();
+ }
+
this.searchTerm.setValue(this.getFilter('field'));
merge(sort.sortChange, paginator.page)
diff --git a/src/frontend/app/administration/alfresco/alfresco-list-administration.component.html b/src/frontend/app/administration/alfresco/alfresco-list-administration.component.html
index e0c89a80e50147622e8b5bbe8ab78ff992045075..94147ffdaf32e3ec28475d50b1ad6ddfe8512b05 100644
--- a/src/frontend/app/administration/alfresco/alfresco-list-administration.component.html
+++ b/src/frontend/app/administration/alfresco/alfresco-list-administration.component.html
@@ -48,7 +48,7 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSortDisableClear matSort>
<ng-container matColumnDef="label">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()">{{lang.label}}</mat-header-cell>
diff --git a/src/frontend/app/administration/basket/baskets-administration.component.html b/src/frontend/app/administration/basket/baskets-administration.component.html
index f07b15cf52fc49585d15f280c42a9915386deeee..e02cbac652cc11f952102b58eab3a7ecce8e0217 100755
--- a/src/frontend/app/administration/basket/baskets-administration.component.html
+++ b/src/frontend/app/administration/basket/baskets-administration.component.html
@@ -46,7 +46,7 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSortDisableClear matSort>
<ng-container matColumnDef="basket_id">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()">{{lang.id}}</mat-header-cell>
diff --git a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html
index e8bbf085279e10853ac1743913c7052de0d46db1..4aaeb56d2f16ffe60babb8c4b071b9baeed49f42 100644
--- a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html
+++ b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html
@@ -49,7 +49,7 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSortDisableClear matSort>
<ng-container matColumnDef="label">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()" style="flex:2;">{{lang.label}}
diff --git a/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.html b/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.html
index 2291204b738655580d048f28592f368d62f3a7a1..ca56e2e9e723691b017372367ced8986af81e0df 100755
--- a/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.html
+++ b/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.html
@@ -40,7 +40,7 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSortDisableClear matSort>
<ng-container matColumnDef="title">
<mat-header-cell *matHeaderCellDef mat-sort-header style="flex:2;">{{lang.label}}</mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:2;">
diff --git a/src/frontend/app/administration/group/groups-administration.component.html b/src/frontend/app/administration/group/groups-administration.component.html
index 432bd8a3c0ce864b7e769318c78ebe18954ae778..01c989a787974df7bf90a3dccf6340f60560015d 100755
--- a/src/frontend/app/administration/group/groups-administration.component.html
+++ b/src/frontend/app/administration/group/groups-administration.component.html
@@ -40,7 +40,7 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSortDisableClear matSort>
<ng-container matColumnDef="group_id">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()">{{lang.id}}</mat-header-cell>
diff --git a/src/frontend/app/administration/user/users-administration.component.html b/src/frontend/app/administration/user/users-administration.component.html
index 66000a17d191f336012279c4fdaeb804781217ca..316280c45b89c7fe976052387051bb0991c67a63 100755
--- a/src/frontend/app/administration/user/users-administration.component.html
+++ b/src/frontend/app/administration/user/users-administration.component.html
@@ -66,7 +66,7 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSort matSortDisableClear>
<ng-container matColumnDef="id">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()">{{lang.technicalId}}
diff --git a/src/frontend/app/administration/user/users-administration.component.ts b/src/frontend/app/administration/user/users-administration.component.ts
index 995e73c8741ae1a272d46ef180169d94d10e298d..610c3f7137744afee93b640a0fb40747b53e7d89 100755
--- a/src/frontend/app/administration/user/users-administration.component.ts
+++ b/src/frontend/app/administration/user/users-administration.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild, Inject, TemplateRef, ViewContainerRef, ElementRef } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject, TemplateRef, ViewContainerRef, ElementRef, ChangeDetectorRef } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { LANG } from '../../translate.component';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
@@ -27,7 +27,7 @@ export class UsersAdministrationComponent implements OnInit {
dialogRef: MatDialogRef<any>;
lang: any = LANG;
- loading: boolean = false;
+ loading: boolean = true;
updateListModel: boolean = true;
updateListInstance: boolean = true;
@@ -56,7 +56,7 @@ export class UsersAdministrationComponent implements OnInit {
public appService: AppService,
public functions: FunctionsService,
public adminService: AdministrationService,
- private viewContainerRef: ViewContainerRef
+ private viewContainerRef: ViewContainerRef,
) { }
ngOnInit(): void {
@@ -65,7 +65,7 @@ export class UsersAdministrationComponent implements OnInit {
this.headerService.injectInSideBarLeft(this.adminMenuTemplate, this.viewContainerRef, 'adminMenu');
this.user = this.headerService.user;
- this.loading = true;
+
this.getData();
}