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

RED-6285: fix watermark double save

Browse Source
This commit is contained in:
Dan Percic 2023-03-15 17:45:56 +02:00
parent fb3ef83cd2
commit 86a0f5f57a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<div class="content-container"> <div class="content-container">
<div class="viewer" id="viewer"></div> <div #viewer class="viewer" id="viewer"></div>
<div *ngIf="changed && currentUser.isAdmin" class="changes-box"> <div *ngIf="changed && currentUser.isAdmin" class="changes-box">
<iqser-icon-button <iqser-icon-button

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

@ -1,4 +1,4 @@
import { Component, Inject } from '@angular/core'; import { Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core';
import WebViewer, { WebViewerInstance } from '@pdftron/webviewer'; import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { FormBuilder, FormGroup } from '@angular/forms'; import { FormBuilder, FormGroup } from '@angular/forms';
@ -51,7 +51,7 @@ interface WatermarkForm {
templateUrl: './watermark-screen.component.html', templateUrl: './watermark-screen.component.html',
styleUrls: ['./watermark-screen.component.scss'], styleUrls: ['./watermark-screen.component.scss'],
}) })
export class WatermarkScreenComponent { export class WatermarkScreenComponent implements OnInit {
readonly iconButtonTypes = IconButtonTypes; readonly iconButtonTypes = IconButtonTypes;
readonly currentUser = getCurrentUser<User>(); readonly currentUser = getCurrentUser<User>();
readonly form = this._getForm(); readonly form = this._getForm();
@ -62,6 +62,7 @@ export class WatermarkScreenComponent {
{ value: 'courier', display: 'Courier' }, { value: 'courier', display: 'Courier' },
]; ];
readonly orientationOptions = ['DIAGONAL', 'HORIZONTAL', 'VERTICAL']; readonly orientationOptions = ['DIAGONAL', 'HORIZONTAL', 'VERTICAL'];
@ViewChild('viewer', { static: true }) viewer: ElementRef<HTMLDivElement>;
readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID); readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID);
readonly #watermarkId = Number(getParam(WATERMARK_ID)); readonly #watermarkId = Number(getParam(WATERMARK_ID));
private _instance: WebViewerInstance; private _instance: WebViewerInstance;
@ -102,6 +103,10 @@ export class WatermarkScreenComponent {
return this.form.valid; return this.form.valid;
} }
async ngOnInit() {
await this._loadViewer();
}
@Debounce() @Debounce()
async configChanged() { async configChanged() {
await this._drawWatermark(); await this._drawWatermark();
@ -144,7 +149,6 @@ export class WatermarkScreenComponent {
private async _initForm(watermark: Partial<IWatermark>) { private async _initForm(watermark: Partial<IWatermark>) {
this._watermark = { ...watermark, dossierTemplateId: this.#dossierTemplateId }; this._watermark = { ...watermark, dossierTemplateId: this.#dossierTemplateId };
this.form.patchValue({ ...watermark }); this.form.patchValue({ ...watermark });
await this._loadViewer();
} }
private async _loadViewer() { private async _loadViewer() {
@ -161,7 +165,7 @@ export class WatermarkScreenComponent {
isReadOnly: true, isReadOnly: true,
backendType: 'ems', backendType: 'ems',
}, },
document.getElementById('viewer'), this.viewer.nativeElement,
); );
this._instance.UI.setTheme(this._userPreferenceService.getTheme()); this._instance.UI.setTheme(this._userPreferenceService.getTheme());