From 95a4786e13827da9b6d2dc457588994f372d4e46 Mon Sep 17 00:00:00 2001
From: Max Ehrlicher-Schmidt <maxes2000@t-online.de>
Date: Sun, 15 Nov 2020 20:33:18 +0100
Subject: [PATCH] Improve performance and add sorting, filtering, pagination

---
 src/app/app.module.ts                         |  5 ++-
 .../pages/tables/bikes/bikes.component.html   | 13 ++++++++
 src/app/pages/tables/bikes/bikes.component.ts | 32 +++++++++----------
 src/app/services/bikes.service.ts             |  7 ++--
 4 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ea6649b..27fc937 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -23,7 +23,8 @@ import {MatCardModule} from '@angular/material/card';
 import {MatGridListModule} from '@angular/material/grid-list';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {MatSelectModule} from '@angular/material/select';
-
+import { MatPaginatorModule } from '@angular/material/paginator';
+import { MatSortModule } from '@angular/material/sort';
 
 
 import { AppRoutingModule } from './app-routing.module';
@@ -76,6 +77,8 @@ import { NavService }from './components/menu-list-item/nav.service';
     DragDropModule,
     MatTooltipModule,
     MatSelectModule,
+    MatPaginatorModule,
+    MatSortModule
   ],
   providers: [NavService],
   bootstrap: [AppComponent],
diff --git a/src/app/pages/tables/bikes/bikes.component.html b/src/app/pages/tables/bikes/bikes.component.html
index d9c2787..cf30a16 100644
--- a/src/app/pages/tables/bikes/bikes.component.html
+++ b/src/app/pages/tables/bikes/bikes.component.html
@@ -13,6 +13,19 @@
     >
       <mat-icon class="spin">sync</mat-icon>
     </button>
+    <mat-form-field>
+      <mat-label>Filter</mat-label>
+      <input
+        matInput
+        (keyup)="applyFilter($event)"
+        placeholder="Suchbegriff eingeben..."
+        #input
+      />
+    </mat-form-field>
+    <mat-paginator
+      [pageSizeOptions]="[25, 30, 50, 100, 500]"
+      showFirstLastButtons
+    ></mat-paginator>
   </div>
   <div class="table-container">
     <table
diff --git a/src/app/pages/tables/bikes/bikes.component.ts b/src/app/pages/tables/bikes/bikes.component.ts
index ab00291..249284c 100644
--- a/src/app/pages/tables/bikes/bikes.component.ts
+++ b/src/app/pages/tables/bikes/bikes.component.ts
@@ -1,5 +1,5 @@
 import { SelectionModel } from '@angular/cdk/collections';
-import { Component, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import { BikesService, CargoBikeResult } from 'src/app/services/bikes.service';
 import { flatten } from 'src/app/helperFunctions/flattenObject';
@@ -14,12 +14,13 @@ import { SchemaService } from 'src/app/services/schema.service';
 
 import { logArrayInColumnInfoForm } from 'src/app/helperFunctions/logArrayInColumnInfoForm';
 import { MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { MatSort } from '@angular/material/sort';
 
 @Component({
   selector: 'app-bikes',
   templateUrl: './bikes.component.html',
   styleUrls: ['./bikes.component.scss'],
-  //changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class BikesComponent {
   /** this array defines the columns and headers of the table and the order they are displayed  */
@@ -91,6 +92,9 @@ export class BikesComponent {
     { name: 'lendingStation.address.zip', header: '' },
   ];
 
+  @ViewChild(MatPaginator) paginator: MatPaginator;
+  @ViewChild(MatSort) sort: MatSort;
+
   additionalColumnsFront: string[] = ['select'];
   additionalColumnsBack: string[] = ['buttons'];
   displayedColumns: string[] = [];
@@ -98,7 +102,7 @@ export class BikesComponent {
   loadingRowIds: string[] = [];
 
   /** data source of the table */
-  data: MatTableDataSource<any> = new MatTableDataSource() ;
+  data: MatTableDataSource<any> = new MatTableDataSource();
   selection = new SelectionModel<CargoBikeResult>(true, []);
 
   reloadingTable = false;
@@ -108,15 +112,15 @@ export class BikesComponent {
 
   constructor(
     private bikesService: BikesService,
-    private schemaService: SchemaService,
-    //private cdr: ChangeDetectorRef
+    private schemaService: SchemaService
   ) {}
 
   ngAfterViewInit() {
-    //this.cdr.detach();
-
     this.addTypesToColumnInfo();
     this.addReadOnlyPropertiesToColumnInfo();
+    this.data.paginator = this.paginator;
+    this.data.sort = this.sort;
+
     this.columnInfo.forEach((column) =>
       this.displayedColumns.push(column.name)
     );
@@ -128,10 +132,8 @@ export class BikesComponent {
     });
 
     this.bikesService.bikes.subscribe((newTableDataSource) => {
-      console.time("newBikes");
       this.reloadingTable = false;
       const tempDataSource = [];
-      console.time("overwriteCheck");
       for (const row of newTableDataSource) {
         const oldRow = this.getRowById(row.id);
         /** make sure to not overwrite a row that is being edited */
@@ -143,13 +145,7 @@ export class BikesComponent {
           tempDataSource.push(oldRow);
         }
       }
-      console.timeEnd("overwriteCheck");
-      console.time("assignData");
       this.data.data = tempDataSource;
-      console.timeEnd("assignData");
-
-      console.timeEnd("newBikes");
-
     });
     this.bikesService.loadBikes();
 
@@ -190,7 +186,6 @@ export class BikesComponent {
   }
 
   getType(propertyName: string) {
-    // console.log(propertyName, this.schemaService.getPropertyTypeFromSchema("CargoBike", propertyName))
     return this.schemaService.getPropertyTypeFromSchema(
       'CargoBike',
       propertyName
@@ -261,4 +256,9 @@ export class BikesComponent {
       ? this.selection.clear()
       : this.data.data.forEach((row) => this.selection.select(row));
   }
+
+  applyFilter(event: Event) {
+    const filterValue = (event.target as HTMLInputElement).value;
+    this.data.filter = filterValue.trim().toLowerCase();
+  }
 }
diff --git a/src/app/services/bikes.service.ts b/src/app/services/bikes.service.ts
index 598cd5c..20efacb 100644
--- a/src/app/services/bikes.service.ts
+++ b/src/app/services/bikes.service.ts
@@ -52,13 +52,12 @@ export class BikesService {
 
   loadBikes() {
     this.getCargoBikesGQL.fetch().subscribe((result) => {
-      console.time("addMoreBikes");
-      for (let i = 1; i <= 500; i++) {
+      // comment in for performance testing
+      /*for (let i = 1; i <= 500; i++) {
         const newBike = deepCopy(result.data.cargoBikes[0]);
         newBike.id = (i + 100).toString();
         result.data.cargoBikes.push(newBike);
-      }
-      console.timeEnd("addMoreBikes");
+      }*/
       this.bikes.next(result.data.cargoBikes);
 
     });