From 55c8706a9d196d1c0bdcc3079ed467f35ce8836c Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Wed, 11 Nov 2020 13:13:11 +0200
Subject: [PATCH] annotation flows

---
 .../annotation-actions.component.html         | 10 ++--
 .../annotation-actions.component.ts           |  8 +++
 .../screens/file/model/annotation.wrapper.ts  | 32 +++++++++--
 .../app/screens/file/model/file-data.model.ts | 36 ++++++++-----
 .../service/annotation-processing.service.ts  | 54 ++++++++++---------
 5 files changed, 90 insertions(+), 50 deletions(-)

diff --git a/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.html
index fadb3dde4..abf3de04f 100644
--- a/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.html
+++ b/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.html
@@ -4,7 +4,7 @@
         <button (click)="acceptSuggestion($event, annotation, annotation.modifyDictionary)" *ngIf="annotation.isSuggestion" mat-icon-button>
             <mat-icon svgIcon="red:check-alt"></mat-icon>
         </button>
-        <button (click)="rejectSuggestion($event, annotation)" *ngIf="annotation.isSuggestion" mat-icon-button>
+        <button (click)="rejectSuggestion($event, annotation)" *ngIf="annotation.isSuggestion && !canUndoAnnotation()" mat-icon-button>
             <mat-icon svgIcon="red:close"></mat-icon>
         </button>
     </ng-container>
@@ -17,14 +17,14 @@
     <!-- Everyone can suggest to remove annotations, manager will remove directly while user will make a suggestion-->
 
     <!-- For Suggesting Removal, in case of hints, the user can suggest removal from dictionary -->
-    <button (click)="suggestRemoveAnnotation($event, annotation, true)" *ngIf="annotation.superType === 'hint'" mat-icon-button>
+    <button (click)="suggestRemoveAnnotation($event, annotation, true)" *ngIf="annotation.superType === 'hint' && !canUndoAnnotation()" mat-icon-button>
         <mat-icon svgIcon="red:trash"></mat-icon>
     </button>
 
     <!-- For Suggesting Removal, in case of redactions, the user can suggest only-here or everywhere-->
     <button
         (click)="openMenu($event)"
-        *ngIf="annotation.superType === 'redaction'"
+        *ngIf="annotation.superType === 'redaction' && !canUndoAnnotation()"
         [class.active]="menuOpen"
         [matMenuTriggerFor]="menu"
         class="confirm"
@@ -34,11 +34,11 @@
     </button>
     <mat-menu #menu="matMenu" (closed)="onMenuClosed()" xPosition="before">
         <div (click)="suggestRemoveAnnotation($event, annotation, true)" mat-menu-item>
-            <redaction-type-annotation-icon [annotation]="annotation"></redaction-type-annotation-icon>
+            <redaction-annotation-icon [type]="'rhombus'" [label]="'S'" [color]="dictionaryColor"></redaction-annotation-icon>
             <div [translate]="'file-preview.tabs.annotations.remove-annotation.remove-from-dict'"></div>
         </div>
         <div (click)="suggestRemoveAnnotation($event, annotation, false)" mat-menu-item>
-            <redaction-type-annotation-icon [annotation]="annotation"></redaction-type-annotation-icon>
+            <redaction-annotation-icon [type]="'rhombus'" [label]="'S'" [color]="suggestionColor"></redaction-annotation-icon>
             <div translate="file-preview.tabs.annotations.remove-annotation.only-here"></div>
         </div>
     </mat-menu>
diff --git a/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts
index 0e7890729..8244f9289 100644
--- a/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts
+++ b/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts
@@ -80,4 +80,12 @@ export class AnnotationActionsComponent implements OnInit {
             this.annotation.manual && this.annotation.userId === this.permissionsService.currentUserId && this.permissionsService.isManagerAndOwner();
         return isSuggestionOfCurrentUser || isManualAnnotationOfCurrentUser;
     }
+
+    get suggestionColor() {
+        return this.appStateService.getDictionaryColor('suggestion');
+    }
+
+    get dictionaryColor() {
+        return this.appStateService.getDictionaryColor('suggestion-dictionary');
+    }
 }
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 a6e103219..ee126563d 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
@@ -61,6 +61,9 @@ export class AnnotationWrapper {
                     // do not draw if it is no longer in the manual redactions
                     annotationWrapper.shouldDraw = false;
                 }
