diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 7f37bb617..c23ea1f9a 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -12,6 +12,7 @@ import { CircleButtonComponent, CommonUiModule, EmptyStateComponent, + HiddenActionDirective, IqserHelpModeModule, IqserLoadingModule, IqserPermissionsModule, @@ -159,6 +160,7 @@ export const appModuleFactory = (config: AppConfig) => { EmptyStateComponent, SkeletonComponent, LogoComponent, + HiddenActionDirective, ], providers: [ { diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 877785591..f9f73cfb2 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -11,9 +11,7 @@ - - - + {{ titleService.getTitle() }} diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts index a1e6d8d81..c6ce575a9 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts @@ -38,9 +38,9 @@ export class FilePreviewStateService { readonly isReadonly$: Observable; readonly isWritable$: Observable; - readonly dossierId: string = getParam(DOSSIER_ID); - readonly dossierTemplateId: string = getParam(DOSSIER_TEMPLATE_ID); - readonly fileId: string = getParam(FILE_ID); + readonly dossierId = getParam(DOSSIER_ID); + readonly dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID); + readonly fileId = getParam(FILE_ID); dossier: Dossier; dialogRef: MatDialogRef; file: File; @@ -51,7 +51,7 @@ export class FilePreviewStateService { router: Router, filesMapService: FilesMapService, private readonly _injector: Injector, - permissionsService: PermissionsService, + private readonly _permissionsService: PermissionsService, private readonly _filesService: FilesService, private readonly _dossiersService: DossiersService, private readonly _fileManagementService: FileManagementService, @@ -65,7 +65,7 @@ export class FilePreviewStateService { this.file$ = filesMapService.watch$(this.dossierId, this.fileId).pipe(tap(file => (this.file = file))); [this.isReadonly$, this.isWritable$] = boolFactory( combineLatest([this.file$, this.dossier$]), - ([file, dossier]) => !permissionsService.canPerformAnnotationActions(file, dossier), + ([file, dossier]) => !_permissionsService.canPerformAnnotationActions(file, dossier), ); this.blob$ = this.#blob$; diff --git a/libs/common-ui b/libs/common-ui index 8ac6f5831..655874989 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 8ac6f583197b4b3771d7db403eccb99926714fbc +Subproject commit 655874989bafa3b7017ceb94e1088c7f9fddd0a5