From bcab9a00719be66c136c40d083af2e9f1b41d824 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 18 Oct 2021 08:12:04 +0300 Subject: [PATCH] license information, trash normalization actions for excluded pages --- .../license-information-screen.component.html | 5 ----- .../modules/admin/screens/trash/trash-screen.component.html | 2 +- .../dossier/components/pdf-viewer/pdf-viewer.component.ts | 5 +++-- .../file-preview-screen/file-preview-screen.component.ts | 1 + .../modules/dossier/services/annotation-actions.service.ts | 1 + .../src/app/modules/dossier/utils/pdf-viewer.utils.ts | 6 ++++++ package-lock.json | 0 7 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 package-lock.json diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html index fc6bbaa71..684b6c4dd 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html @@ -19,11 +19,6 @@
{{ configService.values.BACKEND_APP_VERSION || '-' }}
-
-
-
{{ configService.values.FRONTEND_APP_VERSION || '-' }}
-
-
{{ configService.values.APP_NAME || '-' }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html index d9ead839a..4b28fb1c3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html @@ -68,7 +68,7 @@
- {{ entity.softDeletedTime | date: 'd MMM. yyyy, hh:mm a' }} + {{ entity.softDeletedTime | date: 'exactDate' }}
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 c41f737b2..49d0882f0 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 @@ -249,6 +249,7 @@ export class PdfViewerComponent implements OnInit, OnChanges { } else { this._ngZone.run(() => this.pageChanged.emit(pageNumber)); } + this._handleCustomActions(); }); this.instance.Core.documentViewer.on('documentLoaded', this._documentLoaded); @@ -296,7 +297,7 @@ export class PdfViewerComponent implements OnInit, OnChanges { } private _setSelectionMode(): void { - const textTool = ( this.instance.Core.Tools.TextTool) as TextTool; + const textTool = (this.instance.Core.Tools.TextTool) as TextTool; textTool.SELECTION_MODE = this._configService.values.SELECTION_MODE; } @@ -528,7 +529,7 @@ export class PdfViewerComponent implements OnInit, OnChanges { private _handleCustomActions() { this.instance.UI.setToolMode('AnnotationEdit'); - if (this.canPerformActions) { + if (this.canPerformActions && !this.utils.isCurrentPageExcluded) { this.instance.UI.enableTools(['AnnotationCreateRectangle']); this.instance.UI.enableElements([ 'add-redaction', diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index 334ab7739..53faa4da0 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -544,6 +544,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni private async _doStampExcludedPages(excludedPages: number[]) { if (excludedPages && excludedPages.length > 0) { + this.viewerComponent.utils.excludedPages = excludedPages; const pdfNet = this._instance.Core.PDFNet; const document = await this._instance.Core.documentViewer.getDocument().getPDFDoc(); await clearStamps(document, pdfNet, [...Array(this.fileData.file.numberOfPages).keys()]); diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts index 291f42c10..6dc69210d 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts @@ -126,6 +126,7 @@ export class AnnotationActionsService { annotations: AnnotationWrapper[], annotationsChanged: EventEmitter, ): Record[] { + console.log('============ get actions'); const availableActions = []; const annotationPermissions = annotations.map(annotation => ({ diff --git a/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts b/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts index 6d2acd34a..514c72398 100644 --- a/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts +++ b/apps/red-ui/src/app/modules/dossier/utils/pdf-viewer.utils.ts @@ -40,6 +40,7 @@ const DISABLED_HOTKEYS = [ export class PdfViewerUtils { ready = false; + excludedPages: number[] = []; constructor(readonly instance: WebViewerInstance, public viewMode: ViewMode, public multiSelectActive: boolean) {} @@ -51,6 +52,11 @@ export class PdfViewerUtils { return this.isCompareMode ? 2 : 1; } + get isCurrentPageExcluded() { + const currentPage = this.currentPage; + return !!this.excludedPages?.includes(currentPage); + } + get currentPage() { try { return this.isCompareMode ? Math.ceil(this._currentInternalPage / 2) : this._currentInternalPage; diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index e69de29bb..000000000