+
+
+
+
+ {{ activeViewerPage }} -
+ {{ activeAnnotations?.length || 0 }}
+
+
@@ -141,13 +151,9 @@
[verticalPadding]="40"
icon="iqser:document"
>
-
+
{{ 'file-preview.tabs.annotations.page-is' | translate }}
- .
@@ -173,11 +179,11 @@
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