Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-10258' into 'master'

Browse Source 
Fix text not displayed in viewer?

See merge request redactmanager/red-ui!665
This commit is contained in:
Valentin-Gabriel Mihai 2024-10-31 11:35:27 +01:00
commit 95d57642c4
7 changed files with 2194 additions and 2786 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
angular.json
View File

@ -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,

5
apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
View File

@ -246,14 +246,15 @@ export class WatermarkScreenComponent implements OnInit {
}
async #loadViewer() {
this.instance = await WebViewer(
this.instance = await WebViewer.Iframe(
{
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,
backendType: 'ems',
ui: 'legacy',
},
// use nativeElement instead of document.getElementById('viwer')
// because WebViewer works better with this approach

8
apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
View File

@ -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 {

4
apps/red-ui/src/assets/config/config.json
View File

@ -1,7 +1,7 @@
{
"ADMIN_CONTACT_NAME": null,
"ADMIN_CONTACT_URL": null,
"API_URL": "https://dan2.iqser.cloud",
"API_URL": "https://dan1.iqser.cloud",
"APP_NAME": "RedactManager",
"IS_DOCUMINE": false,
"RULE_EDITOR_DEV_ONLY": false,
@ -13,7 +13,7 @@
"MAX_RETRIES_ON_SERVER_ERROR": 3,
"OAUTH_CLIENT_ID": "redaction",
"OAUTH_IDP_HINT": null,
"OAUTH_URL": "https://dan2.iqser.cloud/auth",
"OAUTH_URL": "https://dan1.iqser.cloud/auth",
"RECENT_PERIOD_IN_HOURS": 24,
"SELECTION_MODE": "structural",
"MANUAL_BASE_URL": "https://docs.redactmanager.com/preview",

2
libs/common-ui

@ -1 +1 @@
Subproject commit 9e457a13b4b4555586e733038fc30cd8b6d4e7cf
Subproject commit b9c01a287c15c7fbdbfd9e5a95b12a45e662b49b

96
package.json
View File

@ -19,85 +19,85 @@
"*.{ts,js,html}": "eslint --fix"
},
"dependencies": {
"@angular/animations": "18.0.3",
"@angular/cdk": "18.0.3",
"@angular/common": "18.0.3",
"@angular/compiler": "18.0.3",
"@angular/core": "18.0.3",
"@angular/forms": "18.0.3",
"@angular/material": "18.0.3",
"@angular/platform-browser": "18.0.3",
"@angular/platform-browser-dynamic": "18.0.3",
"@angular/router": "18.0.3",
"@angular/service-worker": "18.0.3",
"@angular/animations": "18.2.10",
"@angular/cdk": "18.2.10",
"@angular/common": "18.2.10",
"@angular/compiler": "18.2.10",
"@angular/core": "18.2.10",
"@angular/forms": "18.2.10",
"@angular/material": "18.2.10",
"@angular/platform-browser": "18.2.10",
"@angular/platform-browser-dynamic": "18.2.10",
"@angular/router": "18.2.10",
"@angular/service-worker": "18.2.10",
"@materia-ui/ngx-monaco-editor": "^6.0.0",
"@messageformat/core": "^3.3.0",
"@messageformat/core": "^3.4.0",
"@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0",
"@pdftron/webviewer": "10.10.1",
"chart.js": "4.4.3",
"dayjs": "1.11.11",
"@pdftron/webviewer": "11.0.0",
"chart.js": "4.4.6",
"dayjs": "1.11.13",
"file-saver": "^2.0.5",
"jszip": "^3.10.1",
"jwt-decode": "^4.0.0",
"keycloak-angular": "15.1.0",
"keycloak-js": "23.0.1",
"lodash-es": "^4.17.21",
"monaco-editor": "0.49.0",
"monaco-editor": "0.52.0",
"ng2-charts": "6.0.1",
"ngx-color-picker": "16.0.0",
"ngx-color-picker": "17.0.0",
"ngx-logger": "^5.0.11",
"ngx-toastr": "19.0.0",
"ngx-translate-messageformat-compiler": "7.0.0",
"object-hash": "^3.0.0",
"papaparse": "^5.4.0",
"rxjs": "7.8.1",
"sass": "1.77.5",
"sass": "1.80.5",
"scroll-into-view-if-needed": "3.1.0",
"streamsaver": "^2.0.5",
"tslib": "2.6.3",
"zone.js": "0.14.7"
"tslib": "2.8.0",
"zone.js": "0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.0.7",
"@angular-devkit/core": "18.0.4",
"@angular-devkit/schematics": "18.0.4",
"@angular-eslint/builder": "18.0.1",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular-eslint/eslint-plugin-template": "18.0.1",
"@angular-eslint/schematics": "18.0.1",
"@angular-eslint/template-parser": "18.0.1",
"@angular/build": "^18.0.4",
"@angular/cli": "18.0.4",
"@angular/compiler-cli": "18.0.3",
"@angular/language-service": "18.0.3",
"@angular-devkit/build-angular": "^18.2.11",
"@angular-devkit/core": "18.2.11",
"@angular-devkit/schematics": "18.2.11",
"@angular-eslint/builder": "18.4.0",
"@angular-eslint/eslint-plugin": "18.4.0",
"@angular-eslint/eslint-plugin-template": "18.4.0",
"@angular-eslint/schematics": "18.4.0",
"@angular-eslint/template-parser": "18.4.0",
"@angular/build": "^18.2.11",
"@angular/cli": "18.2.11",
"@angular/compiler-cli": "18.2.10",
"@angular/language-service": "18.2.10",
"@localazy/ts-api": "^1.0.0",
"@schematics/angular": "18.0.4",
"@schematics/angular": "18.2.11",
"@types/file-saver": "^2.0.7",
"@types/jest": "29.5.12",
"@types/jest": "29.5.14",
"@types/lodash-es": "4.17.12",
"@types/node": "20.14.2",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@typescript-eslint/utils": "^7.16.0",
"@vendure/ngx-translate-extract": "9.2.0",
"axios": "1.7.2",
"@types/node": "22.8.5",
"@typescript-eslint/eslint-plugin": "^8.12.2",
"@typescript-eslint/parser": "^8.12.2",
"@typescript-eslint/utils": "^8.12.2",
"@vendure/ngx-translate-extract": "9.2.1",
"axios": "1.7.7",
"eslint": "^8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-rxjs": "^5.0.2",
"google-translate-api-browser": "^5.0.0",
"husky": "^9.0.11",
"husky": "^9.1.6",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-extended": "4.0.2",
"jest-preset-angular": "14.1.0",
"lint-staged": "15.2.7",
"prettier": "3.3.2",
"sonarqube-scanner": "4.0.1",
"jest-preset-angular": "14.2.4",
"lint-staged": "15.2.10",
"prettier": "3.3.3",
"sonarqube-scanner": "4.2.5",
"ts-node": "10.9.2",
"typescript": "5.4.5",
"webpack": "5.92.0",
"typescript": "5.5.4",
"webpack": "5.95.0",
"webpack-bundle-analyzer": "4.10.2",
"xliff": "^6.2.1"
}

4861
yarn.lock
View File

File diff suppressed because it is too large Load Diff