From 07d6ab12fc2491ddcf6823c69aec5a37e79251a0 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Wed, 24 Feb 2021 11:45:33 +0200
Subject: [PATCH] skipped annotations partial fix

---
 .../app/common/sorters/super-type-sorter.ts   |  12 +-
 .../type-filter/type-filter.component.html    |  16 +-
 .../annotation-actions.component.html         | 272 +++++++++---------
 .../annotation-actions.component.ts           |   4 -
 .../file-preview-screen.component.html        |  44 +--
 .../file-preview-screen.component.ts          |   4 +
 6 files changed, 177 insertions(+), 175 deletions(-)

diff --git a/apps/red-ui/src/app/common/sorters/super-type-sorter.ts b/apps/red-ui/src/app/common/sorters/super-type-sorter.ts
index 156182c78..5476b0896 100644
--- a/apps/red-ui/src/app/common/sorters/super-type-sorter.ts
+++ b/apps/red-ui/src/app/common/sorters/super-type-sorter.ts
@@ -1,13 +1,15 @@
 export const SuperTypeSorter = {
     'add-dictionary': 2,
     'remove-dictionary': 3,
-    'suggestion-add-dictionary': 7,
-    'suggestion-remove-dictionary': 8,
-    'suggestion-add': 5,
-    'suggestion-remove': 6,
+    'pending-analysis': 4,
+    'remove-only-here': 5,
+    'suggestion-add-dictionary': 12,
+    'suggestion-remove-dictionary': 13,
+    'suggestion-add': 10,
+    'suggestion-remove': 11,
     skipped: 50,
     redaction: 1,
     manual: 2,
-    hint: 10,
+    hint: 15,
     'declined-suggestion': 20
 };
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 362f55da9..00663d6dd 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
@@ -1,12 +1,8 @@
 <redaction-annotation-icon *ngIf="filter.key === 'redaction'" type="square" label="R" [color]="dictionaryColor"></redaction-annotation-icon>
 <redaction-annotation-icon *ngIf="filter.key === 'recommendation'" type="square" label="R" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'analysis'" type="square" label="A" [color]="dictionaryColor"></redaction-annotation-icon>
 <redaction-annotation-icon *ngIf="filter.key === 'hint'" type="circle" label="H" [color]="dictionaryColor"></redaction-annotation-icon>
-
 <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="
@@ -22,17 +18,21 @@
 ></redaction-annotation-icon>
 
 <redaction-annotation-icon
-    *ngIf="filter.key === 'add-dictionary' || filter.key === 'remove-dictionary'"
+    *ngIf="
+        filter.key === 'add-dictionary' ||
+        filter.key === 'remove-dictionary' ||
+        filter.key === 'remove-only-here' ||
+        filter.key === 'pending-analysis' ||
+        filter.key === 'analysis'
+    "
     type="square"
     label="A"
     [color]="dictionaryColor"
 ></redaction-annotation-icon>
 
 <redaction-annotation-icon *ngIf="filter.key === 'declined-suggestion'" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
-
 <redaction-annotation-icon *ngIf="filter.key === 'none'" label="-" color="transparent" type="none"></redaction-annotation-icon>
-
 <redaction-annotation-icon *ngIf="filter.key === 'updated'" type="square" label="U" [color]="dictionaryColor"></redaction-annotation-icon>
-
 <redaction-annotation-icon *ngIf="filter.key === 'image'" type="square" label="I" [color]="dictionaryColor"></redaction-annotation-icon>
