From f77545ab9b4a916870d5227d24fdc6bbdeb50d52 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Thu, 11 Feb 2021 22:17:12 +0200
Subject: [PATCH] skipped annotations re-do state in UI

---
 .../type-filter/type-filter.component.html    |   2 +
 .../file-preview-screen.component.ts          | 119 +++++++++---------
 .../file/model/annotation.permissions.ts      |   4 +-
 .../screens/file/model/annotation.wrapper.ts  |  17 ++-
 .../red-ui/src/app/state/app-state.service.ts |   5 +
 apps/red-ui/src/assets/i18n/en.json           |   2 +
 6 files changed, 85 insertions(+), 64 deletions(-)

diff --git a/apps/red-ui/src/app/components/type-filter/type-filter.component.html b/apps/red-ui/src/app/components/type-filter/type-filter.component.html
index 9a084280e..cc9a70ffd 100644
--- a/apps/red-ui/src/app/components/type-filter/type-filter.component.html
+++ b/apps/red-ui/src/app/components/type-filter/type-filter.component.html
@@ -6,6 +6,8 @@
 <redaction-annotation-icon *ngIf="filter.key === 'manual-redaction'" type="square" label="M" [color]="dictionaryColor"></redaction-annotation-icon>
 
 <redaction-annotation-icon *ngIf="filter.key === 'skipped'" type="square" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
