From 0b4de15f07e9c725a3e3950aba48486f86da92ce Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sun, 13 Nov 2022 00:30:14 +0200 Subject: [PATCH] RED-5482: wip permissions --- apps/red-ui/src/app/app-routing.module.ts | 18 +++++----- apps/red-ui/src/app/app.module.ts | 4 +-- .../base-screen/base-screen.component.html | 4 +-- .../base-screen/base-screen.component.ts | 6 ++-- .../src/app/models/file/annotation.wrapper.ts | 2 +- .../preferences/preferences.component.ts | 14 ++++++-- .../user-profile-screen.component.ts | 9 +++-- .../app/modules/admin/admin-routing.module.ts | 7 ++-- .../admin-side-nav.component.ts | 9 ++--- .../screens/audit/audit-screen.component.html | 2 +- .../screens/audit/audit-screen.component.ts | 12 +++++-- .../digital-signature-screen.component.html | 2 +- .../digital-signature-screen.component.ts | 5 +-- ...ssier-states-listing-screen.component.html | 4 +-- ...dossier-states-listing-screen.component.ts | 4 +-- ...er-templates-listing-screen.component.html | 6 ++-- ...sier-templates-listing-screen.component.ts | 4 ++- .../entities-listing-screen.component.html | 4 +-- .../entities-listing-screen.component.ts | 2 -- .../entity-info/entity-info.component.html | 2 +- .../entity-info/entity-info.component.ts | 2 -- .../general-config-form.component.html | 5 +-- .../general-config-form.component.ts | 7 +++- .../smtp-form/smtp-form.component.ts | 9 +++-- .../system-preferences-form.component.ts | 7 +++- .../license-screen.component.html | 2 +- .../license-screen.component.ts | 4 ++- .../permissions-screen.component.html | 2 +- .../permissions-screen.component.ts | 4 ++- .../user-listing-screen.component.html | 4 +-- .../user-listing-screen.component.ts | 10 +++--- .../table-item/table-item.component.html | 6 ++-- .../table-item/table-item.component.ts | 5 +-- .../template-stats.component.html | 2 +- .../template-stats.component.ts | 7 +++- .../dossier-details.component.html | 2 +- .../dossier-details.component.ts | 14 ++++++-- .../dossier-overview/config.service.ts | 5 ++- .../dossiers-listing-actions.component.html | 6 ++-- .../dossiers-listing-actions.component.ts | 5 +-- .../dossiers-listing.module.ts | 2 ++ .../annotation-actions.component.html | 2 +- .../annotation-actions.component.ts | 2 ++ .../services/manual-redaction.service.ts | 15 ++++++-- .../pdf-annotation-actions.service.ts | 8 +++-- .../services/pdf-proxy.service.ts | 35 +++++++++++-------- .../edit-dossier-dialog.component.ts | 16 +++++++-- .../edit-dossier-team.component.ts | 10 +++--- .../team-members/team-members.component.html | 2 +- .../team-members/team-members.component.ts | 4 ++- .../src/app/services/permissions.service.ts | 18 +++++++--- apps/red-ui/src/app/users/roles.ts | 4 +-- apps/red-ui/src/app/users/user.service.ts | 2 +- 53 files changed, 227 insertions(+), 121 deletions(-) diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 8605d0a88..8bd0e3eba 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -27,6 +27,15 @@ import { ROLES } from '@users/roles'; const dossierTemplateIdRoutes: IqserRoutes = [ { path: `${DOSSIERS_ROUTE}`, + canActivate: [CompositeRouteGuard, IqserPermissionsGuard], + data: { + routeGuards: [DossiersGuard], + dossiersService: ACTIVE_DOSSIERS_SERVICE, + permissions: { + allow: [ROLES.files.readStatus], + redirectTo: '/auth-error', + }, + }, children: [ { path: `:${DOSSIER_ID}`, @@ -65,15 +74,6 @@ const dossierTemplateIdRoutes: IqserRoutes = [ }, }, ], - canActivate: [CompositeRouteGuard, IqserPermissionsGuard], - data: { - routeGuards: [DossiersGuard], - dossiersService: ACTIVE_DOSSIERS_SERVICE, - permissions: { - allow: [ROLES.files.readStatus], - redirectTo: '/auth-error', - }, - }, }, { path: `${ARCHIVE_ROUTE}`, diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 7e9e22bdb..713f2b85a 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -112,14 +112,14 @@ export const appModuleFactory = (config: AppConfig) => { features: { ANNOTATIONS: { color: 'aqua', - enabled: true, + enabled: false, level: NgxLoggerLevel.DEBUG, }, FILTERS: { enabled: false, }, PDF: { - enabled: true, + enabled: false, }, FILE: { enabled: false, 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 2015dcee7..17be91be5 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 @@ -5,7 +5,7 @@
-
+
@@ -21,7 +21,7 @@
{ imported?: boolean; image?: boolean; manual?: boolean; - pending?: boolean; + pending = false; hintDictionary?: boolean; textAfter?: string; textBefore?: string; diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts index 700239dfa..4e23df42f 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts @@ -1,7 +1,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { UserPreferenceService } from '@users/user-preference.service'; import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; -import { BaseFormComponent } from '@iqser/common-ui'; +import { BaseFormComponent, IqserPermissionsService } from '@iqser/common-ui'; +import { ROLES } from '@users/roles'; interface PreferencesForm { autoExpandFiltersOnActions: boolean; @@ -22,12 +23,21 @@ export class PreferencesComponent extends BaseFormComponent { readonly form: FormGroup>; initialFormValue: PreferencesForm; - constructor(readonly userPreferenceService: UserPreferenceService, private readonly _formBuilder: FormBuilder) { + constructor( + readonly userPreferenceService: UserPreferenceService, + private readonly _formBuilder: FormBuilder, + private readonly _permissionsService: IqserPermissionsService, + ) { super(); this.form = this._formBuilder.group({ autoExpandFiltersOnActions: [this.userPreferenceService.getAutoExpandFiltersOnActions()], showSuggestionsInPreview: [this.userPreferenceService.getShowSuggestionsInPreview()], }); + + if (!this._permissionsService.has(ROLES.managePreferences)) { + this.form.disable(); + } + this.initialFormValue = this.form.getRawValue(); } diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts index bcf8aa812..9953c42eb 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts @@ -2,14 +2,14 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { BaseFormComponent, LanguageService, LoadingService } from '@iqser/common-ui'; +import { BaseFormComponent, IqserPermissionsService, LanguageService, LoadingService } from '@iqser/common-ui'; import { IProfile } from '@red/domain'; import { languagesTranslations } from '@translations/languages-translations'; -import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@users/user.service'; import { ConfigService } from '@services/config.service'; import { firstValueFrom } from 'rxjs'; import { UserPreferenceService } from '@users/user-preference.service'; +import { ROLES } from '@users/roles'; @Component({ selector: 'redaction-user-profile-screen', @@ -28,12 +28,12 @@ export class UserProfileScreenComponent extends BaseFormComponent implements OnI domSanitizer: DomSanitizer, configService: ConfigService, private readonly _userService: UserService, - readonly permissionsService: PermissionsService, readonly userPreferences: UserPreferenceService, private readonly _loadingService: LoadingService, private readonly _formBuilder: UntypedFormBuilder, private readonly _languageService: LanguageService, protected readonly _translateService: TranslateService, + private readonly _permissionsService: IqserPermissionsService, protected readonly _userPreferenceService: UserPreferenceService, ) { super(); @@ -112,6 +112,9 @@ export class UserProfileScreenComponent extends BaseFormComponent implements OnI private _initializeForm(): void { try { this.form = this._getForm(); + if (!this._permissionsService.has(ROLES.updateMyProfile)) { + this.form.disable(); + } this.#profileModel = { email: this._userService.currentUser.email ?? '', firstName: this._userService.currentUser.firstName ?? '', diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index 79053bcd6..8b39f8330 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -162,10 +162,13 @@ const routes: IqserRoutes = [ component: UserListingScreenComponent, }, ], - canActivate: [CompositeRouteGuard], + canActivate: [CompositeRouteGuard, IqserPermissionsGuard], data: { routeGuards: [IqserAuthGuard, RedRoleGuard], - requiredRoles: ['RED_USER_ADMIN'], + permissions: { + allow: [ROLES.users.read], + redirectTo: '/', + }, }, }, { diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts index abd6ffbf9..6cdd400f6 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts @@ -4,9 +4,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { adminSideNavTranslations } from '@translations/admin-side-nav-translations'; import { UserService } from '@users/user.service'; import { ActivatedRoute } from '@angular/router'; -import { AdminSideNavType, AdminSideNavTypes, ENTITY_TYPE } from '@red/domain'; +import { AdminSideNavType, AdminSideNavTypes, ENTITY_TYPE, User } from '@red/domain'; import { ROLES } from '@users/roles'; -import { IqserPermissionsService } from '@iqser/common-ui'; +import { getCurrentUser, IqserPermissionsService } from '@iqser/common-ui'; interface NavItem { readonly label: string; @@ -24,6 +24,7 @@ export class AdminSideNavComponent implements OnInit { @Input() type: AdminSideNavType; @Input() disabledItems: string[] = []; readonly translations = adminSideNavTranslations; + readonly currentUser = getCurrentUser(); readonly roles = ROLES; prefix: string; @@ -32,7 +33,7 @@ export class AdminSideNavComponent implements OnInit { { screen: 'dossier-templates', label: _('admin-side-nav.dossier-templates'), - hideIf: !this._permissionsService.has(ROLES.templates.read), + hideIf: !this.currentUser.isManager && !this.currentUser.isAdmin && !this._permissionsService.has(ROLES.templates.read), helpModeKey: 'dossier_templates', }, { @@ -56,7 +57,7 @@ export class AdminSideNavComponent implements OnInit { { screen: 'users', label: _('admin-side-nav.user-management'), - hideIf: !this._userService.currentUser.isUserAdmin, + hideIf: !this._permissionsService.has(ROLES.users.read) && !this._userService.currentUser.isUserAdmin, helpModeKey: 'user_management', }, { diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html index f3812e6ea..1b54546db 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html @@ -1,7 +1,7 @@ implements OnI readonly routerHistoryService = inject(RouterHistoryService); readonly permissionsService = inject(IqserPermissionsService); readonly roles = ROLES; + readonly currentUser = getCurrentUser(); categories: string[] = []; userIds: Set; diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html index 8c5253793..34d0e82a6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html @@ -1,7 +1,7 @@
diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts index b46e42b6d..98d10be79 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; -import { IconButtonTypes, IqserPermissionsService, LoadingService, Toaster } from '@iqser/common-ui'; +import { getCurrentUser, IconButtonTypes, IqserPermissionsService, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { RouterHistoryService } from '@services/router-history.service'; import { DigitalSignatureService } from '../../services/digital-signature.service'; @@ -7,7 +7,7 @@ import { firstValueFrom } from 'rxjs'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { PkcsSignatureConfigurationComponent } from '../../dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component'; import { KmsSignatureConfigurationComponent } from '../../dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component'; -import { DigitalSignatureOptions, IKmsDigitalSignatureRequest, IPkcsDigitalSignatureRequest } from '@red/domain'; +import { DigitalSignatureOptions, IKmsDigitalSignatureRequest, IPkcsDigitalSignatureRequest, User } from '@red/domain'; import { ROLES } from '@users/roles'; @Component({ @@ -22,6 +22,7 @@ export class DigitalSignatureScreenComponent implements OnInit { readonly certificateType = DigitalSignatureOptions; readonly iconButtonTypes = IconButtonTypes; readonly roles = ROLES; + readonly currentUser = getCurrentUser(); digitalSignature: IPkcsDigitalSignatureRequest | IKmsDigitalSignatureRequest; diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html index 265084bbb..46106d68b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html @@ -53,7 +53,7 @@
-
+
implements OnInit, OnDestroy { readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; - readonly roles = ROLES; readonly tableHeaderLabel = _('dossier-states-listing.table-header.title'); readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('dossier-states-listing.table-col-names.name'), sortByKey: 'name', width: '3fr' }, @@ -40,6 +39,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent (); readonly tableHeaderLabel = _('dossier-templates-listing.table-header.title'); readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('dossier-templates-listing.table-col-names.name'), sortByKey: 'searchKey', width: '3fr' }, diff --git a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html index a29d96ce6..e1fbec1a6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html @@ -57,7 +57,7 @@
{ readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; - readonly roles = ROLES; readonly tableHeaderLabel = _('entities-listing.table-header.title'); readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('entities-listing.table-col-names.type'), sortByKey: 'searchKey', width: '2fr' }, diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html index ea792ffea..652ed5e7e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html @@ -17,7 +17,7 @@ >
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts index d374e35f9..f4cc6c19d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts @@ -7,7 +7,6 @@ import { PermissionsService } from '@services/permissions.service'; import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component'; import { IqserEventTarget } from '@iqser/common-ui'; import { Observable } from 'rxjs'; -import { ROLES } from '@users/roles'; @Component({ selector: 'redaction-entity-info', @@ -17,7 +16,6 @@ import { ROLES } from '@users/roles'; }) export class EntityInfoComponent { readonly currentUser = getCurrentUser(); - readonly roles = ROLES; readonly entity$: Observable; readonly dossierTemplateId: string; @ViewChild(AddEditEntityComponent) private readonly _addEditEntityComponent: AddEditEntityComponent; diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html index b8fb0831f..42f43c11a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.html @@ -2,7 +2,7 @@
-
+
@@ -22,13 +22,14 @@
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts index 2cc4d16bc..216cebe57 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts @@ -1,10 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import { BaseFormComponent, LoadingService } from '@iqser/common-ui'; +import { BaseFormComponent, IqserPermissionsService, LoadingService } from '@iqser/common-ui'; import { GeneralSettingsService } from '@services/general-settings.service'; import { IGeneralConfiguration } from '@red/domain'; import { ConfigService } from '@services/config.service'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { firstValueFrom } from 'rxjs'; +import { ROLES } from '@users/roles'; @Component({ selector: 'redaction-general-config-form', @@ -18,9 +19,13 @@ export class GeneralConfigFormComponent extends BaseFormComponent implements OnI private readonly _generalSettingsService: GeneralSettingsService, private readonly _configService: ConfigService, private readonly _formBuilder: UntypedFormBuilder, + private readonly _permissionsService: IqserPermissionsService, ) { super(); this.form = this._getForm(); + if (!_permissionsService.has(ROLES.generalConfiguration.write)) { + this.form.disable(); + } } async ngOnInit(): Promise { diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts index 08284bc17..e6194bd90 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts @@ -1,11 +1,12 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ISmtpConfiguration } from '@red/domain'; -import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; +import { BaseFormComponent, IconButtonTypes, IqserPermissionsService, LoadingService, Toaster } from '@iqser/common-ui'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { SmtpConfigService } from '../../../services/smtp-config.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom } from 'rxjs'; +import { ROLES } from '@users/roles'; @Component({ selector: 'redaction-smtp-form', @@ -21,9 +22,13 @@ export class SmtpFormComponent extends BaseFormComponent implements OnInit { private readonly _smtpConfigService: SmtpConfigService, private readonly _loadingService: LoadingService, private readonly _toaster: Toaster, + private readonly _permissionsService: IqserPermissionsService, ) { super(); this.form = this._getForm(); + if (!_permissionsService.has(ROLES.smtp.write)) { + this.form.disable(); + } } async ngOnInit(): Promise { diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/system-preferences-form/system-preferences-form.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/system-preferences-form/system-preferences-form.component.ts index 7183a3d3e..2669113bd 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/system-preferences-form/system-preferences-form.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/system-preferences-form/system-preferences-form.component.ts @@ -1,10 +1,11 @@ import { Component } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { SystemPreferences } from '@red/domain'; -import { BaseFormComponent, KeysOf, LoadingService } from '@iqser/common-ui'; +import { BaseFormComponent, IqserPermissionsService, KeysOf, LoadingService } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; import { SystemPreferencesService } from '@services/system-preferences.service'; import { systemPreferencesTranslations } from '@translations/system-preferences-translations'; +import { ROLES } from '@users/roles'; export type ValueType = 'number' | 'string' | 'boolean'; @@ -25,10 +26,14 @@ export class SystemPreferencesFormComponent extends BaseFormComponent { private readonly _loadingService: LoadingService, private readonly _systemPreferencesService: SystemPreferencesService, private readonly _formBuilder: UntypedFormBuilder, + private readonly _permissionsService: IqserPermissionsService, ) { super(); this.form = this._getForm(); this._loadData(); + if (!_permissionsService.has(ROLES.appConfiguration.write)) { + this.form.disable(); + } } async save(): Promise { diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html index 2df02a524..60e12518d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html @@ -4,7 +4,7 @@ (closeAction)="routerHistoryService.navigateToLastDossiersScreen()" [buttonConfigs]="buttonConfigs" [pageLabel]="'license-information' | translate" - [showCloseButton]="permissionsService.has$(roles.dossiers.read) | async" + [showCloseButton]="currentUser.isUser && permissionsService.has$(roles.dossiers.read) | async" >
diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts index 4481a06e8..9f9a29a59 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts @@ -1,12 +1,13 @@ import { Component, OnInit } from '@angular/core'; import { ConfigService } from '@services/config.service'; import { TranslateService } from '@ngx-translate/core'; -import { ButtonConfig, IconButtonTypes, IqserPermissionsService, LoadingService } from '@iqser/common-ui'; +import { ButtonConfig, getCurrentUser, IconButtonTypes, IqserPermissionsService, LoadingService } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { RouterHistoryService } from '@services/router-history.service'; import { LicenseService } from '@services/license.service'; import { map } from 'rxjs/operators'; import { ROLES } from '@users/roles'; +import { User } from '@red/domain'; @Component({ templateUrl: './license-screen.component.html', @@ -14,6 +15,7 @@ import { ROLES } from '@users/roles'; }) export class LicenseScreenComponent implements OnInit { readonly roles = ROLES; + readonly currentUser = getCurrentUser(); readonly currentYear = new Date().getFullYear(); readonly buttonConfigs: readonly ButtonConfig[] = [ { diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html index 6de22c773..933e9c652 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html @@ -1,7 +1,7 @@ diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts index 4c291f5cb..05d293fe1 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { + getCurrentUser, IqserPermissionsService, ListingComponent, listingProvidersFactory, @@ -7,7 +8,7 @@ import { SortingOrders, TableColumnConfig, } from '@iqser/common-ui'; -import { PermissionsMapping } from '@red/domain'; +import { PermissionsMapping, User } from '@red/domain'; import { ConfigService } from '../config.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { EntityPermissionsService } from '@services/entity-permissions/entity-permissions.service'; @@ -30,6 +31,7 @@ import { ROLES } from '@users/roles'; }) export class PermissionsScreenComponent extends ListingComponent { readonly roles = ROLES; + readonly currentUser = getCurrentUser(); readonly translations = permissionsTranslations; readonly tableColumnConfigs: TableColumnConfig[]; readonly tableHeaderLabel = _('permissions-screen.table-header.title'); diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html index 2ffe2c917..e938ea29c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html @@ -59,14 +59,14 @@ >
-
+
{{ getDisplayRoles(user) }}
-
+
implement readonly translations = rolesTranslations; readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; + readonly roles = ROLES; readonly currentUser = this._userService.currentUser; readonly canDeleteSelected$ = this.#canDeleteSelected$; readonly tableHeaderLabel = _('user-listing.table-header.title'); @@ -101,11 +103,9 @@ export class UserListingScreenComponent extends ListingComponent implement } getDisplayRoles(user: User) { - const separator = ', '; - return ( - user.roles.map(role => this._translateService.instant(this.translations[role])).join(separator) || - this._translateService.instant(this.translations['NO_ROLE']) - ); + const oldRedRoles = user.roles.filter(role => role.startsWith('RED_')); + const translatedRoles = oldRedRoles.map(role => this._translateService.instant(this.translations[role])); + return translatedRoles.join(', ') || this._translateService.instant(this.translations['NO_ROLE']); } async toggleActive(user: User) { diff --git a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.html index ea50e904a..f9ab61fec 100644 --- a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.html @@ -16,12 +16,12 @@
(); readonly collapseTooltip = _('dossier-details.collapse'); readonly expandTooltip = _('dossier-details.expand'); readonly needsWorkFilters$ = this.filterService.getFilterModels$('needsWorkFilters'); @@ -78,7 +88,7 @@ export class DossierDetailsComponent extends ContextComponent u.has(ROLES.dossiers.write) || u.isManager).map(u => u.id); + return this._userService.all.filter(u => u.isManager).map(u => u.id); } ngOnInit() { diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index 602ee1ab4..7d305d603 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -1,6 +1,7 @@ import { Injectable, TemplateRef } from '@angular/core'; import { ActionConfig, + getCurrentUser, getParam, IFilterGroup, INestedFilter, @@ -22,6 +23,7 @@ import { IFileAttributeConfig, ProcessingType, StatusSorter, + User, WorkflowFileStatus, WorkflowFileStatuses, } from '@red/domain'; @@ -48,6 +50,7 @@ import { ROLES } from '@users/roles'; export class ConfigService { readonly listingMode$: Observable; readonly dossierId = getParam(DOSSIER_ID); + readonly currentUser = getCurrentUser(); private readonly _listingMode$ = new BehaviorSubject(ListingModes.table); constructor( @@ -155,7 +158,7 @@ export class ConfigService { label: this._translateService.instant('dossier-overview.header-actions.edit'), action: $event => this._openEditDossierDialog($event, dossierId), icon: 'iqser:edit', - hide: !this._iqserPermissionsService.has(ROLES.dossiers.edit), + hide: !this.currentUser.isManager && !this._iqserPermissionsService.has(ROLES.dossiers.edit), helpModeKey: 'edit_dossier_in_dossier', disabled$, }, diff --git a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index 9c064c31a..adc772359 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -1,12 +1,12 @@
{ private readonly _toaster: Toaster, private readonly _logger: NGXLogger, private readonly _permissionsService: PermissionsService, + private readonly _iqaerPermissionsService: IqserPermissionsService, private readonly _activeDossiersService: ActiveDossiersService, ) { super(); @@ -93,11 +96,17 @@ export class ManualRedactionService extends GenericService { addAnnotation(requests: List, dossierId: string, fileId: string, dictionaryLabel?: string) { const toast = requests[0].addToDictionary ? this.#showAddToDictionaryToast(requests, dictionaryLabel) : this.#showToast('add'); - if (this._permissionsService.isApprover(this.#dossier(dossierId))) { + const canAddRedaction = this._iqaerPermissionsService.has(ROLES.redactions.write); + if (canAddRedaction && this._permissionsService.isApprover(this.#dossier(dossierId))) { return this.add(requests, dossierId, fileId).pipe(toast); } - return this.requestAdd(requests, dossierId, fileId).pipe(toast); + const canRequestRedaction = this._iqaerPermissionsService.has(ROLES.redactions.request); + if (canRequestRedaction) { + return this.requestAdd(requests, dossierId, fileId).pipe(toast); + } + + return of(undefined); } bulkForce(requests: List, dossierId: string, fileId: string) { diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts index f77fae7ac..dcd169ed6 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts @@ -5,9 +5,10 @@ import { PermissionsService } from '../../../services/permissions.service'; import { FilePreviewStateService } from './file-preview-state.service'; import { TranslateService } from '@ngx-translate/core'; import { AnnotationActionsService } from './annotation-actions.service'; -import { BASE_HREF_FN } from '@iqser/common-ui'; +import { BASE_HREF_FN, IqserPermissionsService } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IHeaderElement } from '@red/domain'; +import { ROLES } from '@users/roles'; @Injectable() export class PdfAnnotationActionsService { @@ -17,6 +18,7 @@ export class PdfAnnotationActionsService { readonly #ngZone = inject(NgZone); readonly #convertPath = inject(BASE_HREF_FN); readonly #annotationActionsService = inject(AnnotationActionsService); + readonly #iqserPermissionsService = inject(IqserPermissionsService); get(annotations: AnnotationWrapper[]): IHeaderElement[] { const availableActions: IHeaderElement[] = []; @@ -152,7 +154,9 @@ export class PdfAnnotationActionsService { ), canAcceptRecommendation: permissions.reduce((acc, next) => acc && next.canAcceptRecommendation, true), canAcceptSuggestion: permissions.reduce((acc, next) => acc && next.canAcceptSuggestion, true), - canUndo: permissions.reduce((acc, next) => acc && next.canUndo, true), + canUndo: + this.#iqserPermissionsService.has(ROLES.redactions.deleteManual) && + permissions.reduce((acc, next) => acc && next.canUndo, true), canMarkAsFalsePositive: permissions.reduce((acc, next) => acc && next.canMarkAsFalsePositive, true), canForceRedaction: permissions.reduce((acc, next) => acc && next.canForceRedaction, true), canForceHint: permissions.reduce((acc, next) => acc && next.canForceHint, true), diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts index 3732e9767..c6ed26bb6 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts @@ -9,7 +9,7 @@ import { } from '@models/file/manual-redaction-entry.wrapper'; import { AnnotationDrawService } from '../../pdf-viewer/services/annotation-draw.service'; import { UserPreferenceService } from '@users/user-preference.service'; -import { BASE_HREF_FN, BaseHrefFn, shareDistinctLast } from '@iqser/common-ui'; +import { BASE_HREF_FN, BaseHrefFn, IqserPermissionsService, shareDistinctLast } from '@iqser/common-ui'; import { toPosition } from '../utils/pdf-calculation.utils'; import { MultiSelectService } from './multi-select.service'; import { FilePreviewStateService } from './file-preview-state.service'; @@ -28,6 +28,7 @@ import { PermissionsService } from '@services/permissions.service'; import { AnnotationsListingService } from './annotations-listing.service'; import { PdfAnnotationActionsService } from './pdf-annotation-actions.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; +import { ROLES } from '@users/roles'; import Annotation = Core.Annotations.Annotation; import Quad = Core.Math.Quad; @@ -70,6 +71,7 @@ export class PdfProxyService { private readonly _listingService: AnnotationsListingService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _dictionariesMapService: DictionariesMapService, + private readonly _iqserPermissionsService: IqserPermissionsService, ) { this.canPerformAnnotationActions$ = this.#canPerformAnnotationActions$; } @@ -240,20 +242,23 @@ export class PdfProxyService { }); } - popups.push({ - type: 'actionButton', - dataElement: TextPopups.ADD_REDACTION, - img: this.#addRedactionIcon, - title: this.#getTitle(ManualRedactionEntryTypes.REDACTION), - onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.REDACTION), - }); - popups.push({ - type: 'actionButton', - dataElement: TextPopups.ADD_DICTIONARY, - img: this.#addDictIcon, - title: this.#getTitle(ManualRedactionEntryTypes.DICTIONARY), - onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.DICTIONARY), - }); + if (this._iqserPermissionsService.has(ROLES.redactions.write) || this._iqserPermissionsService.has(ROLES.redactions.request)) { + popups.push({ + type: 'actionButton', + dataElement: TextPopups.ADD_REDACTION, + img: this.#addRedactionIcon, + title: this.#getTitle(ManualRedactionEntryTypes.REDACTION), + onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.REDACTION), + }); + + popups.push({ + type: 'actionButton', + dataElement: TextPopups.ADD_DICTIONARY, + img: this.#addDictIcon, + title: this.#getTitle(ManualRedactionEntryTypes.DICTIONARY), + onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.DICTIONARY), + }); + } this._pdf.configureTextPopups(popups); diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index fc11418ed..87104a423 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -1,10 +1,17 @@ import { AfterViewInit, Component, Inject, ViewChild } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Dossier } from '@red/domain'; +import { Dossier, User } from '@red/domain'; import { EditDossierGeneralInfoComponent } from './general-info/edit-dossier-general-info.component'; import { EditDossierDownloadPackageComponent } from './download-package/edit-dossier-download-package.component'; import { EditDossierSectionInterface } from './edit-dossier-section.interface'; -import { BaseDialogComponent, ConfirmOptions, IconButtonTypes, IqserPermissionsService, SaveOptions } from '@iqser/common-ui'; +import { + BaseDialogComponent, + ConfirmOptions, + getCurrentUser, + IconButtonTypes, + IqserPermissionsService, + SaveOptions, +} from '@iqser/common-ui'; import { EditDossierDictionaryComponent } from './dictionary/edit-dossier-dictionary.component'; import { EditDossierAttributesComponent } from './attributes/edit-dossier-attributes.component'; @@ -42,6 +49,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A @ViewChild(EditDossierDictionaryComponent) dictionaryComponent: EditDossierDictionaryComponent; @ViewChild(EditDossierTeamComponent) membersComponent: EditDossierTeamComponent; @ViewChild(EditDossierAttributesComponent) attributesComponent: EditDossierAttributesComponent; + readonly #currentUser = getCurrentUser(); private _dossier: Dossier; constructor( @@ -89,7 +97,9 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A get showActionButtons(): boolean { return ( - (['members'].includes(this.activeNav) && this._iqserPermissionsService.has(ROLES.dossiers.edit)) || + (['members'].includes(this.activeNav) && + this.#currentUser.isManager && + this._iqserPermissionsService.has(ROLES.dossiers.edit)) || this._permissionsService.canEditDossier(this._dossier) ); } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index 813cbb526..717f2cc8e 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { UserService } from '@users/user.service'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; -import { Dossier, IDossierRequest } from '@red/domain'; +import { Dossier, IDossierRequest, User } from '@red/domain'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; import { PermissionsService } from '@services/permissions.service'; import { DossiersService } from '@services/dossiers/dossiers.service'; import { compareLists } from '@utils/functions'; import { FilesService } from '@services/files/files.service'; -import { ROLES } from '@users/roles'; +import { getCurrentUser } from '@iqser/common-ui'; @Component({ selector: 'redaction-edit-dossier-team', @@ -23,9 +23,9 @@ export class EditDossierTeamComponent implements EditDossierSectionInterface, On @Input() dossier: Dossier; membersSelectOptions: string[] = []; - - readonly ownersSelectOptions = this.userService.all.filter(u => u.has(ROLES.dossiers.write) || u.isManager).map(m => m.id); + readonly ownersSelectOptions = this.userService.all.filter(u => u.isManager).map(m => m.id); readonly selectedReviewers$ = new BehaviorSubject([]); + readonly #currentUser = getCurrentUser(); constructor( readonly userService: UserService, @@ -138,7 +138,7 @@ export class EditDossierTeamComponent implements EditDossierSectionInterface, On } setMembersSelectOptions(value = this.searchQuery): void { - const possibleMembers = this.userService.all.filter(user => user.has(ROLES.dossiers.read) || user.isUser || user.isManager); + const possibleMembers = this.userService.all.filter(user => user.isUser || user.isManager); this.membersSelectOptions = possibleMembers .filter(user => this.userService.getName(user.id).toLowerCase().includes(value.toLowerCase())) .filter(user => this.selectedOwnerId !== user.id) diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html index f70356724..77d431388 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html @@ -19,7 +19,7 @@ (); @Input() memberIds: List; @Input() perLine: number; diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index a6d4e0a92..103d8a0c1 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -23,14 +23,19 @@ export class PermissionsService { return this.isAdmin() || this.isManager(); } + canPerformDossierStatesActions() { + return this.isAdmin() && this._iqserPermissionsService.has(ROLES.states.write); + } + canEditEntities(): boolean { - return this._iqserPermissionsService.has(ROLES.dictionaryTypes.write); + return this._iqserPermissionsService.has(ROLES.dictionaryTypes.write) && this.isAdmin(); } canDeleteEntities(entity: Dictionary | Dictionary[]): boolean { const entities = entity instanceof Dictionary ? [entity] : entity; return ( entities.length && + this.isAdmin() && this._iqserPermissionsService.has(ROLES.dictionaryTypes.delete) && entities.reduce((acc, _entity) => this._canDeleteEntity(_entity) && acc, true) ); @@ -239,7 +244,10 @@ export class PermissionsService { } canSoftDeleteDossier(dossier: IDossier): boolean { - return this._iqserPermissionsService.has(ROLES.dossiers.delete) && (this.isOwner(dossier) || this.isDossierMember(dossier)); + return ( + this._iqserPermissionsService.has(ROLES.dossiers.delete) && + (this.isOwner(dossier) || (this.isManager() && this.isDossierMember(dossier))) + ); } canHardDeleteDossier(dossier: IDossier): boolean { @@ -251,7 +259,7 @@ export class PermissionsService { } canCreateDossier(dossierTemplate: DossierTemplate | DashboardStats): boolean { - return this._iqserPermissionsService.has(ROLES.dossiers.write) && dossierTemplate.isActive; + return this._iqserPermissionsService.has(ROLES.dossiers.write) && this.isManager() && dossierTemplate.isActive; } canArchiveDossier(dossier: Dossier): boolean { @@ -264,7 +272,7 @@ export class PermissionsService { } canEditDossier(dossier: Dossier): boolean { - return this._iqserPermissionsService.has(ROLES.dossiers.edit) && !!dossier?.ownerId; + return this._iqserPermissionsService.has(ROLES.dossiers.edit) && this.isManager() && !!dossier?.ownerId; } canEditDossierDictionary(dossier: Dossier): boolean { @@ -276,7 +284,7 @@ export class PermissionsService { } canEditTeamMembers(): boolean { - return this._iqserPermissionsService.has(ROLES.dossiers.edit); + return this._iqserPermissionsService.has(ROLES.dossiers.edit) && this.isManager(); } isAdmin(): boolean { diff --git a/apps/red-ui/src/app/users/roles.ts b/apps/red-ui/src/app/users/roles.ts index 49245a57d..26bb7c4bc 100644 --- a/apps/red-ui/src/app/users/roles.ts +++ b/apps/red-ui/src/app/users/roles.ts @@ -2,15 +2,15 @@ export const ROLES = { RED_CREATE_TENANT: 'red-create-tenant', RED_DEPLOYMENT_INFO: 'red-deployment-info', RED_GET_TENANTS: 'red-get-tenants', - RED_MANAGE_USER_PREFERENCES: 'red-manage-user-preferences', RED_PROCESS_DOWNLOAD: 'red-process-download', RED_PROCESS_MANUAL_REDACTION_REQUEST: 'red-process-manual-redaction-request', RED_READ_RULES: 'red-read-rules', RED_READ_VERSIONS: 'red-read-versions', RED_REINDEX: 'red-reindex', RED_ROTATE_PAGE: 'red-rotate-page', - RED_UPDATE_MY_PROFILE: 'red-update-my-profile', RED_WRITE_RULES: 'red-write-rules', + managePreferences: 'red-manage-user-preferences', + updateMyProfile: 'red-update-my-profile', getRss: 'red-get-rss', excludeIncludeFile: 'red-exclude-include-file', excludeIncludePages: 'red-exclude-include-pages', diff --git a/apps/red-ui/src/app/users/user.service.ts b/apps/red-ui/src/app/users/user.service.ts index 1970b7f49..6f1bf439b 100644 --- a/apps/red-ui/src/app/users/user.service.ts +++ b/apps/red-ui/src/app/users/user.service.ts @@ -17,7 +17,7 @@ export class UserService extends IqserUserService { this._permissionsService.add({ [ROLES.any]: (permission, all) => { console.log('all roles: ', Object.keys(all)); - return Object.keys(all).some(key => key.startsWith('red-')); + return Object.keys(all).some(key => key.startsWith('red-') || key.startsWith('RED_')); }, });