From 6d170edb6ab27c996eb280b62636eda43fcf7c06 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Fri, 29 Oct 2021 15:59:11 +0300
Subject: [PATCH] update view accordingly to excluded pages design

---
 .../file-workload.component.html              | 30 +++++++++++--------
 .../file-workload.component.scss              |  8 +++++
 .../file-workload/file-workload.component.ts  |  8 +++++
 .../pdf-viewer/pdf-viewer.component.ts        |  5 ++--
 apps/red-ui/src/assets/i18n/en.json           |  2 +-
 libs/common-ui                                |  2 +-
 6 files changed, 39 insertions(+), 16 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 ad93dcfe9..e3074ac88 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
@@ -104,11 +104,21 @@
 
         <div style="overflow: hidden; width: 100%">
             <ng-container *ngIf="!excludePages">
-                <div [attr.anotation-page-header]="activeViewerPage" class="page-separator">
-                    <span *ngIf="!!activeViewerPage" class="all-caps-label">
-                        <span translate="page"></span> {{ activeViewerPage }} -
-                        {{ activeAnnotations?.length || 0 }}
-                        <span [translate]="activeAnnotations?.length === 1 ? 'annotation' : 'annotations'"></span>
+                <div [attr.anotation-page-header]="activeViewerPage" [class.padding-left-0]="isExcluded" class="page-separator">
+                    <span *ngIf="!!activeViewerPage" class="flex-align-items-center">
+                        <iqser-circle-button
+                            (action)="viewExcludePages()"
+                            *ngIf="isExcluded"
+                            [tooltip]="'file-preview.excluded-from-redaction' | translate | capitalize"
+                            icon="red:exclude-pages"
+                            tooltipPosition="above"
+                        ></iqser-circle-button>
+
+                        <span class="all-caps-label">
+                            <span translate="page"></span> {{ activeViewerPage }} -
+                            {{ activeAnnotations?.length || 0 }}
+                            <span [translate]="activeAnnotations?.length === 1 ? 'annotation' : 'annotations'"></span>
+                        </span>
                     </span>
 
                     <div *ngIf="multiSelectActive">
@@ -141,13 +151,9 @@
                             [verticalPadding]="40"
                             icon="iqser:document"
                         >
-                            <ng-container *ngIf="fileData?.file?.excludedPages?.includes(activeViewerPage)">
+                            <ng-container *ngIf="isExcluded">
                                 {{ 'file-preview.tabs.annotations.page-is' | translate }}
-                                <a
-                                    (click)="actionPerformed.emit('view-exclude-pages')"
-                                    class="with-underline"
-                                    translate="file-preview.excluded-from-redaction"
-                                ></a
+                                <a (click)="viewExcludePages()" class="with-underline" translate="file-preview.excluded-from-redaction"></a
                                 >.
                             </ng-container>
                         </iqser-empty-state>
@@ -173,11 +179,11 @@
                     <redaction-annotations-list
                         (deselectAnnotations)="deselectAnnotations.emit($event)"
                         (pagesPanelActive)="pagesPanelActive = $event"
+                        (selectAnnotations)="selectAnnotations.emit($event)"
                         [(multiSelectActive)]="multiSelectActive"
                         [activeViewerPage]="activeViewerPage"
                         [annotationActionsTemplate]="annotationActionsTemplate"
                         [annotations]="(displayedAnnotations$ | async)?.get(activeViewerPage)"
-                        (selectAnnotations)="selectAnnotations.emit($event)"
                         [canMultiSelect]="!isReadOnly"
                         [selectedAnnotations]="selectedAnnotations"
                     ></redaction-annotations-list>
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss
index 7636f6bec..46fc452ab 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss
@@ -167,3 +167,11 @@
         }
     }
 }
+
+.padding-left-0 {
+    padding-left: 0 !important;
+}
+
+::ng-deep .page-separator iqser-circle-button mat-icon {
+    color: var(--iqser-primary);
+}
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
index abeb97c36..6d5cabf4e 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
@@ -90,6 +90,10 @@ export class FileWorkloadComponent {
         return !this._permissionsService.canPerformAnnotationActions();
     }
 
+    get isExcluded(): boolean {
+        return this.fileData?.file?.excludedPages?.includes(this.activeViewerPage);
+    }
+
     private get _firstSelectedAnnotation() {
         return this.selectedAnnotations?.length ? this.selectedAnnotations[0] : null;
     }
@@ -225,6 +229,10 @@ export class FileWorkloadComponent {
         this.selectPage.emit(this._nextPageWithAnnotations());
     }
 
+    viewExcludePages(): void {
+        this.actionPerformed.emit('view-exclude-pages');
+    }
+
     private _filterAnnotations(
         annotations: AnnotationWrapper[],
         primary: INestedFilter[],
diff --git a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts
index 4cd21ba90..fadb6ffa1 100644
--- a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.ts
@@ -33,6 +33,8 @@ import Tools = Core.Tools;
 import TextTool = Tools.TextTool;
 import Annotation = Core.Annotations.Annotation;
 
+const allowedKeyboardShortcuts = ['+', '-', 'p', 'r', 'Escape'];
+
 @Component({
     selector: 'redaction-pdf-viewer',
     templateUrl: './pdf-viewer.component.html',
@@ -58,7 +60,6 @@ export class PdfViewerComponent implements OnInit, OnChanges {
     utils: PdfViewerUtils;
     private _selectedText = '';
     private _firstPageChange = true;
-    private readonly _allowedKeyboardShortcuts = ['+', '-', 'p', 'r', 'Escape'];
 
     constructor(
         @Inject(BASE_HREF) private readonly _baseHref: string,
@@ -264,7 +265,7 @@ export class PdfViewerComponent implements OnInit, OnChanges {
                 }
             }
 
-            if (this._allowedKeyboardShortcuts.indexOf($event.key) < 0) {
+            if (allowedKeyboardShortcuts.indexOf($event.key) < 0) {
                 $event.preventDefault();
                 $event.stopPropagation();
             }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 7144a3652..685d34dfb 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1017,7 +1017,7 @@
     "document-info": "Your Document Info lives here. This includes metadata required on each document.",
     "download-original-file": "Download Original File",
     "exclude-pages": "Exclude pages from redaction",
-    "excluded-from-redaction": "excluded from redaction",
+    "excluded-from-redaction": "excluded from automatic redaction",
     "fullscreen": "Full Screen (F)",
     "last-reviewer": "Last Reviewed by:",
     "no-data": {
diff --git a/libs/common-ui b/libs/common-ui
index 1df1b1ab8..e1ce89e38 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 1df1b1ab899e21093eb07c444acf90def933cb02
+Subproject commit e1ce89e38d3520ad11960074f74c381429c0251a