+<redaction-annotation-icon *ngIf="filter.key === 'pending-analysis'" type="square" label="P" [color]="dictionaryColor"></redaction-annotation-icon>
+
 <redaction-annotation-icon
     *ngIf="
         filter.key === 'suggestion-remove' ||
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 c1ea0f915..afb58a8a7 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
@@ -41,35 +41,6 @@ const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Es
     styleUrls: ['./file-preview-screen.component.scss']
 })
 export class FilePreviewScreenComponent implements OnInit, OnDestroy {
-    private projectId: string;
-    private _instance: WebViewerInstance;
-    private _dialogRef: MatDialogRef<any>;
-
-    public viewMode: ViewMode = 'STANDARD';
-    public fullScreen = false;
-    public editingReviewer = false;
-    public reviewerForm: FormGroup;
-    public shouldDeselectAnnotationsOnPageChange = true;
-
-    @ViewChild(PdfViewerComponent) private _viewerComponent: PdfViewerComponent;
-    @ViewChild('annotationsElement') private _annotationsElement: ElementRef;
-    @ViewChild('quickNavigation') private _quickNavigationElement: ElementRef;
-
-    fileData: FileDataModel;
-    fileId: string;
-    annotationData: AnnotationData;
-
-    displayedAnnotations: { [key: number]: { annotations: AnnotationWrapper[] } } = {};
-    selectedAnnotation: AnnotationWrapper;
-    pagesPanelActive = true;
-    viewReady = false;
-    annotationFilters: FilterModel[];
-
-    loadingMessage: string;
-    canPerformAnnotationActions: boolean;
-    filesAutoUpdateTimer: Subscription;
-    fileReanalysedSubscription: Subscription;
-
     constructor(
         public readonly appStateService: AppStateService,
         public readonly permissionsService: PermissionsService,
@@ -106,6 +77,65 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
         return this.annotationData ? this.annotationData.visibleAnnotations : [];
     }
 
+    get activeViewer() {
+        return this._instance;
+    }
+
+    get displayedPages(): number[] {
+        return Object.keys(this.displayedAnnotations).map((key) => Number(key));
+    }
+
+    get activeViewerPage() {
+        return this._instance?.docViewer?.getCurrentPage();
+    }
+
+    get canNotSwitchToRedactedView() {
+        return this.permissionsService.fileRequiresReanalysis();
+    }
+
+    get canSwitchToDeltaView() {
+        return this.fileData?.redactionChangeLog?.redactionLogEntry?.length > 0;
+    }
+
+    get ignoreColor() {
+        return this.appStateService.getDictionaryColor('skipped');
+    }
+
+    get displayData() {
+        return this.fileData?.fileData;
+    }
+    private projectId: string;
+    private _instance: WebViewerInstance;
+    private _dialogRef: MatDialogRef<any>;
+
+    public viewMode: ViewMode = 'STANDARD';
+    public fullScreen = false;
+    public editingReviewer = false;
+    public reviewerForm: FormGroup;
+    public shouldDeselectAnnotationsOnPageChange = true;
+
+    @ViewChild(PdfViewerComponent) private _viewerComponent: PdfViewerComponent;
+    @ViewChild('annotationsElement') private _annotationsElement: ElementRef;
+    @ViewChild('quickNavigation') private _quickNavigationElement: ElementRef;
+
+    fileData: FileDataModel;
+    fileId: string;
+    annotationData: AnnotationData;
+
+    displayedAnnotations: { [key: number]: { annotations: AnnotationWrapper[] } } = {};
+    selectedAnnotation: AnnotationWrapper;
+    pagesPanelActive = true;
+    viewReady = false;
+    annotationFilters: FilterModel[];
+
+    loadingMessage: string;
+    canPerformAnnotationActions: boolean;
+    filesAutoUpdateTimer: Subscription;
+    fileReanalysedSubscription: Subscription;
+
+    // <!-- End Dev Mode Features-->
+    areIgnoresVisible = false;
+
     updateViewMode() {
         const allAnnotations = this._instance.annotManager.getAnnotationsList();
 
@@ -150,30 +180,6 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
         this.canPerformAnnotationActions = this.permissionsService.canPerformAnnotationActions() && this.viewMode === 'STANDARD';
     }
 
-    get activeViewer() {
-        return this._instance;
-    }
-
-    get displayedPages(): number[] {
-        return Object.keys(this.displayedAnnotations).map((key) => Number(key));
-    }
-
-    get activeViewerPage() {
-        return this._instance?.docViewer?.getCurrentPage();
-    }
-
-    get canNotSwitchToRedactedView() {
-        return this.permissionsService.fileRequiresReanalysis();
-    }
-
-    get canSwitchToDeltaView() {
-        return this.fileData?.redactionChangeLog?.redactionLogEntry?.length > 0;
-    }
-
-    get ignoreColor() {
-        return this.appStateService.getDictionaryColor('skipped');
-    }
-
     ngOnInit(): void {
         document.documentElement.addEventListener('fullscreenchange', (event) => {
             if (!document.fullscreenElement) {
@@ -614,10 +620,6 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
         }
     }
 
-    get displayData() {
-        return this.fileData?.fileData;
-    }
-
     public async assignToMe() {
         await this._fileActionService.assignToMe(this.fileData.fileStatus, async () => {
             await this.appStateService.reloadActiveFile();
@@ -687,9 +689,6 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
             });
     }
 
-    // <!-- End Dev Mode Features-->
-    areIgnoresVisible: boolean = false;
-
     toggleIgnoresVisible($event) {
         $event.stopPropagation();
         $event.preventDefault();
diff --git a/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts b/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts
index 2f099cd82..2aa09259d 100644
--- a/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts
+++ b/apps/red-ui/src/app/screens/file/model/annotation.permissions.ts
@@ -25,7 +25,9 @@ export class AnnotationPermissions {
         permissions.canRemoveOrSuggestToRemoveFromDictionary = annotation.isRedacted && !annotation.isManualRedaction && annotation.isModifyDictionary;
 
         permissions.canAcceptSuggestion = user.isManager && (annotation.isSuggestion || annotation.isDeclinedSuggestion);
-        permissions.canRejectSuggestion = user.isManager && (annotation.isSuggestion || (annotation.isReadyForAnalysis && !permissions.canUndo));
+        permissions.canRejectSuggestion =
+            user.isManager &&
+            (annotation.isSuggestion || (annotation.isReadyForAnalysis && !permissions.canUndo && annotation.superType !== 'pending-analysis'));
 
         return permissions;
     }
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 4ee34ff3d..7472b4609 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
@@ -15,6 +15,7 @@ export class AnnotationWrapper {
         | 'manual-redaction'
         | 'recommendation'
         | 'hint'
+        | 'pending-analysis'
         | 'declined-suggestion';
 
     dictionary: string;
@@ -99,7 +100,12 @@ export class AnnotationWrapper {
     }
 
     get isReadyForAnalysis() {
-        return this.superType === 'add-dictionary' || this.superType === 'remove-dictionary' || this.superType === 'remove-only-here';
+        return (
+            this.superType === 'add-dictionary' ||
+            this.superType === 'remove-dictionary' ||
+            this.superType === 'remove-only-here' ||
+            this.superType === 'pending-analysis'
+        );
     }
 
     get isApproved() {
@@ -168,10 +174,9 @@ export class AnnotationWrapper {
         annotationWrapper.textAfter = redactionLogEntry.textAfter;
         annotationWrapper.dictionaryOperation = redactionLogEntry.dictionaryEntry;
         annotationWrapper.userId = redactionLogEntry.userId;
+        AnnotationWrapper._createContent(annotationWrapper, redactionLogEntry);
         AnnotationWrapper._setSuperType(annotationWrapper, redactionLogEntry);
         AnnotationWrapper._handleRecommendations(annotationWrapper, redactionLogEntry);
-
-        AnnotationWrapper._createContent(annotationWrapper, redactionLogEntry);
         annotationWrapper.typeLabel = 'annotation-type.' + annotationWrapper.superType;
 
         return annotationWrapper;
@@ -233,6 +238,12 @@ export class AnnotationWrapper {
         if (!annotationWrapper.superType) {
             annotationWrapper.superType = annotationWrapper.redaction ? 'redaction' : annotationWrapper.hint ? 'hint' : 'skipped';
         }
+
+        if (annotationWrapper.superType === 'skipped') {
+            if (!annotationWrapper.userId && annotationWrapper.content.indexOf('manual override') > 0) {
+                annotationWrapper.superType = 'pending-analysis';
+            }
+        }
     }
 
     private static _createContent(annotationWrapper: AnnotationWrapper, entry: RedactionLogEntryWrapper) {
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 1e7931252..6c6824575 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -542,6 +542,11 @@ export class AppStateService {
                     type: 'analysis',
                     virtual: true
                 };
+                dictionaryData['pending-analysis'] = {
+                    hexColor: '#dd4d50',
+                    type: 'analysis',
+                    virtual: true
+                };
                 dictionaryData['hint'] = {
                     hexColor: '#9398a0',
                     type: 'hint',
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index f4629837c..26105150d 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -446,6 +446,7 @@
     "skipped": "Skipped",
     "redaction": "Redaction",
     "comment": "Comment",
+    "pending-analysis": "Pending Re-Analysis",
     "suggestion": "Suggestion for redaction",
     "dictionary": "Dictionary",
     "type": "Type",
@@ -491,6 +492,7 @@
         "suggestion-add": "Suggested redaction",
         "suggestion-remove": "Suggested redaction removal",
         "skipped": "Skipped",
+        "pending-analysis": "Pending Re-Analysis",
         "hint": "Hint",
         "redaction": "Redaction",
         "manual-redaction": "Manual Redaction",