From 2b6001402a99eb540e9b5df6cc90ee09dab75b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 26 Sep 2024 21:22:26 +0300 Subject: [PATCH] RED-9757: Check for changes in dossier dictionary --- .../edit-annotation-dialog.component.ts | 14 +--- .../edit-dossier-dictionary.component.html | 8 +-- .../edit-dossier-dictionary.component.ts | 64 ++++++++++++++----- 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.ts index 58745f45b..156c920ce 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.ts @@ -8,7 +8,7 @@ import { IconButtonTypes, IqserDialogComponent, } from '@iqser/common-ui'; -import { Dictionary, Dossier, SuperTypes } from '@red/domain'; +import { Dictionary, Dossier } from '@red/domain'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DictionaryService } from '@services/entity-services/dictionary.service'; import { Roles } from '@users/roles'; @@ -47,12 +47,12 @@ export class EditAnnotationDialogComponent extends IqserDialogComponent implements OnInit { - readonly #dossier: Dossier; readonly roles = Roles; readonly iconButtonTypes = IconButtonTypes; readonly redactedTexts: string[]; dictionaries: Dictionary[] = []; form: UntypedFormGroup; + readonly #dossier: Dossier; constructor( private readonly _activeDossiersService: ActiveDossiersService, @@ -60,7 +60,7 @@ export class EditAnnotationDialogComponent private readonly _formBuilder: FormBuilder, ) { super(); - this.#dossier = _activeDossiersService.find(this.data.dossierId); + this.#dossier = this._activeDossiersService.find(this.data.dossierId); const annotations = this.data.annotations; this.redactedTexts = annotations.map(annotation => annotation.value); this.form = this.#getForm(); @@ -83,10 +83,6 @@ export class EditAnnotationDialogComponent this.#setTypes(); } - reasonChanged() { - this.form.patchValue({ reason: this.dictionaries.find(d => d.type === SuperTypes.ManualRedaction) }); - } - save(): void { const value = this.form.value; this.dialogRef.close({ @@ -106,8 +102,4 @@ export class EditAnnotationDialogComponent type: [sameType ? this.data.annotations[0].type : null], }); } - - #allRectangles() { - return this.data.annotations.reduce((acc, a) => acc && a.AREA, true); - } } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html index ceb6e9cca..d2ad69a42 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html @@ -1,7 +1,7 @@