FEAT #14454 TIME 0:10 save filters notif admin

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

@@ -59,6 +59,12 @@ export class AdministrationService {
             page: 0,
             field: ''
         },
+        admin_notif: {
+            sort: 'notification_id',
+            sortDirection: 'asc',
+            page: 0,
+            field: ''
+        },
     };
     dataSource: MatTableDataSource<any>;
     filterColumns: string[];

src/frontend/app/administration/notification/notifications-administration.component.html

@@ -38,8 +38,7 @@
                     <div class="row">
                         <div class="col-md-6 col-xs-6">
                             <mat-form-field>
-                                <input matInput (keyup)="applyFilter($event.target.value)"
-                                    placeholder="{{lang.filterBy}}">
+                                <input matInput [formControl]="adminService.getFilterField()" placeholder="{{lang.filterBy}}">
                             </mat-form-field>
                         </div>
                         <div class="col-md-6 col-xs-6">
@@ -47,8 +46,7 @@
                             </mat-paginator>
                         </div>
                     </div>
-                    <mat-table #table [dataSource]="dataSource" matSort matSortActive="notification_id"
-                        matSortDirection="asc">
+                    <mat-table #table [dataSource]="adminService.getDataSource()" matSort matSortDisableClear>
                         <ng-container matColumnDef="notification_id">
                             <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:1;"
                                 [class.hide-for-mobile]="appService.getViewMode()">{{lang.id}}</mat-header-cell>

src/frontend/app/administration/notification/notifications-administration.component.ts

@@ -4,7 +4,6 @@ import { LANG } from '../../translate.component';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSidenav } from '@angular/material/sidenav';
 import { MatSort } from '@angular/material/sort';
-import { MatTableDataSource } from '@angular/material/table';
 import { NotificationService } from '../../../service/notification/notification.service';
 import { HeaderService } from '../../../service/header.service';
 import { AppService } from '../../../service/app.service';
@@ -13,6 +12,7 @@ import { tap } from 'rxjs/internal/operators/tap';
 import { catchError } from 'rxjs/internal/operators/catchError';
 import { of } from 'rxjs/internal/observable/of';
 import { finalize } from 'rxjs/operators';
+import { AdministrationService } from '../administration.service';
 
 @Component({
     templateUrl: 'notifications-administration.component.html'
@@ -48,17 +48,10 @@ export class NotificationsAdministrationComponent implements OnInit {
     crontab: any;
 
     displayedColumns = ['notification_id', 'description', 'is_enabled', 'notifications'];
-    dataSource = new MatTableDataSource(this.notifications);
+    filterColumns = ['notification_id', 'description'];
+
     @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
     @ViewChild(MatSort, { static: false }) sort: MatSort;
-    applyFilter(filterValue: string) {
-        filterValue = filterValue.trim(); // Remove whitespace
-        filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
-        this.dataSource.filter = filterValue;
-        this.dataSource.filterPredicate = (template, filter: string) => {
-            return this.functions.filterUnSensitive(template, filter, ['notification_id', 'description']);
-        };
-    }
 
     constructor(
         public http: HttpClient,
@@ -66,6 +59,7 @@ export class NotificationsAdministrationComponent implements OnInit {
         private headerService: HeaderService,
         public appService: AppService,
         public functions: FunctionsService,
+        public adminService: AdministrationService,
         private viewContainerRef: ViewContainerRef
     ) { }
 
@@ -81,12 +75,7 @@ export class NotificationsAdministrationComponent implements OnInit {
                 this.notifications = data.notifications;
                 this.loading = false;
                 setTimeout(() => {
-                    this.dataSource = new MatTableDataSource(this.notifications);
-                    this.dataSource.paginator = this.paginator;
-                    this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
-                    this.sort.active = 'notification_id';
-                    this.sort.direction = 'asc';
-                    this.dataSource.sort = this.sort;
+                    this.adminService.setDataSource('admin_notif', this.notifications, this.sort, this.paginator, this.filterColumns);
                 }, 0);
             }, (err: any) => {
                 this.notify.error(err.error.errors);
@@ -101,9 +90,7 @@ export class NotificationsAdministrationComponent implements OnInit {
                 .subscribe((data: any) => {
                     this.notifications = data.notifications;
                     setTimeout(() => {
-                        this.dataSource = new MatTableDataSource(this.notifications);
-                        this.dataSource.paginator = this.paginator;
-                        this.dataSource.sort = this.sort;
+                        this.adminService.setDataSource('admin_notif', this.notifications, this.sort, this.paginator, this.filterColumns);
                     }, 0);
                     this.sidenavRight.close();
                     this.notify.success(this.lang.notificationDeleted);