diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html index bcec18e2e..600edd1a7 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html @@ -35,7 +35,7 @@ ; @ViewChild('actionsWrapper', { static: false }) private _actionsWrapper: ElementRef; - readonly rssEnabled: boolean; constructor( readonly pdf: PdfViewer, @@ -131,7 +131,6 @@ export class FilePreviewScreenComponent private readonly _manualRedactionService: ManualRedactionService, private readonly _filesService: FilesService, private readonly _fileManagementService: FileManagementService, - private readonly _translateService: TranslateService, private readonly _readableRedactionsService: ReadableRedactionsService, private readonly _helpModeService: HelpModeService, ) { @@ -141,7 +140,6 @@ export class FilePreviewScreenComponent this.fullScreen = false; } }); - this.rssEnabled = 'true' === `${configService.values.RSS_ENABLED}`.toLowerCase(); } get changed() { diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts index e9dd2ce2c..2b5e148c3 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts @@ -8,6 +8,7 @@ import { IqserHelpModeModule, IqserIconsModule, IqserInputsModule, + IqserPermissionsModule, IqserScrollbarModule, IqserSharedModule, IqserUploadFileModule, @@ -119,6 +120,7 @@ const components = [ IqserEmptyStatesModule, IqserFiltersModule, IqserScrollbarModule, + IqserPermissionsModule, ], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard], }) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index 9993c1a47..36d688474 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -174,7 +174,10 @@ export class FileActionsComponent implements OnChanges { ariaExpanded: this._excludedPagesService?.shown$, showDot: !!this.file.excludedPages?.length, icon: 'red:exclude-pages', - show: !!this._excludedPagesService && !this.file.excluded, + show: + !!this._excludedPagesService && + !this.file.excluded && + this._permissionsService.canExcludePages(this.file, this.dossier), }, { 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 0bfa55109..a6d4e0a92 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -74,7 +74,7 @@ export class PermissionsService { } showToggleAnalysis(dossier: Dossier): boolean { - return this._iqserPermissionsService.has(ROLES.files.reanalyze) && dossier.isActive; + return this._iqserPermissionsService.has(ROLES.excludeIncludeFile) && dossier.isActive; } canReanalyseFile(file: File | File[], dossier: Dossier): boolean { diff --git a/apps/red-ui/src/app/users/roles.ts b/apps/red-ui/src/app/users/roles.ts index be8c1a281..49245a57d 100644 --- a/apps/red-ui/src/app/users/roles.ts +++ b/apps/red-ui/src/app/users/roles.ts @@ -1,8 +1,6 @@ export const ROLES = { RED_CREATE_TENANT: 'red-create-tenant', RED_DEPLOYMENT_INFO: 'red-deployment-info', - RED_EXCLUDE_INCLUDE_FILE: 'red-exclude-include-file', - RED_GET_RSS: 'red-get-rss', RED_GET_TENANTS: 'red-get-tenants', RED_MANAGE_USER_PREFERENCES: 'red-manage-user-preferences', RED_PROCESS_DOWNLOAD: 'red-process-download', @@ -13,6 +11,8 @@ export const ROLES = { RED_ROTATE_PAGE: 'red-rotate-page', RED_UPDATE_MY_PROFILE: 'red-update-my-profile', RED_WRITE_RULES: 'red-write-rules', + getRss: 'red-get-rss', + excludeIncludeFile: 'red-exclude-include-file', excludeIncludePages: 'red-exclude-include-pages', manageViewedPages: 'red-manage-viewed-pages', setReviewer: 'red-set-reviewer',