+                if (manualRedactionEntry) {
+                    annotationWrapper.shouldDraw = manualRedactionEntry.status === 'REQUESTED' || manualRedactionEntry.status === 'APPROVED';
+                }
             }
 
             annotationWrapper.id = redactionLogEntry.id;
@@ -74,7 +77,6 @@ export class AnnotationWrapper {
             // either marked as manual or idRemove or manualRedactionEntry exists
             annotationWrapper.manual = redactionLogEntry.manual;
             annotationWrapper.modifyDictionary = !!manualRedactionEntry?.addToDictionary || !!idRemoval?.removeFromDictionary;
-            AnnotationWrapper._setSuperType(annotationWrapper, redactionLogEntry, manualRedactionEntry, idRemoval);
         } else {
             const dictionary = dictionaryData[manualRedactionEntry.type];
             annotationWrapper.id = manualRedactionEntry.id;
@@ -86,12 +88,13 @@ export class AnnotationWrapper {
             annotationWrapper.positions = manualRedactionEntry.positions;
             annotationWrapper.content = manualRedactionEntry.addToDictionary ? null : AnnotationWrapper.createContent(manualRedactionEntry);
             annotationWrapper.manual = true;
+            annotationWrapper.shouldDraw = manualRedactionEntry.status === 'REQUESTED' || manualRedactionEntry.status === 'APPROVED';
             annotationWrapper.comments = comments[manualRedactionEntry.id] ? comments[manualRedactionEntry.id] : [];
             annotationWrapper.userId = manualRedactionEntry.user;
             annotationWrapper.modifyDictionary = manualRedactionEntry.addToDictionary;
-            AnnotationWrapper._setSuperType(annotationWrapper, redactionLogEntry, manualRedactionEntry, idRemoval);
         }
 
+        AnnotationWrapper._setSuperType(annotationWrapper, redactionLogEntry, manualRedactionEntry, idRemoval);
         AnnotationWrapper._setTypeLabel(annotationWrapper);
 
         return annotationWrapper;
@@ -103,6 +106,25 @@ export class AnnotationWrapper {
         manualRedactionEntry?: ManualRedactionEntry,
         idRemoval?: IdRemoval
     ) {
+        if (idRemoval && manualRedactionEntry) {
+            const handleManualRedactionFirst = new Date(idRemoval.requestDate).getTime() > new Date(manualRedactionEntry.requestDate).getTime();
+            if (handleManualRedactionFirst) {
+                AnnotationWrapper._handleManualRedaction(annotationWrapper, manualRedactionEntry);
+                AnnotationWrapper._handleIdRemoval(annotationWrapper, idRemoval);
+            } else {
+                AnnotationWrapper._handleIdRemoval(annotationWrapper, idRemoval);
+                AnnotationWrapper._handleManualRedaction(annotationWrapper, manualRedactionEntry);
+            }
+        } else {
+            AnnotationWrapper._handleIdRemoval(annotationWrapper, idRemoval);
+            AnnotationWrapper._handleManualRedaction(annotationWrapper, manualRedactionEntry);
+        }
+        if (!annotationWrapper.superType) {
+            annotationWrapper.superType = annotationWrapper.redaction ? 'redaction' : annotationWrapper.hint ? 'hint' : 'ignore';
+        }
+    }
+
+    private static _handleIdRemoval(annotationWrapper: AnnotationWrapper, idRemoval?: IdRemoval) {
         if (idRemoval) {
             if (idRemoval.status === 'REQUESTED') {
                 annotationWrapper.superType = 'suggestion-remove';
@@ -111,6 +133,9 @@ export class AnnotationWrapper {
                 annotationWrapper.superType = 'ignore';
             }
         }
+    }
+
+    private static _handleManualRedaction(annotationWrapper: AnnotationWrapper, manualRedactionEntry?: ManualRedactionEntry) {
         if (manualRedactionEntry) {
             if (manualRedactionEntry.status === 'REQUESTED') {
                 annotationWrapper.superType = 'suggestion';
@@ -119,9 +144,6 @@ export class AnnotationWrapper {
                 annotationWrapper.superType = annotationWrapper.redaction ? 'redaction' : annotationWrapper.hint ? 'hint' : 'ignore';
             }
         }
-        if (!annotationWrapper.superType) {
-            annotationWrapper.superType = annotationWrapper.redaction ? 'redaction' : annotationWrapper.hint ? 'hint' : 'ignore';
-        }
     }
 
     private static _setTypeLabel(annotationWrapper: AnnotationWrapper) {
diff --git a/apps/red-ui/src/app/screens/file/model/file-data.model.ts b/apps/red-ui/src/app/screens/file/model/file-data.model.ts
index c2faadc88..5436a67e0 100644
--- a/apps/red-ui/src/app/screens/file/model/file-data.model.ts
+++ b/apps/red-ui/src/app/screens/file/model/file-data.model.ts
@@ -52,23 +52,31 @@ export class FileDataModel {
         const pairs: AnnotationPair[] = [];
 
         this.redactionLog.redactionLogEntry.forEach((rdl) => {
-            pairs.push({
-                redactionLogEntry: rdl,
-                manualRedactionEntry: this.manualRedactions.entriesToAdd.find((eta) => eta.id === rdl.id),
-                idRemoval: this.manualRedactions.idsToRemove.find((idr) => idr.id === rdl.id),
-                comments: this.manualRedactions.comments[rdl.id]
-            });
+            if (rdl.status !== 'DECLINED') {
+                pairs.push({
+                    redactionLogEntry: rdl,
+                    // only not declined
+                    manualRedactionEntry: this.manualRedactions.entriesToAdd.find((eta) => eta.id === rdl.id && eta.status !== 'DECLINED'),
+                    // only not declined
+                    idRemoval: this.manualRedactions.idsToRemove.find((idr) => idr.id === rdl.id && idr.status !== 'DECLINED'),
+                    comments: this.manualRedactions.comments[rdl.id]
+                });
+            }
         });
 
         this.manualRedactions.entriesToAdd.forEach((eta) => {
-            const redactionLogEntry = this.redactionLog.redactionLogEntry.find((rdl) => rdl.id === eta.id);
-            if (!redactionLogEntry) {
-                pairs.push({
-                    redactionLogEntry: null,
-                    manualRedactionEntry: eta,
-                    idRemoval: this.manualRedactions.idsToRemove.find((idr) => idr.id === eta.id),
-                    comments: this.manualRedactions.comments[eta.id]
-                });
+            // only not declined
+            if (eta.status !== 'DECLINED') {
+                const redactionLogEntry = this.redactionLog.redactionLogEntry.find((rdl) => rdl.id === eta.id);
+                if (!redactionLogEntry) {
+                    pairs.push({
+                        redactionLogEntry: null,
+                        manualRedactionEntry: eta,
+                        // only not declined
+                        idRemoval: this.manualRedactions.idsToRemove.find((idr) => idr.id === eta.id && idr.status !== 'DECLINED'),
+                        comments: this.manualRedactions.comments[eta.id]
+                    });
+                }
             }
         });
 
diff --git a/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts b/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
index 8e198148c..59abab578 100644
--- a/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
+++ b/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
@@ -57,37 +57,39 @@ export class AnnotationProcessingService {
             flatFilters.push(...filter.filters);
         });
         for (const annotation of annotations) {
-            const pageNumber = annotation.pageNumber;
-            const type = annotation.superType;
+            if (annotation.shouldDraw) {
+                const pageNumber = annotation.pageNumber;
+                const type = annotation.superType;
 
-            if (hasActiveFilters) {
-                let found = false;
-                for (const filter of flatFilters) {
-                    if (
-                        filter.checked &&
-                        ((filter.key === annotation.dictionary && (annotation.superType === 'hint' || annotation.superType === 'redaction')) ||
-                            filter.key === annotation.superType)
-                    ) {
-                        found = true;
-                        break;
+                if (hasActiveFilters) {
+                    let found = false;
+                    for (const filter of flatFilters) {
+                        if (
+                            filter.checked &&
+                            ((filter.key === annotation.dictionary && (annotation.superType === 'hint' || annotation.superType === 'redaction')) ||
+                                filter.key === annotation.superType)
+                        ) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        continue;
                     }
                 }
-                if (!found) {
-                    continue;
-                }
-            }
 
-            if (!obj[pageNumber]) {
-                obj[pageNumber] = {
-                    annotations: [],
-                    hint: 0,
-                    redaction: 0,
-                    request: 0,
-                    ignore: 0
-                };
+                if (!obj[pageNumber]) {
+                    obj[pageNumber] = {
+                        annotations: [],
+                        hint: 0,
+                        redaction: 0,
+                        request: 0,
+                        ignore: 0
+                    };
+                }
+                obj[pageNumber].annotations.push(annotation);
+                obj[pageNumber][type]++;
             }
-            obj[pageNumber].annotations.push(annotation);
-            obj[pageNumber][type]++;
         }
 
         Object.keys(obj).map((page) => {