From fd8ea88d314067b54b4274bd13c0c41f2037abaa Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 27 Jun 2024 18:02:21 +0300 Subject: [PATCH] RED-9400 - Forced redaction shows two force entries in manual changes tooltip --- apps/red-ui/src/app/models/file/annotation.wrapper.ts | 8 ++++---- libs/common-ui | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 5a19d4356..96c3456c3 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -266,10 +266,10 @@ export class AnnotationWrapper implements IListable { annotationWrapper.hasLegalBasisChanged = !!logEntry.manualChanges?.find( c => c.manualRedactionType === ManualRedactionTypes.LEGAL_BASIS_CHANGE, ); - annotationWrapper.hasBeenForcedHint = !!logEntry.manualChanges?.find(c => c.manualRedactionType === ManualRedactionTypes.FORCE); - annotationWrapper.hasBeenForcedRedaction = !!logEntry.manualChanges?.find( - c => c.manualRedactionType === ManualRedactionTypes.FORCE, - ); + annotationWrapper.hasBeenForcedHint = + !!logEntry.manualChanges?.find(c => c.manualRedactionType === ManualRedactionTypes.FORCE) && annotationWrapper.HINT; + annotationWrapper.hasBeenForcedRedaction = + !!logEntry.manualChanges?.find(c => c.manualRedactionType === ManualRedactionTypes.FORCE) && !annotationWrapper.HINT; annotationWrapper.hasBeenRemovedByManualOverride = !!logEntry.manualChanges?.find( c => c.manualRedactionType === ManualRedactionTypes.REMOVE, ); diff --git a/libs/common-ui b/libs/common-ui index 1c48cea02..ce334dbde 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 1c48cea02e97efb5d40f69e844484c6611985f5e +Subproject commit ce334dbdebffef79a92d0a5ab9734710d527b8fe