From d0e19adbcd7947f4efeb1d2f0255632e998ba0b8 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Mon, 17 Oct 2022 15:58:06 +0300 Subject: [PATCH] RED-5317: Disabled read-only watermarks. --- .../edit-dossier-download-package.component.html | 2 ++ .../edit-dossier-download-package.component.ts | 6 +++++- .../watermark-selector.component.ts | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html index d4ed31b75..8b27bb41e 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html @@ -17,6 +17,7 @@ @@ -24,6 +25,7 @@ diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 1db6d6a20..56ba686a8 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -76,6 +76,10 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS return this.form && this.form.valid; } + get canEditDossier(): boolean { + return this._permissionsService.canEditDossier(this.dossier); + } + reportTemplateValueMapper = (reportTemplate: IReportTemplate) => reportTemplate.templateId; async ngOnInit() { @@ -84,7 +88,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS (await firstValueFrom(this._reportTemplateController.getAvailableReportTemplates(dossierTemplateId))) || []; this.form = this._getForm(); - if (!this._permissionsService.canEditDossier(this.dossier)) { + if (!this.canEditDossier) { this.form.disable(); } } diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts index 7b039f177..7d8a04abe 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts @@ -28,6 +28,7 @@ import { MatCheckboxChange } from '@angular/material/checkbox'; export class WatermarkSelectorComponent extends FormFieldComponent implements OnChanges { @Input() dossierTemplateId: string; @Input() label: string; + @Input() isReadonly: boolean; readonly watermarks$: Observable; watermarksMap = new Map(); #watermarks: Watermark[] = []; @@ -44,7 +45,7 @@ export class WatermarkSelectorComponent extends FormFieldComponent imple watermarks.forEach(watermark => this.watermarksMap.set(watermark.id, watermark)); }), tap(watermarks => { - if (!watermarks.length) { + if (!watermarks.length || this.isReadonly) { this.selectWatermark(null); this.setDisabledState(true); } else {