diff options
author | Ryan T. Baldwin | 2024-05-09 19:59:00 +0000 |
---|---|---|
committer | Ryan T. Baldwin | 2024-05-13 12:12:03 +0000 |
commit | 2b83877f59ce547e845f0629321acfb4ab286251 (patch) | |
tree | f47a58853f6d040ddcbf0248b7616320dfd648ce | |
parent | b1531de45d58aeaf23f4988bbc39b002c3ba0051 (diff) | |
download | org.eclipse.osee-2b83877f59ce547e845f0629321acfb4ab286251.tar.gz org.eclipse.osee-2b83877f59ce547e845f0629321acfb4ab286251.tar.xz org.eclipse.osee-2b83877f59ce547e845f0629321acfb4ab286251.zip |
feature[TW26318]: Add CI and MIM admin roles
Change-Id: Idf5dcbcbed29dee4943bded0d009efd2da361b8d
8 files changed, 74 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CIUserGroups.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CIUserGroups.java new file mode 100644 index 00000000000..0fc71295b0d --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CIUserGroups.java @@ -0,0 +1,22 @@ +/********************************************************************* + * Copyright (c) 2024 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ +package org.eclipse.osee.framework.core.enums; + +import org.eclipse.osee.framework.core.data.IUserGroupArtifactToken; +import org.eclipse.osee.framework.core.data.UserGroupArtifactToken; + +public class CIUserGroups { + + public static final IUserGroupArtifactToken CIAdmin = UserGroupArtifactToken.valueOf(11563063L, "CI Admin"); + +} diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoUsers.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoUsers.java index 447b3bb6cd0..c8c074e8c9e 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoUsers.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoUsers.java @@ -13,12 +13,14 @@ package org.eclipse.osee.framework.core.enums; +import static org.eclipse.osee.framework.core.enums.CIUserGroups.CIAdmin; import static org.eclipse.osee.framework.core.enums.CoreUserGroups.AccountAdmin; import static org.eclipse.osee.framework.core.enums.CoreUserGroups.AgileUser; import static org.eclipse.osee.framework.core.enums.CoreUserGroups.DefaultArtifactEditor; import static org.eclipse.osee.framework.core.enums.CoreUserGroups.EarnedValueUser; import static org.eclipse.osee.framework.core.enums.CoreUserGroups.OseeAccessAdmin; import static org.eclipse.osee.framework.core.enums.CoreUserGroups.OseeAdmin; +import static org.eclipse.osee.framework.core.enums.MimUserGroups.MimAdmin; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -36,8 +38,9 @@ public class DemoUsers implements BootstrapUserProvider { public static List<UserToken> values = new ArrayList<UserToken>(); - public static final UserToken Joe_Smith = create(61106791L, "Joe Smith", "joe@google.com", "3333", true, - Arrays.asList("3333"), AgileUser, EarnedValueUser, DefaultArtifactEditor, AccountAdmin, OseeAccessAdmin); + public static final UserToken Joe_Smith = + create(61106791L, "Joe Smith", "joe@google.com", "3333", true, Arrays.asList("3333"), AgileUser, EarnedValueUser, + DefaultArtifactEditor, AccountAdmin, OseeAccessAdmin, MimAdmin, CIAdmin); public static final UserToken Kay_Jones = create(5896672L, "Kay Jones", "kay@google.com", "4444", true, AgileUser, EarnedValueUser); diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/MimUserGroups.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/MimUserGroups.java new file mode 100644 index 00000000000..8683fba8e6f --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/MimUserGroups.java @@ -0,0 +1,22 @@ +/********************************************************************* + * Copyright (c) 2024 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ +package org.eclipse.osee.framework.core.enums; + +import org.eclipse.osee.framework.core.data.IUserGroupArtifactToken; +import org.eclipse.osee.framework.core.data.UserGroupArtifactToken; + +public class MimUserGroups { + + public static final IUserGroupArtifactToken MimAdmin = UserGroupArtifactToken.valueOf(11563064L, "MIM Admin"); + +} diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java index 26322f74087..b82d0331a79 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/CreateSystemBranches.java @@ -27,10 +27,12 @@ import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.data.UserId; import org.eclipse.osee.framework.core.data.UserService; import org.eclipse.osee.framework.core.data.UserToken; +import org.eclipse.osee.framework.core.enums.CIUserGroups; import org.eclipse.osee.framework.core.enums.CoreArtifactTokens; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.CoreUserGroups; +import org.eclipse.osee.framework.core.enums.MimUserGroups; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; @@ -92,6 +94,8 @@ public class CreateSystemBranches { tx.createArtifact(userGroupsFolder, CoreUserGroups.AccountAdmin); tx.createArtifact(userGroupsFolder, CoreUserGroups.OseeAccessAdmin); tx.createArtifact(userGroupsFolder, CoreUserGroups.Publishing); + tx.createArtifact(userGroupsFolder, MimUserGroups.MimAdmin); + tx.createArtifact(userGroupsFolder, CIUserGroups.CIAdmin); ArtifactToken prefArt = orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andId( CoreArtifactTokens.GlobalPreferences).getArtifactOrSentinal(); @@ -117,6 +121,12 @@ public class CreateSystemBranches { if (!roles.contains(CoreUserGroups.OseeAccessAdmin)) { roles.add(CoreUserGroups.OseeAccessAdmin); } + if (!roles.contains(MimUserGroups.MimAdmin)) { + roles.add(MimUserGroups.MimAdmin); + } + if (!roles.contains(CIUserGroups.CIAdmin)) { + roles.add(CIUserGroups.CIAdmin); + } UserToken userWithRoles = UserToken.create(superUser.getId(), superUser.getName(), superUser.getEmail(), superUser.getUserId(), true, superUser.getLoginIds(), roles); diff --git a/web/apps/osee/src/app/auth/user-data-account.service.ts b/web/apps/osee/src/app/auth/user-data-account.service.ts index 3484cc21f05..f218a161482 100644 --- a/web/apps/osee/src/app/auth/user-data-account.service.ts +++ b/web/apps/osee/src/app/auth/user-data-account.service.ts @@ -50,7 +50,15 @@ export class UserDataAccountService { uuid: 0, roles: [ { - id: '52247', + id: UserRoles.CI_ADMIN, + name: 'CI Admin', + }, + { + id: UserRoles.MIM_ADMIN, + name: 'MIM Admin', + }, + { + id: UserRoles.OSEE_ADMIN, name: 'Osee Admin', }, ], diff --git a/web/apps/osee/src/app/ci-dashboard/lib/navigation/ci-dashboard-navigation-structure.ts b/web/apps/osee/src/app/ci-dashboard/lib/navigation/ci-dashboard-navigation-structure.ts index 2faa13bd9e6..188124db88f 100644 --- a/web/apps/osee/src/app/ci-dashboard/lib/navigation/ci-dashboard-navigation-structure.ts +++ b/web/apps/osee/src/app/ci-dashboard/lib/navigation/ci-dashboard-navigation-structure.ts @@ -100,7 +100,7 @@ export const ciNavigationStructure: navigationElement[] = [ pageTitle: 'OSEE - Continuous Integration', isDropdown: false, isDropdownOpen: false, - requiredRoles: [UserRoles.OSEE_ADMIN], + requiredRoles: [UserRoles.CI_ADMIN], routerLink: '/ci/import', icon: '', description: '', diff --git a/web/apps/osee/src/app/layout/lib/navigation/top-level-navigation/top-level-navigation-structure.ts b/web/apps/osee/src/app/layout/lib/navigation/top-level-navigation/top-level-navigation-structure.ts index fffd8362e03..b6176993bd9 100644 --- a/web/apps/osee/src/app/layout/lib/navigation/top-level-navigation/top-level-navigation-structure.ts +++ b/web/apps/osee/src/app/layout/lib/navigation/top-level-navigation/top-level-navigation-structure.ts @@ -198,7 +198,7 @@ export const navigationStructure: navigationElement[] = [ pageTitle: 'MIM - Transport Type Manager', isDropdown: false, isDropdownOpen: false, - requiredRoles: [UserRoles.OSEE_ADMIN], + requiredRoles: [UserRoles.MIM_ADMIN], routerLink: '/ple/messaging/transports', icon: 'timeline', description: '', @@ -210,7 +210,7 @@ export const navigationStructure: navigationElement[] = [ pageTitle: 'MIM - Import', isDropdown: false, isDropdownOpen: false, - requiredRoles: [UserRoles.OSEE_ADMIN], + requiredRoles: [UserRoles.MIM_ADMIN], routerLink: '/ple/messaging/import', icon: 'cloud_upload', description: '', @@ -222,7 +222,7 @@ export const navigationStructure: navigationElement[] = [ pageTitle: 'MIM - Enum List Configuration', isDropdown: false, isDropdownOpen: false, - requiredRoles: [UserRoles.OSEE_ADMIN], + requiredRoles: [UserRoles.MIM_ADMIN], routerLink: '/ple/messaging/lists', icon: 'view_list', description: '', diff --git a/web/apps/osee/src/app/shared/types/auth/user-roles.ts b/web/apps/osee/src/app/shared/types/auth/user-roles.ts index 53f0d7f9725..3f61da8bdba 100644 --- a/web/apps/osee/src/app/shared/types/auth/user-roles.ts +++ b/web/apps/osee/src/app/shared/types/auth/user-roles.ts @@ -11,5 +11,7 @@ * Boeing - initial API and implementation **********************************************************************/ export enum UserRoles { + CI_ADMIN = '11563063', + MIM_ADMIN = '11563064', OSEE_ADMIN = '52247', } |