From f1b5610f53e3bfb5cf4e813c2f886c96d77a5cb9 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 6 Aug 2020 09:46:22 +0200
Subject: [PATCH] FEAT #14454 TIME 0:20 save filter baskets admin
---
.../administration/administration.service.ts | 7 ++-
.../baskets-administration.component.html | 6 +--
.../baskets-administration.component.ts | 53 ++++++++-----------
3 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/src/frontend/app/administration/administration.service.ts b/src/frontend/app/administration/administration.service.ts
index fafbdc4d7a8..a4a44d4d414 100644
--- a/src/frontend/app/administration/administration.service.ts
+++ b/src/frontend/app/administration/administration.service.ts
@@ -12,7 +12,6 @@ import { catchError } from 'rxjs/internal/operators/catchError';
import { of } from 'rxjs/internal/observable/of';
import { NotificationService } from '../../service/notification/notification.service';
import { FormControl } from '@angular/forms';
-import { debounceTime } from 'rxjs/operators';
@Injectable()
export class AdministrationService {
@@ -30,6 +29,12 @@ export class AdministrationService {
page: 0,
field: ''
},
+ admin_baskets: {
+ sort: 'basket_id',
+ sortDirection: 'asc',
+ page: 0,
+ field: ''
+ },
};
dataSource: MatTableDataSource<any>;
filterColumns: string[];
diff --git a/src/frontend/app/administration/basket/baskets-administration.component.html b/src/frontend/app/administration/basket/baskets-administration.component.html
index d8df5fccf05..f07b15cf52f 100755
--- a/src/frontend/app/administration/basket/baskets-administration.component.html
+++ b/src/frontend/app/administration/basket/baskets-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="basket_id"
- matSortDirection="asc">
+ <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" 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/basket/baskets-administration.component.ts b/src/frontend/app/administration/basket/baskets-administration.component.ts
index 139989ca939..a5f8e7409a3 100755
--- a/src/frontend/app/administration/basket/baskets-administration.component.ts
+++ b/src/frontend/app/administration/basket/baskets-administration.component.ts
@@ -4,11 +4,13 @@ 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';
import { FunctionsService } from '../../../service/functions.service';
+import { AdministrationService } from '../administration.service';
+import { catchError, tap, finalize } from 'rxjs/operators';
+import { of } from 'rxjs/internal/observable/of';
@Component({
templateUrl: 'baskets-administration.component.html'
@@ -25,18 +27,10 @@ export class BasketsAdministrationComponent implements OnInit {
basketsOrder: any[] = [];
displayedColumns = ['basket_id', 'basket_name', 'basket_desc', 'actions'];
- dataSource: any;
+ filterColumns = ['basket_id', 'basket_name', 'basket_desc'];
@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: any, filter: string) => {
- return this.functions.filterUnSensitive(template, filter, ['basket_id', 'basket_name', 'basket_desc']);
- };
- }
constructor(
public http: HttpClient,
@@ -44,6 +38,7 @@ export class BasketsAdministrationComponent implements OnInit {
private headerService: HeaderService,
public appService: AppService,
public functions: FunctionsService,
+ public adminService: AdministrationService,
private viewContainerRef: ViewContainerRef
) { }
@@ -53,29 +48,32 @@ export class BasketsAdministrationComponent implements OnInit {
this.loading = true;
+ this.getSortedBasket();
+
this.http.get('../rest/baskets')
.subscribe((data: any) => {
this.baskets = data['baskets'];
this.loading = false;
setTimeout(() => {
- this.http.get('../rest/sortedBaskets')
- .subscribe((dataSort: any) => {
- this.basketsOrder = dataSort['baskets'];
- }, (err) => {
- this.notify.handleErrors(err);
- });
- this.dataSource = new MatTableDataSource(this.baskets);
- this.dataSource.paginator = this.paginator;
- this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
- this.sort.active = 'basket_id';
- this.sort.direction = 'asc';
- this.dataSource.sort = this.sort;
+ this.adminService.setDataSource('admin_baskets', this.baskets, this.sort, this.paginator, this.filterColumns);
}, 0);
}, (err) => {
this.notify.handleErrors(err);
});
}
+ getSortedBasket() {
+ this.http.get('../rest/sortedBaskets').pipe(
+ tap((dataSort: any) => {
+ this.basketsOrder = dataSort['baskets'];
+ }),
+ catchError((err: any) => {
+ this.notify.handleSoftErrors(err);
+ return of(false);
+ })
+ ).subscribe();
+ }
+
delete(basket: any) {
const r = confirm(this.lang.confirmAction + ' ' + this.lang.delete + ' « ' + basket['basket_name'] + ' »');
@@ -84,15 +82,8 @@ export class BasketsAdministrationComponent implements OnInit {
.subscribe((data: any) => {
this.notify.success(this.lang.basketDeleted);
this.baskets = data['baskets'];
- this.dataSource = new MatTableDataSource(this.baskets);
- this.dataSource.paginator = this.paginator;
- this.dataSource.sort = this.sort;
- this.http.get('../rest/sortedBaskets')
- .subscribe((dataSort: any) => {
- this.basketsOrder = dataSort['baskets'];
- }, (err) => {
- this.notify.handleErrors(err);
- });
+ this.adminService.setDataSource('admin_baskets', this.baskets, this.sort, this.paginator, this.filterColumns);
+ this.getSortedBasket();
}, (err: any) => {
this.notify.error(err.error.errors);
});
--
GitLab