fix(PM-574): show update/add billing address for project manager who belongs to the project #1640
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -25,7 +25,7 @@ import Loader from '../../Loader' | |||
| import UpdateBillingAccount from '../../UpdateBillingAccount' | |||
|
|
|||
| import { CHALLENGE_STATUS, PAGE_SIZE, PAGINATION_PER_PAGE_OPTIONS, PROJECT_ROLES } from '../../../config/constants' | |||
| import { checkAdmin, checkReadOnlyRoles } from '../../../util/tc' | |||
| import { checkAdmin, checkManager, checkReadOnlyRoles } from '../../../util/tc' | |||
There was a problem hiding this comment.
The function checkManager is newly imported, but it is not used anywhere in the current diff. Ensure that checkManager is utilized appropriately in the code where necessary, or remove the import if it is not needed.
| @@ -406,6 +406,9 @@ class ChallengeList extends Component { | |||
| } = this.props | |||
| const isReadOnly = checkReadOnlyRoles(this.props.auth.token) || loginUserRoleInProject === PROJECT_ROLES.READ | |||
| const isAdmin = checkAdmin(this.props.auth.token) | |||
| const isManager = checkManager(this.props.auth.token) | |||
There was a problem hiding this comment.
checkManager function usage is introduced here, but ensure that this function is defined and imported correctly to avoid runtime errors.
| @@ -406,6 +406,9 @@ class ChallengeList extends Component { | |||
| } = this.props | |||
| const isReadOnly = checkReadOnlyRoles(this.props.auth.token) || loginUserRoleInProject === PROJECT_ROLES.READ | |||
| const isAdmin = checkAdmin(this.props.auth.token) | |||
| const isManager = checkManager(this.props.auth.token) | |||
| const loginUserId = this.props.auth.user.userId | |||
| const isMemberOfActiveProject = activeProject && activeProject.members && activeProject.members.some(member => member.userId === loginUserId) | |||
There was a problem hiding this comment.
Consider adding a null check for activeProject.members to prevent potential runtime errors if members is undefined.
| @@ -129,7 +131,7 @@ const UpdateBillingAccount = ({ | |||
| !currentBillingAccount && ( | |||
| <Fragment> | |||
| <span className={styles.error}>No Billing Account set</span> | |||
| {isAdmin && ( | |||
| {(isAdmin || (isManager && isMemberOfActiveProject)) && ( | |||
There was a problem hiding this comment.
Consider adding a comment to explain the logic behind the condition (isAdmin || (isManager && isMemberOfActiveProject)) to improve code readability.
| @@ -153,7 +155,7 @@ const UpdateBillingAccount = ({ | |||
| > | |||
| {isBillingAccountExpired ? 'INACTIVE' : 'ACTIVE'} | |||
| </span>{' '} | |||
| {isAdmin && ( | |||
| {(isAdmin || (isManager && isMemberOfActiveProject)) && ( | |||
There was a problem hiding this comment.
Consider adding a test case to ensure that the condition (isAdmin || (isManager && isMemberOfActiveProject)) behaves as expected in different scenarios. This will help prevent any future regressions.
What's in this PR?