From 47086c3c3534ddbd0770c512c581fe289fc8d6aa Mon Sep 17 00:00:00 2001
From: Max Ehrlicher-Schmidt <maxes2000@t-online.de>
Date: Mon, 30 Nov 2020 14:20:23 +0100
Subject: [PATCH] Improve validation

---
 .../data-page/data-page.component.html        |  2 +-
 .../data-page/data-page.component.ts          | 13 ++-
 src/app/components/table/table.component.html |  8 +-
 src/app/components/table/table.component.ts   | 13 +--
 .../tableComponents/cell/cell.component.ts    | 92 +++++--------------
 src/generated/graphql.schema.json             |  1 +
 6 files changed, 37 insertions(+), 92 deletions(-)

diff --git a/src/app/components/data-page/data-page.component.html b/src/app/components/data-page/data-page.component.html
index 1dbbd37..00a4921 100644
--- a/src/app/components/data-page/data-page.component.html
+++ b/src/app/components/data-page/data-page.component.html
@@ -18,7 +18,7 @@
         <app-cell
           *ngIf="prop.type !== 'NumRange'"
           [editable]="data.isLockedByMe && prop.acceptedForUpdating"
-          [required]="prop.requiredForUpdating"
+          [required]="prop.required && data.isLockedByMe"
           (validityChange)="validityChange(prop.dataPath, $event)"
           [(value)]="data[prop.dataPath]"
           [label]="prop.translation || prop.dataPath"
diff --git a/src/app/components/data-page/data-page.component.ts b/src/app/components/data-page/data-page.component.ts
index 6f13180..f0c8af6 100644
--- a/src/app/components/data-page/data-page.component.ts
+++ b/src/app/components/data-page/data-page.component.ts
@@ -15,7 +15,7 @@ interface PropertyTypeInfo {
   dataPath: string;
   translation: string;
   acceptedForUpdating?: boolean;
-  requiredForUpdating?: boolean;
+  required?: boolean;
   type?: string;
 }
 
@@ -121,6 +121,9 @@ export class DataPageComponent implements OnInit, OnDestroy {
           prop.dataPath
         );
         prop.type = prop.type || typeInformation.type;
+        prop.required =
+          prop.required != null ? prop.required : typeInformation.isRequired;
+
         const updateTypeInformation = this.schemaService.getTypeInformation(
           this.pageDataGQLUpdateInputType,
           prop.dataPath
@@ -129,10 +132,6 @@ export class DataPageComponent implements OnInit, OnDestroy {
           prop.acceptedForUpdating != null
             ? prop.acceptedForUpdating
             : updateTypeInformation.isPartOfType;
-        prop.requiredForUpdating =
-          prop.requiredForUpdating != null
-            ? prop.requiredForUpdating
-            : updateTypeInformation.isRequired;
       }
     }
   }
@@ -141,8 +140,8 @@ export class DataPageComponent implements OnInit, OnDestroy {
     this.lockEvent.emit(deepen(this.data));
   }
 
