From 5013f7b8d8bf3de3526c191cff6e04e542b430d3 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 2 Apr 2025 21:39:45 +0200 Subject: [PATCH 1/4] fix: allow PM to edit project members --- .circleci/config.yml | 2 +- src/permissions/constants.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1acd4a4c..0158411f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,7 +149,7 @@ workflows: context : org-global filters: branches: - only: ['develop', 'migration-setup'] + only: ['develop', 'migration-setup', 'pm-971_1'] - deployProd: context : org-global filters: diff --git a/src/permissions/constants.js b/src/permissions/constants.js index eb9a45c8..fd6f1c2f 100644 --- a/src/permissions/constants.js +++ b/src/permissions/constants.js @@ -384,7 +384,7 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export group: 'Project Member', description: 'Who can update project members with "customer" role.', }, - topcoderRoles: TOPCODER_ROLES_ADMINS, + topcoderRoles: [...TOPCODER_ROLES_ADMINS, USER_ROLE.PROJECT_MANAGER], projectRoles: [ ...PROJECT_ROLES_MANAGEMENT, PROJECT_MEMBER_ROLE.COPILOT, @@ -398,7 +398,7 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export group: 'Project Member', description: 'Who can update project members with non "customer" role.', }, - topcoderRoles: TOPCODER_ROLES_ADMINS, + topcoderRoles: [...TOPCODER_ROLES_ADMINS, USER_ROLE.PROJECT_MANAGER], projectRoles: PROJECT_ROLES_MANAGEMENT, scopes: SCOPES_PROJECT_MEMBERS_WRITE, }, From 9502ce5ccaaf5e51c20a3666c98a32bd8e981612 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 2 Apr 2025 22:09:06 +0200 Subject: [PATCH 2/4] fix: allow PM to edit project members --- src/permissions/constants.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/permissions/constants.js b/src/permissions/constants.js index fd6f1c2f..0bdfc934 100644 --- a/src/permissions/constants.js +++ b/src/permissions/constants.js @@ -364,7 +364,7 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export group: 'Project Member', description: 'Who can add themselves as project members.', }, - topcoderRoles: TOPCODER_ROLES_MANAGERS_AND_ADMINS, + topcoderRoles: [...TOPCODER_ROLES_MANAGERS_AND_ADMINS, USER_ROLE.PROJECT_MANAGER], scopes: SCOPES_PROJECT_MEMBERS_WRITE, }, @@ -374,7 +374,7 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export group: 'Project Member', description: 'Who can add other users as project members.', }, - topcoderRoles: TOPCODER_ROLES_ADMINS, + topcoderRoles: [...TOPCODER_ROLES_ADMINS, USER_ROLE.PROJECT_MANAGER], scopes: SCOPES_PROJECT_MEMBERS_WRITE, }, From e8fb805ba9e9123c19f70eac2d444ff785d96d0b Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 2 Apr 2025 23:32:40 +0200 Subject: [PATCH 3/4] fix: allow PM to delete users from project --- src/permissions/constants.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/permissions/constants.js b/src/permissions/constants.js index 0bdfc934..17585d30 100644 --- a/src/permissions/constants.js +++ b/src/permissions/constants.js @@ -409,7 +409,7 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export group: 'Project Member', description: 'Who can delete project members with "customer" role.', }, - topcoderRoles: TOPCODER_ROLES_ADMINS, + topcoderRoles: [...TOPCODER_ROLES_ADMINS, USER_ROLE.PROJECT_MANAGER], projectRoles: [ ...PROJECT_ROLES_MANAGEMENT, PROJECT_MEMBER_ROLE.COPILOT, @@ -423,7 +423,7 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export group: 'Project Member', description: 'Who can delete project members with some topcoder role like "manager" etc.', }, - topcoderRoles: TOPCODER_ROLES_ADMINS, + topcoderRoles: [...TOPCODER_ROLES_ADMINS, USER_ROLE.PROJECT_MANAGER], projectRoles: PROJECT_ROLES_MANAGEMENT, scopes: SCOPES_PROJECT_MEMBERS_WRITE, }, @@ -437,6 +437,7 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export topcoderRoles: [ ...TOPCODER_ROLES_ADMINS, USER_ROLE.COPILOT_MANAGER, + USER_ROLE.PROJECT_MANAGER, ], projectRoles: [ ...PROJECT_ROLES_MANAGEMENT, From 15a8a5aac815445c87321175266de618fa8bf8bd Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 2 Apr 2025 23:53:48 +0200 Subject: [PATCH 4/4] removed extra circle config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0158411f..1acd4a4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,7 +149,7 @@ workflows: context : org-global filters: branches: - only: ['develop', 'migration-setup', 'pm-971_1'] + only: ['develop', 'migration-setup'] - deployProd: context : org-global filters: