From dc810ae4910bf239152dbee7c486134e26ca083f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Mon, 9 Aug 2021 20:47:44 +0300
Subject: [PATCH] Refactor dossiers dialog service: change legal basis

---
 .../services/annotation-actions.service.ts    |  2 +-
 .../services/dossiers-dialog.service.ts       | 23 ++++---------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
index 316bde88a..3d381b8ee 100644
--- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
@@ -59,7 +59,7 @@ export class AnnotationActionsService {
     }
 
     changeLegalBasis($event: MouseEvent, annotations: AnnotationWrapper[], annotationsChanged: EventEmitter<AnnotationWrapper>) {
-        this._dialogService.openChangeLegalBasisDialog($event, annotations, (data: { comment: string; legalBasis: string }) => {
+        this._dialogService.openDialog('changeLegalBasis', $event, annotations, (data: { comment: string; legalBasis: string }) => {
             annotations.forEach(annotation => {
                 this._processObsAndEmit(
                     this._manualAnnotationService.changeLegalBasis(annotation.annotationId, data.legalBasis, data.comment),
diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
index f583df392..f7ffb1d87 100644
--- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
@@ -28,7 +28,7 @@ const dialogConfig = {
 
 // TODO: Continue refactor
 
-type DialogType = 'confirm' | 'documentInfo' | 'editDossier' | 'addDossier' | 'assignFile' | 'recategorizeImage';
+type DialogType = 'confirm' | 'documentInfo' | 'editDossier' | 'addDossier' | 'assignFile' | 'recategorizeImage' | 'changeLegalBasis';
 
 type DossiersDialogConfig = {
     [key in DialogType]: {
@@ -64,6 +64,9 @@ export class DossiersDialogService extends DialogService<DialogType> {
         },
         recategorizeImage: {
             component: RecategorizeImageDialogComponent
+        },
+        changeLegalBasis: {
+            component: ChangeLegalBasisDialogComponent
         }
     };
 
@@ -105,24 +108,6 @@ export class DossiersDialogService extends DialogService<DialogType> {
         return ref;
     }
 
-    openChangeLegalBasisDialog(
-        $event: MouseEvent,
-        annotations: AnnotationWrapper[],
-        cb?: Function
-    ): MatDialogRef<ChangeLegalBasisDialogComponent> {
-        $event?.stopPropagation();
-        const ref = this._dialog.open(ChangeLegalBasisDialogComponent, {
-            ...dialogConfig,
-            data: annotations
-        });
-        ref.afterClosed().subscribe(async result => {
-            if (result && cb) {
-                cb(result);
-            }
-        });
-        return ref;
-    }
-
     openRemoveFromDictionaryDialog(
         $event: MouseEvent,
         annotations: AnnotationWrapper[],