+
 {{ filter.label | translate }}
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 f1566968c..ae4f620d1 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
@@ -1,141 +1,139 @@
-<redaction-hidden-action (action)="logAnnotation(annotation)">
-    <div [class.visible]="menuOpen" *ngIf="canPerformAnnotationActions" class="annotation-actions">
-        <redaction-circle-button
-            (action)="annotationActionsService.forceRedaction($event, [annotation], annotationsChanged)"
-            type="dark-bg"
-            *ngIf="annotationPermissions.canForceRedaction"
-            tooltipPosition="before"
-            tooltip="annotation-actions.force-redaction.label"
-            icon="red:thumb-up"
-        >
-        </redaction-circle-button>
+<div [class.visible]="menuOpen" *ngIf="canPerformAnnotationActions" class="annotation-actions">
+    <redaction-circle-button
+        (action)="annotationActionsService.forceRedaction($event, [annotation], annotationsChanged)"
+        type="dark-bg"
+        *ngIf="annotationPermissions.canForceRedaction"
+        tooltipPosition="before"
+        tooltip="annotation-actions.force-redaction.label"
+        icon="red:thumb-up"
+    >
+    </redaction-circle-button>
 
-        <redaction-circle-button
-            (action)="annotationActionsService.convertRecommendationToAnnotation($event, [annotation], annotationsChanged)"
-            type="dark-bg"
-            *ngIf="annotationPermissions.canAcceptRecommendation"
-            tooltipPosition="before"
-            tooltip="annotation-actions.accept-recommendation.label"
-            icon="red:check-alt"
-        >
-        </redaction-circle-button>
+    <redaction-circle-button
+        (action)="annotationActionsService.convertRecommendationToAnnotation($event, [annotation], annotationsChanged)"
+        type="dark-bg"
+        *ngIf="annotationPermissions.canAcceptRecommendation"
+        tooltipPosition="before"
+        tooltip="annotation-actions.accept-recommendation.label"
+        icon="red:check-alt"
+    >
+    </redaction-circle-button>
 
