From db1edf162f754950258802581790791309371d73 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 30 Nov 2023 15:47:13 +0200 Subject: [PATCH] RED-7990 fix rule based annotations cannot be resized --- .../src/app/models/file/annotation-permissions.utils.ts | 8 ++++++-- apps/red-ui/src/app/models/file/annotation.permissions.ts | 2 +- apps/red-ui/src/app/models/file/annotation.wrapper.ts | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts b/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts index 179b87bea..6fecfd9a0 100644 --- a/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts +++ b/apps/red-ui/src/app/models/file/annotation-permissions.utils.ts @@ -34,11 +34,15 @@ export const canChangeLegalBasis = (annotation: AnnotationWrapper, canAddRedacti export const canRecategorizeAnnotation = (annotation: AnnotationWrapper, canRecategorize: boolean) => canRecategorize && (annotation.isImage || annotation.isDictBasedHint) && !annotation.pending; -export const canResizeAnnotation = (annotation: AnnotationWrapper, canAddRedaction: boolean) => +export const canResizeAnnotation = (annotation: AnnotationWrapper, canAddRedaction: boolean, hasDictionary = false) => canAddRedaction && !annotation.isSkipped && !annotation.pending && - (annotation.isRedacted || annotation.isImage || annotation.isDictBasedHint || annotation.isRecommendation); + (annotation.isRedacted || + annotation.isImage || + annotation.isDictBasedHint || + annotation.isRecommendation || + (hasDictionary && annotation.isRuleBased)); export const canEditAnnotation = (annotation: AnnotationWrapper) => (annotation.isRedacted || annotation.isSkipped) && !annotation.isImage; diff --git a/apps/red-ui/src/app/models/file/annotation.permissions.ts b/apps/red-ui/src/app/models/file/annotation.permissions.ts index 02ef8c65c..4abb9d7bb 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -62,7 +62,7 @@ export class AnnotationPermissions { permissions.canRemoveRedaction = canRemoveRedaction(annotation, permissions); permissions.canChangeLegalBasis = canChangeLegalBasis(annotation, canAddRedaction); permissions.canRecategorizeAnnotation = canRecategorizeAnnotation(annotation, canAddRedaction); - permissions.canResizeAnnotation = canResizeAnnotation(annotation, canAddRedaction); + permissions.canResizeAnnotation = canResizeAnnotation(annotation, canAddRedaction, annotationEntity.hasDictionary); permissions.canEditAnnotations = canEditAnnotation(annotation); permissions.canEditHints = canEditHint(annotation); permissions.canEditImages = canEditImage(annotation); 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 88e9dc088..4688b0587 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -61,6 +61,10 @@ export class AnnotationWrapper implements IListable { hasBeenRemovedByManualOverride: boolean; isRemoved = false; + get isRuleBased() { + return this.engines.includes(LogEntryEngines.RULE); + } + get searchKey(): string { return this.id; }