Skip to content

[PROD RELEASE] - release pm1093 #1642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

[PROD RELEASE] - release pm1093 #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/components/ChallengesComponent/ChallengeList/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The import statement has been updated to include checkManager. Ensure that checkManager is used appropriately in the code where necessary, and verify that it is defined and exported correctly from ../../../util/tc.


require('bootstrap/scss/bootstrap.scss')

Expand Down Expand Up @@ -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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider checking if checkManager function is defined and imported correctly to ensure it works as expected.

const loginUserId = this.props.auth.user.userId
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure userId is a valid property of this.props.auth.user. Consider adding error handling if userId might be undefined.

const isMemberOfActiveProject = activeProject && activeProject.members && activeProject.members.some(member => member.userId === loginUserId)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a null check for activeProject.members before calling .some() to prevent potential runtime errors if members is undefined.


if (warnMessage) {
return <Message warnMessage={warnMessage} />
Expand Down Expand Up @@ -496,6 +499,8 @@ class ChallengeList extends Component {
currentBillingAccount={currentBillingAccount}
updateProject={updateProject}
projectId={activeProject.id}
isMemberOfActiveProject={isMemberOfActiveProject}
isManager={isManager}
/>
</div>
) : (
Expand Down
12 changes: 8 additions & 4 deletions src/components/UpdateBillingAccount/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ const UpdateBillingAccount = ({
isAdmin,
currentBillingAccount,
projectId,
updateProject
updateProject,
isMemberOfActiveProject,
isManager
}) => {
const [isEditing, setIsEditing] = useState(false)
const [selectedBillingAccount, setSelectedBillingAccount] = useState(null)
Expand Down Expand Up @@ -129,7 +131,7 @@ const UpdateBillingAccount = ({
!currentBillingAccount && (
<Fragment>
<span className={styles.error}>No Billing Account set</span>
{isAdmin && (
{(isAdmin || (isManager && isMemberOfActiveProject)) && (
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition (isAdmin || (isManager && isMemberOfActiveProject)) could be simplified or clarified for better readability. Consider refactoring or adding parentheses to make the logic more explicit.

<span>
{' '}
({' '}
Expand All @@ -153,7 +155,7 @@ const UpdateBillingAccount = ({
>
{isBillingAccountExpired ? 'INACTIVE' : 'ACTIVE'}
</span>{' '}
{isAdmin && (
{(isAdmin || (isManager && isMemberOfActiveProject)) && (
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition (isManager && isMemberOfActiveProject) has been added to the existing isAdmin check. Ensure that this logic aligns with the intended functionality and that both conditions are necessary for displaying the span. If this change is meant to alter access control, verify that the roles and project membership are correctly handled elsewhere in the code.

<span>
{' '}
({' '}
Expand Down Expand Up @@ -187,7 +189,9 @@ UpdateBillingAccount.propTypes = {
isBillingAccountExpired: PropTypes.bool,
isAdmin: PropTypes.bool,
projectId: PropTypes.number,
updateProject: PropTypes.func.isRequired
updateProject: PropTypes.func.isRequired,
isMemberOfActiveProject: PropTypes.bool.isRequired,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The isMemberOfActiveProject prop is marked as isRequired, but ensure that this prop is always provided where UpdateBillingAccount is used, otherwise it could lead to runtime errors.

isManager: PropTypes.bool.isRequired
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The isManager prop is marked as isRequired, but ensure that this prop is always provided where UpdateBillingAccount is used, otherwise it could lead to runtime errors.

}

export default UpdateBillingAccount