From 6dec34a1264fc68ac32b41c5ea4fa06e8fc8a140 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Wed, 4 Aug 2021 12:10:23 +0300
Subject: [PATCH] fixed user endpoint, search and annotation remove,
 file-status refresh

---
 .../components/file-workload/file-workload.component.html     | 2 +-
 .../remove-annotations-dialog.component.ts                    | 2 +-
 .../dossier-overview-screen.component.ts                      | 1 +
 .../screens/search-screen/search-screen.component.html        | 2 +-
 .../modules/dossier/services/annotation-actions.service.ts    | 4 ++--
 libs/common-ui                                                | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
index a2919dc27..55693c59b 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
@@ -28,7 +28,7 @@
 <div class="right-content">
     <div *ngIf="isReadOnly" [class.justify-center]="!isProcessing" class="read-only d-flex">
         <div *ngIf="isProcessing" class="flex-align-items-center">
-            <span [translate]="fileData.fileStatus.status" class="read-only-text"></span>
+            <span [translate]="'filestatus.processing'" class="read-only-text"></span>
             <mat-progress-bar [mode]="'indeterminate'" class="w-100"></mat-progress-bar>
         </div>
         <div class="flex-center">
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
index 5bda381c3..2c7039e83 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
@@ -36,7 +36,7 @@ export class RemoveAnnotationsDialogComponent {
     }
 
     confirm() {
-        this.dialogRef.close(this.redactionForm.getRawValue().comment);
+        this.dialogRef.close({ comment: this.redactionForm.getRawValue().comment });
     }
 
     printable(annotation: AnnotationWrapper) {
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
index 4b79949d1..6a1e7dc12 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
@@ -141,6 +141,7 @@ export class DossierOverviewScreenComponent
     }
 
     async ngOnAttach() {
+        await this._appStateService.reloadActiveDossierFiles();
         this._loadEntitiesFromState();
         await this.ngOnInit();
         this.scrollViewport.scrollTo({ top: this._lastScrollPosition });
diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
index 9bf89fde2..bce8ba1ad 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
@@ -44,7 +44,7 @@
                             </div>
                         </ng-container>
 
-                        <div *ngIf="item.unmatched as unmatched" class="small-label">
+                        <div *ngIf="item.unmatched?.length && item.unmatched as unmatched" class="small-label">
                             <span>
                                 {{ 'search-screen.missing' | translate }}:<span *ngFor="let term of unmatched"
                                     >&nbsp;<s>{{ term }}</s></span
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 87cea40fe..866579915 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
@@ -73,10 +73,10 @@ export class AnnotationActionsService {
         removeFromDictionary: boolean,
         annotationsChanged: EventEmitter<AnnotationWrapper>
     ) {
-        this._dialogService.openRemoveFromDictionaryDialog($event, annotations, removeFromDictionary, comment => {
+        this._dialogService.openRemoveFromDictionaryDialog($event, annotations, removeFromDictionary, result => {
             annotations.forEach(annotation => {
                 this._processObsAndEmit(
-                    this._manualAnnotationService.removeOrSuggestRemoveAnnotation(annotation, removeFromDictionary, comment),
+                    this._manualAnnotationService.removeOrSuggestRemoveAnnotation(annotation, removeFromDictionary, result.comment),
                     annotation,
                     annotationsChanged
                 );
diff --git a/libs/common-ui b/libs/common-ui
index 3625e2951..1633911e1 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 3625e295161fddd62c6f8f45623279773bbb8a16
+Subproject commit 1633911e1339b39f96f243885defec4a92b6e6eb