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
19 changes: 5 additions & 14 deletions src/components/ChallengeEditor/ChallengeReviewer-Field/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import cn from 'classnames'
import { PrimaryButton, OutlineButton } from '../../Buttons'
import { REVIEW_OPPORTUNITY_TYPES, VALIDATION_VALUE_TYPE } from '../../../config/constants'
import { REVIEW_OPPORTUNITY_TYPE_LABELS, REVIEW_OPPORTUNITY_TYPES, VALIDATION_VALUE_TYPE } from '../../../config/constants'
import { loadScorecards, loadDefaultReviewers, loadWorkflows } from '../../../actions/challenges'
import styles from './ChallengeReviewer-Field.module.scss'
import { convertDollarToInteger, validateValue } from '../../../util/input-check'
Expand Down Expand Up @@ -126,7 +126,7 @@ class ChallengeReviewerField extends Component {
phaseId: (defaultReviewer && defaultReviewer.phaseId) || (firstReviewPhase ? (firstReviewPhase.id || firstReviewPhase.phaseId) : ''),
basePayment: (defaultReviewer && defaultReviewer.basePayment) || '0',
incrementalPayment: (defaultReviewer && defaultReviewer.incrementalPayment) || 0,
type: isAIReviewer ? null : ((defaultReviewer && defaultReviewer.opportunityType) || REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW)
type: isAIReviewer ? undefined : ((defaultReviewer && defaultReviewer.opportunityType) || REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW)
}

if (isAIReviewer) {
Expand Down Expand Up @@ -285,7 +285,7 @@ class ChallengeReviewerField extends Component {
phaseId: currentReviewer.phaseId,
basePayment: currentReviewer.basePayment || '0',
incrementalPayment: currentReviewer.incrementalPayment || 0,
type: isAI ? null : (currentReviewer.type || REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW)
type: isAI ? undefined : (currentReviewer.type || REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW)
}

if (isAI) {
Expand Down Expand Up @@ -384,7 +384,7 @@ class ChallengeReviewerField extends Component {
// For AI reviewers, allow both review and submission phases
// For member reviewers, only allow review phases even after changing the reviewer type
if (this.isAIReviewer(reviewer)) {
return (isReviewPhase || isSubmissionPhase) || isCurrentlySelected
return isReviewPhase || isSubmissionPhase || isCurrentlySelected
} else {
return isReviewPhase || isCurrentlySelected
}
Expand Down Expand Up @@ -459,16 +459,7 @@ class ChallengeReviewerField extends Component {
<label>Review Type:</label>
{readOnly ? (
<span>
{(() => {
const typeMap = {
[REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW]: 'Regular Review',
[REVIEW_OPPORTUNITY_TYPES.COMPONENT_DEV_REVIEW]: 'Component Dev Review',
[REVIEW_OPPORTUNITY_TYPES.SPEC_REVIEW]: 'Spec Review',
[REVIEW_OPPORTUNITY_TYPES.ITERATIVE_REVIEW]: 'Iterative Review',
[REVIEW_OPPORTUNITY_TYPES.SCENARIOS_REVIEW]: 'Scenarios Review'
}
return typeMap[reviewer.type] || 'Regular Review'
})()}
{ REVIEW_OPPORTUNITY_TYPE_LABELS[reviewer.type] || 'Regular Review'}
</span>
) : (
<select
Expand Down
8 changes: 8 additions & 0 deletions src/config/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,14 @@ export const REVIEW_OPPORTUNITY_TYPES = {
SCENARIOS_REVIEW: 'SCENARIOS_REVIEW'
}

export const REVIEW_OPPORTUNITY_TYPE_LABELS = {
[REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW]: 'Regular Review',
[REVIEW_OPPORTUNITY_TYPES.COMPONENT_DEV_REVIEW]: 'Component Dev Review',
[REVIEW_OPPORTUNITY_TYPES.SPEC_REVIEW]: 'Spec Review',
[REVIEW_OPPORTUNITY_TYPES.ITERATIVE_REVIEW]: 'Iterative Review',
[REVIEW_OPPORTUNITY_TYPES.SCENARIOS_REVIEW]: 'Scenarios Review'
}

export const ROUND_TYPES = {
'SINGLE_ROUND': 'Single round',
'TWO_ROUNDS': 'Two rounds'
Expand Down