Merge pull request #1712 from topcoder-platform/develop

Prod deploy for recent changes

Author: jmgasper

pnpm-lock.yaml

@@ -39,6 +39,10 @@
       flex-direction: column;
       width: 600px;
     }
+
+    .fieldError {
+      margin-top: 12px;
+    }
   }
 }
 

src/components/ChallengeEditor/ChallengeReviewer-Field/ChallengeReviewer-Field.module.scss

@@ -482,6 +482,11 @@ class ChallengeReviewerField extends Component {
       newReviewer.memberReviewerCount = (defaultReviewer && defaultReviewer.memberReviewerCount) || 1
     }
 
+    // Clear any prior transient error when add succeeds
+    if (this.state.error) {
+      this.setState({ error: null })
+    }
+
     const updatedReviewers = currentReviewers.concat([newReviewer])
     onUpdateReviewers({ field: 'reviewers', value: updatedReviewers })
   }
@@ -513,6 +518,21 @@ class ChallengeReviewerField extends Component {
 
     // Special handling for phase and count changes
     if (field === 'phaseId') {
+      // Before changing phase, ensure we're not creating a duplicate manual reviewer for the target phase
+      const targetPhaseId = value
+      const isCurrentMember = (updatedReviewers[index] && (updatedReviewers[index].isMemberReview !== false))
+      if (isCurrentMember) {
+        const conflict = (currentReviewers || []).some((r, i) => i !== index && (r.isMemberReview !== false) && (r.phaseId === targetPhaseId))
+        if (conflict) {
+          const phase = (challenge.phases || []).find(p => (p.id === targetPhaseId) || (p.phaseId === targetPhaseId))
+          const phaseName = phase ? (phase.name || targetPhaseId) : targetPhaseId
+          this.setState({
+            error: `Cannot move manual reviewer to phase '${phaseName}' because a manual reviewer configuration already exists for that phase.`
+          })
+          return
+        }
+      }
+
       this.handlePhaseChangeWithReassign(index, value)
 
       // update payment based on default reviewer
@@ -632,6 +652,21 @@ class ChallengeReviewerField extends Component {
                   const currentReviewers = challenge.reviewers || []
                   const updatedReviewers = currentReviewers.slice()
 
+                  // Block switching an AI reviewer to a member reviewer if another manual reviewer exists for same phase
+                  if (!isAI) {
+                    const existingReviewer = currentReviewers[index] || {}
+                    const phaseId = existingReviewer.phaseId
+                    const conflict = currentReviewers.some((r, i) => i !== index && (r.isMemberReview !== false) && (r.phaseId === phaseId))
+                    if (conflict) {
+                      const phase = (challenge.phases || []).find(p => (p.id === phaseId) || (p.phaseId === phaseId))
+                      const phaseName = phase ? (phase.name || phaseId) : phaseId
+                      this.setState({
+                        error: `Cannot switch to Member Reviewer: a manual reviewer configuration already exists for phase '${phaseName}'. Increase "Number of Reviewers" on the existing configuration instead.`
+                      })
+                      return
+                    }
+                  }
+
                   // Update reviewer type by setting/clearing aiWorkflowId
                   const currentReviewer = updatedReviewers[index]
 
@@ -674,6 +709,11 @@ class ChallengeReviewerField extends Component {
                     this.handleToggleShouldOpen(index, true)
                   }
 
+                  // Clear any transient error when successful change is applied
+                  if (this.state.error) {
+                    this.setState({ error: null })
+                  }
+
                   onUpdateReviewers({ field: 'reviewers', value: updatedReviewers })
                 }}
               >
@@ -772,10 +812,10 @@ class ChallengeReviewerField extends Component {
                     const isPostMortemPhase = norm === 'postmortem'
                     const isCurrentlySelected = reviewer.phaseId && ((phase.id === reviewer.phaseId) || (phase.phaseId === reviewer.phaseId)) && !isSubmissionPhase
 
-                    // Collect phases already assigned to other reviewers (excluding current reviewer)
+                    // Collect phases already assigned to other manual (member) reviewers (excluding current reviewer)
                     const assignedPhaseIds = new Set(
                       (challenge.reviewers || [])
-                        .filter((r, i) => i !== index)
+                        .filter((r, i) => i !== index && (r.isMemberReview !== false))
                         .map(r => r.phaseId)
                         .filter(id => id !== undefined && id !== null)
                     )
@@ -1051,6 +1091,11 @@ class ChallengeReviewerField extends Component {
                 />
               </div>
             )}
+            {error && !isLoading && (
+              <div className={cn(styles.fieldError, styles.error)}>
+                {error}
+              </div>
+            )}
           </div>
         </div>
       </>

src/components/ChallengeEditor/ChallengeReviewer-Field/index.js

@@ -23,6 +23,9 @@ import {
   PHASE_PRODUCT_CHALLENGE_ID_FIELD,
   MULTI_ROUND_CHALLENGE_TEMPLATE_ID,
   DS_TRACK_ID,
+  DEV_TRACK_ID,
+  MARATHON_TYPE_ID,
+  CHALLENGE_TYPE_ID,
   COMMUNITY_APP_URL
 } from '../../../config/constants'
 import PhaseInput from '../../PhaseInput'
@@ -94,11 +97,33 @@ const ChallengeView = ({
   const isTask = _.get(challenge, 'task.isTask', false)
   const phases = _.get(challenge, 'phases', [])
   const showCheckpointPrizes = _.get(challenge, 'timelineTemplateId') === MULTI_ROUND_CHALLENGE_TEMPLATE_ID
-  const isDataScience = challenge.trackId === DS_TRACK_ID
   const useDashboardData = _.find(challenge.metadata, { name: 'show_data_dashboard' })
   const useDashboard = useDashboardData
     ? (_.isString(useDashboardData.value) && useDashboardData.value === 'true') ||
     (_.isBoolean(useDashboardData.value) && useDashboardData.value) : false
+  const showDashBoard = (() => {
+    const isSupportedTrack = challenge.trackId === DS_TRACK_ID || challenge.trackId === DEV_TRACK_ID
+    const isSupportedType = challenge.typeId === MARATHON_TYPE_ID || challenge.typeId === CHALLENGE_TYPE_ID
+
+    return (isSupportedTrack && isSupportedType) || Boolean(useDashboardData)
+  })()
+  const dashboardToggle = showDashBoard && (
+    <div className={styles.row}>
+      <div className={styles.col}>
+        <label className={styles.fieldTitle} htmlFor='isDashboardEnabled'>Use data dashboard :</label>
+      </div>
+      <div className={styles.col}>
+        <input
+          name='isDashboardEnabled'
+          type='checkbox'
+          id='isDashboardEnabled'
+          checked={useDashboard}
+          readOnly
+          disabled
+        />
+      </div>
+    </div>
+  )
 
   return (
     <div className={styles.wrapper}>
@@ -138,13 +163,6 @@ const ChallengeView = ({
                 </a></span>
               </div>
             </div>
-            {isDataScience && (
-              <div className={cn(styles.row, styles.topRow)}>
-                <div className={styles.col}>
-                  <span><span className={styles.fieldTitle}>Show data dashboard:</span> {useDashboard ? 'Yes' : 'No'}</span>
-                </div>
-              </div>
-            )}
             {isTask &&
               <AssignedMemberField challenge={challenge} assignedMemberDetails={assignedMemberDetails} readOnly />}
             <CopilotField challenge={{
@@ -175,6 +193,7 @@ const ChallengeView = ({
             </div>
             {openAdvanceSettings && (
               <>
+                {dashboardToggle}
                 <NDAField beta challenge={challenge} readOnly />
                 <div className={cn(styles.row, styles.topRow)}>
                   <div className={styles.col}>

src/components/ChallengeEditor/ChallengeView/index.js

@@ -25,7 +25,7 @@ import {
   MILESTONE_STATUS,
   PHASE_PRODUCT_CHALLENGE_ID_FIELD,
   QA_TRACK_ID, DESIGN_CHALLENGE_TYPES, ROUND_TYPES,
-  MULTI_ROUND_CHALLENGE_TEMPLATE_ID, DS_TRACK_ID,
+  MULTI_ROUND_CHALLENGE_TEMPLATE_ID,
   CHALLENGE_STATUS,
   SKILLS_OPTIONAL_BILLING_ACCOUNT_IDS
 } from '../../config/constants'
@@ -148,6 +148,7 @@ class ChallengeEditor extends Component {
     this.onSaveChallenge = this.onSaveChallenge.bind(this)
     this.getCurrentTemplate = this.getCurrentTemplate.bind(this)
     this.onUpdateMetadata = this.onUpdateMetadata.bind(this)
+    this.shouldShowDashboardSetting = this.shouldShowDashboardSetting.bind(this)
     this.getTemplatePhases = this.getTemplatePhases.bind(this)
     this.getAvailableTimelineTemplates = this.getAvailableTimelineTemplates.bind(this)
     this.autoUpdateChallengeThrottled = _.throttle(this.validateAndAutoUpdateChallenge.bind(this), 3000) // 3s
@@ -669,6 +670,20 @@ class ChallengeEditor extends Component {
     this.setState({ challenge: newChallenge })
   }
 
+  /**
+   * Determines when the data dashboard toggle should be shown.
+   *
+   * @param {Object} challenge the challenge data to evaluate
+   */
+  shouldShowDashboardSetting (challenge = {}) {
+    const typeId = _.get(challenge, 'typeId')
+    const metadata = _.get(challenge, 'metadata', [])
+    const hasDashboardMetadata = _.some(metadata, { name: 'show_data_dashboard' })
+    const isMarathonMatch = typeId === MARATHON_TYPE_ID
+
+    return isMarathonMatch || hasDashboardMetadata
+  }
+
   /**
    * Remove Phase from challenge Phases list
    * @param index
@@ -897,11 +912,47 @@ class ChallengeEditor extends Component {
     return !(isRequiredMissing || _.isEmpty(this.state.currentTemplate))
   }
 
+  // Return array of phase names that have more than one manual (member) reviewer configured.
+  // If none, returns empty array.
+  getDuplicateManualReviewerPhases () {
+    const { challenge } = this.state
+    const reviewers = (challenge && challenge.reviewers) || []
+    const phases = (challenge && challenge.phases) || []
+
+    const counts = {}
+    reviewers.forEach(r => {
+      if (r && (r.isMemberReview !== false) && r.phaseId) {
+        const pid = String(r.phaseId)
+        counts[pid] = (counts[pid] || 0) + 1
+      }
+    })
+
+    const duplicatedPhaseIds = Object.keys(counts).filter(pid => counts[pid] > 1)
+    if (duplicatedPhaseIds.length === 0) return []
+
+    return duplicatedPhaseIds.map(pid => {
+      const p = phases.find(ph => String(ph.phaseId || ph.id) === pid)
+      return p ? (p.name || pid) : pid
+    })
+  }
+
   validateChallenge () {
     if (this.isValidChallenge()) {
+      // Additional validation: block saving draft if there are duplicate manual reviewer configs per phase
+      const duplicates = this.getDuplicateManualReviewerPhases()
+      if (duplicates && duplicates.length > 0) {
+        const message = `Duplicate manual reviewer configuration found for phase(s): ${duplicates.join(', ')}. Only one manual reviewer configuration is allowed per phase.`
+        this.setState({ hasValidationErrors: true, error: message })
+        return false
+      }
+
+      if (this.state.error) {
+        this.setState({ error: null })
+      }
       this.setState({ hasValidationErrors: false })
       return true
     }
+
     this.setState(prevState => ({
       ...prevState,
       challenge: {
@@ -1095,11 +1146,7 @@ class ChallengeEditor extends Component {
     const { challenge: { name, trackId, typeId, milestoneId, roundType, challengeType, metadata: challengeMetadata } } = this.state
     const { timelineTemplates } = metadata
     const isDesignChallenge = trackId === DES_TRACK_ID
-    const isDataScience = trackId === DS_TRACK_ID
-    const isChallengeType = typeId === CHALLENGE_TYPE_ID
-    const isDevChallenge = trackId === DEV_TRACK_ID
-    const isMM = typeId === MARATHON_TYPE_ID
-    const showDashBoard = (isDataScience && isChallengeType) || (isDevChallenge && isMM) || (isDevChallenge && isChallengeType)
+    const showDashBoard = this.shouldShowDashboardSetting({ trackId, typeId, metadata: challengeMetadata })
 
     // indicate that creating process has started
     this.setState({ isSaving: true })
@@ -1754,18 +1801,33 @@ class ChallengeEditor extends Component {
     const showTimeline = false // disables the timeline for time being https://github.com/topcoder-platform/challenge-engine-ui/issues/706
     const copilotResources = metadata.members || challengeResources
     const isDesignChallenge = challenge.trackId === DES_TRACK_ID
-    const isDevChallenge = challenge.trackId === DEV_TRACK_ID
-    const isMM = challenge.typeId === MARATHON_TYPE_ID
     const isChallengeType = challenge.typeId === CHALLENGE_TYPE_ID
     const showRoundType = isDesignChallenge && isChallengeType
     const showCheckpointPrizes = challenge.timelineTemplateId === MULTI_ROUND_CHALLENGE_TEMPLATE_ID
-    const showDashBoard = (challenge.trackId === DS_TRACK_ID && isChallengeType) || (isDevChallenge && isMM) || (isDevChallenge && isChallengeType)
     const useDashboardData = _.find(challenge.metadata, { name: 'show_data_dashboard' })
+    const showDashBoard = this.shouldShowDashboardSetting(challenge)
 
     const useDashboard = useDashboardData
       ? (_.isString(useDashboardData.value) && useDashboardData.value === 'true') ||
       (_.isBoolean(useDashboardData.value) && useDashboardData.value) : false
 
+    const dashboardToggle = showDashBoard && (
+      <div className={styles.row}>
+        <div className={cn(styles.field, styles.col1)}>
+          <label htmlFor='isDashboardEnabled'>Use data dashboard :</label>
+        </div>
+        <div className={cn(styles.field, styles.col2)}>
+          <input
+            name='isDashboardEnabled'
+            type='checkbox'
+            id='isDashboardEnabled'
+            checked={useDashboard}
+            onChange={(e) => this.onUpdateMetadata('show_data_dashboard', e.target.checked)}
+          />
+        </div>
+      </div>
+    )
+
     const workTypes = getDomainTypes(challenge.trackId)
     let filteredTypes = metadata.challengeTypes.filter(type => workTypes.includes(type.abbreviation))
 
@@ -1794,22 +1856,7 @@ class ChallengeEditor extends Component {
             }
             <ChallengeNameField challenge={challenge} onUpdateInput={this.onUpdateInput} />
             {
-              showDashBoard && (
-                <div className={styles.row}>
-                  <div className={cn(styles.field, styles.col1)}>
-                    <label htmlFor='isDashboardEnabled'>Use data dashboard :</label>
-                  </div>
-                  <div className={cn(styles.field, styles.col2)}>
-                    <input
-                      name='isDashboardEnabled'
-                      type='checkbox'
-                      id='isDashboardEnabled'
-                      checked={useDashboard}
-                      onChange={(e) => this.onUpdateMetadata('show_data_dashboard', e.target.checked)}
-                    />
-                  </div>
-                </div>
-              )
+              dashboardToggle
             }
             {projectDetail.version === 'v4' && <MilestoneField milestones={activeProjectMilestones} onUpdateSelect={this.onUpdateSelect} projectId={projectDetail.id} selectedMilestoneId={selectedMilestoneId} />}
             {useTask && (<DiscussionField hasForum={hasForum} toggleForum={this.toggleForumOnCreate} />)}
@@ -1841,24 +1888,6 @@ class ChallengeEditor extends Component {
             </div>
 
             <ChallengeNameField challenge={challenge} onUpdateInput={this.onUpdateInput} />
-            {
-              showDashBoard && (
-                <div className={styles.row}>
-                  <div className={cn(styles.field, styles.col1)}>
-                    <label htmlFor='isDashboardEnabled'>Use data dashboard :</label>
-                  </div>
-                  <div className={cn(styles.field, styles.col2)}>
-                    <input
-                      name='isDashboardEnabled'
-                      type='checkbox'
-                      id='isDashboardEnabled'
-                      checked={useDashboard}
-                      onChange={(e) => this.onUpdateMetadata('show_data_dashboard', e.target.checked)}
-                    />
-                  </div>
-                </div>
-              )
-            }
             {isTask && (
               <AssignedMemberField
                 challenge={challenge}
@@ -1890,6 +1919,7 @@ class ChallengeEditor extends Component {
             </div>
             {isOpenAdvanceSettings && (
               <React.Fragment>
+                {dashboardToggle}
                 <NDAField challenge={challenge} toggleNdaRequire={this.toggleNdaRequire} />
                 {/* remove terms field and use default term */}
                 {false && (<TermsField terms={metadata.challengeTerms} challenge={challenge} onUpdateMultiSelect={this.onUpdateMultiSelect} />)}