Skip to content
Merged
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
48 changes: 35 additions & 13 deletions src/components/ChallengeEditor/ChallengeReviewer-Field/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ const ResourceToPhaseNameMap = {
Reviewer: 'Review',
Approver: 'Approval',
Screener: 'Screening',
'Iterative Reviewer': 'Iterative Review'
'Iterative Reviewer': 'Iterative Review',
'Checkpoint Reviewer': 'Checkpoint Review',
'Checkpoint Screener': 'Checkpoint Screening'
}

class ChallengeReviewerField extends Component {
Expand Down Expand Up @@ -98,6 +100,10 @@ class ChallengeReviewerField extends Component {
}

componentDidMount () {
const { challenge, challengeResources } = this.props
if (challenge && challenge.id && challengeResources) {

Choose a reason for hiding this comment

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

[⚠️ correctness]
The componentDidMount method now calls updateAssignedMembers unconditionally if challenge and challengeResources are present. Ensure that this does not lead to unintended side effects, especially if updateAssignedMembers is expected to be called conditionally based on other criteria.

this.updateAssignedMembers(challengeResources, challenge)
}
if (this.props.challenge.track || this.props.challenge.type) {
this.loadScorecards()
}
Expand All @@ -117,26 +123,25 @@ class ChallengeReviewerField extends Component {
const reviewerIndex = {}
reviewersWithPhaseName.forEach((reviewer, index) => {
if (!reviewerIndex[reviewer.name]) {
reviewerIndex[reviewer.name] = index
reviewerIndex[reviewer.name] = []
}
reviewerIndex[reviewer.name].push(index)
})

const assignedMembers = {}

challengeResources.forEach((resource) => {
const index = reviewerIndex[ResourceToPhaseNameMap[resource.roleName]]
const indices = reviewerIndex[ResourceToPhaseNameMap[resource.roleName]] || []

if (!assignedMembers[index]) {
assignedMembers[index] = [{
// Distribute resources across all reviewers with the same phase name
indices.forEach((index) => {
if (!assignedMembers[index]) {
assignedMembers[index] = []
}
assignedMembers[index].push({
handle: resource.memberHandle,
userId: resource.memberId
}]
return
}

assignedMembers[index].push({
handle: resource.memberHandle,
userId: resource.memberId
})
})
})

Expand All @@ -158,7 +163,24 @@ class ChallengeReviewerField extends Component {
}
}

if (challenge && this.doUpdateAssignedMembers) {
const reviewersChanged = (() => {
if (!challenge || !prevChallenge) return false
const currReviewers = challenge.reviewers || []
const prevReviewers = prevChallenge.reviewers || []
if (currReviewers.length !== prevReviewers.length) return true
for (let i = 0; i < currReviewers.length; i++) {
const curr = currReviewers[i]
const prev = prevReviewers[i]
const { scorecardId: currScorecardId, ...currRest } = curr
const { scorecardId: prevScorecardId, ...prevRest } = prev
if (JSON.stringify(currRest) !== JSON.stringify(prevRest)) {
return true
}
}
return false
})()

if (challenge && this.doUpdateAssignedMembers && reviewersChanged) {
this.updateAssignedMembers(challengeResources, challenge)
}

Expand Down