From 9672b0d9d6d81287a4820f66f5fb99f6717935a7 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 7 Apr 2022 12:28:52 +0300 Subject: [PATCH] RED-3724: fix last visited page --- apps/red-ui/src/app/app.module.ts | 2 +- .../file-preview/components/pdf-viewer/pdf-viewer.component.ts | 2 -- .../app/modules/file-preview/file-preview-screen.component.ts | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 01f721622..90bd1aba0 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -123,7 +123,7 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp enabled: false, }, PDF: { - enabled: false, + enabled: true, }, STATS: { enabled: false, diff --git a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts index 19118ca77..5cc471472 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts @@ -564,8 +564,6 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha private _setReadyAndInitialState() { this._ngZone.run(() => { this.pdfViewer.emitDocumentLoaded(); - const routePageNumber: number = this._activatedRoute.snapshot.queryParams.page; - this.pageChanged.emit(routePageNumber || 1); this._setInitialDisplayMode(); this._tooltipsService.updateTooltipsVisibility(); }); diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 9920e8a9a..2ec4f8da8 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -327,6 +327,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni await this.#updateQueryParamsPage(page); } + @Debounce(100) viewerReady() { this.ready = true; this._setExcludedPageStyles(); @@ -341,12 +342,14 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni setTimeout(async () => { const file = await this.state.file; let page = parseInt(pageNumber, 10); + if (page < 1 || Number.isNaN(page)) { page = 1; await this.#updateQueryParamsPage(page); } else if (page > file.numberOfPages) { page = file.numberOfPages; } + this.selectPage(page); this._scrollViews(); this._changeDetectorRef.markForCheck();