-  validityChange(columnName: string, isValid: Event) {
-    this.propertyValidity[columnName] = isValid;
+  validityChange(propName: string, isValid: Event) {
+    this.propertyValidity[propName] = isValid;
   }
 
   countUnvalidProperties() {
diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index cc31737..d407d1a 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -131,8 +131,8 @@
                 (column.acceptedForUpdating && element.isLockedByMe)
               "
               [required]="
-                (element.newObject && column.requiredForCreation) ||
-                (element.isLockedByMe && column.requiredForCreation)
+                (element.newObject && column.required) ||
+                (element.isLockedByMe && column.required)
               "
               (validityChange)="
                 validityChange(element, column.dataPath, $event)
@@ -159,8 +159,8 @@
                 (column.acceptedForUpdating && element.isLockedByMe)
               "
               [required]="
-                (element.newObject && column.requiredForCreation) ||
-                (element.isLockedByMe && column.requiredForCreation)
+                (element.newObject && column.required) ||
+                (element.isLockedByMe && column.required)
               "
               (validityChange)="
                 validityChange(element, column.dataPath, $event)
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index 70a5ed9..e2aa4ca 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -36,10 +36,9 @@ export class TableComponent implements AfterViewInit {
     dataPath: string;
     translation: string;
     acceptedForCreation?: boolean;
-    requiredForCreation?: boolean;
     sticky?: boolean;
     acceptedForUpdating?: boolean;
-    requiredForUpdating?: boolean;
+    required?: boolean;
     type?: string;
     link?: (row: any) => string;
   }[] = [];
@@ -189,6 +188,8 @@ export class TableComponent implements AfterViewInit {
         column.dataPath
       );
       column.type = column.type || typeInformation.type;
+      column.required =
+        column.required != null ? column.required : typeInformation.isRequired;
     }
     for (const column of this.columnInfo) {
       const typeInformation = this.schemaService.getTypeInformation(
@@ -199,20 +200,12 @@ export class TableComponent implements AfterViewInit {
         column.acceptedForUpdating != null
           ? column.acceptedForUpdating
           : typeInformation.isPartOfType;
-      column.requiredForUpdating =
-        column.requiredForUpdating != null
-          ? column.requiredForUpdating
-          : typeInformation.isRequired;
     }
     for (const column of this.columnInfo) {
       const typeInformation = this.schemaService.getTypeInformation(
         this.tableDataGQLCreateInputType,
         column.dataPath
       );
-      column.requiredForCreation =
-        column.requiredForCreation != null
-          ? column.requiredForCreation
-          : typeInformation.isRequired;
       column.acceptedForCreation =
         column.acceptedForCreation != null
           ? column.acceptedForCreation
diff --git a/src/app/components/tableComponents/cell/cell.component.ts b/src/app/components/tableComponents/cell/cell.component.ts
index 9a29c48..b734bae 100644
--- a/src/app/components/tableComponents/cell/cell.component.ts
+++ b/src/app/components/tableComponents/cell/cell.component.ts
@@ -23,21 +23,21 @@ export class CellComponent implements AfterViewInit {
     setTimeout(() => {
       this.checkIfValid();
     });
-  } // number | string | boolean | { start: string; end: string; };
+  }
   get value(): any {
     return this._value;
   }
-  _value: any;
-
-  rangeForm: FormGroup;
-  minValue: number;
-  maxValue: number;
+  _value: number | string | boolean;
 
-  @Output() valueChange = new EventEmitter<
-    number | string | boolean | { start: string; end: string }
-  >();
+  @Output() valueChange = new EventEmitter<number | string | boolean>();
   @Input()
-  editable = false;
+  set editable(value: boolean) {
+    this._editable = value;
+  }
+  get editable(): boolean {
+    return this._editable;
+  }
+  _editable = false;
   _inputType = 'text';
   get inputType(): string {
     return this._inputType;
@@ -48,7 +48,17 @@ export class CellComponent implements AfterViewInit {
     this.getHtmlInputType(type);
   }
   @Input()
-  required = false;
+  set required(value) {
+    this._required = value;
+    if (value) {
+      this.input?.control?.markAsTouched();
+      this.checkIfValid();
+    }
+  }
+  get required(): boolean {
+    return this._required;
+  }
+  _required = false;
   @Input()
   link: string = null;
   @Input()
@@ -73,13 +83,12 @@ export class CellComponent implements AfterViewInit {
       this.cdr.detectChanges();
 
       if (
-        this.value === undefined &&
         this.inputType === 'Boolean' &&
         this.editable
       ) {
         setTimeout(() => {
           this.change(false);
-        }, 0);
+        });
       }
     }
   }
@@ -98,21 +107,6 @@ export class CellComponent implements AfterViewInit {
       this.htmlInputType = 'date';
     } else if (type === 'DateRange') {
       this.htmlInputType = 'dateRange';
-    } else if (type === 'NumRange') {
-      this.htmlInputType = 'numberRange';
-      if (
-        !this.value ||
-        this.value.min === undefined ||
-        this.value.max === undefined
-      ) {
-        this.value = { min: null, max: null };
-      }
-      this.rangeForm = new FormGroup({
-        minValue: new FormControl(),
-        maxValue: new FormControl(),
-      });
-      this.rangeForm.controls['minValue'].markAsTouched();
-      this.rangeForm.controls['maxValue'].markAsTouched();
     }
   }
 
@@ -144,41 +138,6 @@ export class CellComponent implements AfterViewInit {
     this.valueChange.emit(this.value);
   }
 
-  minValueChange(event) {
-    this.value.min = Math.abs(this.toNumber(event.target.value));
-    this.valueChange.emit(this.value);
-    this.checkIfRangeIsValid();
-  }
-
-  maxValueChange(event) {
-    this.value.max = Math.abs(this.toNumber(event.target.value));
-    this.valueChange.emit(this.value);
-    this.checkIfRangeIsValid();
-  }
-
-  checkIfRangeIsValid() {
-    if (this.value.min === null || this.value.max === null) {
-      this.setRangeError(false);
-      return;
-    }
-    if (this.value.min <= this.value.max) {
-      this.setRangeError(false);
-      return;
-    }
-    this.setRangeError(true);
-  }
-
-  setRangeError(error: boolean): void {
-    this.validityChange.emit(!error);
-    if (error) {
-      this.rangeForm.controls['minValue'].setErrors({ rangeError: true });
-      this.rangeForm.controls['maxValue'].setErrors({ rangeError: true });
-    } else {
-      this.rangeForm.controls['minValue'].setErrors(null);
-      this.rangeForm.controls['maxValue'].setErrors(null);
-    }
-  }
-
   transformDate(date) {
     return this.datepipe.transform(date, 'yyyy-MM-dd');
   }
@@ -189,11 +148,4 @@ export class CellComponent implements AfterViewInit {
       this.validityChange.emit(this.isValid);
     }
   }
-
-  toNumber(str: string): number {
-    if (str === '') {
-      return null;
-    }
-    return +str;
-  }
 }
diff --git a/src/generated/graphql.schema.json b/src/generated/graphql.schema.json
index fc4fe16..29fd6be 100644
--- a/src/generated/graphql.schema.json
+++ b/src/generated/graphql.schema.json
@@ -1,5 +1,6 @@
 {
   "__schema": {
+    "description": null,
     "queryType": {
       "name": "Query"
     },