From 8b5d3ee0f6bc8dff43f6f993074b63548fee5620 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Fri, 30 Oct 2020 21:21:42 +0200
Subject: [PATCH] work in progress performance

---
 apps/red-ui/src/app/dialogs/dialog.service.ts |  2 -
 .../file-preview-screen.component.html        |  2 +-
 .../file-preview-screen.component.ts          |  7 +--
 .../screens/file/model/annotation.wrapper.ts  |  5 ++-
 .../file/service/file-action.service.ts       | 44 +++++++++++++++++++
 .../project-overview-screen.component.html    |  2 +-
 .../project-overview-screen.component.ts      |  9 ++--
 .../red-ui/src/app/state/app-state.service.ts |  4 ++
 apps/red-ui/src/app/utils/annotation-utils.ts |  6 ++-
 9 files changed, 68 insertions(+), 13 deletions(-)
 create mode 100644 apps/red-ui/src/app/screens/file/service/file-action.service.ts

diff --git a/apps/red-ui/src/app/dialogs/dialog.service.ts b/apps/red-ui/src/app/dialogs/dialog.service.ts
index d4798b319..5f049d3eb 100644
--- a/apps/red-ui/src/app/dialogs/dialog.service.ts
+++ b/apps/red-ui/src/app/dialogs/dialog.service.ts
@@ -183,11 +183,9 @@ export class DialogService {
     }
 
     public openAssignFileReviewerDialog(
-        $event: MouseEvent,
         file: FileStatus,
         cb?: Function
     ): MatDialogRef<AssignOwnerDialogComponent> {
-        $event.stopPropagation();
         const ref = this._dialog.open(AssignOwnerDialogComponent, {
             ...dialogConfig,
             data: { type: 'file', file: file }
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
index cfd9dd2cf..4aa53892e 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
@@ -24,7 +24,7 @@
                 </button>
                 <button
                     mat-icon-button
-                    (click)="openAssignFileReviewerDialog($event)"
+                    (click)="assignReviewer()"
                     *ngIf="appStateService.isActiveProjectMember"
                 >
                     <mat-icon svgIcon="red:assign"></mat-icon>
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
index 3fa3b37c1..137b20268 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
@@ -28,6 +28,7 @@ import { ManualAnnotationService } from '../service/manual-annotation.service';
 import { ManualAnnotationResponse } from '../model/manual-annotation-response';
 import { FileDataModel } from '../model/file-data.model';
 import { AnnotationFilter } from '../../../utils/types';
+import { FileActionService } from '../service/file-action.service';
 
 @Component({
     selector: 'redaction-file-preview-screen',
@@ -59,6 +60,7 @@ export class FilePreviewScreenComponent implements OnInit {
         private readonly _activatedRoute: ActivatedRoute,
         private readonly _dialogService: DialogService,
         private readonly _router: Router,
+        private readonly _fileActionService: FileActionService,
         private readonly _manualAnnotationService: ManualAnnotationService,
         private readonly _fileDownloadService: FileDownloadService,
         private readonly _reanalysisControllerService: ReanalysisControllerService,
@@ -132,9 +134,8 @@ export class FilePreviewScreenComponent implements OnInit {
         );
     }
 
-    public openAssignFileReviewerDialog($event: MouseEvent) {
-        const file = this.appStateService.getFileById(this.projectId, this.fileId);
-        this._dialogRef = this._dialogService.openAssignFileReviewerDialog($event, file);
+    public assignReviewer() {
+        this._fileActionService.assignProjectReviewer();
     }
 
     public get activeViewer() {
diff --git a/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts b/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts
index 00be497e8..40f0c1bed 100644
--- a/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts
+++ b/apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts
@@ -27,7 +27,10 @@ export class AnnotationWrapper {
         this.firstTopLeftPoint = redactionLogEntry.positions[0]?.topLeft;
         this.pageNumber = redactionLogEntry.positions[0]?.page;
         this.id = redactionLogEntry.id;
-        this.content = this.createAnnotationContent(redactionLogEntry);
+        this.content =
+            this.superType === 'redaction' || this.superType === 'ignore'
+                ? this.createAnnotationContent(redactionLogEntry)
+                : null;
     }
 
     get manualRedactionOwner() {
diff --git a/apps/red-ui/src/app/screens/file/service/file-action.service.ts b/apps/red-ui/src/app/screens/file/service/file-action.service.ts
new file mode 100644
index 000000000..408ffc055
--- /dev/null
+++ b/apps/red-ui/src/app/screens/file/service/file-action.service.ts
@@ -0,0 +1,44 @@
+import { Injectable } from '@angular/core';
+import { DialogService } from '../../../dialogs/dialog.service';
+import { AppStateService } from '../../../state/app-state.service';
+import { UserService } from '../../../user/user.service';
+import { StatusControllerService } from '@redaction/red-ui-http';
+import { FileStatus } from '@redaction/red-ui-http';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class FileActionService {
+    constructor(
+        private readonly _dialogService: DialogService,
+        private readonly _userService: UserService,
+        private readonly _statusControllerService: StatusControllerService,
+        private _appStateService: AppStateService
+    ) {}
+
+    // TODO refactor callback to observable or promise
+    public assignProjectReviewer(file?: FileStatus, callback?: Function) {
+        if (this._appStateService.isActiveProjectOwnerAndManager) {
+            this._dialogService.openAssignFileReviewerDialog(
+                file ? file : this._appStateService.activeFile,
+                () => {
+                    if (callback) {
+                        callback();
+                    }
+                }
+            );
+        } else {
+            this._statusControllerService
+                .assignProjectOwner1(
+                    this._appStateService.activeProjectId,
+                    file ? file.fileId : this._appStateService.activeFileId,
+                    this._userService.userId
+                )
+                .subscribe(() => {
+                    if (callback) {
+                        callback();
+                    }
+                });
+        }
+    }
+}
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
index e6736dbb9..70c5f17f3 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
@@ -245,7 +245,7 @@
                             <mat-icon svgIcon="red:report"></mat-icon>
                         </button>
                         <button
-                            (click)="openAssignFileReviewerDialog($event, fileStatus)"
+                            (click)="assignReviewer($event, fileStatus)"
                             color="accent"
                             *ngIf="appStateService.isActiveProjectMember"
                             mat-icon-button
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
index 462f9eeb5..228414884 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
@@ -18,6 +18,7 @@ import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simp
 import { groupBy } from '../../utils/functions';
 import { DialogService } from '../../dialogs/dialog.service';
 import { TranslateService } from '@ngx-translate/core';
+import { FileActionService } from '../file/service/file-action.service';
 
 @Component({
     selector: 'redaction-project-overview-screen',
@@ -57,6 +58,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
         private readonly _statusControllerService: StatusControllerService,
         private readonly _notificationService: NotificationService,
         private readonly _dialogService: DialogService,
+        private readonly _fileActionService: FileActionService,
         private readonly _fileUploadService: FileUploadService,
         private readonly _uploadStatusOverlayService: UploadStatusOverlayService,
         private readonly _reanalysisControllerService: ReanalysisControllerService,
@@ -244,10 +246,9 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
         });
     }
 
-    public openAssignFileReviewerDialog($event: MouseEvent, file: FileStatus) {
-        this._dialogService.openAssignFileReviewerDialog($event, file, () => {
-            this._reloadProjects();
-        });
+    public assignReviewer($event: MouseEvent, file: FileStatus) {
+        $event.stopPropagation();
+        this._fileActionService.assignProjectReviewer(file, () => this._reloadProjects());
     }
 
     public reanalyseFile($event: MouseEvent, fileStatus: FileStatus) {
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index 444901246..6de22ac0c 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -135,6 +135,10 @@ export class AppStateService {
         return this._appState.activeFile;
     }
 
+    get activeFileId(): string {
+        return this._appState.activeFile.fileId;
+    }
+
     get totalAnalysedPages() {
         return this._appState.totalAnalysedPages;
     }
diff --git a/apps/red-ui/src/app/utils/annotation-utils.ts b/apps/red-ui/src/app/utils/annotation-utils.ts
index bfbde64d6..e2fe24a4d 100644
--- a/apps/red-ui/src/app/utils/annotation-utils.ts
+++ b/apps/red-ui/src/app/utils/annotation-utils.ts
@@ -39,7 +39,11 @@ export class AnnotationUtils {
             if (hasActiveFilters) {
                 let found = false;
                 for (const filter of flatFilters) {
-                    if (filter.key === annotation.dictionary && filter.checked) {
+                    if (
+                        filter.checked &&
+                        (filter.key === annotation.dictionary ||
+                            filter.key === annotation.superType)
+                    ) {
                         found = true;
                         break;
                     }