From db1a618061ebc1b4aa8cdf6a41a80ab1470e029f Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 20 Jun 2024 15:24:28 +0300 Subject: [PATCH] add pdftron version to assets --- apps/red-ui/project.json | 2 +- .../watermark-screen.component.ts | 30 +++++++++---------- .../pdf-viewer/services/pdf-viewer.service.ts | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/red-ui/project.json b/apps/red-ui/project.json index 6d95197ca..04b121408 100644 --- a/apps/red-ui/project.json +++ b/apps/red-ui/project.json @@ -40,7 +40,7 @@ { "glob": "**/*", "input": "node_modules/@pdftron/webviewer/public/", - "output": "/assets/wv-resources/" + "output": "/assets/wv-resources/10.9.0" }, { "glob": "**/*", 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 f8fabc61f..3a4e37156 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 @@ -1,8 +1,14 @@ -import { ChangeDetectorRef, Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'; -import WebViewer, { WebViewerInstance } from '@pdftron/webviewer'; import { HttpClient } from '@angular/common/http'; +import { ChangeDetectorRef, Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; +import { Router } from '@angular/router'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { environment } from '@environments/environment'; import { getConfig, IconButtonTypes, IqserPermissionsService, LoadingService, Toaster } from '@iqser/common-ui'; +import { TenantsService } from '@iqser/common-ui/lib/tenants'; +import { getCurrentUser } from '@iqser/common-ui/lib/users'; +import { AsControl, BASE_HREF_FN, Debounce, getParam, trackByFactory } from '@iqser/common-ui/lib/utils'; +import WebViewer, { WebViewerInstance } from '@pdftron/webviewer'; import { AppConfig, DOSSIER_TEMPLATE_ID, @@ -17,21 +23,15 @@ import { WatermarkOrientations, WatermarkVerticalAlignment, } from '@red/domain'; -import { stampPDFPage } from '@utils/page-stamper'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { WatermarkService } from '@services/entity-services/watermark.service'; -import { BehaviorSubject, firstValueFrom, Observable, of } from 'rxjs'; -import { LicenseService } from '@services/license.service'; -import { UserPreferenceService } from '@users/user-preference.service'; -import { Router } from '@angular/router'; import { WatermarksMapService } from '@services/entity-services/watermarks-map.service'; -import { Roles } from '@users/roles'; -import { environment } from '@environments/environment'; -import { tap } from 'rxjs/operators'; +import { LicenseService } from '@services/license.service'; import { watermarkTranslations } from '@translations/watermark-translations'; -import { getCurrentUser } from '@iqser/common-ui/lib/users'; -import { AsControl, BASE_HREF_FN, Debounce, getParam, trackByFactory } from '@iqser/common-ui/lib/utils'; -import { TenantsService } from '@iqser/common-ui/lib/tenants'; +import { Roles } from '@users/roles'; +import { UserPreferenceService } from '@users/user-preference.service'; +import { stampPDFPage } from '@utils/page-stamper'; +import { BehaviorSubject, firstValueFrom, Observable, of } from 'rxjs'; +import { tap } from 'rxjs/operators'; export const DEFAULT_WATERMARK: Partial = { text: 'Watermark', @@ -222,7 +222,7 @@ export class WatermarkScreenComponent implements OnInit { this.instance = await WebViewer( { licenseKey: this._licenseService.activeLicenseKey, - path: this._convertPath('/assets/wv-resources'), + path: this._convertPath('/assets/wv-resources/10.9.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 5e31cd85a..48a0258e1 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,7 +359,7 @@ export class PdfViewer { const options: WebViewerOptions = { licenseKey: this.#licenseKey, fullAPI: true, - path: this.#convertPath('/assets/wv-resources'), + path: this.#convertPath('/assets/wv-resources/10.9.0'), css: this.#convertPath('/assets/pdftron/stylesheet.css'), backendType: 'ems', };