From 875c80d6fe079bfdce4c1dc74e388ca5411054ca Mon Sep 17 00:00:00 2001
From: Max Ehrlicher-Schmidt <maxes2000@t-online.de>
Date: Thu, 26 Nov 2020 13:51:58 +0100
Subject: [PATCH] Remove batch editing components

---
 src/app/components/data-page/data-page.component.ts | 8 ++++++--
 src/app/components/table/table.component.html       | 4 ++--
 src/app/components/table/table.component.scss       | 3 +++
 src/app/components/table/table.component.ts         | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/app/components/data-page/data-page.component.ts b/src/app/components/data-page/data-page.component.ts
index 432f674..dc2736f 100644
--- a/src/app/components/data-page/data-page.component.ts
+++ b/src/app/components/data-page/data-page.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { deepen } from 'src/app/helperFunctions/deepenObject';
 import { flatten } from 'src/app/helperFunctions/flattenObject';
@@ -32,7 +32,7 @@ interface ReferenceTableInfo {
   templateUrl: './data-page.component.html',
   styleUrls: ['./data-page.component.scss'],
 })
-export class DataPageComponent implements OnInit {
+export class DataPageComponent implements OnInit, OnDestroy {
   @Input()
   propertiesInfo: Array<any> = [];
 
@@ -89,6 +89,10 @@ export class DataPageComponent implements OnInit {
     }, this.relockingIntervalDuration);
   }
 
+  ngOnDestroy() {
+    clearInterval(this.relockingInterval);
+  }
+
   addPropertiesFromGQLSchemaToObject(infoObject: any) {
     for (const prop of infoObject) {
       if (prop.type === 'Group') {
diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index 9b3a277..17d2b4c 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -3,7 +3,7 @@
     {{ headline }}
   </h1>
   <div class="table-control">
-    <button
+    <!--<button
       mat-raised-button
       color="primary"
       class="table-control-button"
@@ -11,7 +11,7 @@
       i18n
     >
       Alle ausgewählten Fahrräder bearbeiten
-    </button>
+    </button>-->
     <button
       mat-raised-button
       class="table-control-button"
diff --git a/src/app/components/table/table.component.scss b/src/app/components/table/table.component.scss
index 6af3060..d600d31 100644
--- a/src/app/components/table/table.component.scss
+++ b/src/app/components/table/table.component.scss
@@ -41,6 +41,9 @@
           min-width: 50px !important;
         }
       }
+      .mat-header-cell:first-child {
+        padding-left: 1.5em;
+      }
       ::ng-deep.mat-form-field {
         width: 100%;
       }
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index dd65d54..165c3f6 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -51,7 +51,7 @@ export class TableComponent {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  additionalColumnsFront: string[] = ['select'];
+  additionalColumnsFront: string[] = [];
   additionalColumnsBack: string[] = ['buttons'];
   displayedColumns: string[] = [];
 
@@ -109,8 +109,8 @@ export class TableComponent {
     this.columnInfo.forEach((column) =>
       this.displayedColumns.push(column.dataPath)
     );
-    this.displayedColumns.unshift(this.additionalColumnsFront[0]);
-    this.displayedColumns.push(this.additionalColumnsBack[0]);
+    this.displayedColumns.unshift(...this.additionalColumnsFront);
+    this.displayedColumns.push(...this.additionalColumnsBack);
 
     this.dataService.loadingRowIds.subscribe((rowIds) => {
       this.loadingRowIds = rowIds;