diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 1c0c63e09..64ff6c3d7 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -117,7 +117,6 @@ const mainRoutes: IqserRoutes = [ Roles.any, Roles.templates.read, Roles.fileAttributes.readConfig, - Roles.watermarks.read, Roles.dictionaryTypes.read, Roles.colors.read, Roles.states.read, @@ -181,7 +180,6 @@ const mainRoutes: IqserRoutes = [ Roles.any, Roles.templates.read, Roles.fileAttributes.readConfig, - Roles.watermarks.read, Roles.dictionaryTypes.read, Roles.colors.read, Roles.states.read, diff --git a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts index c7b9d5303..bae2b5a66 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts @@ -107,7 +107,7 @@ export class AdminSideNavComponent implements OnInit { screen: 'watermarks', label: _('admin-side-nav.watermarks'), helpModeKey: 'watermarks', - show: !this._permissionsService.has(Roles.getRss), + show: this._permissionsService.has(Roles.watermarks.read), }, { screen: 'file-attributes', diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html index a6d6d9efb..6026d1705 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html @@ -18,7 +18,7 @@ formControlName="downloadFileTypes" > - +

{{ 'dossier-watermark-selector.heading' | translate }}

{ - readonly #watermarksMapService = inject(WatermarksMapService); protected readonly _defaultModelPath = 'watermark'; + readonly #watermarksMapService = inject(WatermarksMapService); + readonly #allowed = inject(IqserPermissionsService).has(Roles.watermarks.read); + async deleteWatermark(dossierTemplateId: string, watermarkId: number) { await firstValueFrom(super.delete(null, `${this._defaultModelPath}/${watermarkId}`)); return firstValueFrom(this.loadForDossierTemplate(dossierTemplateId)); @@ -37,6 +40,9 @@ export class WatermarkService extends GenericService { } loadAll(dossierTemplateIds: string[]): Observable { + if (!this.#allowed) { + return of([]); + } return forkJoin(dossierTemplateIds.map(id => this.loadForDossierTemplate(id))).pipe(map(arrays => [].concat(...arrays))); }