Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ workflows:
context: org-global
filters: &filters-dev
branches:
only: ["develop"]
only: ["develop", "pm-2917"]

# Production builds are exectuted only on tagged commits to the
# master branch.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -780,8 +780,9 @@ class ChallengeReviewerField extends Component {
.filter(id => id !== undefined && id !== null)
)

// Exclude phases already assigned to other reviewers, except the currently selected phase
if (assignedPhaseIds.has(phase.phaseId || phase.id) && !isCurrentlySelected) {
// If current reviewer is a member review, allow selecting phases even if already assigned to others.
// Only exclude assigned phases for ai reviewers.
if (!!reviewer.isMemberReview && assignedPhaseIds.has(phase.phaseId || phase.id) && !isCurrentlySelected) {
return false
}

Expand Down
14 changes: 13 additions & 1 deletion src/components/ChallengeEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1314,9 +1314,21 @@ class ChallengeEditor extends Component {
const { updateChallengeDetails, assignedMemberDetails: oldAssignedMember, projectDetail, challengeDetails } = this.props
if (this.state.isSaving) return
this.setState({ isSaving: true }, async () => {
const challenge = this.collectChallengeData(status)
let challenge = this.collectChallengeData(status)
let newChallenge = _.cloneDeep(this.state.challenge)
newChallenge.status = status

if (challenge.reviewers && Array.isArray(challenge.reviewers)) {
challenge.reviewers = challenge.reviewers.map(reviewer => {
if (reviewer.isMemberReview === false) {
const copy = { ...reviewer }
delete copy.type
return copy
}
return reviewer
})
}

try {
const challengeId = this.getCurrentChallengeId()
// state can have updated assigned member (in cases where user changes assignments without refreshing the page)
Expand Down
Loading