From 9f781853a7ab10f2a925732c025f1a7676a4a5d3 Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Tue, 12 Dec 2023 17:51:40 +0200 Subject: [PATCH] Resolving role naming conflicts --- .../eudat/service/keycloak/KeycloakRole.java | 2 +- .../main/resources/config/keycloak-devel.yml | 9 +++------ .../src/main/resources/config/permissions.yml | 18 +++++++++--------- .../src/app/core/common/enum/app-role.ts | 2 +- .../services/utilities/enum-utils.service.ts | 2 +- .../dataset-profile/dataset-profile.routing.ts | 12 ++++++------ .../user-role-editor.component.html | 2 +- .../user-role-editor.component.scss | 2 +- .../src/app/ui/sidebar/sidebar.component.ts | 2 +- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakRole.java b/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakRole.java index 35ac0c191..bb509ed57 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakRole.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakRole.java @@ -2,6 +2,6 @@ package eu.eudat.service.keycloak; public enum KeycloakRole { - Admin, DatasetTemplateEditor, DatasetProfileManager, Manager, User + Admin, DescriptionTemplateEditor, Manager, User } diff --git a/dmp-backend/web/src/main/resources/config/keycloak-devel.yml b/dmp-backend/web/src/main/resources/config/keycloak-devel.yml index ad206360c..83303e735 100644 --- a/dmp-backend/web/src/main/resources/config/keycloak-devel.yml +++ b/dmp-backend/web/src/main/resources/config/keycloak-devel.yml @@ -9,9 +9,6 @@ keycloak-resources: Manager: groupId: 1753f7a7-cedb-4ad4-ae5f-96fe9bdabe3e groupTitle: role-manager - DatasetProfileManager: - groupId: 969aa109-9c4d-4f12-ba9b-4a84b2e5a394 - groupTitle: role-dataset-template-editor - DatasetTemplateEditor: - groupId: 969aa109-9c4d-4f12-ba9b-4a84b2e5a394 - groupTitle: role-dataset-template-editor \ No newline at end of file + DescriptionTemplateEditor: + groupId: b0ea3cf3-21b0-4c6b-9c42-fb09f0e09dbb + groupTitle: role-description-template-editor \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/config/permissions.yml b/dmp-backend/web/src/main/resources/config/permissions.yml index f94abab73..3c3ef5dad 100644 --- a/dmp-backend/web/src/main/resources/config/permissions.yml +++ b/dmp-backend/web/src/main/resources/config/permissions.yml @@ -13,9 +13,9 @@ permissions: clients: [ ] allowAnonymous: false allowAuthenticated: false - DatasetProfileManagerRole: + DescriptionTemplateEditorRole: roles: - - DatasetProfileManager + - DescriptionTemplateEditor clients: [ ] allowAnonymous: false allowAuthenticated: false @@ -244,21 +244,21 @@ permissions: BrowseDescriptionTemplate: roles: - Admin - - DatasetProfileManager + - DescriptionTemplateEditor clients: [ ] allowAnonymous: false allowAuthenticated: false EditDescriptionTemplate: roles: - Admin - - DatasetProfileManager + - DescriptionTemplateEditor clients: [ ] allowAnonymous: false allowAuthenticated: false DeleteDescriptionTemplate: roles: - Admin - - DatasetProfileManager + - DescriptionTemplateEditor claims: [ ] clients: [ ] allowAnonymous: false @@ -266,7 +266,7 @@ permissions: CloneDescriptionTemplate: roles: - Admin - - DatasetProfileManager + - DescriptionTemplateEditor claims: [ ] clients: [ ] allowAnonymous: false @@ -274,7 +274,7 @@ permissions: CreateNewVersionDescriptionTemplate: roles: - Admin - - DatasetProfileManager + - DescriptionTemplateEditor claims: [ ] clients: [ ] allowAnonymous: false @@ -282,7 +282,7 @@ permissions: ImportDescriptionTemplate: roles: - Admin - - DatasetProfileManager + - DescriptionTemplateEditor claims: [ ] clients: [ ] allowAnonymous: false @@ -290,7 +290,7 @@ permissions: ExportDescriptionTemplate: roles: - Admin - - DatasetProfileManager + - DescriptionTemplateEditor claims: [ ] clients: [ ] allowAnonymous: false diff --git a/dmp-frontend/src/app/core/common/enum/app-role.ts b/dmp-frontend/src/app/core/common/enum/app-role.ts index a08ce00a1..b5fbdc70f 100644 --- a/dmp-frontend/src/app/core/common/enum/app-role.ts +++ b/dmp-frontend/src/app/core/common/enum/app-role.ts @@ -2,5 +2,5 @@ export enum AppRole { Admin = "Admin", Manager = "Manager", User = "User", - DatasetTemplateEditor = "DatasetProfileManager" + DescriptionTemplateEditor = "DescriptionTemplateEditor" } diff --git a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts index 19573da24..be8df9173 100644 --- a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts +++ b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts @@ -58,7 +58,7 @@ export class EnumUtils { case AppRole.Admin: return this.language.instant('TYPES.APP-ROLE.ADMIN'); case AppRole.User: return this.language.instant('TYPES.APP-ROLE.USER'); case AppRole.Manager: return this.language.instant('TYPES.APP-ROLE.MANAGER'); - case AppRole.DatasetTemplateEditor: return this.language.instant('TYPES.APP-ROLE.DESCRIPTION-TEMPLATE-EDITOR'); + case AppRole.DescriptionTemplateEditor: return this.language.instant('TYPES.APP-ROLE.DESCRIPTION-TEMPLATE-EDITOR'); } } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.routing.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.routing.ts index 1bf042f25..9d8f971a7 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.routing.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.routing.ts @@ -14,7 +14,7 @@ const routes: Routes = [ data: { title: 'GENERAL.TITLES.DATASET-PROFILES-NEW', authContext: { - permissions: [AppRole.Admin, AppRole.DatasetTemplateEditor] + permissions: [AppRole.Admin, AppRole.DescriptionTemplateEditor] } }, canActivate: [SpecialAuthGuard], @@ -26,7 +26,7 @@ const routes: Routes = [ data: { title: 'GENERAL.TITLES.DATASET-PROFILES-EDIT', authContext: { - permissions: [AppRole.Admin, AppRole.DatasetTemplateEditor] + permissions: [AppRole.Admin, AppRole.DescriptionTemplateEditor] } }, canActivate: [SpecialAuthGuard], @@ -38,7 +38,7 @@ const routes: Routes = [ data: { title: 'GENERAL.TITLES.DATASET-PROFILES-CLONE', authContext: { - permissions: [AppRole.Admin, AppRole.DatasetTemplateEditor] + permissions: [AppRole.Admin, AppRole.DescriptionTemplateEditor] } }, canActivate: [SpecialAuthGuard], @@ -50,7 +50,7 @@ const routes: Routes = [ data: { title: 'GENERAL.TITLES.DATASET-PROFILES-NEW-VERSION', authContext: { - permissions: [AppRole.Admin, AppRole.DatasetTemplateEditor] + permissions: [AppRole.Admin, AppRole.DescriptionTemplateEditor] } }, canActivate: [SpecialAuthGuard], @@ -61,7 +61,7 @@ const routes: Routes = [ component: DatasetProfileListingComponent, data: { authContext: { - permissions: [AppRole.Admin, AppRole.DatasetTemplateEditor] + permissions: [AppRole.Admin, AppRole.DescriptionTemplateEditor] } }, canActivate: [SpecialAuthGuard] @@ -71,7 +71,7 @@ const routes: Routes = [ component: DatasetProfileListingComponent, data: { authContext: { - permissions: [AppRole.Admin, AppRole.DatasetTemplateEditor] + permissions: [AppRole.Admin, AppRole.DescriptionTemplateEditor] } }, canActivate: [SpecialAuthGuard] diff --git a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html index d97099255..91819b19c 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html @@ -2,7 +2,7 @@
- + {{enumUtils.toAppRoleString(role)}}
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss index 47399e7d4..e551c69e1 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss @@ -85,7 +85,7 @@ padding-right: 10px; } - .dataset-template-editor { + .description-template-editor { // display: flex; // justify-content: center; // align-items: center; diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index 554cf7617..226327617 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -159,7 +159,7 @@ export class SidebarComponent implements OnInit { title: 'SIDE-BAR.ADMIN', routes: DATASET_TEMPLATE_ROUTES, requiresAuthentication: true, - requiresSpecialPermission: AppRole.DatasetTemplateEditor, + requiresSpecialPermission: AppRole.DescriptionTemplateEditor, requiresAdmin: false, isGeneral: false }