From 6204cc1cdfede4a45c90fddb87792f0ca4063b4d Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Wed, 25 May 2022 18:03:08 +0300
Subject: [PATCH] RED-3800 updated viewer to 8.5.0

---
 .../watermark-screen/watermark-screen.component.ts        | 8 ++++----
 .../pdf-viewer/services/document-viewer.service.ts        | 2 +-
 package.json                                              | 2 +-
 yarn.lock                                                 | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
index 75dba4ccc..26ff136f2 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
@@ -6,7 +6,7 @@ import { HttpClient } from '@angular/common/http';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Debounce, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui';
 import { DOSSIER_TEMPLATE_ID, IWatermark, WatermarkOrientation, WatermarkOrientations } from '@red/domain';
-import { BASE_HREF } from '../../../../../tokens';
+import { BASE_HREF, BASE_HREF_FN, BaseHrefFn } from '../../../../../tokens';
 import { stampPDFPage } from '@utils/page-stamper';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { WatermarkService } from '@services/entity-services/watermark.service';
@@ -44,7 +44,7 @@ export class WatermarkScreenComponent implements OnInit {
         private readonly _formBuilder: FormBuilder,
         readonly permissionsService: PermissionsService,
         private readonly _loadingService: LoadingService,
-        @Inject(BASE_HREF) private readonly _baseHref: string,
+        @Inject(BASE_HREF_FN) private readonly _convertPath: BaseHrefFn,
         private readonly _watermarkService: WatermarkService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
     ) {
@@ -126,8 +126,8 @@ export class WatermarkScreenComponent implements OnInit {
             WebViewer(
                 {
                     licenseKey: environment.licenseKey ? atob(environment.licenseKey) : null,
-                    path: this._baseHref + '/assets/wv-resources',
-                    css: this._baseHref + '/assets/pdftron/stylesheet.css',
+                    path: this._convertPath('/assets/wv-resources'),
+                    css: this._convertPath('/assets/pdftron/stylesheet.css'),
                     fullAPI: true,
                     isReadOnly: true,
                     backendType: 'ems',
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 c2e2e03e2..75b09d978 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
@@ -166,7 +166,7 @@ export class REDDocumentViewer {
 
     #setCurrentPage() {
         const currentDocPage = this._activatedRoute.snapshot.queryParamMap.get('page');
-        this.#document.setCurrentPage(Number(currentDocPage ?? '1'));
+        this.#document.setCurrentPage(Number(currentDocPage ?? '1'), false);
     }
 
     #setInitialDisplayMode() {
diff --git a/package.json b/package.json
index 25efd27ea..439d4aaa8 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",
     "@nrwl/angular": "13.9.5",
-    "@pdftron/webviewer": "8.3.3",
+    "@pdftron/webviewer": "8.5.0",
     "@tabuckner/material-dayjs-adapter": "2.0.0",
     "angular-google-charts": "^2.2.2",
     "dayjs": "^1.11.0",
diff --git a/yarn.lock b/yarn.lock
index 19ce5dcba..d31f7d8fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1955,10 +1955,10 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
-"@pdftron/webviewer@8.3.3":
-  version "8.3.3"
-  resolved "https://registry.yarnpkg.com/@pdftron/webviewer/-/webviewer-8.3.3.tgz#7cb2b27abeaa76c0f02f1e51199a4a8a75870a7b"
-  integrity sha512-l5u6N9Az8o/NzbSz2+86YFVK1JIk/gUkM5UBx+EC5la60wzI6ldIn7vbbZxQ9wKX9H5gh0lKLP86YAoeWaibrA==
+"@pdftron/webviewer@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@pdftron/webviewer/-/webviewer-8.5.0.tgz#1a45b04224115eafd453ab69d250e8fa8b684025"
+  integrity sha512-UYWJ7tT4OKhPjZ6MLv359T2fXkzy2sd+OAubNM9anmQXEpTkk8ZZVTTK4nAKpW5ycK4th+HzhXFlDD5Z18I7gQ==
 
 "@phenomnomnominal/tsquery@4.1.1":
   version "4.1.1"