-        <redaction-circle-button
-            (action)="annotationActionsService.markTextOnlyAsFalsePositive($event, [annotation], annotationsChanged)"
-            type="dark-bg"
+    <redaction-circle-button
+        (action)="annotationActionsService.markTextOnlyAsFalsePositive($event, [annotation], annotationsChanged)"
+        type="dark-bg"
+        *ngIf="annotationPermissions.canMarkTextOnlyAsFalsePositive"
+        tooltipPosition="before"
+        tooltip="annotation-actions.remove-annotation.false-positive"
+        icon="red:thumb-down"
+    >
+    </redaction-circle-button>
+
+    <redaction-circle-button
+        (action)="annotationActionsService.acceptSuggestion($event, [annotation], annotationsChanged)"
+        type="dark-bg"
+        *ngIf="annotationPermissions.canAcceptSuggestion"
+        tooltipPosition="before"
+        tooltip="annotation-actions.accept-suggestion.label"
+        icon="red:check-alt"
+    >
+    </redaction-circle-button>
+
+    <redaction-circle-button
+        (action)="annotationActionsService.undoDirectAction($event, [annotation], annotationsChanged)"
+        *ngIf="annotationPermissions.canUndo"
+        type="dark-bg"
+        icon="red:undo"
+        tooltipPosition="before"
+        tooltip="annotation-actions.undo"
+    >
+    </redaction-circle-button>
+
+    <redaction-circle-button
+        (action)="hideAnnotation($event)"
+        *ngIf="annotation.isImage && viewerAnnotation?.isVisible()"
+        type="dark-bg"
+        icon="red:visibility-off"
+        tooltipPosition="before"
+        tooltip="annotation-actions.hide"
+    >
+    </redaction-circle-button>
+
+    <redaction-circle-button
+        (action)="showAnnotation($event)"
+        *ngIf="annotation.isImage && !viewerAnnotation?.isVisible()"
+        type="dark-bg"
+        icon="red:visibility"
+        tooltipPosition="before"
+        tooltip="annotation-actions.show"
+    >
+    </redaction-circle-button>
+
+    <redaction-circle-button
+        (action)="annotationActionsService.rejectSuggestion($event, [annotation], annotationsChanged)"
+        type="dark-bg"
+        icon="red:close"
+        *ngIf="annotationPermissions.canRejectSuggestion"
+        tooltipPosition="before"
+        tooltip="annotation-actions.reject-suggestion"
+    >
+    </redaction-circle-button>
+
+    <redaction-circle-button
+        (action)="annotationActionsService.suggestRemoveAnnotation($event, [annotation], false, annotationsChanged)"
+        type="dark-bg"
+        icon="red:trash"
+        *ngIf="annotationPermissions.canRemoveOrSuggestToRemoveOnlyHere && !annotationPermissions.canPerformMultipleRemoveActions"
+        tooltipPosition="before"
+        tooltip="annotation-actions.suggest-remove-annotation"
+    >
+    </redaction-circle-button>
+
+    <redaction-circle-button
+        *ngIf="annotationPermissions.canPerformMultipleRemoveActions"
+        (action)="openMenu($event)"
+        [class.active]="menuOpen"
+        [matMenuTriggerFor]="menu"
+        tooltipPosition="before"
+        tooltip="annotation-actions.suggest-remove-annotation"
+        type="dark-bg"
+        icon="red:trash"
+    >
+    </redaction-circle-button>
+
+    <mat-menu #menu="matMenu" (closed)="onMenuClosed()" xPosition="before">
+        <div
+            (click)="annotationActionsService.suggestRemoveAnnotation($event, [annotation], true, annotationsChanged)"
+            mat-menu-item
+            *ngIf="annotationPermissions.canRemoveOrSuggestToRemoveFromDictionary"
+        >
+            <redaction-annotation-icon [type]="'rhombus'" [label]="'S'" [color]="dictionaryColor"></redaction-annotation-icon>
+            <div [translate]="'annotation-actions.remove-annotation.remove-from-dict'"></div>
+        </div>
+        <div
+            (click)="annotationActionsService.suggestRemoveAnnotation($event, [annotation], false, annotationsChanged)"
+            mat-menu-item
+            *ngIf="annotationPermissions.canRemoveOrSuggestToRemoveOnlyHere"
+        >
+            <redaction-annotation-icon [type]="'rhombus'" [label]="'S'" [color]="suggestionColor"></redaction-annotation-icon>
+            <div translate="annotation-actions.remove-annotation.only-here"></div>
+        </div>
+
+        <div
+            (click)="annotationActionsService.markAsFalsePositive($event, [annotation], annotationsChanged)"
+            mat-menu-item
+            *ngIf="annotationPermissions.canMarkAsFalsePositive"
+        >
+            <mat-icon svgIcon="red:thumb-down" class="false-positive-icon"></mat-icon>
+            <div translate="annotation-actions.remove-annotation.false-positive"></div>
+        </div>
+        <div
+            (click)="annotationActionsService.markTextOnlyAsFalsePositive($event, [annotation], annotationsChanged)"
+            mat-menu-item
             *ngIf="annotationPermissions.canMarkTextOnlyAsFalsePositive"
-            tooltipPosition="before"
-            tooltip="annotation-actions.remove-annotation.false-positive"
-            icon="red:thumb-down"
         >
