Skip to content

Sync Master into develop #1645

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.

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 12 commits into from
Apr 24, 2025
Merged

Sync Master into develop #1645

merged 12 commits into from
Apr 24, 2025

Conversation

kkartunov
Copy link
Contributor

No description provided.

jmgasper and others added 12 commits November 9, 2023 08:25
Standardised skills and minor fixes
Fix bug where copilots can't assign tasks to themselves, even before activation
Update the URL for saving skills
PROD HOTFIX - Handle strings or booleans for `show_data_dashboard` flag
PROD - Support dashboard checkbox for code challenges
Switch how we save the challenge (PS-263)
PROD Release - Work Manager Security Issues (5442)
[RELEASE] PM-413 - Deprecate Connect (5443)
PROD RELEASE - Features and fixes in WM related to deprecating Connect & Submission Review UI apps
[PROD RELEASE] - WorkManager Changes - Connect Decommission
@kkartunov kkartunov merged commit 00f7089 into develop Apr 24, 2025
6 checks passed
@@ -129,7 +131,7 @@ const UpdateBillingAccount = ({
!currentBillingAccount && (
<Fragment>
<span className={styles.error}>No Billing Account set</span>
{isAdmin && (
{(isAdmin || (isManager && isMemberOfActiveProject)) && (

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)) has been added. Ensure that this logic is correct and that it reflects the intended access control. Consider whether this change could inadvertently restrict or broaden access compared to the previous condition isAdmin.

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

Choose a reason for hiding this comment

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

Consider extracting the condition (isAdmin || (isManager && isMemberOfActiveProject)) into a well-named variable to improve readability and maintainability of the code.

@@ -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,

Choose a reason for hiding this comment

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

The isMemberOfActiveProject prop type should be PropTypes.bool instead of PropTypes.bool.isRequired. The .isRequired should be applied to PropTypes.bool, like this: PropTypes.bool.isRequired.

updateProject: PropTypes.func.isRequired
updateProject: PropTypes.func.isRequired,
isMemberOfActiveProject: PropTypes.bool.isRequired,
isManager: PropTypes.bool.isRequired

Choose a reason for hiding this comment

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

The isManager prop type should be PropTypes.bool instead of PropTypes.bool.isRequired. The .isRequired should be applied to PropTypes.bool, like this: PropTypes.bool.isRequired.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants