From 0ae4729b8a66536ec65abb19dd5d2b5f81f9dbec Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 23 May 2022 20:41:11 +0300 Subject: [PATCH] RED-3988: fix current route params --- .../file-preview-screen.component.html | 6 +++--- .../file-preview-screen.component.ts | 9 +++++---- .../file-preview/services/pdf-proxy.service.ts | 1 - .../services/annotation-draw.service.ts | 17 ++++++++++------- .../services/document-viewer.service.ts | 11 +++++++++++ .../services/page-rotation.service.ts | 5 +---- .../pdf-viewer/services/pdf-viewer.service.ts | 14 ++++++++------ .../src/app/services/logger-rules.service.ts | 11 ++++++----- 8 files changed, 44 insertions(+), 30 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html index d4a6ac6af..10cac377b 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html @@ -1,5 +1,3 @@ - -
@@ -62,7 +60,9 @@
-
+
+ +
from(this._documentViewer.lock()).pipe(map(() => blob))), tap(() => this._errorService.clear()), tap(blob => this.pdf.loadDocument(blob, this.state.file)), @@ -628,6 +628,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } private _navigateToDossier() { - return this._router.navigate([this._dossiersService.find(this.dossierId)?.routerLink]); + this._logger.info('Navigating to ', this.state.dossier.dossierName); + return this._router.navigate([this.state.dossier.routerLink]); } } diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts index 94e8eba33..6f117f6a9 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts @@ -246,7 +246,6 @@ export class PdfProxyService { onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.DICTIONARY), }); - console.log('configure popup'); this._pdf.configureTextPopups(popups); return this._handleCustomActions(); diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts index 9d1593122..4e1f519d4 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts @@ -4,9 +4,8 @@ import { hexToRgb } from '../../../utils'; import { AnnotationWrapper } from '../../../models/file/annotation.wrapper'; import { UserPreferenceService } from '../../../services/user-preference.service'; import { RedactionLogService } from '../../../services/files/redaction-log.service'; -import { environment } from '../../../../environments/environment'; -import { DOSSIER_ID, FILE_ID, IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain'; +import { IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain'; import { firstValueFrom } from 'rxjs'; import { DictionariesMapService } from '../../../services/entity-services/dictionaries-map.service'; import { SuperTypes } from '../../../models/file/super-types'; @@ -33,9 +32,14 @@ export class AnnotationDrawService { private readonly _documentViewer: REDDocumentViewer, ) {} - draw(annotations: List, dossierTemplateId: string, hideSkipped: boolean) { - const licenseKey = environment.licenseKey ? atob(environment.licenseKey) : null; - return this._pdf.PDFNet.runWithCleanup(() => this._draw(annotations, dossierTemplateId, hideSkipped), licenseKey); + async draw(annotations: List, dossierTemplateId: string, hideSkipped: boolean) { + await this._documentViewer.lock(); + try { + await this._draw(annotations, dossierTemplateId, hideSkipped); + } catch (e) { + console.log(e); + } + await this._documentViewer.unlock(); } getAndConvertColor(superType: string, dossierTemplateId: string, dictionary?: string) { @@ -90,8 +94,7 @@ export class AnnotationDrawService { await this._pdf.annotationManager.drawAnnotationsFromList(annotations); if (this._userPreferenceService.areDevFeaturesEnabled) { - const dossierId = this._activatedRoute.snapshot.paramMap.get(DOSSIER_ID); - const fileId = this._activatedRoute.snapshot.paramMap.get(FILE_ID); + const { dossierId, fileId } = this._pdf; const sectionsGrid$ = this._redactionLogService.getSectionGrid(dossierId, fileId); const sectionsGrid = await firstValueFrom(sectionsGrid$).catch(() => ({ rectanglesPerPage: {} })); await this._drawSections(sectionsGrid, dossierTemplateId); diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts index 590def5d0..24f741b92 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts @@ -119,6 +119,17 @@ export class REDDocumentViewer { return true; } + async unlock() { + const document = await this.PDFDoc; + if (!document) { + return false; + } + + await document.unlock(); + this._logger.info('[PDF] Unlocked'); + return true; + } + setRectangleToolStyles(color: Color) { this.#document.getTool('AnnotationCreateRectangle').setStyles({ StrokeThickness: 2, diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts index b8eae0e25..74f541614 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/page-rotation.service.ts @@ -14,7 +14,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { MatDialog } from '@angular/material/dialog'; import { FilesService } from '../../../services/files/files.service'; import { PdfViewer } from './pdf-viewer.service'; -import { ActivatedRoute } from '@angular/router'; import { FilesMapService } from '../../../services/files/files-map.service'; import { NGXLogger } from 'ngx-logger'; @@ -27,7 +26,6 @@ export class PageRotationService { constructor( private readonly _pdf: PdfViewer, private readonly _loadingService: LoadingService, - private readonly _activatedRoute: ActivatedRoute, private readonly _logger: NGXLogger, private readonly _injector: Injector, private readonly _fileManagementService: FileManagementService, @@ -49,8 +47,7 @@ export class PageRotationService { applyRotation() { this._loadingService.start(); const pages = this.#rotations$.value; - const dossierId = this._activatedRoute.snapshot.paramMap.get('dossierId'); - const fileId = this._activatedRoute.snapshot.paramMap.get('fileId'); + const { dossierId, fileId } = this._pdf; if (!dossierId || !fileId) { this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts index dc6f7d7fd..2b628a687 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts @@ -1,13 +1,13 @@ import { Inject, Injectable, Injector } from '@angular/core'; import WebViewer, { Core, WebViewerInstance, WebViewerOptions } from '@pdftron/webviewer'; -import { environment } from '../../../../environments/environment'; +import { environment } from '@environments/environment'; import { BASE_HREF_FN, BaseHrefFn } from '../../../tokens'; import { File, IHeaderElement } from '@red/domain'; import { ErrorService, shareDistinctLast, shareLast } from '@iqser/common-ui'; import { ActivatedRoute } from '@angular/router'; import { distinctUntilChanged, map, startWith, tap } from 'rxjs/operators'; import { BehaviorSubject, combineLatest, fromEvent, Observable } from 'rxjs'; -import { ConfigService } from '../../../services/config.service'; +import { ConfigService } from '@services/config.service'; import { NGXLogger } from 'ngx-logger'; import { DISABLED_HOTKEYS, DOCUMENT_LOADING_ERROR, SEARCH_OPTIONS, USELESS_ELEMENTS } from '../utils/constants'; import { Rgb } from '../utils/types'; @@ -36,6 +36,8 @@ export class PdfViewer { * @deprecated Use REDAnnotationManager service instead */ annotationManager: AnnotationManager; + fileId: string; + dossierId: string; pageChanged$: Observable; compareMode$: Observable; @@ -138,6 +140,7 @@ export class PdfViewer { async init(htmlElement: HTMLElement) { this.#instance = await this.#getInstance(htmlElement); + await this.PDFNet.initialize(environment.licenseKey ? window.atob(environment.licenseKey) : null); this._logger.info('[PDF] Initialized'); this.documentViewer = this.#instance.Core.documentViewer; @@ -171,18 +174,17 @@ export class PdfViewer { } async loadDocument(blob: Blob, file: File) { - this._logger.info('[PDF] Loading document', blob, file); const onError = () => { this._injector.get(ErrorService).set(DOCUMENT_LOADING_ERROR); this._logger.error('[PDF] Error while loading document'); // this.stateService.reloadBlob(); }; - const pdfNet = this.#instance.Core.PDFNet; - await pdfNet.initialize(environment.licenseKey ? window.atob(environment.licenseKey) : null); - const document = await pdfNet.PDFDoc.createFromBuffer(await blob.arrayBuffer()); + const document = await this.PDFNet.PDFDoc.createFromBuffer(await blob.arrayBuffer()); await document.flattenAnnotations(false); this.#currentBlob = blob; + this.fileId = file.fileId; + this.dossierId = file.dossierId; this.#instance.UI.loadDocument(document, { filename: file?.filename + '.pdf' ?? 'document.pdf', onError }); } diff --git a/apps/red-ui/src/app/services/logger-rules.service.ts b/apps/red-ui/src/app/services/logger-rules.service.ts index e4aafbe98..3db35feab 100644 --- a/apps/red-ui/src/app/services/logger-rules.service.ts +++ b/apps/red-ui/src/app/services/logger-rules.service.ts @@ -8,13 +8,14 @@ export class LoggerRulesService extends NGXLoggerRulesService { if (message && typeof message === 'string') { const matches = message.match('\\[(.*?)\\]'); - const firstMatch = matches[1]?.toUpperCase(); - - if (matches && matches.length > 0 && config.features[firstMatch]) { + if (matches && matches.length > 0) { + const firstMatch = matches[1]?.toUpperCase(); const featureConfig = config.features[firstMatch]; - if (!featureConfig.enabled || (featureConfig.level && featureConfig?.level < config.level)) { - return false; + if (featureConfig) { + if (!featureConfig.enabled || (featureConfig.level && featureConfig.level < config.level)) { + return false; + } } } }