Skip to content

Prod release #1398

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 3 commits into from
Jul 7, 2022
Merged

Prod release #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a301e68
https://github.com/topcoder-platform/work-manager/issues/1388
jmgasper May 2, 2022
aa801b0
fix access checks
ThomasKranitsas Jun 23, 2022
98340c5
enable editing of self service challenges
ThomasKranitsas Jul 4, 2022
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
8 changes: 4 additions & 4 deletions src/components/ChallengeEditor/ChallengeViewTabs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const ChallengeViewTabs = ({
const isDraft = challenge.status.toUpperCase() === CHALLENGE_STATUS.DRAFT
const isSelfServiceCopilot = challenge.legacy.selfServiceCopilot === loggedInUser.handle
const isAdmin = checkAdmin(token)
const canApprove = isSelfServiceCopilot && isDraft && isSelfService
const canApprove = (isSelfServiceCopilot || enableEdit) && isDraft && isSelfService
const hasBillingAccount = _.get(projectDetail, 'billingAccountId') !== null
// only challenges that have a billing account can be launched AND
// if this isn't self-service, permit launching if the challenge is draft
Expand All @@ -97,7 +97,7 @@ const ChallengeViewTabs = ({
// b) the challenge is approved
const canLaunch = hasBillingAccount &&
((!isSelfService && isDraft) ||
((isSelfServiceCopilot || isAdmin) &&
((isSelfServiceCopilot || enableEdit || isAdmin) &&
challenge.status.toUpperCase() === CHALLENGE_STATUS.APPROVED))

return (
Expand Down Expand Up @@ -168,10 +168,10 @@ const ChallengeViewTabs = ({
)}
</div>
)}
{enableEdit && !isSelfService && (
{enableEdit && (
<PrimaryButton text={'Edit'} type={'info'} submit link={`./edit`} />
)}
{isSelfService && isDraft && (isAdmin || isSelfServiceCopilot) && (
{isSelfService && isDraft && (isAdmin || isSelfServiceCopilot || enableEdit) && (
<div className={styles.button}>
<PrimaryButton
text='Reject challenge'
Expand Down
3 changes: 1 addition & 2 deletions src/components/ChallengeEditor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,7 @@ class ChallengeEditor extends Component {
for (let index = 0; index < phases.length; ++index) {
newChallenge.phases[index].isDurationActive =
moment(newChallenge.phases[index]['scheduledEndDate']).isAfter()
newChallenge.phases[index].isStartTimeActive = index > 0 ? false
: moment(newChallenge.phases[0]['scheduledStartDate']).isAfter()
newChallenge.phases[index].isStartTimeActive = index <= 0
newChallenge.phases[index].isOpen =
newChallenge.phases[index].isDurationActive
}
Expand Down
5 changes: 1 addition & 4 deletions src/containers/ChallengeEditor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,17 +175,14 @@ class ChallengeEditor extends Component {
if (isAdmin) {
return true
}
if (!hasProjectAccess) {
return false
}
const userRoles = _.filter(
challengeResources,
cr => cr.memberId === `${loggedInUser.userId}`
)
const userResourceRoles = _.filter(resourceRoles, rr =>
_.some(userRoles, ur => ur.roleId === rr.id)
)
return _.some(
return hasProjectAccess || _.some(
userResourceRoles,
urr => urr.fullWriteAccess && urr.isActive
)
Expand Down