From 73408135bed58bcd7b680e8d0004e339b2cf4544 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 12 Dec 2023 23:00:12 +0200 Subject: [PATCH 1/2] RED-7761 - Missing fields in Edit Dialog for Signature (redacted images) --- .../edit-redaction-dialog.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts index 094a1bf96..b3a908010 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts @@ -33,6 +33,7 @@ export class EditRedactionDialogComponent dictionaries: Dictionary[] = []; readonly form = this.#getForm(); hasTypeChanged = false; + initialReasonDisabled = this.someSkipped; constructor( private readonly _justificationsService: JustificationsService, @@ -120,9 +121,13 @@ export class EditRedactionDialogComponent const selectedDictionaryType = this.form.controls.type.value; this.#setOptions(selectedDictionaryType); - if (this.redactBasedTypes.includes(selectedDictionaryType)) { + const initialReason = this.form.get('type').value === this.initialFormValue.type && !this.initialReasonDisabled; + if (this.redactBasedTypes.includes(selectedDictionaryType) || initialReason) { this.form.controls.reason.enable(); this.hasTypeChanged = true; + if (initialReason) { + this.form.controls.reason.setValue(this.initialFormValue.reason); + } } else { this.form.controls.reason.disable(); } From 2833029d65f1fbdf78658e2a82da75be7aef6da8 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 14 Dec 2023 17:14:48 +0200 Subject: [PATCH 2/2] RED-7761 - Missing fields in Edit Dialog for Signature (redacted images) --- .../edit-redaction-dialog/edit-redaction-dialog.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts index b3a908010..0fba8ed51 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts @@ -126,7 +126,9 @@ export class EditRedactionDialogComponent this.form.controls.reason.enable(); this.hasTypeChanged = true; if (initialReason) { - this.form.controls.reason.setValue(this.initialFormValue.reason); + setTimeout(() => { + this.form.controls.reason.setValue(this.initialFormValue.reason); + }); } } else { this.form.controls.reason.disable();