-        </redaction-circle-button>
-
-        <redaction-circle-button
-            (action)="annotationActionsService.acceptSuggestion($event, [annotation], annotationsChanged)"
-            type="dark-bg"
-            *ngIf="annotationPermissions.canAcceptSuggestion"
-            tooltipPosition="before"
-            tooltip="annotation-actions.accept-suggestion.label"
-            icon="red:check-alt"
-        >
-        </redaction-circle-button>
-
-        <redaction-circle-button
-            (action)="annotationActionsService.undoDirectAction($event, [annotation], annotationsChanged)"
-            *ngIf="annotationPermissions.canUndo"
-            type="dark-bg"
-            icon="red:undo"
-            tooltipPosition="before"
-            tooltip="annotation-actions.undo"
-        >
-        </redaction-circle-button>
-
-        <redaction-circle-button
-            (action)="hideAnnotation($event)"
-            *ngIf="annotation.isImage && viewerAnnotation?.isVisible()"
-            type="dark-bg"
-            icon="red:visibility-off"
-            tooltipPosition="before"
-            tooltip="annotation-actions.hide"
-        >
-        </redaction-circle-button>
-
-        <redaction-circle-button
-            (action)="showAnnotation($event)"
-            *ngIf="annotation.isImage && !viewerAnnotation?.isVisible()"
-            type="dark-bg"
-            icon="red:visibility"
-            tooltipPosition="before"
-            tooltip="annotation-actions.show"
-        >
-        </redaction-circle-button>
-
-        <redaction-circle-button
-            (action)="annotationActionsService.rejectSuggestion($event, [annotation], annotationsChanged)"
-            type="dark-bg"
-            icon="red:close"
-            *ngIf="annotationPermissions.canRejectSuggestion"
-            tooltipPosition="before"
-            tooltip="annotation-actions.reject-suggestion"
-        >
-        </redaction-circle-button>
-
-        <redaction-circle-button
-            (action)="annotationActionsService.suggestRemoveAnnotation($event, [annotation], false, annotationsChanged)"
-            type="dark-bg"
-            icon="red:trash"
-            *ngIf="annotationPermissions.canRemoveOrSuggestToRemoveOnlyHere && !annotationPermissions.canPerformMultipleRemoveActions"
-            tooltipPosition="before"
-            tooltip="annotation-actions.suggest-remove-annotation"
-        >
-        </redaction-circle-button>
-
-        <redaction-circle-button
-            *ngIf="annotationPermissions.canPerformMultipleRemoveActions"
-            (action)="openMenu($event)"
-            [class.active]="menuOpen"
-            [matMenuTriggerFor]="menu"
-            tooltipPosition="before"
-            tooltip="annotation-actions.suggest-remove-annotation"
-            type="dark-bg"
-            icon="red:trash"
-        >
-        </redaction-circle-button>
-
-        <mat-menu #menu="matMenu" (closed)="onMenuClosed()" xPosition="before">
-            <div
-                (click)="annotationActionsService.suggestRemoveAnnotation($event, [annotation], true, annotationsChanged)"
-                mat-menu-item
-                *ngIf="annotationPermissions.canRemoveOrSuggestToRemoveFromDictionary"
-            >
-                <redaction-annotation-icon [type]="'rhombus'" [label]="'S'" [color]="dictionaryColor"></redaction-annotation-icon>
-                <div [translate]="'annotation-actions.remove-annotation.remove-from-dict'"></div>
-            </div>
-            <div
-                (click)="annotationActionsService.suggestRemoveAnnotation($event, [annotation], false, annotationsChanged)"
-                mat-menu-item
-                *ngIf="annotationPermissions.canRemoveOrSuggestToRemoveOnlyHere"
-            >
-                <redaction-annotation-icon [type]="'rhombus'" [label]="'S'" [color]="suggestionColor"></redaction-annotation-icon>
-                <div translate="annotation-actions.remove-annotation.only-here"></div>
-            </div>
-
-            <div
-                (click)="annotationActionsService.markAsFalsePositive($event, [annotation], annotationsChanged)"
-                mat-menu-item
-                *ngIf="annotationPermissions.canMarkAsFalsePositive"
-            >
-                <mat-icon svgIcon="red:thumb-down" class="false-positive-icon"></mat-icon>
-                <div translate="annotation-actions.remove-annotation.false-positive"></div>
-            </div>
-            <div
-                (click)="annotationActionsService.markTextOnlyAsFalsePositive($event, [annotation], annotationsChanged)"
-                mat-menu-item
-                *ngIf="annotationPermissions.canMarkTextOnlyAsFalsePositive"
-            >
-                <mat-icon svgIcon="red:thumb-down" class="false-positive-icon"></mat-icon>
-                <div translate="annotation-actions.remove-annotation.false-positive"></div>
-            </div>
-        </mat-menu>
-    </div>
-</redaction-hidden-action>
+            <mat-icon svgIcon="red:thumb-down" class="false-positive-icon"></mat-icon>
+            <div translate="annotation-actions.remove-annotation.false-positive"></div>
+        </div>
+    </mat-menu>
+</div>
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 3a11d9ca2..51b539317 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
@@ -61,8 +61,4 @@ export class AnnotationActionsComponent implements OnInit {
     get dictionaryColor() {
         return this.appStateService.getDictionaryColor('suggestion-add-dictionary');
     }
-
-    logAnnotation(annotation: AnnotationWrapper) {
-        console.log(annotation);
-    }
 }
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 15302d42e..a9331e9c4 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
@@ -246,29 +246,31 @@
                             class="annotation"
                             [class.removed]="annotation.isChangeLogRemoved"
                         >
