From b7d290778e0baad94e768f904aec9f913d0b612f Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 14 Feb 2022 14:08:18 +0200
Subject: [PATCH] back to data

---
 .../add-edit-dossier-state-dialog.component.html  |  4 ++--
 .../add-edit-dossier-state-dialog.component.ts    | 15 +++++----------
 ...irm-delete-dossier-state-dialog.component.html |  2 +-
 ...nfirm-delete-dossier-state-dialog.component.ts | 12 +++---------
 libs/common-ui                                    |  2 +-
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
index 4bb4a6f4d..8eabdf913 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
@@ -1,8 +1,8 @@
 <section class="dialog">
     <div
         [translateParams]="{
-            type: dossierState ? 'edit' : 'create',
-            name: dossierState?.name
+            type: data.dossierState ? 'edit' : 'create',
+            name: data.dossierState?.name
         }"
         [translate]="'add-edit-dossier-state.title'"
         class="dialog-header heading-l"
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts
index cbe065049..0a3ec2ad4 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts
@@ -16,26 +16,21 @@ interface DialogData {
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
-    readonly dossierState: IDossierState;
-    readonly dossierTemplateId: string;
-
     constructor(
         private readonly _formBuilder: FormBuilder,
         protected readonly _injector: Injector,
         protected readonly _dialogRef: MatDialogRef<AddEditDossierStateDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public readonly data: DialogData,
+        @Inject(MAT_DIALOG_DATA) readonly data: DialogData,
     ) {
         super(_injector, _dialogRef);
-        this.dossierState = data.dossierState;
-        this.dossierTemplateId = data.dossierTemplateId;
         this.form = this.#getForm();
         this.initialFormValue = this.form.getRawValue();
     }
 
     save(): void {
         const dossierState: IDossierState = {
-            dossierStatusId: this.dossierState?.dossierStatusId,
-            dossierTemplateId: this.dossierTemplateId,
+            dossierStatusId: this.data.dossierState?.dossierStatusId,
+            dossierTemplateId: this.data.dossierTemplateId,
             ...this.form.getRawValue(),
         };
         this._dialogRef.close(dossierState);
@@ -43,8 +38,8 @@ export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
 
     #getForm(): FormGroup {
         return this._formBuilder.group({
-            name: [this.dossierState?.name, Validators.required],
-            color: [this.dossierState?.color, Validators.required],
+            name: [this.data.dossierState?.name, Validators.required],
+            color: [this.data.dossierState?.color, Validators.required],
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index 6aa8cacc5..8618972b1 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -17,7 +17,7 @@
                         formControlName="replaceDossierStatusId"
                     >
                         <mat-option>{{ 'confirm-delete-dossier-state.form.status-placeholder' | translate }}</mat-option>
-                        <mat-option *ngFor="let state of otherStates" [value]="state.dossierStatusId">
+                        <mat-option *ngFor="let state of data.otherStates" [value]="state.dossierStatusId">
                             {{ state.name }}
                         </mat-option>
                     </mat-select>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
index 9c8117150..ec4cb8916 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
@@ -17,25 +17,19 @@ interface DialogData {
 })
 export class ConfirmDeleteDossierStateDialogComponent {
     readonly form: FormGroup;
-    readonly toBeDeletedState: IDossierState;
-    readonly otherStates: IDossierState[];
-    readonly dossierCount: number;
 
     constructor(
         private readonly _formBuilder: FormBuilder,
         readonly dialogRef: MatDialogRef<ConfirmDeleteDossierStateDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public readonly data: DialogData,
+        @Inject(MAT_DIALOG_DATA) readonly data: DialogData,
     ) {
         this.form = this._getForm();
-        this.toBeDeletedState = data.toBeDeletedState;
-        this.otherStates = data.otherStates;
-        this.dossierCount = data.dossierCount;
     }
 
     get translateArgs() {
         return {
-            name: this.toBeDeletedState.name,
-            count: this.dossierCount,
+            name: this.data.toBeDeletedState.name,
+            count: this.data.dossierCount,
         };
     }
 
diff --git a/libs/common-ui b/libs/common-ui
index 5a0e5accb..d4b1bb5c0 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 5a0e5accb76b8e4d2d2f5de64822a716c6572f37
+Subproject commit d4b1bb5c07594dbce9d78cf56d26f75334116aaf