From b1615b7309170842e2cbd1723a2cc25a585e7e6b Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Thu, 21 Mar 2024 17:14:00 +0200 Subject: [PATCH] RED-8817: added fp extraOption description and increase dialog height. --- .../remove-redaction-dialog.component.scss | 2 +- .../src/app/modules/file-preview/utils/dialog-options.ts | 1 + apps/red-ui/src/app/translations/redact-text-translations.ts | 1 + .../src/app/translations/remove-redaction-translations.ts | 1 + apps/red-ui/src/assets/i18n/redact/de.json | 5 +++-- apps/red-ui/src/assets/i18n/redact/en.json | 1 + apps/red-ui/src/assets/i18n/scm/de.json | 1 + apps/red-ui/src/assets/i18n/scm/en.json | 1 + libs/common-ui | 2 +- 9 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss index 152dacc4d..fd8ec46a6 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.scss @@ -1,7 +1,7 @@ @use 'common-mixins'; .dialog-content { - height: 408px; + height: 470px; } cdk-virtual-scroll-viewport { 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 9ff5d572f..82894b5db 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 @@ -219,6 +219,7 @@ export const getRemoveRedactionOptions = ( label: translations.FALSE_POSITIVE.extraOptionLabel, checked: false, hidden: !isApprover, + description: translations.FALSE_POSITIVE.extraOptionDescription, } : null, }); diff --git a/apps/red-ui/src/app/translations/redact-text-translations.ts b/apps/red-ui/src/app/translations/redact-text-translations.ts index 529e01f22..76bfadb81 100644 --- a/apps/red-ui/src/app/translations/redact-text-translations.ts +++ b/apps/red-ui/src/app/translations/redact-text-translations.ts @@ -6,6 +6,7 @@ export interface DialogOption { description: string; descriptionBulk?: string; extraOptionLabel?: string; + extraOptionDescription?: string; } export const redactTextTranslations: Record<'onlyHere' | 'inDossier', DialogOption> = { diff --git a/apps/red-ui/src/app/translations/remove-redaction-translations.ts b/apps/red-ui/src/app/translations/remove-redaction-translations.ts index a6abfa7eb..615cb7bb9 100644 --- a/apps/red-ui/src/app/translations/remove-redaction-translations.ts +++ b/apps/red-ui/src/app/translations/remove-redaction-translations.ts @@ -20,6 +20,7 @@ export const removeRedactionTranslations: { [key in RemoveRedactionOption]: Dial description: _('remove-redaction.dialog.content.options.false-positive.description'), descriptionBulk: _('remove-redaction.dialog.content.options.false-positive.description-bulk'), extraOptionLabel: _('remove-redaction.dialog.content.options.false-positive.extraOptionLabel'), + extraOptionDescription: _('remove-redaction.dialog.content.options.false-positive.extraOptionDescription'), }, DO_NOT_RECOMMEND: { label: _('remove-redaction.dialog.content.options.do-not-recommend.label'), diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index d917d59cf..43ae4540d 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -2057,8 +2057,9 @@ "label": "Remove from dossier" }, "false-positive": { - "description": "''{value}'' is not a ''{type}'' in this context: ''{context}''.", - "description-bulk": "Do not redact the selected terms in their respective context.", + "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.", + "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.", + "extraOptionDescription": "", "extraOptionLabel": "Apply to all active and future dossiers", "label": "False positive" }, diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index b1b2d3a41..4aa3633a8 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -2059,6 +2059,7 @@ "false-positive": { "description": "Mark this redaction as a false-positive. The term will not be redacted in this dossier if it occurs in the same context.", "description-bulk": "Mark these redactions as false-positives. The terms will not be redacted in this dossier if they occur in the same context.", + "extraOptionDescription": "Dossier template access is required to reverse this action. As a regular user you can only reverse it for the current dossier.", "extraOptionLabel": "Apply to all active and future dossiers", "label": "Remove from dossier in this context" }, diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index f41c930be..a7f49bf86 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -2059,6 +2059,7 @@ "false-positive": { "description": "''{value}'' is not a {type} in this context: ''{context}''.", "description-bulk": "", + "extraOptionDescription": "", "extraOptionLabel": "Apply to all dossiers", "label": "False positive" }, diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index f84e6398c..8f72210c8 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -2059,6 +2059,7 @@ "false-positive": { "description": "''{value}'' is not a {type} in this context: ''{context}''.", "description-bulk": "", + "extraOptionDescription": "", "extraOptionLabel": "Apply to all dossiers", "label": "False positive" }, diff --git a/libs/common-ui b/libs/common-ui index 4b8fa5f53..aea61cbcf 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 4b8fa5f53342f72a06c492b83db3cb372538491e +Subproject commit aea61cbcf6b31260d67cb375140c2e84173dab2e