FEAT #14454 TIME 0:10 save filters indexing models admin

src/frontend/app/administration/indexingModel/indexing-models-administration.component.html

@@ -32,7 +32,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">
@@ -40,7 +40,7 @@
                             </mat-paginator>
                         </div>
                     </div>
-                    <mat-table #table [dataSource]="dataSource" matSort matSortActive="label" matSortDirection="asc">
+                    <mat-table #table [dataSource]="adminService.getDataSource()" matSortDisableClear matSort>
                         <ng-container matColumnDef="id">
                             <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.technicalId}}</mat-header-cell>
                             <mat-cell *matCellDef="let element"> {{element.id}} </mat-cell>

src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts

@@ -4,7 +4,6 @@ import { LANG } from '../../translate.component';
 import { NotificationService } from '../../../service/notification/notification.service';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
-import { MatTableDataSource } from '@angular/material/table';
 import { HeaderService } from '../../../service/header.service';
 import { AppService } from '../../../service/app.service';
 import { tap, finalize, catchError, filter, exhaustMap, map } from 'rxjs/operators';
@@ -13,6 +12,7 @@ import { MatDialogRef, MatDialog } from '@angular/material/dialog';
 import { FunctionsService } from '../../../service/functions.service';
 import { of } from 'rxjs/internal/observable/of';
 import {RedirectIndexingModelComponent} from './redirectIndexingModel/redirect-indexing-model.component';
+import { AdministrationService } from '../administration.service';
 
 @Component({
     templateUrl: 'indexing-models-administration.component.html',
@@ -31,23 +31,13 @@ export class IndexingModelsAdministrationComponent implements OnInit {
     loading: boolean = false;
 
     displayedColumns = ['id', 'category', 'label', 'private', 'default', 'enabled', 'actions'];
-
-    dataSource = new MatTableDataSource(this.indexingModels);
+    filterColumns = ['id', 'label'];
 
     @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
     @ViewChild(MatSort, { static: false }) sort: MatSort;
 
     dialogRef: MatDialogRef<any>;
 
-    applyFilter(filterValue: string) {
-        filterValue = filterValue.trim(); // Remove whitespace
-        filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
-        this.dataSource.filter = filterValue;
-        this.dataSource.filterPredicate = (template, filterTarget: string) => {
-            return this.functions.filterUnSensitive(template, filterTarget, ['id', 'label']);
-        };
-    }
-
     constructor(
         public http: HttpClient,
         private notify: NotificationService,
@@ -55,6 +45,7 @@ export class IndexingModelsAdministrationComponent implements OnInit {
         public appService: AppService,
         private dialog: MatDialog,
         public functions: FunctionsService,
+        public adminService: AdministrationService,
         private viewContainerRef: ViewContainerRef
     ) { }
 
@@ -72,12 +63,7 @@ export class IndexingModelsAdministrationComponent implements OnInit {
                 this.indexingModels = data;
                 this.headerService.setHeader(this.lang.administration + ' ' + this.lang.indexingModels);
                 setTimeout(() => {
-                    this.dataSource = new MatTableDataSource(this.indexingModels);
-                    this.dataSource.paginator = this.paginator;
-                    this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
-                    this.sort.active = 'label';
-                    this.sort.direction = 'asc';
-                    this.dataSource.sort = this.sort;
+                    this.adminService.setDataSource('admin_indexing_models', this.indexingModels, this.sort, this.paginator, this.filterColumns);
                 }, 0);
             }),
             finalize(() => this.loading = false),
@@ -102,9 +88,7 @@ export class IndexingModelsAdministrationComponent implements OnInit {
                             this.indexingModels.splice(Number(i), 1);
                         }
                     }
-                    this.dataSource = new MatTableDataSource(this.indexingModels);
-                    this.dataSource.paginator = this.paginator;
-                    this.dataSource.sort = this.sort;
+                    this.adminService.setDataSource('admin_indexing_models', this.indexingModels, this.sort, this.paginator, this.filterColumns);
                     this.notify.success(this.lang.indexingModelDeleted);
                 }),
                 catchError((err: any) => {
@@ -123,9 +107,7 @@ export class IndexingModelsAdministrationComponent implements OnInit {
                             this.indexingModels.splice(Number(i), 1);
                         }
                     }
-                    this.dataSource = new MatTableDataSource(this.indexingModels);
-                    this.dataSource.paginator = this.paginator;
-                    this.dataSource.sort = this.sort;
+                    this.adminService.setDataSource('admin_indexing_models', this.indexingModels, this.sort, this.paginator, this.filterColumns);
                 }),
                 catchError((err: any) => {
                     this.notify.handleSoftErrors(err);