-                            <div class="details">
-                                <redaction-type-annotation-icon [annotation]="annotation"></redaction-type-annotation-icon>
-                                <div class="flex-1">
-                                    <div>
-                                        <strong>{{ annotation.typeLabel | translate }}</strong>
-                                    </div>
-                                    <div *ngIf="annotation.dictionary && annotation.dictionary !== 'manual'">
-                                        <strong
-                                            ><span>{{ annotation.descriptor | translate }}</span
-                                            >: </strong
-                                        >{{ annotation.dictionary | humanize: false }}
-                                    </div>
-                                    <div *ngIf="annotation.content && !annotation.isHint">
-                                        <strong><span translate="content"></span>: </strong>{{ annotation.content }}
+                            <redaction-hidden-action (action)="logAnnotation(annotation)" [requiredClicks]="2">
+                                <div class="details">
+                                    <redaction-type-annotation-icon [annotation]="annotation"></redaction-type-annotation-icon>
+                                    <div class="flex-1">
+                                        <div>
+                                            <strong>{{ annotation.typeLabel | translate }}</strong>
+                                        </div>
+                                        <div *ngIf="annotation.dictionary && annotation.dictionary !== 'manual'">
+                                            <strong
+                                                ><span>{{ annotation.descriptor | translate }}</span
+                                                >: </strong
+                                            >{{ annotation.dictionary | humanize: false }}
+                                        </div>
+                                        <div *ngIf="annotation.content && !annotation.isHint">
+                                            <strong><span translate="content"></span>: </strong>{{ annotation.content }}
+                                        </div>
                                     </div>
+                                    <redaction-annotation-actions
+                                        (annotationsChanged)="annotationsChangedByReviewAction($event)"
+                                        [annotation]="annotation"
+                                        [canPerformAnnotationActions]="canPerformAnnotationActions"
+                                        [viewer]="activeViewer"
+                                    ></redaction-annotation-actions>
                                 </div>
-                                <redaction-annotation-actions
-                                    (annotationsChanged)="annotationsChangedByReviewAction($event)"
-                                    [annotation]="annotation"
-                                    [canPerformAnnotationActions]="canPerformAnnotationActions"
-                                    [viewer]="activeViewer"
-                                ></redaction-annotation-actions>
-                            </div>
+                            </redaction-hidden-action>
                             <redaction-comments [annotation]="annotation"></redaction-comments>
                         </div>
                     </div>
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 b2d526df5..d6fcc3a65 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
@@ -708,6 +708,10 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
         window.open(`/html-debug/${this.projectId}/${this.fileId}`, '_blank');
     }
 
+    logAnnotation(annotation: AnnotationWrapper) {
+        console.log(annotation);
+    }
+
     private _handleIgnoreAnnotationsDrawing() {
         const allAnnotations = this._instance.annotManager.getAnnotationsList();
         const ignoreAnnotations = allAnnotations.filter((a) => a.getCustomData('skipped'));