From 5e98c7808445277e1e5323a9958455b84d38ebbe Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 28 Mar 2023 12:57:45 +0300 Subject: [PATCH 1/2] RED-6412: wait for document to be closed --- .../pdf-viewer/services/document-viewer.service.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 3d50465dc..ed2ed54dd 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 @@ -1,7 +1,7 @@ import { inject, Injectable } from '@angular/core'; import { Core } from '@pdftron/webviewer'; import { NGXLogger } from 'ngx-logger'; -import { fromEvent, merge, Observable, Subject } from 'rxjs'; +import { fromEvent, merge, Observable } from 'rxjs'; import { debounceTime, filter, map, tap } from 'rxjs/operators'; import { ActivatedRoute } from '@angular/router'; import { PdfViewer } from './pdf-viewer.service'; @@ -23,8 +23,6 @@ export class REDDocumentViewer { selectedText = ''; #document: DocumentViewer; - readonly #documentClosed$ = new Subject(); - readonly #logger = inject(NGXLogger); readonly #userPreferenceService = inject(UserPreferenceService); readonly #pdf = inject(PdfViewer); @@ -39,7 +37,7 @@ export class REDDocumentViewer { } get #documentUnloaded$() { - const event$ = merge(fromEvent(this.#document, 'documentUnloaded'), this.#documentClosed$); + const event$ = fromEvent(this.#document, 'documentUnloaded'); const toBool$ = event$.pipe(map(() => false)); return toBool$.pipe(tap(() => this.#logger.info('[PDF] Document unloaded'))); @@ -101,8 +99,6 @@ export class REDDocumentViewer { } close() { - this.#documentClosed$.next(undefined); - const closeAction = async () => { this.#logger.info('[PDF] Closing document'); this.#document.closeDocument(); @@ -173,7 +169,7 @@ export class REDDocumentViewer { } async #flattenAnnotations() { - const pdfDoc = await this.#document.getDocument().getPDFDoc(); + const pdfDoc = await this.PDFDoc; await pdfDoc.flattenAnnotations(false); } From 9565d4e215c8e84889611ec82f4323787f6109a4 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 28 Mar 2023 12:00:17 +0200 Subject: [PATCH 2/2] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee27a6377..c1a034e50 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.30.0", + "version": "4.31.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 8f56d3561255d2e61d92a42e60596fc0b4ece75d..752aacd0c4eabe09ced135474cd154efed8f4977 100644 GIT binary patch delta 307 zcmV-30nGmM8uJ>EcYg<7VEe%n8=h?U2?~A^YzD2V8LkleIhOiwY)f7K@<+|?Gg5yn zZFso+J$Jo2%m3$SN9A9U7)MO@Eu*^rur;`VSN@dzJ#Xc@z5HF@0r{^259DuuTvE;L z|6KkrqZC&)Vd(PD-+pCnE}vh#r2Dd{7;38Q*=5RDS#PhelYb&-^>SAfyNuwH*2}2a zUxPxpzfSO;X7^wGu_XDgzQK9Dr3`0_yIsm&+6&LNpW6#xdT( delta 307 zcmV-30nGmM8uJ>EcYph~^9xF^-t*TSj&LVQX*!ulyAox~hMFpSc9}9(*4yjrq<_d+z1$VWE+e?4^)f2< z*PsyYuM@nd+5H!PEJ^;WZ*X33DZ|;~ZkMu`_QJF6=k~%EpMm&XiO;q8+`y+J#yDb( zBgQylj3dT4e9SLnT9+BV|DwLb<>l4$izUYoXI4sZOe*yE3xwWUG>^%fEpnd2uar<& ze~bLUF5f)Acpf*HvE7CwDJmjnhB&(2RYjA>R#ap~wM9?ejpzE#vy%bX3kW`RYia;c F002+Zr