From 7f09c4c045d95e75f348fa6d258616df842301aa Mon Sep 17 00:00:00 2001
From: Valentin <valentin@devplant.ro>
Date: Mon, 22 Nov 2021 23:16:43 +0200
Subject: [PATCH] displayed 'Unassigned' option only when 'Assign Reviewer'
 button is pressed

---
 .../assign-reviewer-approver-dialog.component.ts              | 3 ++-
 .../shared/components/file-actions/file-actions.component.ts  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
index e9a1dc5c5..e70d953c5 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
@@ -13,6 +13,7 @@ class DialogData {
     mode: 'approver' | 'reviewer';
     files: File[];
     ignoreChanged?: boolean;
+    withUnassignedOption?: boolean;
     withCurrentUserAsDefault?: boolean;
 }
 
@@ -44,7 +45,7 @@ export class AssignReviewerApproverDialogComponent {
     }
 
     get userOptions() {
-        const unassignUser = this._canUnassignFiles ? [undefined] : [];
+        const unassignUser = this._canUnassignFiles && this.data.withUnassignedOption ? [undefined] : [];
         return this.data.mode === 'approver'
             ? [...this.dossier.approverIds, ...unassignUser]
             : [...this.dossier.memberIds, ...unassignUser];
diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
index 72c57caef..0f7d29d3c 100644
--- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
@@ -126,7 +126,9 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
     assign($event: MouseEvent) {
         const mode = this.file.isUnderApproval ? 'approver' : 'reviewer';
         const files = [this.file];
-        this._dialogService.openDialog('assignFile', $event, { mode, files, withCurrentUserAsDefault: true });
+        const withCurrentUserAsDefault = true;
+        const withUnassignedOption = mode === 'reviewer';
+        this._dialogService.openDialog('assignFile', $event, { mode, files, withCurrentUserAsDefault, withUnassignedOption });
     }
 
     async assignToMe($event: MouseEvent) {