From 7ddcb23fc9e5be253791a403831b16131774079e Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 17 Jan 2022 15:08:29 +0200 Subject: [PATCH] excluded file btn fix --- .../shared/components/file-actions/file-actions.component.ts | 2 +- apps/red-ui/src/app/services/permissions.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index 95a6427cd..f4bc25a51 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -159,7 +159,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, ariaExpanded: this._excludedPagesService?.shown$, showDot: !!this.file.excludedPages?.length, icon: 'red:exclude-pages', - show: !!this._excludedPagesService, + show: !!this._excludedPagesService && !this.file.excluded, }, { type: ActionTypes.circleBtn, diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 88b9afe77..55eeaf96b 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -97,7 +97,7 @@ export class PermissionsService { // TODO: Remove '?', after we make sure file is loaded before page canPerformAnnotationActions(file: File): boolean { - return (file?.isUnderReview || file?.isUnderApproval) && this.isFileAssignee(file); + return !file.excluded && (file?.isUnderReview || file?.isUnderApproval) && this.isFileAssignee(file); } canUndoApproval(file: File | File[]): boolean {