From 0adf3288c85732d789bfb7267bcf42848195a711 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 31 Oct 2024 11:40:09 +0200 Subject: [PATCH] upgrade pdf web viewer --- angular.json | 4 ++-- .../watermark-screen/watermark-screen.component.ts | 2 +- .../app/modules/pdf-viewer/services/pdf-viewer.service.ts | 8 ++++++-- package.json | 2 +- yarn.lock | 8 ++++---- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/angular.json b/angular.json index 74a38dc98..e4aac0cb6 100644 --- a/angular.json +++ b/angular.json @@ -50,7 +50,7 @@ { "glob": "**/*", "input": "node_modules/@pdftron/webviewer/public/", - "output": "/assets/wv-resources/10.10.1/" + "output": "/assets/wv-resources/11.0.0/" }, { "glob": "**/*", @@ -73,7 +73,7 @@ "stylePreprocessorOptions": { "includePaths": ["./apps/red-ui/src/assets/styles", "./libs/common-ui/src/assets/styles"] }, - "scripts": ["node_modules/@pdftron/webviewer/webviewer.min.js", "node_modules/chart.js/auto/auto.cjs"], + "scripts": ["node_modules/chart.js/auto/auto.cjs"], "extractLicenses": false, "sourceMap": true, "optimization": false, 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 8c6d5284c..48468ece3 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 @@ -249,7 +249,7 @@ export class WatermarkScreenComponent implements OnInit { this.instance = await WebViewer( { licenseKey: this._licenseService.activeLicenseKey, - path: this.#convertPath('/assets/wv-resources/10.10.1'), + path: this.#convertPath('/assets/wv-resources/11.0.0'), css: this.#convertPath('/assets/pdftron/stylesheet.css'), fullAPI: true, isReadOnly: true, 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 f4e80c3b5..3790b7ab3 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 @@ -359,12 +359,16 @@ export class PdfViewer { const options: WebViewerOptions = { licenseKey: this.#licenseKey, fullAPI: true, - path: this.#convertPath('/assets/wv-resources/10.10.1'), + path: this.#convertPath('/assets/wv-resources/11.0.0'), css: this.#convertPath('/assets/pdftron/stylesheet.css'), backendType: 'ems', + // This should be migrated to v11 + ui: 'legacy', }; - return WebViewer(options, htmlElement); + // This should be migrated to v11 + // https://docs.apryse.com/web/get-started/migrating-to-v11/ + return WebViewer.Iframe(options, htmlElement); } #isElementActive(element: string): boolean { diff --git a/package.json b/package.json index bda7cc297..b9d159a59 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@messageformat/core": "^3.4.0", "@ngx-translate/core": "15.0.0", "@ngx-translate/http-loader": "8.0.0", - "@pdftron/webviewer": "10.10.1", + "@pdftron/webviewer": "11.0.0", "chart.js": "4.4.6", "dayjs": "1.11.13", "file-saver": "^2.0.5", diff --git a/yarn.lock b/yarn.lock index 086330711..014ea2fae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2618,10 +2618,10 @@ "@parcel/watcher-win32-ia32" "2.4.1" "@parcel/watcher-win32-x64" "2.4.1" -"@pdftron/webviewer@10.10.1": - version "10.10.1" - resolved "https://registry.yarnpkg.com/@pdftron/webviewer/-/webviewer-10.10.1.tgz#f55f8ce5102582472e970742599449d05810e3d6" - integrity sha512-5CzTS5q1TvjitC2yJGTKq4zuPVN8A696D/57sdlmMVF6RwzGJ9QWHEnDAzkAp5U2wyXs+0QNsOe7EWKcUH7/5Q== +"@pdftron/webviewer@11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@pdftron/webviewer/-/webviewer-11.0.0.tgz#366ff6d4fd555db8e842525e87edb0f07fb334e2" + integrity sha512-1aH5yeOrVgCaM3LI7CYcx/6Npa09ZPN94D3d54v59Fb9GRacfFd+WvTpRcgMtt4FsBEa42xlILqchxur/XwJvQ== "@phenomnomnominal/tsquery@^6.1.3": version "6.1.3"