From 4d95b0c9eb120f8637b045fdaf7a38cdfd27ce25 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 6 Aug 2020 18:50:51 +0200
Subject: [PATCH] FEAT #14454 TIME 0:10 save filters notif admin
---
.../administration/administration.service.ts | 6 +++++
.../templates-administration.component.html | 8 +++---
.../templates-administration.component.ts | 25 +++++--------------
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/src/frontend/app/administration/administration.service.ts b/src/frontend/app/administration/administration.service.ts
index e48b566cbf2..f63bcf8b078 100644
--- a/src/frontend/app/administration/administration.service.ts
+++ b/src/frontend/app/administration/administration.service.ts
@@ -95,6 +95,12 @@ export class AdministrationService {
page: 0,
field: ''
},
+ admin_templates: {
+ sort: 'template_label',
+ sortDirection: 'asc',
+ page: 0,
+ field: ''
+ },
};
dataSource: MatTableDataSource<any>;
filterColumns: string[];
diff --git a/src/frontend/app/administration/template/templates-administration.component.html b/src/frontend/app/administration/template/templates-administration.component.html
index 26e1678c7f2..37350434318 100755
--- a/src/frontend/app/administration/template/templates-administration.component.html
+++ b/src/frontend/app/administration/template/templates-administration.component.html
@@ -32,8 +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">
@@ -41,10 +40,9 @@
</mat-paginator>
</div>
</div>
- <mat-table #table [dataSource]="dataSource" matSort matSortActive="template_label"
- matSortDirection="asc">
+ <mat-table #table [dataSource]="adminService.getDataSource()" matSort matSortDisableClear>
<ng-container matColumnDef="template_id">
- <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:2;">{{lang.technicalId}}
+ <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:1;">{{lang.technicalId}}
</mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:1;"> {{element.template_id}} </mat-cell>
</ng-container>
diff --git a/src/frontend/app/administration/template/templates-administration.component.ts b/src/frontend/app/administration/template/templates-administration.component.ts
index 95d32e025cf..ff61757327c 100755
--- a/src/frontend/app/administration/template/templates-administration.component.ts
+++ b/src/frontend/app/administration/template/templates-administration.component.ts
@@ -4,10 +4,10 @@ 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 { FunctionsService } from '../../../service/functions.service';
+import { AdministrationService } from '../administration.service';
@Component({
templateUrl: 'templates-administration.component.html'
@@ -26,17 +26,10 @@ export class TemplatesAdministrationComponent implements OnInit {
loading: boolean = false;
displayedColumns = ['template_id', 'template_label', 'template_comment', 'template_type', 'template_target', 'actions'];
- dataSource = new MatTableDataSource(this.templates);
+ filterColumns = ['template_label', 'template_comment', 'template_type', 'template_target'];
+
@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, ['template_label', 'template_comment', 'template_type', 'template_target']);
- };
- }
constructor(
public http: HttpClient,
@@ -44,6 +37,7 @@ export class TemplatesAdministrationComponent implements OnInit {
private headerService: HeaderService,
public appService: AppService,
public functions: FunctionsService,
+ public adminService: AdministrationService,
private viewContainerRef: ViewContainerRef
) { }
@@ -59,12 +53,7 @@ export class TemplatesAdministrationComponent implements OnInit {
this.templates = data['templates'];
this.loading = false;
setTimeout(() => {
- this.dataSource = new MatTableDataSource(this.templates);
- this.dataSource.paginator = this.paginator;
- this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
- this.sort.active = 'template_label';
- this.sort.direction = 'asc';
- this.dataSource.sort = this.sort;
+ this.adminService.setDataSource('admin_templates', this.templates, this.sort, this.paginator, this.filterColumns);
}, 0);
}, (err) => {
this.notify.handleErrors(err);
@@ -82,9 +71,7 @@ export class TemplatesAdministrationComponent implements OnInit {
this.templates.splice(Number(i), 1);
}
}
- this.dataSource = new MatTableDataSource(this.templates);
- this.dataSource.paginator = this.paginator;
- this.dataSource.sort = this.sort;
+ this.adminService.setDataSource('admin_templates', this.templates, this.sort, this.paginator, this.filterColumns);
this.notify.success(this.lang.templateDeleted);
--
GitLab