From fa7fd420a88e3bf898a65822a169d2a90fc4d4a5 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 30 Oct 2024 14:22:50 +0200 Subject: [PATCH] RED-10256 - Bulk-local: Changes should not be filtered + Remove for image-based redactions and hints --- .../edit-redaction-dialog.component.ts | 7 ++++--- .../file-preview/services/annotation-actions.service.ts | 2 -- .../src/app/modules/file-preview/utils/dialog-options.ts | 6 +++++- 3 files changed, 9 insertions(+), 6 deletions(-) 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 03753ad6a..645fa6850 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 @@ import { LegalBasisOption, RectangleRedactOption, RectangleRedactOptions, + RedactOrHintOptions, } from '../../utils/dialog-types'; import { DetailsRadioComponent } from '@common-ui/inputs/details-radio/details-radio.component'; import { DetailsRadioOption } from '@common-ui/inputs/details-radio/details-radio-option'; @@ -88,7 +89,7 @@ export class EditRedactionDialogComponent { label: redaction.value, bold: true }, { label: redaction.typeLabel }, ]); - options = this.allRectangles ? getRectangleRedactOptions('edit') : getEditRedactionOptions(); + options = this.allRectangles ? getRectangleRedactOptions('edit') : getEditRedactionOptions(this.isHint); legalOptions: LegalBasisOption[] = []; dictionaries: Dictionary[] = []; typeSelectOptions: TypeSelectOptions[] = []; @@ -214,7 +215,7 @@ export class EditRedactionDialogComponent const initialReason: LegalBasisOption = this.initialFormValue.reason; const initialLegalBasis = initialReason?.legalBasis ?? ''; const pageNumbers = parseSelectedPageNumbers( - this.form.get('option').value.additionalInput?.value, + this.form.get('option').value?.additionalInput?.value, this.data.file, this.data.annotations[0], ); @@ -226,7 +227,7 @@ export class EditRedactionDialogComponent comment: value.comment, type: value.type, value: this.allRectangles ? value.value : null, - option: value.option.value, + option: value.option?.value ?? RedactOrHintOptions.ONLY_HERE, position, pageNumbers, }); diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts index 020d61af5..863bd1b43 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts @@ -588,8 +588,6 @@ export class AnnotationActionsService { return { value: redaction.value, rectangle: redaction.value === NON_READABLE_CONTENT, - originTypes: [redaction.entry.type], - originLegalBases: [redaction.legalBasis], pageNumbers: dialogResult.pageNumbers, position: dialogResult.position, comment: dialogResult.comment, diff --git a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts index f4390648c..29db18b8e 100644 --- a/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts +++ b/apps/red-ui/src/app/modules/file-preview/utils/dialog-options.ts @@ -30,7 +30,11 @@ const DOCUMENT_ICON = 'iqser:document'; const FOLDER_ICON = 'red:folder'; const REMOVE_FROM_DICT_ICON = 'red:remove-from-dict'; -export const getEditRedactionOptions = (): DetailsRadioOption[] => { +export const getEditRedactionOptions = (hint: boolean): DetailsRadioOption[] => { + if (hint) { + return []; + } + return [ { label: editRedactionTranslations.onlyHere.label,