From accdd4f510133d24b072f7a8b8a14cd9bb4ca05b Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 18 Nov 2021 10:43:02 +0200 Subject: [PATCH] fixed some issues of RED-2782 --- .../src/app/models/file/annotation.permissions.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 41695bc5b..ca2f1f911 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -24,7 +24,10 @@ export class AnnotationPermissions { for (const annotation of annotations) { const permissions: AnnotationPermissions = new AnnotationPermissions(); + permissions.canUndo = !isApprover && annotation.isSuggestion; + permissions.canAcceptSuggestion = isApprover && (annotation.isSuggestion || annotation.isDeclinedSuggestion); + permissions.canRejectSuggestion = isApprover && annotation.isSuggestion; permissions.canForceRedaction = annotation.isSkipped && !annotation.isFalsePositive; permissions.canAcceptRecommendation = annotation.isRecommendation; @@ -35,14 +38,11 @@ export class AnnotationPermissions { permissions.canRemoveOrSuggestToRemoveFromDictionary = annotation.isModifyDictionary && (annotation.isRedacted || annotation.isSkipped || annotation.isHint); - permissions.canAcceptSuggestion = isApprover && (annotation.isSuggestion || annotation.isDeclinedSuggestion); - permissions.canRejectSuggestion = isApprover && annotation.isSuggestion; - permissions.canChangeLegalBasis = annotation.isRedacted; - permissions.canRecategorizeImage = annotation.isImage; - - permissions.canResizeAnnotation = annotation.isRedacted || annotation.isImage; + permissions.canRecategorizeImage = (annotation.isImage && !annotation.isSuggestion) || annotation.isSuggestionRecategorizeImage; + permissions.canResizeAnnotation = + ((annotation.isRedacted || annotation.isImage) && !annotation.isSuggestion) || annotation.isSuggestionResize; summedPermissions._merge(permissions); }