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 71328d94c..99067833d 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -24,29 +24,36 @@ export class AnnotationPermissions { const summedPermissions: AnnotationPermissions = new AnnotationPermissions(); for (const annotation of annotations) { + console.log(annotation.pending); const permissions: AnnotationPermissions = new AnnotationPermissions(); - permissions.canUndo = !isApprover && annotation.isSuggestion; - permissions.canAcceptSuggestion = isApprover && (annotation.isSuggestion || annotation.isDeclinedSuggestion); - permissions.canRejectSuggestion = isApprover && annotation.isSuggestion; + permissions.canUndo = (!isApprover && annotation.isSuggestion) || annotation.pending; + permissions.canAcceptSuggestion = + isApprover && (annotation.isSuggestion || annotation.isDeclinedSuggestion) && !annotation.pending; + permissions.canRejectSuggestion = isApprover && annotation.isSuggestion && !annotation.pending; - permissions.canForceHint = annotation.isIgnoredHint; - permissions.canForceRedaction = annotation.isSkipped && !annotation.isFalsePositive; - permissions.canAcceptRecommendation = annotation.isRecommendation; + permissions.canForceHint = annotation.isIgnoredHint && !annotation.pending; + permissions.canForceRedaction = annotation.isSkipped && !annotation.isFalsePositive && !annotation.pending; + permissions.canAcceptRecommendation = annotation.isRecommendation && !annotation.pending; - permissions.canMarkAsFalsePositive = annotation.canBeMarkedAsFalsePositive && !annotation.imported; + permissions.canMarkAsFalsePositive = annotation.canBeMarkedAsFalsePositive && !annotation.imported && !annotation.pending; - permissions.canRemoveOrSuggestToRemoveOnlyHere = annotation.isRedacted || annotation.isHint; + permissions.canRemoveOrSuggestToRemoveOnlyHere = (annotation.isRedacted || annotation.isHint) && !annotation.pending; permissions.canRemoveOrSuggestToRemoveFromDictionary = - annotation.isModifyDictionary && (annotation.isRedacted || annotation.isSkipped || annotation.isHint); + annotation.isModifyDictionary && + (annotation.isRedacted || annotation.isSkipped || annotation.isHint) && + !annotation.pending; - permissions.canChangeLegalBasis = annotation.isRedacted && !annotation.imported; + permissions.canChangeLegalBasis = annotation.isRedacted && !annotation.imported && !annotation.pending; + + permissions.canRecategorizeImage = + ((annotation.isImage && !annotation.isSuggestion) || annotation.isSuggestionRecategorizeImage) && !annotation.pending; - permissions.canRecategorizeImage = (annotation.isImage && !annotation.isSuggestion) || annotation.isSuggestionRecategorizeImage; permissions.canResizeAnnotation = - ((annotation.isRedacted || annotation.isImage) && !annotation.isSuggestion) || - annotation.isSuggestionResize || - annotation.isRecommendation; + (((annotation.isRedacted || annotation.isImage) && !annotation.isSuggestion) || + annotation.isSuggestionResize || + annotation.isRecommendation) && + !annotation.pending; summedPermissions._merge(permissions); } diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index b1ea8c209..84a616882 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -574,12 +574,13 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni private _subscribeToFileUpdates(): void { this.addActiveScreenSubscription = this.loadAnnotations().subscribe(); - this.addActiveScreenSubscription = timer(0, 5000) - .pipe( - switchMap(() => this.stateService.file$), - switchMap(file => this._filesService.reload(this.dossierId, file)), - ) - .subscribe(); + // With changes monitoring, this should not be necessary + // this.addActiveScreenSubscription = timer(0, 5000) + // .pipe( + // switchMap(() => this.stateService.file$), + // switchMap(file => this._filesService.reload(this.dossierId, file)), + // ) + // .subscribe(); this.addActiveScreenSubscription = this._dossiersService .getEntityDeleted$(this.dossierId) diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 10c141307..4f84161f0 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://aks-staging.redactmanager.com/redaction-gateway-v1", + "API_URL": "https://dom1.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://aks-staging.redactmanager.com/auth/realms/redaction", + "OAUTH_URL": "https://dom1.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview"