FEAT #14454 TIME 0:20 simplify set filter

src/frontend/app/administration/action/actions-administration.component.html

@@ -40,7 +40,7 @@
                             </mat-paginator>
                         </div>
                     </div>
-                    <mat-table #table [dataSource]="adminService.getDataSource()" matSort [matSortActive]="adminService.getFilter('admin_actions', 'sort')" [matSortDirection]="adminService.getFilter('admin_actions', 'sortDirection')">
+                    <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
                         <ng-container matColumnDef="id">
                             <mat-header-cell *matHeaderCellDef mat-sort-header
                                 [class.hide-for-mobile]="appService.getViewMode()">{{lang.id}}</mat-header-cell>

src/frontend/app/administration/administration.service.ts

@@ -34,6 +34,7 @@ export class AdministrationService {
     dataSource: MatTableDataSource<any>;
     filterColumns: string[];
     searchTerm: FormControl = new FormControl('');
+    currentAdminId: string = '';
 
     constructor(
         private notify: NotificationService,
@@ -46,20 +47,8 @@ export class AdministrationService {
         }
     }
 
-    setFilter(id: string, filter: any) {
-        this.filters[id] = filter;
-        this.localStorage.save(`filtersAdmin_${this.headerService.user.id}`, JSON.stringify(this.filters));
-    }
-
-    getFilterField() {
-        return this.searchTerm;
-    }
-
-    getDataSource() {
-        return this.dataSource;
-    }
-
     setDataSource(adminId: string, data: any, sort: MatSort, paginator: MatPaginator, filterColumns: string[]) {
+        this.currentAdminId = adminId;
         this.searchTerm = new FormControl('');
 
         this.searchTerm.valueChanges
@@ -67,8 +56,8 @@ export class AdministrationService {
                 // debounceTime(300),
                 // filter(value => value.length > 2),
                 tap((filterValue: any) => {
-                    this.filters[adminId]['field'] = filterValue;
-                    this.setFilter(adminId, this.filters[adminId]);
+                    this.filters[this.currentAdminId]['field'] = filterValue;
+                    this.setFilter(this.filters[this.currentAdminId]);
                     filterValue = filterValue.trim(); // Remove whitespace
                     filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
                     setTimeout(() => {
@@ -85,32 +74,31 @@ export class AdministrationService {
         this.dataSource.paginator = paginator;
         this.dataSource.sortingDataAccessor = this.functionsService.listSortingDataAccessor;
 
-        if (this.functionsService.empty(this.getFilter(adminId))) {
+        if (this.functionsService.empty(this.getFilter())) {
+
             this.setFilter(
-                adminId,
-                this.defaultFilters[adminId]
+                this.defaultFilters[this.currentAdminId]
             );
         }
 
-        sort.active = this.getFilter(adminId, 'sort');
-        sort.direction = this.getFilter(adminId, 'sortDirection');
-        paginator.pageIndex = this.getFilter(adminId, 'page');
+        sort.active = this.getFilter('sort');
+        sort.direction = this.getFilter('sortDirection');
+        paginator.pageIndex = this.getFilter('page');
 
         this.dataSource.sort = sort;
 
-        this.searchTerm.setValue(this.getFilter(adminId, 'field'));
+        this.searchTerm.setValue(this.getFilter('field'));
 
         merge(sort.sortChange, paginator.page)
             .pipe(
                 startWith({}),
                 tap(() => {
                     this.setFilter(
-                        adminId,
                         {
                             sort: sort.active,
                             sortDirection: sort.direction,
                             page: paginator.pageIndex,
-                            field: this.getFilter(adminId, 'field')
+                            field: this.getFilter('field')
                         }
                     );
                 }),
@@ -121,12 +109,25 @@ export class AdministrationService {
             ).subscribe();
     }
 
-    getFilter(id: string, idFilter: string = null) {
-        if (!this.functionsService.empty(this.filters[id])) {
+    setFilter(filter: any) {
+        this.filters[this.currentAdminId] = filter;
+        this.localStorage.save(`filtersAdmin_${this.headerService.user.id}`, JSON.stringify(this.filters));
+    }
+
+    getFilterField() {
+        return this.searchTerm;
+    }
+
+    getDataSource() {
+        return this.dataSource;
+    }
+
+    getFilter(idFilter: string = null) {
+        if (!this.functionsService.empty(this.filters[this.currentAdminId])) {
             if (!this.functionsService.empty(idFilter)) {
-                return !this.functionsService.empty(this.filters[id][idFilter]) ? this.filters[id][idFilter] : '';
+                return !this.functionsService.empty(this.filters[this.currentAdminId][idFilter]) ? this.filters[this.currentAdminId][idFilter] : '';
             } else {
-                return !this.functionsService.empty(this.filters[id]) ? this.filters[id] : '';
+                return !this.functionsService.empty(this.filters[this.currentAdminId]) ? this.filters[this.currentAdminId] : '';
             }
         } else {
             return null;

src/frontend/app/administration/alfresco/alfresco-list-administration.component.html

@@ -39,7 +39,7 @@
                         </div>
                         <div class="col-md-6 col-xs-6">
                             <mat-form-field>
-                                <input matInput (keyup)="applyFilter($event.target.value)"
+                                <input matInput [formControl]="adminService.getFilterField()"
                                     placeholder="{{lang.filterBy}}">
                             </mat-form-field>
                         </div>
@@ -48,7 +48,7 @@
                             </mat-paginator>
                         </div>
                     </div>
-                    <mat-table #table [dataSource]="dataSource" matSort matSortActive="id" matSortDirection="asc">
+                    <mat-table #table [dataSource]="adminService.getDataSource()" matSort [matSortActive]="adminService.getFilter('admin_alfresco', 'sort')" [matSortDirection]="adminService.getFilter('admin_alfresco', 'sortDirection')">
                         <ng-container matColumnDef="label">
                             <mat-header-cell *matHeaderCellDef mat-sort-header
                                 [class.hide-for-mobile]="appService.getViewMode()">{{lang.label}}</mat-header-cell>

src/frontend/app/administration/alfresco/alfresco-list-administration.component.ts

@@ -16,6 +16,7 @@ import { MatDialogRef } from '@angular/material/dialog/dialog-ref';
 import { filter } from 'rxjs/internal/operators/filter';
 import { exhaustMap } from 'rxjs/internal/operators/exhaustMap';
 import { MatDialog } from '@angular/material/dialog';
+import { AdministrationService } from '../administration.service';
 
 @Component({
     templateUrl: 'alfresco-list-administration.component.html',
@@ -34,7 +35,8 @@ export class AlfrescoListAdministrationComponent implements OnInit {
     loading: boolean = false;
 
     displayedColumns = ['label', 'entitiesLabel', 'actions'];
-    dataSource: any;
+    filterColumns = ['label', 'entitiesLabel'];
+
     dialogRef: MatDialogRef<any>;
 
     @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@@ -48,18 +50,10 @@ export class AlfrescoListAdministrationComponent implements OnInit {
         public appService: AppService,
         private dialog: MatDialog,
         public functions: FunctionsService,
+        public adminService: AdministrationService,
         private viewContainerRef: ViewContainerRef
     ) { }
 
-    applyFilter(filterValue: string) {
-        filterValue = filterValue.trim(); // Remove whitespace
-        filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
-        this.dataSource.filter = filterValue;
-        this.dataSource.filterPredicate = (template: any, filter: string) => {
-            return this.functions.filterUnSensitive(template, filter, ['label', 'entitiesLabel']);
-        };
-    }
-
     ngOnInit(): void {
         this.headerService.setHeader(this.lang.administration + ' ' + this.lang.alfresco);
 
@@ -77,13 +71,10 @@ export class AlfrescoListAdministrationComponent implements OnInit {
         this.http.get('../rest/alfresco/accounts')
             .subscribe((data: any) => {
                 this.accounts = data.accounts;
-
+                this.loading = false;
                 setTimeout(() => {
-                    this.dataSource = new MatTableDataSource(this.accounts);
-                    this.dataSource.paginator = this.paginator;
-                    this.dataSource.sort = this.sort;
+                    this.adminService.setDataSource('admin_alfresco', this.accounts, this.sort, this.paginator, this.filterColumns);
                 }, 0);
-                this.loading = false;
             });
     }
 
@@ -96,9 +87,9 @@ export class AlfrescoListAdministrationComponent implements OnInit {
             exhaustMap(() => this.http.delete('../rest/alfresco/accounts/' + id)),
             tap(() => {
                 this.accounts = this.accounts.filter((account: any) => account.id !== id);
-                this.dataSource = new MatTableDataSource(this.accounts);
-                this.dataSource.paginator = this.paginator;
-                this.dataSource.sort = this.sort;
+                setTimeout(() => {
+                    this.adminService.setDataSource('admin_alfresco', this.accounts, this.sort, this.paginator, this.filterColumns);
+                }, 0);
                 this.notify.success(this.lang.accountDeleted);
             }),
             catchError((err: any) => {

src/frontend/app/administration/user/users-administration.component.html

@@ -66,7 +66,7 @@
                             </mat-paginator>
                         </div>
                     </div>
-                    <mat-table #table [dataSource]="adminService.getDataSource()" matSort [matSortActive]="adminService.getFilter('admin_users', 'sort')" [matSortDirection]="adminService.getFilter('admin_users', 'sortDirection')">
+                    <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
                         <ng-container matColumnDef="id">
                             <mat-header-cell *matHeaderCellDef mat-sort-header
                                 [class.hide-for-mobile]="appService.getViewMode()">{{lang.technicalId}}