Use same error message in checkinbase dialog as in other dialogs

puzzle · Oct 20, 2023 · 668833b · 668833b
1 parent ed36222
commit 668833b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/...hared/dialog/checkin/check-in-base-informations/check-in-base-informations.component.html b/...hared/dialog/checkin/check-in-base-informations/check-in-base-informations.component.html
@@ -5,7 +5,7 @@
     <textarea matInput class="w-100" formControlName="changeInfo"></textarea>
     <div *ngIf="isTouchedOrDirty('changeInfo')">
       <mat-error *ngFor="let errorKey of getErrorKeysOfFormField('changeInfo')">
-        {{ getErrorMessage(errorKey).trim() }}
+        {{ errorMessages[errorKey.toUpperCase().trim()] }}
       </mat-error>
     </div>
   </mat-form-field>
@@ -16,7 +16,7 @@
     <textarea matInput formControlName="initiatives"></textarea>
     <div *ngIf="isTouchedOrDirty('initiatives')">
       <mat-error *ngFor="let errorKey of getErrorKeysOfFormField('initiatives')">
-        {{ getErrorMessage(errorKey).trim() }}
+        {{ errorMessages[errorKey.toUpperCase().trim()] }}
       </mat-error>
     </div>
   </mat-form-field>

diff --git a/.../shared/dialog/checkin/check-in-base-informations/check-in-base-informations.component.ts b/.../shared/dialog/checkin/check-in-base-informations/check-in-base-informations.component.ts
@@ -10,6 +10,7 @@ import errorMessages from '../../../../../assets/errors/error-messages.json';
 export class CheckInBaseInformationsComponent {
   @Input()
   dialogForm!: FormGroup;
+  protected readonly errorMessages: any = errorMessages;
 
   isTouchedOrDirty(name: string) {
     return this.dialogForm.get(name)?.dirty || this.dialogForm.get(name)?.touched;
@@ -19,10 +20,4 @@ export class CheckInBaseInformationsComponent {
     const errors = this.dialogForm.get(name)?.errors;
     return errors == null ? [] : Object.keys(errors);
   }
-
-  getErrorMessage(key: string) {
-    return errorMessages[key.toUpperCase() as keyof typeof errorMessages];
-  }
-
-  protected readonly errorMessages = errorMessages;
 }