@@ -29,7 +29,7 @@ const ChallengeNameField = ({ challenge, onUpdateInput }) => {
id='name'
name='name'
type='text'
- placeholder='Work Name'
+ placeholder='Challenge Name'
value={challenge.name}
maxLength='200'
required
@@ -41,7 +41,7 @@ const ChallengeNameField = ({ challenge, onUpdateInput }) => {
)}
diff --git a/src/components/ChallengeEditor/ChallengePrizes-Field/ChallengePrizes-Field.module.scss b/src/components/ChallengeEditor/ChallengePrizes-Field/ChallengePrizes-Field.module.scss
index d5d4366d..ce9a964c 100644
--- a/src/components/ChallengeEditor/ChallengePrizes-Field/ChallengePrizes-Field.module.scss
+++ b/src/components/ChallengeEditor/ChallengePrizes-Field/ChallengePrizes-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.container {
display: flex;
diff --git a/src/components/ChallengeEditor/ChallengePrizes-Field/index.js b/src/components/ChallengeEditor/ChallengePrizes-Field/index.js
index 5897a08b..1fafe7d9 100644
--- a/src/components/ChallengeEditor/ChallengePrizes-Field/index.js
+++ b/src/components/ChallengeEditor/ChallengePrizes-Field/index.js
@@ -84,9 +84,10 @@ class ChallengePrizesField extends Component {
renderPrizes () {
const { currentPrizeIndex } = this.state
const { readOnly, challenge } = this.props
+ const typeName = typeof challenge.type === 'string' ? challenge.type : (challenge.type && challenge.type.name)
const allowMultiplePrizes = _.includes(
CHALLENGE_TYPES_WITH_MULTIPLE_PRIZES,
- challenge.type
+ typeName
)
return _.map(
this.getChallengePrize().prizes,
@@ -151,9 +152,10 @@ class ChallengePrizesField extends Component {
render () {
const { readOnly, challenge } = this.props
+ const typeName = typeof challenge.type === 'string' ? challenge.type : (challenge.type && challenge.type.name)
const allowMultiplePrizes = _.includes(
CHALLENGE_TYPES_WITH_MULTIPLE_PRIZES,
- challenge.type
+ typeName
)
return (
- {isInternal && reviewer && (
- Work Name is required field
+ Challenge Name is required field
diff --git a/src/components/ChallengeEditor/ChallengeReviewer-Field/ChallengeReviewer-Field.module.scss b/src/components/ChallengeEditor/ChallengeReviewer-Field/ChallengeReviewer-Field.module.scss
new file mode 100644
index 00000000..ca2cf854
--- /dev/null
+++ b/src/components/ChallengeEditor/ChallengeReviewer-Field/ChallengeReviewer-Field.module.scss
@@ -0,0 +1,226 @@
+@use '../../../styles/includes' as *;
+
+.row {
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: row;
+ margin: 30px 30px 0 30px;
+ align-content: space-between;
+ justify-content: flex-start;
+
+ .field {
+ @include upto-sm {
+ display: block;
+ padding-bottom: 10px;
+ }
+
+ label {
+ @include roboto-bold();
+ font-size: 16px;
+ line-height: 19px;
+ font-weight: 500;
+ color: $tc-gray-80;
+ }
+
+ &.col1 {
+ max-width: 185px;
+ min-width: 185px;
+ margin-right: 14px;
+ white-space: nowrap;
+ display: flex;
+ align-items: center;
+ }
+
+ &.col2 {
+ align-self: flex-end;
+ margin-bottom: auto;
+ margin-top: auto;
+ display: flex;
+ flex-direction: column;
+ width: 600px;
+ }
+ }
+}
+
+.description {
+ color: #666;
+ margin-bottom: 20px;
+ font-size: 14px;
+ line-height: 1.4;
+}
+
+.noReviewers {
+ text-align: center;
+ padding: 30px;
+ color: #999;
+ font-style: italic;
+ background-color: #f5f5f5;
+ border-radius: 4px;
+ margin-bottom: 20px;
+}
+
+.defaultReviewerNote {
+ margin-top: 20px;
+ padding: 15px;
+ background-color: #e3f2fd;
+ border: 1px solid #bbdefb;
+ border-radius: 4px;
+}
+
+.defaultReviewerNote p {
+ margin: 0 0 15px 0;
+ color: #1976d2;
+ font-style: normal;
+}
+
+.reviewerForm {
+ background-color: white;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ padding: 20px;
+ margin-bottom: 20px;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.reviewerHeader {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 20px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #eee;
+}
+
+.reviewerHeader h4 {
+ margin: 0;
+ color: #333;
+ font-size: 16px;
+ font-weight: 600;
+}
+
+.formRow {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 20px;
+ margin-bottom: 15px;
+}
+
+.formGroup {
+ flex: 1;
+ min-width: 200px;
+}
+
+.formGroup label {
+ display: block;
+ margin-bottom: 5px;
+ font-weight: 500;
+ color: #555;
+ font-size: 14px;
+}
+
+.formGroup input,
+.formGroup select {
+ width: 100%;
+ padding: 8px 12px;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ font-size: 14px;
+ background-color: white;
+}
+
+.formGroup input:focus,
+.formGroup select:focus {
+ outline: none;
+ border-color: #0066cc;
+ box-shadow: 0 0 0 2px rgba(0, 102, 204, 0.2);
+}
+
+.addButton {
+ text-align: center;
+ margin-top: 20px;
+}
+
+.summary {
+ background-color: #f8f9fa;
+ border: 1px solid #dee2e6;
+ border-radius: 4px;
+ padding: 20px;
+ margin: 20px 0;
+}
+
+.summary h4 {
+ margin: 0 0 15px 0;
+ color: #333;
+ font-size: 16px;
+ font-weight: 600;
+}
+
+.summaryRow {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 8px 0;
+ border-bottom: 1px solid #eee;
+}
+
+.summaryRow:last-child {
+ border-bottom: none;
+ font-weight: 600;
+ color: #0066cc;
+}
+
+.summaryRow span:first-child {
+ color: #666;
+}
+
+.summaryRow span:last-child {
+ font-weight: 500;
+}
+
+.loading {
+ text-align: center;
+ padding: 40px;
+ color: #666;
+ font-style: italic;
+}
+
+.error {
+ color: $tc-red;
+ padding: 5px;
+}
+
+.validationErrors {
+ background-color: #fff3cd;
+ border: 1px solid #ffeaa7;
+ border-radius: 4px;
+ padding: 10px;
+ margin-bottom: 15px;
+}
+
+.validationError {
+ color: #856404;
+ font-size: 13px;
+ margin-bottom: 5px;
+}
+
+.validationError:last-child {
+ margin-bottom: 0;
+}
+
+// Responsive adjustments
+@media (max-width: 768px) {
+ .formRow {
+ flex-direction: column;
+ gap: 15px;
+ }
+
+ .formGroup {
+ min-width: 100%;
+ }
+
+ .reviewerHeader {
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 10px;
+ }
+}
diff --git a/src/components/ChallengeEditor/ChallengeReviewer-Field/index.js b/src/components/ChallengeEditor/ChallengeReviewer-Field/index.js
new file mode 100644
index 00000000..56b070db
--- /dev/null
+++ b/src/components/ChallengeEditor/ChallengeReviewer-Field/index.js
@@ -0,0 +1,1044 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import cn from 'classnames'
+import { PrimaryButton, OutlineButton } from '../../Buttons'
+import { REVIEW_OPPORTUNITY_TYPE_LABELS, REVIEW_OPPORTUNITY_TYPES, VALIDATION_VALUE_TYPE, MARATHON_TYPE_ID, DES_TRACK_ID } from '../../../config/constants'
+import { loadScorecards, loadDefaultReviewers, loadWorkflows, replaceResourceInRole, createResource, deleteResource } from '../../../actions/challenges'
+import styles from './ChallengeReviewer-Field.module.scss'
+import { validateValue } from '../../../util/input-check'
+import AssignedMemberField from '../AssignedMember-Field'
+import { getResourceRoleByName } from '../../../util/tc'
+import { isEqual } from 'lodash'
+
+const ResourceToPhaseNameMap = {
+ Reviewer: 'Review',
+ Approver: 'Approval',
+ Screener: 'Screening',
+ 'Iterative Reviewer': 'Iterative Review',
+ 'Checkpoint Reviewer': 'Checkpoint Review',
+ 'Checkpoint Screener': 'Checkpoint Screening'
+}
+
+class ChallengeReviewerField extends Component {
+ constructor (props) {
+ super(props)
+ this.state = {
+ error: null,
+ // Map reviewer index -> array of assigned member details { handle, userId }
+ assignedMembers: {}
+ }
+
+ this.addReviewer = this.addReviewer.bind(this)
+ this.removeReviewer = this.removeReviewer.bind(this)
+ this.updateReviewer = this.updateReviewer.bind(this)
+ this.renderReviewerForm = this.renderReviewerForm.bind(this)
+ this.handleApplyDefault = this.handleApplyDefault.bind(this)
+ this.isAIReviewer = this.isAIReviewer.bind(this)
+ this.getMissingRequiredPhases = this.getMissingRequiredPhases.bind(this)
+ this.getRoleNameForReviewer = this.getRoleNameForReviewer.bind(this)
+ this.onAssignmentChange = this.onAssignmentChange.bind(this)
+ this.syncAssignmentsOnCountChange = this.syncAssignmentsOnCountChange.bind(this)
+ this.handlePhaseChangeWithReassign = this.handlePhaseChangeWithReassign.bind(this)
+ this.handleToggleShouldOpen = this.handleToggleShouldOpen.bind(this)
+ this.updateAssignedMembers = this.updateAssignedMembers.bind(this)
+ this.doUpdateAssignedMembers = true
+ }
+
+ isAIReviewer (reviewer) {
+ return reviewer && (
+ (reviewer.aiWorkflowId && reviewer.aiWorkflowId.trim() !== '') ||
+ (reviewer.isMemberReview === false)
+ )
+ }
+
+ getMissingRequiredPhases () {
+ const { challenge } = this.props
+ // Marathon Match does not require review configuration
+ if (challenge && challenge.typeId === MARATHON_TYPE_ID) {
+ return []
+ }
+ const reviewers = challenge.reviewers || []
+ const phases = Array.isArray(challenge.phases) ? challenge.phases : []
+
+ const requiredPhaseNames = [
+ 'Screening',
+ 'Review',
+ 'Post-mortem',
+ 'Approval',
+ 'Checkpoint Screening',
+ 'Iterative Review'
+ ]
+
+ const normalize = (name) => (name || '')
+ .toString()
+ .toLowerCase()
+ .replace(/[-\s]/g, '')
+
+ const requiredNormalized = new Set(requiredPhaseNames.map(normalize))
+
+ // Map challenge phases by normalized name to phase ids (only those we care about)
+ const requiredPhaseEntries = phases
+ .filter(p => requiredNormalized.has(normalize(p.name)))
+ .map(p => ({ name: p.name, id: p.phaseId || p.id }))
+
+ const missing = []
+ for (const entry of requiredPhaseEntries) {
+ const hasReviewerWithScorecard = reviewers.some(r => {
+ const rPhaseId = r.phaseId
+ const hasScorecard = !!r.scorecardId
+ return rPhaseId === entry.id && hasScorecard
+ })
+ if (!hasReviewerWithScorecard) {
+ // Use the canonical capitalization from requiredPhaseNames when possible
+ const canonical = requiredPhaseNames.find(n => normalize(n) === normalize(entry.name)) || entry.name
+ missing.push(canonical)
+ }
+ }
+
+ return missing
+ }
+
+ componentDidMount () {
+ const { challenge, challengeResources } = this.props
+ if (challenge && challenge.id && challengeResources) {
+ this.updateAssignedMembers(challengeResources, challenge)
+ }
+ if (this.props.challenge.track || this.props.challenge.type) {
+ this.loadScorecards()
+ }
+ this.loadDefaultReviewers()
+ this.loadWorkflows()
+ }
+
+ updateAssignedMembers (challengeResources, challenge) {
+ const reviewersWithPhaseName = challenge.reviewers.map(item => {
+ const phase = challenge.phases && challenge.phases.find(p => p.phaseId === item.phaseId)
+ return {
+ ...item,
+ name: phase && phase.name
+ }
+ })
+
+ const reviewerIndex = {}
+ reviewersWithPhaseName.forEach((reviewer, index) => {
+ if (!reviewerIndex[reviewer.name]) {
+ reviewerIndex[reviewer.name] = []
+ }
+ reviewerIndex[reviewer.name].push(index)
+ })
+
+ const assignedMembers = {}
+
+ challengeResources.forEach((resource) => {
+ const indices = reviewerIndex[ResourceToPhaseNameMap[resource.roleName]] || []
+
+ // 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
+ })
+ })
+ })
+
+ if (!isEqual(this.state.assignedMembers, assignedMembers)) {
+ this.setState({
+ assignedMembers
+ })
+ }
+ }
+
+ componentDidUpdate (prevProps) {
+ const { challenge, challengeResources } = this.props
+ const prevChallenge = prevProps.challenge
+
+ if (challenge && prevChallenge &&
+ (challenge.type !== prevChallenge.type || challenge.track !== prevChallenge.track)) {
+ if (challenge.track || challenge.type) {
+ this.loadScorecards()
+ }
+ }
+
+ 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)
+ }
+
+ if (challenge && prevChallenge &&
+ (challenge.typeId !== prevChallenge.typeId || challenge.trackId !== prevChallenge.trackId)) {
+ this.loadDefaultReviewers()
+ }
+ }
+
+ getRoleNameForReviewer (reviewer) {
+ const { challenge } = this.props
+ const phase = (challenge.phases || []).find(p => (p.id === reviewer.phaseId) || (p.phaseId === reviewer.phaseId))
+ const name = (phase && phase.name) ? phase.name.toLowerCase() : ''
+
+ // Normalize for matching
+ const norm = name.replace(/[-\s]/g, '')
+
+ if (name.includes('iterative review') || norm === 'iterativereview') return 'Iterative Reviewer'
+ if (norm === 'approval') return 'Approver'
+ if (norm === 'checkpointscreening') return 'Checkpoint Screener'
+ if (norm === 'checkpointreview') return 'Checkpoint Reviewer'
+ if (norm === 'screening') return 'Screener'
+ // default to Reviewer for any kind of review
+ return 'Reviewer'
+ }
+
+ async onAssignmentChange (reviewerIndex, slotIndex, option) {
+ const { challenge, metadata = {}, replaceResourceInRole } = this.props
+ if (!challenge || !challenge.id) return
+
+ const roleName = this.getRoleNameForReviewer((challenge.reviewers || [])[reviewerIndex] || {})
+ const role = getResourceRoleByName(metadata.resourceRoles || [], roleName)
+ if (!role) return
+
+ this.setState(prev => {
+ const prevHandles = prev.assignedMembers[reviewerIndex] || []
+ const prevMember = prevHandles[slotIndex] || null
+ const newHandles = [...prevHandles]
+
+ let newMemberHandle = null
+ if (option && option.value) {
+ newHandles[slotIndex] = {
+ handle: option.label,
+ userId: parseInt(option.value, 10)
+ }
+ newMemberHandle = option.label
+ } else {
+ newHandles[slotIndex] = null
+ }
+
+ // fire resource update
+ const oldHandle = prevMember && prevMember.handle
+ // replaceResourceInRole gracefully handles deletion when newMember is falsy
+ replaceResourceInRole(challenge.id, role.id, newMemberHandle, oldHandle)
+ this.doUpdateAssignedMembers = false
+ return {
+ assignedMembers: {
+ ...prev.assignedMembers,
+ [reviewerIndex]: newHandles
+ }
+ }
+ }, () => {
+ const n = this
+ setTimeout(() => {
+ n.doUpdateAssignedMembers = true
+ }, 1000)
+ })
+ }
+
+ async syncAssignmentsOnCountChange (reviewerIndex, newCount) {
+ const { challenge, metadata = {}, deleteResource } = this.props
+ const roleName = this.getRoleNameForReviewer((challenge.reviewers || [])[reviewerIndex] || {})
+ const role = getResourceRoleByName(metadata.resourceRoles || [], roleName)
+ if (!role) return
+ this.setState(prev => {
+ const current = prev.assignedMembers[reviewerIndex] || []
+ const toRemove = current.slice(newCount).filter(Boolean)
+ // remove extra assigned resources
+ toRemove.forEach(m => {
+ if (challenge && challenge.id && m && m.handle) {
+ deleteResource(challenge.id, role.id, m.handle)
+ }
+ })
+ const next = current.slice(0, newCount)
+ return {
+ assignedMembers: {
+ ...prev.assignedMembers,
+ [reviewerIndex]: next
+ }
+ }
+ })
+ }
+
+ async handlePhaseChangeWithReassign (reviewerIndex, newPhaseId) {
+ const { challenge, metadata = {}, createResource, deleteResource } = this.props
+ const reviewers = challenge.reviewers || []
+ const currentReviewer = reviewers[reviewerIndex]
+ if (!currentReviewer) return
+
+ const oldRoleName = this.getRoleNameForReviewer(currentReviewer)
+ const newReviewer = { ...currentReviewer, phaseId: newPhaseId }
+ const newRoleName = this.getRoleNameForReviewer(newReviewer)
+
+ if (oldRoleName === newRoleName) return
+
+ const oldRole = getResourceRoleByName(metadata.resourceRoles || [], oldRoleName)
+ const newRole = getResourceRoleByName(metadata.resourceRoles || [], newRoleName)
+ if (!oldRole || !newRole) return
+
+ const assigned = (this.state.assignedMembers[reviewerIndex] || []).filter(Boolean)
+ // move any existing assigned members from old role to new role
+ for (const m of assigned) {
+ try {
+ if (challenge && challenge.id && m && m.handle) {
+ await deleteResource(challenge.id, oldRole.id, m.handle)
+ await createResource(challenge.id, newRole.id, m.handle)
+ }
+ } catch (e) {}
+ }
+ }
+
+ async handleToggleShouldOpen (reviewerIndex, nextValue) {
+ // If toggling to open public opportunity, remove any existing assigned members for this reviewer
+ if (nextValue) {
+ const { challenge, metadata = {}, deleteResource } = this.props
+ const roleName = this.getRoleNameForReviewer((challenge.reviewers || [])[reviewerIndex] || {})
+ const role = getResourceRoleByName(metadata.resourceRoles || [], roleName)
+ if (!role) return
+ const assigned = (this.state.assignedMembers[reviewerIndex] || []).filter(Boolean)
+ for (const m of assigned) {
+ try {
+ if (challenge && challenge.id && m && m.handle) {
+ await deleteResource(challenge.id, role.id, m.handle)
+ }
+ } catch (e) {}
+ }
+ this.setState(prev => ({
+ assignedMembers: {
+ ...prev.assignedMembers,
+ [reviewerIndex]: []
+ }
+ }))
+ }
+ }
+
+ loadScorecards () {
+ const { challenge, loadScorecards } = this.props
+
+ const filters = {
+ status: 'ACTIVE'
+ }
+
+ // Add challenge track if available
+ if (challenge.track) {
+ if (typeof challenge.track === 'string') {
+ filters.challengeTrack = challenge.track.toUpperCase().replace(' ', '_')
+ } else if (challenge.track.track) {
+ filters.challengeTrack = challenge.track.track
+ }
+ }
+
+ // Add challenge type if available
+ if (challenge.type) {
+ if (typeof challenge.type === 'string') {
+ filters.challengeType = challenge.type
+ } else if (challenge.type.name) {
+ filters.challengeType = challenge.type.name
+ }
+ }
+
+ loadScorecards(filters)
+ }
+
+ loadDefaultReviewers () {
+ const { challenge, loadDefaultReviewers } = this.props
+
+ // only load default reviewers if we have typeId and trackId
+ if (!challenge.typeId || !challenge.trackId) {
+ console.log('Cannot load default reviewers: missing typeId or trackId')
+ return
+ }
+
+ loadDefaultReviewers({
+ typeId: challenge.typeId,
+ trackId: challenge.trackId
+ })
+ }
+
+ loadWorkflows () {
+ const { loadWorkflows } = this.props
+ loadWorkflows()
+ }
+
+ addReviewer () {
+ const { challenge, onUpdateReviewers } = this.props
+ const currentReviewers = challenge.reviewers || []
+
+ // Create a new default reviewer based on track and type
+ const defaultTrackReviewer = this.findDefaultReviewer()
+
+ // Get the first available review phase if phases exist
+ const reviewPhases = challenge.phases && challenge.phases.filter(phase =>
+ phase.name && phase.name.toLowerCase().includes('review')
+ )
+ const firstReviewPhase = reviewPhases && reviewPhases.length > 0 ? reviewPhases[0] : null
+
+ // If no review phases, get the first available phase as fallback
+ const fallbackPhase = !firstReviewPhase && challenge.phases && challenge.phases.length > 0
+ ? challenge.phases[0]
+ : null
+
+ // Determine the default phase ID
+ let defaultPhaseId = ''
+ if (defaultTrackReviewer && defaultTrackReviewer.phaseId) {
+ defaultPhaseId = defaultTrackReviewer.phaseId
+ } else if (firstReviewPhase) {
+ defaultPhaseId = firstReviewPhase.phaseId || firstReviewPhase.id
+ } else if (fallbackPhase) {
+ defaultPhaseId = fallbackPhase.phaseId || fallbackPhase.id
+ }
+
+ const defaultReviewer = this.findDefaultReviewer(defaultPhaseId) || defaultTrackReviewer
+
+ const isAIReviewer = this.isAIReviewer(defaultTrackReviewer)
+
+ // For AI reviewers, get scorecardId from the workflow if available
+ let scorecardId = ''
+ if (isAIReviewer) {
+ const { metadata = {} } = this.props
+ const { workflows = [] } = metadata
+ const defaultWorkflowId = defaultReviewer && defaultReviewer.aiWorkflowId
+ if (defaultWorkflowId) {
+ const workflow = workflows.find(w => w.id === defaultWorkflowId)
+ scorecardId = workflow && workflow.scorecardId ? workflow.scorecardId : undefined
+ } else {
+ scorecardId = undefined
+ }
+ } else {
+ scorecardId = (defaultReviewer && defaultReviewer.scorecardId) || ''
+ }
+
+ const newReviewer = {
+ scorecardId,
+ isMemberReview: !isAIReviewer,
+ phaseId: defaultPhaseId,
+ fixedAmount: (defaultReviewer && defaultReviewer.fixedAmount) || 0,
+ baseCoefficient: (defaultReviewer && defaultReviewer.baseCoefficient) || '0.13',
+ incrementalCoefficient: (defaultReviewer && defaultReviewer.incrementalCoefficient) || 0.05,
+ type: isAIReviewer
+ ? undefined
+ : (defaultReviewer && defaultReviewer.opportunityType) || REVIEW_OPPORTUNITY_TYPES.REGULAR_REVIEW,
+ shouldOpenOpportunity: false
+ }
+
+ if (isAIReviewer) {
+ newReviewer.aiWorkflowId = (defaultReviewer && defaultReviewer.aiWorkflowId) || ''
+ }
+
+ // Set member-specific fields for member reviewers
+ if (!isAIReviewer) {
+ newReviewer.memberReviewerCount = (defaultReviewer && defaultReviewer.memberReviewerCount) || 1
+ }
+
+ const updatedReviewers = currentReviewers.concat([newReviewer])
+ onUpdateReviewers({ field: 'reviewers', value: updatedReviewers })
+ }
+
+ removeReviewer (index) {
+ const { challenge, onUpdateReviewers } = this.props
+ const currentReviewers = challenge.reviewers || []
+ const updatedReviewers = currentReviewers.filter((_, i) => i !== index)
+ onUpdateReviewers({ field: 'reviewers', value: updatedReviewers })
+ }
+
+ updateReviewer (index, field, value) {
+ const { challenge, onUpdateReviewers } = this.props
+ const currentReviewers = challenge.reviewers || []
+ const updatedReviewers = currentReviewers.slice()
+ const fieldUpdate = {}
+ fieldUpdate[field] = value
+
+ if (field === 'aiWorkflowId') {
+ const { metadata = {} } = this.props
+ const { workflows = [] } = metadata
+ const workflow = workflows.find(w => w.id === value)
+ if (workflow && workflow.scorecardId) {
+ fieldUpdate.scorecardId = workflow.scorecardId
+ } else {
+ fieldUpdate.scorecardId = undefined
+ }
+ }
+
+ // Special handling for phase and count changes
+ if (field === 'phaseId') {
+ this.handlePhaseChangeWithReassign(index, value)
+
+ // update payment based on default reviewer
+ const defaultReviewer = this.findDefaultReviewer(value) || updatedReviewers[index]
+ Object.assign(fieldUpdate, {
+ fixedAmount: defaultReviewer.fixedAmount,
+ baseCoefficient: defaultReviewer.baseCoefficient,
+ incrementalCoefficient: defaultReviewer.incrementalCoefficient
+ })
+ }
+
+ if (field === 'memberReviewerCount') {
+ const newCount = parseInt(value) || 1
+ this.syncAssignmentsOnCountChange(index, Math.max(1, newCount))
+ }
+
+ updatedReviewers[index] = Object.assign({}, updatedReviewers[index], fieldUpdate)
+ onUpdateReviewers({ field: 'reviewers', value: updatedReviewers })
+ }
+
+ findDefaultReviewer (phaseId) {
+ const { challenge, metadata = {} } = this.props
+ const { defaultReviewers = [] } = metadata
+
+ if (!challenge || !challenge.trackId || !challenge.typeId) {
+ return null
+ }
+
+ return phaseId ? defaultReviewers.find(dr => dr.phaseId === phaseId) : defaultReviewers[0]
+ }
+
+ validateReviewer (reviewer) {
+ const errors = {}
+ const isAI = this.isAIReviewer(reviewer)
+
+ if (isAI) {
+ if (!reviewer.aiWorkflowId || reviewer.aiWorkflowId.trim() === '') {
+ errors.aiWorkflowId = 'AI Workflow is required'
+ }
+ } else {
+ if (!reviewer.scorecardId) {
+ errors.scorecardId = 'Scorecard is required'
+ }
+
+ const memberCount = parseInt(reviewer.memberReviewerCount) || 1
+ if (memberCount < 1 || !Number.isInteger(memberCount)) {
+ errors.memberReviewerCount = 'Number of reviewers must be a positive integer'
+ }
+ }
+
+ if (!reviewer.phaseId) {
+ errors.phaseId = 'Phase is required'
+ }
+
+ return errors
+ }
+
+ handleApplyDefault () {
+ const defaultReviewer = this.findDefaultReviewer()
+ if (defaultReviewer) {
+ this.addReviewer()
+ }
+ }
+
+ renderReviewerForm (reviewer, index) {
+ const { challenge, metadata = {}, readOnly = false } = this.props
+ const { scorecards = [], workflows = [] } = metadata
+ const validationErrors = challenge.submitTriggered ? this.validateReviewer(reviewer) : {}
+ const selectedPhase = challenge.phases.find(p => p.phaseId === reviewer.phaseId)
+ const isDesignChallenge = challenge && challenge.trackId === DES_TRACK_ID
+ const normalize = (value) => (value || '')
+ .toString()
+ .toLowerCase()
+ .trim()
+ .replace(/\bphase\b$/, '')
+ .replace(/[-_\s]/g, '')
+
+ const filteredScorecards = scorecards.filter(item => {
+ if (!selectedPhase || !selectedPhase.name || !item || !item.type) {
+ return false
+ }
+
+ const normalizedType = normalize(item.type)
+ const normalizedPhaseName = normalize(selectedPhase.name)
+
+ if (!normalizedType || !normalizedPhaseName) {
+ return false
+ }
+
+ return normalizedType === normalizedPhaseName
+ })
+
+ return (
+
)
diff --git a/src/components/ChallengeEditor/ChallengeType-Field/ChallengeType-Field.module.scss b/src/components/ChallengeEditor/ChallengeType-Field/ChallengeType-Field.module.scss
index f6707a0c..fb8fb6a0 100644
--- a/src/components/ChallengeEditor/ChallengeType-Field/ChallengeType-Field.module.scss
+++ b/src/components/ChallengeEditor/ChallengeType-Field/ChallengeType-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/ChallengeType-Field/index.js b/src/components/ChallengeEditor/ChallengeType-Field/index.js
index bafa1f0a..00949a75 100644
--- a/src/components/ChallengeEditor/ChallengeType-Field/index.js
+++ b/src/components/ChallengeEditor/ChallengeType-Field/index.js
@@ -39,7 +39,7 @@ ChallengeTypeField.defaultProps = {
}
ChallengeTypeField.propTypes = {
- types: PropTypes.arrayOf(PropTypes.shape()).isRequired,
+ types: PropTypes.arrayOf(PropTypes.string).isRequired,
onUpdateSelect: PropTypes.func.isRequired,
challenge: PropTypes.shape().isRequired,
disabled: PropTypes.bool
diff --git a/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss b/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss
index 264c98b1..ef88e671 100644
--- a/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss
+++ b/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.wrapper {
box-sizing: border-box;
@@ -296,4 +296,3 @@
justify-content: space-between;
align-items: center;
}
-
diff --git a/src/components/ChallengeEditor/ChallengeView/index.js b/src/components/ChallengeEditor/ChallengeView/index.js
index 430e22bf..c5681f6c 100644
--- a/src/components/ChallengeEditor/ChallengeView/index.js
+++ b/src/components/ChallengeEditor/ChallengeView/index.js
@@ -22,7 +22,8 @@ import {
REVIEW_TYPES,
PHASE_PRODUCT_CHALLENGE_ID_FIELD,
MULTI_ROUND_CHALLENGE_TEMPLATE_ID,
- DS_TRACK_ID
+ DS_TRACK_ID,
+ COMMUNITY_APP_URL
} from '../../../config/constants'
import PhaseInput from '../../PhaseInput'
import CheckpointPrizesField from '../CheckpointPrizes-Field'
@@ -79,19 +80,14 @@ const ChallengeView = ({
const copilotResource = getResourceFromProps('Copilot')
const copilotFromResources = copilotResource ? copilotResource.memberHandle : ''
- const reviewerResource = getResourceFromProps('Reviewer')
- const reviewerFromResources = reviewerResource ? reviewerResource.memberHandle : ''
- let copilot, reviewer
+ let copilot
if (challenge) {
copilot = challenge.copilot || (challenge.legacy && challenge.legacy.selfServiceCopilot)
- reviewer = challenge.reviewer
}
copilot = copilot || copilotFromResources
- reviewer = reviewer || reviewerFromResources
const reviewType = challenge.reviewType ? challenge.reviewType.toUpperCase() : REVIEW_TYPES.COMMUNITY
const isCommunity = reviewType === REVIEW_TYPES.COMMUNITY
- const isInternal = reviewType === REVIEW_TYPES.INTERNAL
const timeLineTemplate = _.find(metadata.timelineTemplates, { id: challenge.timelineTemplateId })
if (isLoading || _.isEmpty(metadata.challengePhases) || challenge.id !== challengeId) return
+
+ )
+ }
+
+ getFirstPlacePrizeValue (challenge) {
+ const placementPrizeSet = challenge.prizeSets.find(set => set.type === 'PLACEMENT')
+ if (placementPrizeSet && placementPrizeSet.prizes && placementPrizeSet.prizes[0] && placementPrizeSet.prizes[0].value) {
+ return placementPrizeSet.prizes[0].value
+ }
+ return 0
+ }
+
+ render () {
+ const { challenge, metadata = {}, isLoading, readOnly = false } = this.props
+ const { error } = this.state
+ const { scorecards = [], defaultReviewers = [], workflows = [] } = metadata
+ const reviewers = challenge.reviewers || []
+ const firstPlacePrize = this.getFirstPlacePrizeValue(challenge)
+ const estimatedSubmissionsCount = 2 // Estimate assumes two submissions
+ const reviewersCost = reviewers
+ .filter((r) => !this.isAIReviewer(r))
+ .reduce((sum, r) => {
+ const fixedAmount = parseFloat(r.fixedAmount || 0)
+ const baseCoefficient = parseFloat(r.baseCoefficient || 0)
+ const incrementalCoefficient = parseFloat(r.incrementalCoefficient || 0)
+ const reviewerCost = fixedAmount + (baseCoefficient + incrementalCoefficient * estimatedSubmissionsCount) * firstPlacePrize
+
+ const count = parseInt(r.memberReviewerCount) || 1
+ return sum + reviewerCost * count
+ }, 0)
+ .toFixed(2)
+
+ if (isLoading) {
+ return (
+
+ this.removeReviewer(index)}
+ />
+ )}
+
+
+ Reviewer Type {index + 1}
+ {!readOnly && ( +
+
+
+ {!this.isAIReviewer(reviewer) && (
+
+
+ {readOnly ? (
+ {this.isAIReviewer(reviewer) ? 'AI Reviewer' : 'Member Reviewer'}
+ ) : (
+
+ )}
+
+
+ {this.isAIReviewer(reviewer) ? (
+
+
+ {readOnly ? (
+
+ {(() => {
+ const workflow = workflows.find(w => w.id === reviewer.aiWorkflowId)
+ return workflow ? workflow.name : 'Not selected'
+ })()}
+
+ ) : (
+
+ )}
+ {!readOnly && challenge.submitTriggered && validationErrors.aiWorkflowId && (
+
+ ) : (
+
+ {validationErrors.aiWorkflowId}
+
+ )}
+
+
+ {readOnly ? (
+
+ {(() => {
+ const scorecard = scorecards.find(s => s.id === reviewer.scorecardId)
+ return scorecard ? `${scorecard.name || 'Unknown'} - ${scorecard.type || 'Unknown'} (${scorecard.challengeTrack || 'Unknown'}) v${scorecard.version || 'Unknown'}` : 'Not selected'
+ })()}
+
+ ) : (
+
+ )}
+ {!readOnly && challenge.submitTriggered && validationErrors.scorecardId && (
+
+ )}
+
+
+ {validationErrors.scorecardId}
+
+ )}
+
+
+ {readOnly ? (
+
+ {(() => {
+ const phase = challenge.phases && challenge.phases.find(p =>
+ (p.id === reviewer.phaseId) || (p.phaseId === reviewer.phaseId)
+ )
+ return phase ? (phase.name || `Phase ${phase.phaseId || phase.id}`) : 'Not selected'
+ })()}
+
+ ) : (
+
+ )}
+ {!readOnly && challenge.submitTriggered && validationErrors.phaseId && (
+
+
+ {validationErrors.phaseId}
+
+ )}
+
+
+ )}
+
+ {!this.isAIReviewer(reviewer) && (
+
+
+ {readOnly ? (
+ {reviewer.memberReviewerCount || 1}
+ ) : (
+ {
+ const validatedValue = validateValue(e.target.value, VALIDATION_VALUE_TYPE.INTEGER)
+ const parsedValue = parseInt(validatedValue) || 1
+ this.updateReviewer(index, 'memberReviewerCount', Math.max(1, parsedValue))
+ }}
+ />
+ )}
+ {!readOnly && challenge.submitTriggered && validationErrors.memberReviewerCount && (
+
+
+ {validationErrors.memberReviewerCount}
+
+ )}
+
+
+ )}
+
+ {/* Assignment controls when public opportunity is OFF */}
+ {!this.isAIReviewer(reviewer) && (reviewer.shouldOpenOpportunity === false) && (
+
+
+ {readOnly ? (
+
+ { REVIEW_OPPORTUNITY_TYPE_LABELS[reviewer.type] || 'Regular Review'}
+
+ ) : (
+
+ )}
+
+ {!isDesignChallenge && (
+
+
+
+ )}
+
+
+ )}
+
+
+ {Array.from({ length: parseInt(reviewer.memberReviewerCount || 1) }, (_, i) => {
+ const assigned = (this.state.assignedMembers[index] || [])[i] || null
+ return (
+
+
+ this.onAssignmentChange(index, i, option)}
+ />
+
+ )
+ })}
+
+
+ )
+ }
+
+ if (error && !scorecards.length && !defaultReviewers.length && !workflows.length) {
+ return (
+
+
+
+
+
+ Loading...
+
+
+ )
+ }
+
+ return (
+ <>
+
+
+
+
+ {error}
+
+
+
+
+ )
+ }
+}
+
+ChallengeReviewerField.propTypes = {
+ challenge: PropTypes.object.isRequired,
+ onUpdateReviewers: PropTypes.func.isRequired,
+ metadata: PropTypes.shape({
+ scorecards: PropTypes.array,
+ defaultReviewers: PropTypes.array,
+ workflows: PropTypes.array,
+ resourceRoles: PropTypes.array
+ }),
+ isLoading: PropTypes.bool,
+ readOnly: PropTypes.bool,
+ loadScorecards: PropTypes.func.isRequired,
+ loadDefaultReviewers: PropTypes.func.isRequired,
+ loadWorkflows: PropTypes.func.isRequired,
+ replaceResourceInRole: PropTypes.func.isRequired,
+ createResource: PropTypes.func.isRequired,
+ deleteResource: PropTypes.func.isRequired,
+ challengeResources: PropTypes.array.isRequired
+}
+
+const mapStateToProps = (state) => ({
+ metadata: state.challenges.metadata || {},
+ isLoading: state.challenges.isLoading,
+ challengeResources: state.challenges.challengeResources
+})
+
+const mapDispatchToProps = {
+ loadScorecards,
+ loadDefaultReviewers,
+ loadWorkflows,
+ replaceResourceInRole,
+ createResource,
+ deleteResource
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(ChallengeReviewerField)
diff --git a/src/components/ChallengeEditor/ChallengeSchedule-Field/ChallengeSchedule-Field.module.scss b/src/components/ChallengeEditor/ChallengeSchedule-Field/ChallengeSchedule-Field.module.scss
index 8afe2400..af264b2f 100644
--- a/src/components/ChallengeEditor/ChallengeSchedule-Field/ChallengeSchedule-Field.module.scss
+++ b/src/components/ChallengeEditor/ChallengeSchedule-Field/ChallengeSchedule-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.container {
padding: 20px;
@@ -222,4 +222,3 @@
}
}
}
-
diff --git a/src/components/ChallengeEditor/ChallengeTotal-Field/ChallengeTotal-Field.module.scss b/src/components/ChallengeEditor/ChallengeTotal-Field/ChallengeTotal-Field.module.scss
index 3192fc6c..908aa61a 100644
--- a/src/components/ChallengeEditor/ChallengeTotal-Field/ChallengeTotal-Field.module.scss
+++ b/src/components/ChallengeEditor/ChallengeTotal-Field/ChallengeTotal-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/ChallengeTotal-Field/index.js b/src/components/ChallengeEditor/ChallengeTotal-Field/index.js
index d968d00c..e8c92c59 100644
--- a/src/components/ChallengeEditor/ChallengeTotal-Field/index.js
+++ b/src/components/ChallengeEditor/ChallengeTotal-Field/index.js
@@ -13,13 +13,36 @@ const ChallengeTotalField = ({ challenge }) => {
.map(v => convertDollarToInteger(v, '$'))
.reduce((prev, next) => prev + next, 0)
}
+ const placementPrizeSet = challenge.prizeSets.find(set => set.type === 'PLACEMENT')
+ const firstPlacePrize = (placementPrizeSet && placementPrizeSet.prizes && placementPrizeSet.prizes[0] && placementPrizeSet.prizes[0].value) || 0
+ let reviewerTotal = 0
+ if (challenge.reviewers && Array.isArray(challenge.reviewers)) {
+ reviewerTotal = challenge.reviewers
+ .filter(r => {
+ const isAI = r && (
+ (r.aiWorkflowId && r.aiWorkflowId.trim() !== '') ||
+ (r.isMemberReview === false)
+ )
+ return !isAI
+ })
+ .reduce((sum, r) => {
+ const basePayment = firstPlacePrize * parseFloat(r.baseCoefficient || 0)
+ const incrementalPayment = parseFloat(r.incrementalCoefficient || 0) * firstPlacePrize
+
+ const count = parseInt(r.memberReviewerCount) || 1
+ return sum + (basePayment + incrementalPayment) * count
+ }, 0)
+ }
+
+ const totalChallengeCost = ((challengeTotal || 0) + reviewerTotal) || 0
+ const formattedTotalChallengeCost = Number.isFinite(totalChallengeCost) ? totalChallengeCost.toFixed(2) : '0.00'
return (
+
+
+
+ {(!readOnly && challenge.submitTriggered) && (() => {
+ const missing = this.getMissingRequiredPhases()
+ if (missing.length > 0) {
+ return (
+
+
+ {`Please configure a scorecard for: ${missing.join(', ')}`}
+
+ )
+ }
+ return null
+ })()}
+ {!readOnly && (
+
+ Configure how this challenge will be reviewed. You can add multiple reviewers including AI and member reviewers.
+
+ )}
+
+ {!readOnly && reviewers && reviewers.length === 0 && (
+
+
+ )}
+
+ {readOnly && reviewers && reviewers.length === 0 && (
+ No reviewers configured. Click "Add Reviewer" to get started.
+ {this.findDefaultReviewer() && ( +
+
+ )}
+ Note: Default reviewer configuration is available for this track and type combination.
+
+
+ )}
+
+ {reviewers && reviewers.map((reviewer, index) =>
+ this.renderReviewerForm(reviewer, index)
+ )}
+
+ {reviewers && reviewers.length > 0 && (
+ No reviewers configured for this challenge.
+
+
+ )}
+
+ {!readOnly && (
+ Review Summary
+
+ Total Member Reviewers:
+ {reviewers.filter(r => !this.isAIReviewer(r)).reduce((sum, r) => sum + (parseInt(r.memberReviewerCount) || 0), 0)}
+
+
+ Total AI Reviewers:
+ {reviewers.filter(r => this.isAIReviewer(r)).length}
+
+
+ Estimated Review Cost:
+
+ ${reviewersCost}
+
+
+
+
+ )}
+
- $ {challengeTotal || 0}
+ $ {formattedTotalChallengeCost}
- Challenge Name: {challenge.name}
+ Challenge Name:
+ {challenge.name}
+
-
)}
- Reviewer: {reviewer}
-
-
@@ -241,6 +234,7 @@ const ChallengeView = ({
- {isTask ? (
+
+ )}
{canLaunch && (
- {challenge.legacyId || isTask ? (
-
- {/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
-
- )}
+
)}
{canApprove && (
@@ -236,7 +241,7 @@ const ChallengeViewTabs = ({
{
(
isTask &&
- challenge.status === 'Active' &&
+ challenge.status === CHALLENGE_STATUS.ACTIVE &&
!preventCopilotFromActivatingTask
) && (
@@ -302,22 +307,20 @@ const ChallengeViewTabs = ({
>
RESOURCES
- {totalSubmissions ? (
- {
- setSelectedTab(2)
- }}
- onKeyPress={e => {
- setSelectedTab(2)
- }}
- className={getSelectorStyle(selectedTab, 2)}
- >
- SUBMISSIONS ({totalSubmissions})
-
- ) : null}
+ {
+ setSelectedTab(2)
+ }}
+ onKeyPress={e => {
+ setSelectedTab(2)
+ }}
+ className={getSelectorStyle(selectedTab, 2)}
+ >
+ SUBMISSIONS ({totalSubmissions || 0})
+
{selectedTab === 0 && (
- ${amount} for each submission up to {number} submissions
+ ${amount} for each submission up to {number} submissions
) : (
diff --git a/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss b/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss
index c288cf00..fc2006d8 100644
--- a/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss
+++ b/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
@@ -52,4 +52,3 @@
}
}
}
-
diff --git a/src/components/ChallengeEditor/CopilotFee-Field/CopilotFee-Field.module.scss b/src/components/ChallengeEditor/CopilotFee-Field/CopilotFee-Field.module.scss
index 94ed732e..298397d8 100644
--- a/src/components/ChallengeEditor/CopilotFee-Field/CopilotFee-Field.module.scss
+++ b/src/components/ChallengeEditor/CopilotFee-Field/CopilotFee-Field.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/CopilotFee-Field/index.js b/src/components/ChallengeEditor/CopilotFee-Field/index.js
index fbee9df3..2345cc2b 100644
--- a/src/components/ChallengeEditor/CopilotFee-Field/index.js
+++ b/src/components/ChallengeEditor/CopilotFee-Field/index.js
@@ -7,12 +7,16 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faDollarSign } from '@fortawesome/free-solid-svg-icons'
import { VALIDATION_VALUE_TYPE, PRIZE_SETS_TYPE, CHALLENGE_PRIZE_TYPE } from '../../../config/constants'
-const CopilotFeeField = ({ challenge, onUpdateOthers, readOnly }) => {
- const type = PRIZE_SETS_TYPE.COPILOT_PAYMENT
- const copilotFee = (challenge.prizeSets && challenge.prizeSets.find(p => p.type === type)) || { type, prizes: [{ type: CHALLENGE_PRIZE_TYPE.USD, value: 0 }] }
- const value = copilotFee.prizes[0].value
+class CopilotFeeField extends React.Component {
+ constructor (props) {
+ super(props)
+ this.onChange = this.onChange.bind(this)
+ }
- function onChange (e) {
+ onChange (e) {
+ const { challenge, onUpdateOthers } = this.props
+ const type = PRIZE_SETS_TYPE.COPILOT_PAYMENT
+ const copilotFee = (challenge.prizeSets && challenge.prizeSets.find(p => p.type === type)) || { type, prizes: [{ type: CHALLENGE_PRIZE_TYPE.USD, value: 0 }] }
let value = validateValue(e.target.value, VALIDATION_VALUE_TYPE.INTEGER)
if (parseInt(value) > 1000000) {
value = '1000000'
@@ -21,21 +25,30 @@ const CopilotFeeField = ({ challenge, onUpdateOthers, readOnly }) => {
onUpdateOthers({ field: 'prizeSets', value: [...challenge.prizeSets.filter(p => p.type !== type), copilotFee] })
}
- return (
-
{
diff --git a/src/components/ChallengeEditor/Resources/index.js b/src/components/ChallengeEditor/Resources/index.js
index 2ae2a393..67ee0afa 100644
--- a/src/components/ChallengeEditor/Resources/index.js
+++ b/src/components/ChallengeEditor/Resources/index.js
@@ -12,8 +12,10 @@ import { getTCMemberURL, CHALLENGE_STATUS } from '../../../config/constants'
import ReactSVG from 'react-svg'
import { getRatingLevel, sortList } from '../../../util/tc'
import { getCurrentPhase } from '../../../util/phase'
+import { fetchReviews } from '../../../services/challenges'
import styles from './styles.module.scss'
import ResourcesDeleteModal from '../ResourcesDeleteModal'
+import Loader from '../../Loader'
const assets = require.context('../../../assets/images', false, /svg/)
const ArrowDown = './arrow-down.svg'
@@ -64,7 +66,8 @@ export default class Resources extends React.Component {
},
selectedTab: 0,
showDeleteResourceModal: null,
- exceptionResourceIdDeleteList: {}
+ exceptionResourceIdDeleteList: {},
+ isLoadingResourceDeletionRules: true
}
this.sortResources = this.sortResources.bind(this)
@@ -151,7 +154,9 @@ export default class Resources extends React.Component {
/**
* Update exception handles delete
*/
- updateExceptionHandlesDelete () {
+ async updateExceptionHandlesDelete () {
+ this.setState({ isLoadingResourceDeletionRules: true })
+
const {
submissions,
challenge,
@@ -166,6 +171,33 @@ export default class Resources extends React.Component {
exceptionHandlesDeleteList[s.createdBy] = true
})
+ // Fetch reviews to check which reviewers have actually submitted reviews
+ let resourceIdsWithSubmittedReviews = new Set()
+ try {
+ if (challenge && challenge.id) {
+ const reviews = await fetchReviews({ challengeId: challenge.id })
+ // Build a set of resource IDs who have submitted reviews
+ // Only count reviews that are actually submitted (committed or completed)
+ // Filter out PENDING reviews that haven't been submitted yet
+ const submittedReviews = reviews.filter(review =>
+ review.committed === true ||
+ (review.status && review.status.toUpperCase() === 'COMPLETED')
+ )
+ resourceIdsWithSubmittedReviews = new Set(
+ submittedReviews.map(review => review.resourceId).filter(Boolean)
+ )
+ }
+ } catch (error) {
+ console.error('Error fetching reviews:', error)
+ // Safe fallback: If we can't fetch reviews, protect ALL reviewers
+ // This prevents accidental deletion of reviewers who may have submitted work
+ resources.forEach(resourceItem => {
+ if (`${resourceItem.role}`.toLowerCase().indexOf('reviewer') >= 0) {
+ resourceIdsWithSubmittedReviews.add(resourceItem.id)
+ }
+ })
+ }
+
const exceptionResourceIdDeleteList = {}
_.forEach(resources, (resourceItem) => {
if (exceptionHandlesDeleteList[resourceItem.memberHandle]) {
@@ -202,14 +234,27 @@ export default class Resources extends React.Component {
exceptionResourceIdDeleteList[resourceItem.id] = true
} else if (
// If the current phase is not submission or registration
- // then we will disable removing reviewers and copilots.
- _.some(['reviewer', 'copilot'], (role) => `${resourceItem.role}`.toLowerCase().indexOf(role) >= 0) &&
+ // Only protect reviewers who have actually submitted a review
+ // Copilots are still protected to maintain existing behavior
isCurrentPhasesNotSubmissionOrRegistration
) {
- exceptionResourceIdDeleteList[resourceItem.id] = true
+ const isReviewer = `${resourceItem.role}`.toLowerCase().indexOf('reviewer') >= 0
+ const isCopilot = `${resourceItem.role}`.toLowerCase().indexOf('copilot') >= 0
+
+ if (isCopilot) {
+ // Copilots are still protected (original behavior)
+ exceptionResourceIdDeleteList[resourceItem.id] = true
+ } else if (isReviewer && resourceIdsWithSubmittedReviews.has(resourceItem.id)) {
+ // Only protect reviewers who have submitted a review
+ // This allows removal of reviewers who haven't submitted yet, even if other reviewers have
+ exceptionResourceIdDeleteList[resourceItem.id] = true
+ }
}
})
- this.setState({ exceptionResourceIdDeleteList })
+ this.setState({
+ exceptionResourceIdDeleteList,
+ isLoadingResourceDeletionRules: false
+ })
}
/**
@@ -269,11 +314,17 @@ export default class Resources extends React.Component {
const { challenge, canEditResource, deleteResource } = this.props
const { track } = challenge
- const { sortedResources, selectedTab, showDeleteResourceModal, exceptionResourceIdDeleteList } = this.state
+ const { sortedResources, selectedTab, showDeleteResourceModal, exceptionResourceIdDeleteList, isLoadingResourceDeletionRules } = this.state
const { field, sort } = this.getResourcesSortParam()
const revertSort = sort === 'desc' ? 'asc' : 'desc'
- const isDesign = track.toLowerCase() === 'design'
+ // Normalize track to a string before comparison; handle objects or missing values gracefully
+ const normalizedTrack = (
+ typeof track === 'string'
+ ? track
+ : (track && (track.track || track.name || track.abbreviation)) || ''
+ ).toString()
+ const isDesign = normalizedTrack.toLowerCase() === 'design'
return (
-
)
})}
+ {!loading && reviews.length === 0 && (
+
-
-
- {readOnly ? (
- ${value}
- ) : (
-
+ )
+ }
}
CopilotFeeField.defaultProps = {
diff --git a/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss b/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss
index 6b303aaa..bc7a1ed2 100644
--- a/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss
+++ b/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.editor {
@include roboto-light();
diff --git a/src/components/ChallengeEditor/Discussion-Field/Discussion-Field.module.scss b/src/components/ChallengeEditor/Discussion-Field/Discussion-Field.module.scss
index 70719729..92b8ac45 100644
--- a/src/components/ChallengeEditor/Discussion-Field/Discussion-Field.module.scss
+++ b/src/components/ChallengeEditor/Discussion-Field/Discussion-Field.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/FinalDeliverables-Field/FinalDeliverables-Field.module.scss b/src/components/ChallengeEditor/FinalDeliverables-Field/FinalDeliverables-Field.module.scss
index 4dd15523..6e4d8c92 100644
--- a/src/components/ChallengeEditor/FinalDeliverables-Field/FinalDeliverables-Field.module.scss
+++ b/src/components/ChallengeEditor/FinalDeliverables-Field/FinalDeliverables-Field.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/Groups-Field/Groups-Field.module.scss b/src/components/ChallengeEditor/Groups-Field/Groups-Field.module.scss
index 11f02521..ae58d44c 100644
--- a/src/components/ChallengeEditor/Groups-Field/Groups-Field.module.scss
+++ b/src/components/ChallengeEditor/Groups-Field/Groups-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/LastSaved-Display/LastSaved-Display.module.scss b/src/components/ChallengeEditor/LastSaved-Display/LastSaved-Display.module.scss
index 599f60d0..0a6e17c7 100644
--- a/src/components/ChallengeEditor/LastSaved-Display/LastSaved-Display.module.scss
+++ b/src/components/ChallengeEditor/LastSaved-Display/LastSaved-Display.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.container {
display: flex;
diff --git a/src/components/ChallengeEditor/MaximumSubmissions-Field/MaximumSubmissions-Field.module.scss b/src/components/ChallengeEditor/MaximumSubmissions-Field/MaximumSubmissions-Field.module.scss
index 6d342d2c..d9f97277 100644
--- a/src/components/ChallengeEditor/MaximumSubmissions-Field/MaximumSubmissions-Field.module.scss
+++ b/src/components/ChallengeEditor/MaximumSubmissions-Field/MaximumSubmissions-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/Milestone-Field/Milestone-Field.module.scss b/src/components/ChallengeEditor/Milestone-Field/Milestone-Field.module.scss
index 33657673..8454301a 100644
--- a/src/components/ChallengeEditor/Milestone-Field/Milestone-Field.module.scss
+++ b/src/components/ChallengeEditor/Milestone-Field/Milestone-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/Milestone-Field/index.js b/src/components/ChallengeEditor/Milestone-Field/index.js
index 346981ba..c912a4e0 100644
--- a/src/components/ChallengeEditor/Milestone-Field/index.js
+++ b/src/components/ChallengeEditor/Milestone-Field/index.js
@@ -38,7 +38,6 @@ MilestoneField.defaultProps = {
MilestoneField.propTypes = {
// currentType: PropTypes.string.isRequired,
- track: PropTypes.string,
milestones: PropTypes.arrayOf(PropTypes.shape()),
onUpdateSelect: PropTypes.func.isRequired,
disabled: PropTypes.bool,
diff --git a/src/components/ChallengeEditor/NDAField/NDAField.module.scss b/src/components/ChallengeEditor/NDAField/NDAField.module.scss
index 70719729..92b8ac45 100644
--- a/src/components/ChallengeEditor/NDAField/NDAField.module.scss
+++ b/src/components/ChallengeEditor/NDAField/NDAField.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/RatingsListModal/RatingsListModal.module.scss b/src/components/ChallengeEditor/RatingsListModal/RatingsListModal.module.scss
index 2a1c49e6..8127b102 100644
--- a/src/components/ChallengeEditor/RatingsListModal/RatingsListModal.module.scss
+++ b/src/components/ChallengeEditor/RatingsListModal/RatingsListModal.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.container {
box-sizing: border-box;
@@ -41,4 +41,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/components/ChallengeEditor/RatingsListModal/index.js b/src/components/ChallengeEditor/RatingsListModal/index.js
index 33f17e94..ff78383b 100644
--- a/src/components/ChallengeEditor/RatingsListModal/index.js
+++ b/src/components/ChallengeEditor/RatingsListModal/index.js
@@ -7,26 +7,27 @@ import { getTopcoderReactLib } from '../../../util/topcoder-react-lib'
import Loader from '../../Loader'
import { getReviewTypes } from '../../../services/challenges'
import { SystemReviewers } from '../../../config/constants'
+import { getSubmissionsService } from '../../../services/submissions'
export const RatingsListModal = ({ onClose, theme, token, submissionId, challengeId }) => {
const [reviews, setReviews] = useState([])
const [loading, setLoading] = useState(false)
- const enrichSources = useCallback(async (submissionReviews, reviewSummation) => {
+ const enrichSources = useCallback(async (submissionReviews = [], reviewSummation = null) => {
const reactLib = getTopcoderReactLib()
const { getService } = reactLib.services.members
const membersService = getService(token)
const resources = await membersService.getChallengeResources(challengeId)
const reviewTypes = await getReviewTypes()
- const finalReview = {
+ const finalReview = reviewSummation ? {
reviewType: 'Final score',
reviewer: '',
- score: reviewSummation ? reviewSummation.aggregateScore : 'N/A',
- isPassing: reviewSummation ? reviewSummation.isPassing : undefined
- }
+ score: reviewSummation.aggregateScore,
+ isPassing: reviewSummation.isPassing
+ } : null
- return [...submissionReviews.map(review => {
+ const baseReviews = submissionReviews.map(review => {
const reviewType = reviewTypes.find(rt => rt.id === review.typeId)
const reviewer = resources.find(resource => resource.memberHandle === review.reviewerId) || SystemReviewers.Default
return {
@@ -34,16 +35,30 @@ export const RatingsListModal = ({ onClose, theme, token, submissionId, challeng
reviewType: reviewType ? reviewType.name : '',
reviewer
}
- }), finalReview]
+ })
+
+ return finalReview ? [...baseReviews, finalReview] : baseReviews
}, [token])
const getSubmission = useCallback(async () => {
- const reactLib = getTopcoderReactLib()
- const { getService } = reactLib.services.submissions
- const submissionsService = getService(token)
- const submissionInfo = await submissionsService.getSubmissionInformation(submissionId)
- setReviews(await enrichSources(submissionInfo.review, submissionInfo.reviewSummation[0]))
- setLoading(false)
+ try {
+ const submissionsService = getSubmissionsService(token)
+ const submissionInfo = await submissionsService.getSubmissionInformation(submissionId)
+ const submissionReviews = Array.isArray(submissionInfo.review) ? submissionInfo.review : []
+ const reviewSummation = Array.isArray(submissionInfo.reviewSummation) && submissionInfo.reviewSummation.length > 0
+ ? submissionInfo.reviewSummation[0]
+ : null
+
+ if ((!submissionReviews || submissionReviews.length === 0) && !reviewSummation) {
+ setReviews([])
+ } else {
+ setReviews(await enrichSources(submissionReviews, reviewSummation))
+ }
+ } catch (e) {
+ setReviews([])
+ } finally {
+ setLoading(false)
+ }
}, [submissionId, token])
useEffect(() => {
@@ -85,6 +100,11 @@ export const RatingsListModal = ({ onClose, theme, token, submissionId, challeng
-
- )
+ {readOnly ? (
+ ${value}
+ ) : (
+
+
)}
-
+
-
-
+
+ )}
+
+
+
+
+ No review details available
+
+ )}
@@ -436,18 +487,23 @@ export default class Resources extends React.Component {
{formatDate(r.created)}
- {(canEditResource && !exceptionResourceIdDeleteList[r.id]) ? (
+ {canEditResource && (
-
- ) : null}
+ {isLoadingResourceDeletionRules ? (
+
-
+
)
}
diff --git a/src/components/ChallengeEditor/SkillsField/styles.module.scss b/src/components/ChallengeEditor/SkillsField/styles.module.scss
index 877b75fc..f4a36fac 100644
--- a/src/components/ChallengeEditor/SkillsField/styles.module.scss
+++ b/src/components/ChallengeEditor/SkillsField/styles.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/SpecialChallengeField/styles.module.scss b/src/components/ChallengeEditor/SpecialChallengeField/styles.module.scss
index 877b75fc..f4a36fac 100644
--- a/src/components/ChallengeEditor/SpecialChallengeField/styles.module.scss
+++ b/src/components/ChallengeEditor/SpecialChallengeField/styles.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/StockArts-Field/StockArts-Field.module.scss b/src/components/ChallengeEditor/StockArts-Field/StockArts-Field.module.scss
index 6840fb99..ca5a80be 100644
--- a/src/components/ChallengeEditor/StockArts-Field/StockArts-Field.module.scss
+++ b/src/components/ChallengeEditor/StockArts-Field/StockArts-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/SubmissionVisibility-Field/SubmissionVisibility-Field.module.scss b/src/components/ChallengeEditor/SubmissionVisibility-Field/SubmissionVisibility-Field.module.scss
index 6840fb99..ca5a80be 100644
--- a/src/components/ChallengeEditor/SubmissionVisibility-Field/SubmissionVisibility-Field.module.scss
+++ b/src/components/ChallengeEditor/SubmissionVisibility-Field/SubmissionVisibility-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/Submissions/Submissions.module.scss b/src/components/ChallengeEditor/Submissions/Submissions.module.scss
index 966452fc..1b8ebaff 100644
--- a/src/components/ChallengeEditor/Submissions/Submissions.module.scss
+++ b/src/components/ChallengeEditor/Submissions/Submissions.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
$tc-black : #151516;
$tc-gray-10: #d5d5d5;
diff --git a/src/components/ChallengeEditor/Submissions/index.js b/src/components/ChallengeEditor/Submissions/index.js
index e3b71051..52747c10 100644
--- a/src/components/ChallengeEditor/Submissions/index.js
+++ b/src/components/ChallengeEditor/Submissions/index.js
@@ -18,7 +18,6 @@ import {
checkAdmin
} from '../../../util/tc'
import {
- getTopcoderReactLib,
isValidDownloadFile
} from '../../../util/topcoder-react-lib'
import {
@@ -31,6 +30,8 @@ import Tooltip from '../../Tooltip'
import { RatingsListModal } from '../RatingsListModal'
import Select from '../../Select'
import Pagination from 'react-js-pagination'
+import { getSubmissionsService } from '../../../services/submissions'
+import { searchProfilesByUserIds } from '../../../services/user'
const assets = require.context('../../../assets/images', false, /svg/)
const Lock = './lock.svg'
const Download = './IconSquareDownload.svg'
@@ -56,14 +57,33 @@ class SubmissionsComponent extends React.Component {
alertMessage: '',
selectedSubmissionId: '',
showArtifactsListModal: false,
- showRatingsListModal: false
+ showRatingsListModal: false,
+ memberDetails: {}
}
+ this.pendingMemberIds = new Set()
+ this._isMounted = false
this.checkIsReviewPhaseComplete = this.checkIsReviewPhaseComplete.bind(
this
)
this.downloadSubmission = this.downloadSubmission.bind(this)
this.handlePageChange = this.handlePageChange.bind(this)
this.handlePerPageChange = this.handlePerPageChange.bind(this)
+ this.loadMemberDetails = this.loadMemberDetails.bind(this)
+ }
+
+ componentDidMount () {
+ this._isMounted = true
+ this.loadMemberDetails(this.props.submissions)
+ }
+
+ componentDidUpdate (prevProps) {
+ if (!_.isEqual(prevProps.submissions, this.props.submissions)) {
+ this.loadMemberDetails(this.props.submissions)
+ }
+ }
+
+ componentWillUnmount () {
+ this._isMounted = false
}
/**
@@ -96,9 +116,7 @@ class SubmissionsComponent extends React.Component {
async downloadSubmission (submission) {
// download submission
- const reactLib = getTopcoderReactLib()
- const { getService } = reactLib.services.submissions
- const submissionsService = getService(this.props.token)
+ const submissionsService = getSubmissionsService(this.props.token)
submissionsService.downloadSubmission(submission.id)
.then((blob) => {
isValidDownloadFile(blob).then((isValidFile) => {
@@ -147,6 +165,65 @@ class SubmissionsComponent extends React.Component {
}
}
+ async loadMemberDetails (submissions = []) {
+ const memberIds = []
+ submissions.forEach(submission => {
+ const submissionMemberId = submission.memberId || _.get(submission, 'registrant.memberId') || _.get(submission, 'registrant.userId')
+ if (!_.isNil(submissionMemberId)) {
+ memberIds.push(String(submissionMemberId))
+ }
+ })
+
+ const uniqueMemberIds = _.uniq(memberIds)
+ const { memberDetails } = this.state
+
+ const missingMemberIds = uniqueMemberIds.filter(memberId => (
+ _.isUndefined(memberDetails[memberId]) && !this.pendingMemberIds.has(memberId)
+ ))
+
+ if (!missingMemberIds.length) {
+ return
+ }
+
+ missingMemberIds.forEach(memberId => this.pendingMemberIds.add(memberId))
+
+ try {
+ const members = await searchProfilesByUserIds(missingMemberIds, 'userId,handle,email,maxRating')
+ const updatedMemberDetails = { ...memberDetails }
+
+ members.forEach(member => {
+ if (member && !_.isNil(member.userId)) {
+ const memberIdKey = String(member.userId)
+ updatedMemberDetails[memberIdKey] = member
+ this.pendingMemberIds.delete(memberIdKey)
+ }
+ })
+
+ missingMemberIds.forEach(memberId => {
+ if (!Object.prototype.hasOwnProperty.call(updatedMemberDetails, memberId)) {
+ updatedMemberDetails[memberId] = null
+ }
+ this.pendingMemberIds.delete(memberId)
+ })
+
+ if (this._isMounted) {
+ this.setState({ memberDetails: updatedMemberDetails })
+ }
+ } catch (error) {
+ const updatedMemberDetails = { ...memberDetails }
+ missingMemberIds.forEach(memberId => {
+ if (!Object.prototype.hasOwnProperty.call(updatedMemberDetails, memberId)) {
+ updatedMemberDetails[memberId] = null
+ }
+ this.pendingMemberIds.delete(memberId)
+ })
+
+ if (this._isMounted) {
+ this.setState({ memberDetails: updatedMemberDetails })
+ }
+ }
+ }
+
/**
* Update filter for getting project by pagination
* @param {Number} pageNumber page number
@@ -176,43 +253,47 @@ class SubmissionsComponent extends React.Component {
(loggedInUserResource && checkDownloadSubmissionRoles(loggedInUserResource.roles)) ||
checkAdmin(token)
- const { downloadingAll, alertMessage } = this.state
-
- const renderSubmission = s => (
-
-
-
-
-
-
+ render () {
+ const { challenge } = this.props
+ const type = PRIZE_SETS_TYPE.REVIEWER_PAYMENT
+ const reviewCost = challenge.prizeSets.find(p => p.type === type) || { type, prizes: [{ type: CHALLENGE_PRIZE_TYPE.USD, value: 0 }] }
+ const value = reviewCost.prizes[0].value
+
+ return (
+
- )
+ )
+ }
}
ReviewCostField.propTypes = {
diff --git a/src/components/ChallengeEditor/ReviewType-Field/ReviewType-Field.module.scss b/src/components/ChallengeEditor/ReviewType-Field/ReviewType-Field.module.scss
index 027acb9a..833c8c04 100644
--- a/src/components/ChallengeEditor/ReviewType-Field/ReviewType-Field.module.scss
+++ b/src/components/ChallengeEditor/ReviewType-Field/ReviewType-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/ReviewType-Field/index.js b/src/components/ChallengeEditor/ReviewType-Field/index.js
index e726dc1c..20cba011 100644
--- a/src/components/ChallengeEditor/ReviewType-Field/index.js
+++ b/src/components/ChallengeEditor/ReviewType-Field/index.js
@@ -1,113 +1,10 @@
-import _ from 'lodash'
-import React from 'react'
import PropTypes from 'prop-types'
-import Select from '../../Select'
-import cn from 'classnames'
-import styles from './ReviewType-Field.module.scss'
-import Tooltip from '../../Tooltip'
-import { DES_TRACK_ID, REVIEW_TYPES, MESSAGE, QA_TRACK_ID } from '../../../config/constants'
-const ReviewTypeField = ({ reviewers, challenge, onUpdateOthers, onUpdateSelect }) => {
- const isDesignChallenge = challenge.trackId === DES_TRACK_ID
- const isQAChallenge = challenge.trackId === QA_TRACK_ID
- const isTask = _.get(challenge, 'task.isTask', false)
- const defaultReviewType = isDesignChallenge ? REVIEW_TYPES.INTERNAL : REVIEW_TYPES.COMMUNITY
- const reviewType = challenge.reviewType ? challenge.reviewType.toUpperCase() : defaultReviewType
- const isCommunity = reviewType === REVIEW_TYPES.COMMUNITY
- const isInternal = reviewType === REVIEW_TYPES.INTERNAL || isTask
- const communityOption = (disabled) => (
+
-
+
+
+
+
+
- e.target.checked && onUpdateOthers({ field: 'reviewType', value: REVIEW_TYPES.COMMUNITY })}
- />
-
-
)
- const internalOption = (disabled) => (
- e.target.checked && onUpdateOthers({ field: 'reviewType', value: REVIEW_TYPES.INTERNAL })}
- />
-
-
)
- return (
-
-
- )
-}
-
-ReviewTypeField.defaultProps = {
- reviewers: []
-}
+const ReviewTypeField = () => null
ReviewTypeField.propTypes = {
- reviewers: PropTypes.arrayOf(PropTypes.shape()).isRequired,
challenge: PropTypes.shape().isRequired,
- onUpdateOthers: PropTypes.func.isRequired,
- onUpdateSelect: PropTypes.func.isRequired
+ onUpdateOthers: PropTypes.func.isRequired
}
export default ReviewTypeField
diff --git a/src/components/ChallengeEditor/RoundType-Field/RoundType-Field.module.scss b/src/components/ChallengeEditor/RoundType-Field/RoundType-Field.module.scss
index 9f111d85..572941a8 100644
--- a/src/components/ChallengeEditor/RoundType-Field/RoundType-Field.module.scss
+++ b/src/components/ChallengeEditor/RoundType-Field/RoundType-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/RoundType-Field/index.js b/src/components/ChallengeEditor/RoundType-Field/index.js
index 45ea5e9a..116a70f0 100644
--- a/src/components/ChallengeEditor/RoundType-Field/index.js
+++ b/src/components/ChallengeEditor/RoundType-Field/index.js
@@ -35,7 +35,7 @@ const RoundTypeField = ({ roundType, onUpdateOthers }) => {
-
- {challenge.submitTriggered && isInternal && !challenge.reviewer &&
-
-
-
-
-
-
-
- { isDesignChallenge &&
-
- { communityOption(true) }
-
- }
- { !isDesignChallenge && !isTask &&
- communityOption()
- }
-
-
- {
- isQAChallenge &&
-
- { internalOption(true) }
-
- }
- { !isQAChallenge &&
- internalOption()
- }
- {
- isInternal && (
-
-
- Select a reviewer
-
}
-
-
- 
-
-
-
-
-
-
- {`#${s.id}`}
-
-
- {_.get(s.registrant, 'memberHandle', '')}
-
+ const { downloadingAll, alertMessage, memberDetails } = this.state
+
+ const renderSubmission = s => {
+ const createdAt = s.createdAt || s.created || s.submissionTime
+ const createdAtDisplay = createdAt ? moment(createdAt).format('MMM DD, YYYY HH:mm') : 'N/A'
+ return (
+
-
- )
+ )
+ }
const isF2F = type === 'First2Finish'
const isBugHunt = _.includes(tags, 'Bug Hunt')
@@ -237,7 +318,13 @@ class SubmissionsComponent extends React.Component {
})
let checkpointsUI = null
- if (track.toLowerCase() === 'design') {
+ // Normalize track to a string before comparison; handle objects or missing values gracefully
+ const normalizedTrack = (
+ typeof track === 'string'
+ ? track
+ : (track && (track.track || track.name || track.abbreviation)) || ''
+ ).toString()
+ if (normalizedTrack.toLowerCase() === 'design') {
if (challenge.submissionViewable === 'true') {
checkpointsUI = (
@@ -307,11 +394,6 @@ class SubmissionsComponent extends React.Component {
>
Submission ID (UUID)
-
- Legacy submission ID
-
{canDownloadSubmission ? (
@@ -320,42 +402,61 @@ class SubmissionsComponent extends React.Component {
- {submissions.map(s => {
- const rating = s.registrant && !_.isNil(s.registrant.rating)
- ? s.registrant.rating
- : '-'
- const memberHandle = _.get(s.registrant, 'memberHandle', '')
- const email = _.get(s.registrant, 'email', '')
- const submissionDate = moment(s.created).format('MMM DD, YYYY HH:mm')
+ {submissions.length === 0 ? (
+
+
+ No submissions received for this challenge yet
+
+
+ ) : submissions.map(s => {
+ const memberId = s.memberId || _.get(s, 'registrant.memberId') || _.get(s, 'registrant.userId')
+ const memberInfo = memberId ? memberDetails[String(memberId)] : undefined
+ const ratingFromMemberInfo = _.get(memberInfo, 'maxRating.rating')
+ const fallbackRating = !_.isNil(s.rating) ? s.rating : _.get(s, 'registrant.rating')
+ const rawRating = !_.isNil(ratingFromMemberInfo) ? ratingFromMemberInfo : fallbackRating
+ const parsedRating = _.isNil(rawRating) || rawRating === '' ? null : Number(rawRating)
+ const hasValidRating = !_.isNil(parsedRating) && !Number.isNaN(parsedRating)
+ const ratingDisplay = hasValidRating ? parsedRating : '-'
+ const ratingLevel = getRatingLevel(hasValidRating ? parsedRating : 0)
+ const memberHandle = _.get(memberInfo, 'handle', _.get(s, 'registrant.memberHandle', ''))
+ const email = _.get(memberInfo, 'email', _.get(s, 'registrant.email', ''))
+ const createdAt = s.createdAt || s.created || s.submissionTime
+ const submissionDate = createdAt ? moment(createdAt).format('MMM DD, YYYY HH:mm') : 'N/A'
+ const reviewScore = !_.isEmpty(s.review) && !_.isNil(_.get(s.review, '0.score'))
+ ? parseFloat(_.get(s.review, '0.score')).toFixed(2)
+ : 'N/A'
+ const reviewSummations = Array.isArray(s.reviewSummation) ? s.reviewSummation : []
+ const aggregateScore = !_.isEmpty(reviewSummations) && !_.isNil(_.get(reviewSummations, '0.aggregateScore'))
+ ? parseFloat(_.get(reviewSummations, '0.aggregateScore')).toFixed(2)
+ : 'N/A'
return (
{!isF2F && !isBugHunt && (
-
- {rating}
+
+ {ratingDisplay}
)}
{memberHandle}
@@ -372,14 +473,10 @@ class SubmissionsComponent extends React.Component {
-
- {!_.isEmpty(s.review) && s.review[0].score
- ? parseFloat(s.review[0].score).toFixed(2)
- : 'N/A'}
+
+ {reviewScore}
/
- {s.reviewSummation && s.reviewSummation[0].aggregateScore
- ? parseFloat(s.reviewSummation[0].aggregateScore).toFixed(2)
- : 'N/A'}
+ {aggregateScore}
@@ -387,11 +484,6 @@ class SubmissionsComponent extends React.Component {
{s.id}
-
-
- {s.legacySubmissionId}
-
-
{canDownloadSubmission ? (
@@ -471,13 +563,11 @@ class SubmissionsComponent extends React.Component {
type='info'
disabled={downloadingAll}
onClick={async () => {
- const reactLib = getTopcoderReactLib()
- const { getService } = reactLib.services.submissions
// download submission
this.setState({
downloadingAll: true
})
- const submissionsService = getService(token)
+ const submissionsService = getSubmissionsService(token)
const allFiles = []
let downloadedFile = 0
const checkToCompressFiles = () => {
@@ -577,7 +667,10 @@ SubmissionsComponent.propTypes = {
checkpoints: PT.arrayOf(PT.object),
submissions: PT.arrayOf(PT.object),
submissionViewable: PT.string,
- track: PT.string.isRequired,
+ track: PT.oneOfType([
+ PT.string,
+ PT.shape({ track: PT.string, name: PT.string, abbreviation: PT.string })
+ ]).isRequired,
type: PT.string.isRequired,
tags: PT.arrayOf(PT.string),
registrants: PT.any,
diff --git a/src/components/ChallengeEditor/TagsField/styles.module.scss b/src/components/ChallengeEditor/TagsField/styles.module.scss
index 877b75fc..f4a36fac 100644
--- a/src/components/ChallengeEditor/TagsField/styles.module.scss
+++ b/src/components/ChallengeEditor/TagsField/styles.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/Terms-Field/Terms-Field.module.scss b/src/components/ChallengeEditor/Terms-Field/Terms-Field.module.scss
index 7c429d44..08fb1409 100644
--- a/src/components/ChallengeEditor/Terms-Field/Terms-Field.module.scss
+++ b/src/components/ChallengeEditor/Terms-Field/Terms-Field.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/TextEditor-Field/TextEditor-Field.module.scss b/src/components/ChallengeEditor/TextEditor-Field/TextEditor-Field.module.scss
index cb3277bf..cbda4f77 100644
--- a/src/components/ChallengeEditor/TextEditor-Field/TextEditor-Field.module.scss
+++ b/src/components/ChallengeEditor/TextEditor-Field/TextEditor-Field.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.title {
@include roboto-bold();
diff --git a/src/components/ChallengeEditor/TextEditor-Field/index.js b/src/components/ChallengeEditor/TextEditor-Field/index.js
index 6a90a139..59e6e353 100644
--- a/src/components/ChallengeEditor/TextEditor-Field/index.js
+++ b/src/components/ChallengeEditor/TextEditor-Field/index.js
@@ -11,6 +11,7 @@ import styles from './TextEditor-Field.module.scss'
import PropTypes from 'prop-types'
import DescriptionField from '../Description-Field'
import { PrimaryButton } from '../../Buttons'
+import ChallengeReviewerField from '../ChallengeReviewer-Field'
class TextEditorField extends Component {
constructor (props) {
@@ -36,7 +37,8 @@ class TextEditorField extends Component {
onUpdateMultiSelect,
shouldShowPrivateDescription,
onUpdateMetadata,
- readOnly
+ readOnly,
+ showReviewerField
} = this.props
const { addedNewPrivateDescription } = this.state
const showShowPrivateDescriptionField = addedNewPrivateDescription || (challenge.privateDescription !== null && challenge.privateDescription !== undefined)
@@ -78,6 +80,13 @@ class TextEditorField extends Component {
/>
)}
+ {showReviewerField && (
+ {},
onUpdateSkills: () => {},
onUpdateMultiSelect: () => {},
- readOnly: false
+ readOnly: false,
+ showReviewerField: false,
+ onUpdateReviewers: () => {}
}
TextEditorField.propTypes = {
@@ -145,7 +156,9 @@ TextEditorField.propTypes = {
onUpdateSkills: PropTypes.func,
onUpdateMultiSelect: PropTypes.func,
shouldShowPrivateDescription: PropTypes.bool,
- readOnly: PropTypes.bool
+ readOnly: PropTypes.bool,
+ showReviewerField: PropTypes.bool,
+ onUpdateReviewers: PropTypes.func
}
export default TextEditorField
diff --git a/src/components/ChallengeEditor/Track-Field/Track-Field.module.scss b/src/components/ChallengeEditor/Track-Field/Track-Field.module.scss
index 4cd7b164..c1c1bca3 100644
--- a/src/components/ChallengeEditor/Track-Field/Track-Field.module.scss
+++ b/src/components/ChallengeEditor/Track-Field/Track-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/Track-Field/index.js b/src/components/ChallengeEditor/Track-Field/index.js
index 7d9b4cd1..01129e4b 100644
--- a/src/components/ChallengeEditor/Track-Field/index.js
+++ b/src/components/ChallengeEditor/Track-Field/index.js
@@ -16,7 +16,7 @@ const TrackField = ({ challenge, tracks, onUpdateOthers, disabled }) => {
<>
@@ -814,6 +814,7 @@ class ChallengeList extends Component {
challengeTypes={challengeTypes}
loginUserRoleInProject={loginUserRoleInProject}
auth={this.props.auth}
+ resetFilter={this.resetFilter}
/>
)
@@ -823,7 +824,7 @@ class ChallengeList extends Component {
-
+
{
@@ -27,7 +27,7 @@ const TrackField = ({ challenge, tracks, onUpdateOthers, disabled }) => {
{ challenge.submitTriggered && !challenge.trackId &&
}
@@ -41,7 +41,8 @@ TrackField.defaultProps = {
TrackField.propTypes = {
challenge: PropTypes.shape().isRequired,
onUpdateOthers: PropTypes.func.isRequired,
- disabled: PropTypes.bool
+ disabled: PropTypes.bool,
+ tracks: PropTypes.arrayOf(PropTypes.shape()).isRequired
}
export default TrackField
diff --git a/src/components/ChallengeEditor/Type-Field/Type-Field.module.scss b/src/components/ChallengeEditor/Type-Field/Type-Field.module.scss
index f6707a0c..fb8fb6a0 100644
--- a/src/components/ChallengeEditor/Type-Field/Type-Field.module.scss
+++ b/src/components/ChallengeEditor/Type-Field/Type-Field.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.row {
box-sizing: border-box;
diff --git a/src/components/ChallengeEditor/Type-Field/index.js b/src/components/ChallengeEditor/Type-Field/index.js
index abe41c78..09e299f5 100644
--- a/src/components/ChallengeEditor/Type-Field/index.js
+++ b/src/components/ChallengeEditor/Type-Field/index.js
@@ -11,13 +11,13 @@ const TypeField = ({ types, onUpdateSelect, challenge, disabled }) => {
<>
@@ -735,7 +735,7 @@ class ChallengeList extends Component {
onClick={() => this.updateSort('startDate')}
>
- Start Date
+ Start Date
{this.renderSortIcon('startDate')}
@@ -744,7 +744,7 @@ class ChallengeList extends Component {
onClick={() => this.updateSort('endDate')}
>
- End Date
+ End Date
{this.renderSortIcon('endDate')}
@@ -770,7 +770,7 @@ class ChallengeList extends Component {
className={cn(styles.col3)}
>
- Status
+ Status
{this.renderSortIcon('status')}
- Domain is a required field
+ Challenge Track is a required field
-
+
@@ -866,7 +867,8 @@ ChallengeList.propTypes = {
projects: PropTypes.arrayOf(PropTypes.object),
activeProject: PropTypes.shape({
id: PropTypes.number,
- name: PropTypes.string
+ name: PropTypes.string,
+ members: PropTypes.arrayOf(PropTypes.shape())
}),
warnMessage: PropTypes.string,
filterChallengeName: PropTypes.string,
diff --git a/src/components/ChallengesComponent/ChallengeStatus/ChallengeStatus.module.scss b/src/components/ChallengesComponent/ChallengeStatus/ChallengeStatus.module.scss
index 5d29d46c..668df4f0 100644
--- a/src/components/ChallengesComponent/ChallengeStatus/ChallengeStatus.module.scss
+++ b/src/components/ChallengesComponent/ChallengeStatus/ChallengeStatus.module.scss
@@ -1,4 +1,4 @@
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.container {
min-height: 22px;
@@ -42,4 +42,3 @@
background-color: $tc-red;
}
}
-
diff --git a/src/components/ChallengesComponent/ChallengeStatus/index.js b/src/components/ChallengesComponent/ChallengeStatus/index.js
index 4290670f..3994346a 100644
--- a/src/components/ChallengesComponent/ChallengeStatus/index.js
+++ b/src/components/ChallengesComponent/ChallengeStatus/index.js
@@ -15,14 +15,18 @@ const statuses = {
[CHALLENGE_STATUS.APPROVED]: styles.yellow,
[CHALLENGE_STATUS.NEW]: styles.yellow,
[CHALLENGE_STATUS.DRAFT]: styles.gray,
- [CHALLENGE_STATUS.COMPLETED]: styles.blue,
- [CHALLENGE_STATUS.CANCELLED]: styles.red
+ [CHALLENGE_STATUS.COMPLETED]: styles.blue
}
const ChallengeStatus = ({ status, statusText }) => {
+ const normalizedStatus = (status || '').toUpperCase()
+ const isCancelledStatus = normalizedStatus.startsWith(CHALLENGE_STATUS.CANCELLED)
+ const containerClass = cn(styles.container, isCancelledStatus ? styles.red : statuses[normalizedStatus])
+ const displayText = isCancelledStatus ? 'Cancelled' : _.startCase(_.toLower(statusText || normalizedStatus))
+
return (
-
- {_.startCase(_.toLower(statusText))}
+ {
const onClick = useCallback((e) => {
e.stopPropagation()
}, [])
- const orUrl = `${ONLINE_REVIEW_URL}/review/actions/ViewProjectDetails?pid=${challenge.legacyId}`
+ const reviewUrl = `${REVIEW_APP_URL}/active-challenges/${challenge.id}/challenge-details`
return (
+ {displayText}
)
}
diff --git a/src/components/ChallengesComponent/ChallengeTag/ChallengeTag.module.scss b/src/components/ChallengesComponent/ChallengeTag/ChallengeTag.module.scss
index d7c38e7a..12cd3d40 100644
--- a/src/components/ChallengesComponent/ChallengeTag/ChallengeTag.module.scss
+++ b/src/components/ChallengesComponent/ChallengeTag/ChallengeTag.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
$base-unit: 5px;
$track-space-10: $base-unit * 2;
@@ -61,9 +61,13 @@ $corner-radius: 2px;
background: $track-code-grey;
}
+ &.TGT {
+ background: $orange;
+ }
+
&.withTco {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/components/ChallengesComponent/ChallengeTag/index.js b/src/components/ChallengesComponent/ChallengeTag/index.js
index 2bc95c8d..de88bdcd 100644
--- a/src/components/ChallengesComponent/ChallengeTag/index.js
+++ b/src/components/ChallengesComponent/ChallengeTag/index.js
@@ -8,7 +8,7 @@ export default function ChallengeTag ({
type, challengeTypes
}) {
let abbreviation = getChallengeTypeAbbr(type, challengeTypes)
- if (['CH', 'F2F', 'TSK', 'MM', 'RDM', 'SKL', 'MA', 'SRM', 'PC'].indexOf(abbreviation) < 0) {
+ if (['CH', 'F2F', 'TSK', 'MM', 'RDM', 'SKL', 'MA', 'SRM', 'PC', 'TGT'].indexOf(abbreviation) < 0) {
abbreviation = ''
}
return (
diff --git a/src/components/ChallengesComponent/ChallengesComponent.module.scss b/src/components/ChallengesComponent/ChallengesComponent.module.scss
index 8908f679..ba536a27 100644
--- a/src/components/ChallengesComponent/ChallengesComponent.module.scss
+++ b/src/components/ChallengesComponent/ChallengesComponent.module.scss
@@ -1,9 +1,10 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.challenges {
width: 100%;
box-sizing: border-box;
padding: 20px 30px 30px 30px;
+ background-color: $light-bg;
}
.title {
diff --git a/src/components/ChallengesComponent/Message/Message.module.scss b/src/components/ChallengesComponent/Message/Message.module.scss
index 3a807e67..09cac6c7 100644
--- a/src/components/ChallengesComponent/Message/Message.module.scss
+++ b/src/components/ChallengesComponent/Message/Message.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.messageContainer {
justify-content: center;
@@ -14,4 +14,4 @@
text-align: center;
margin: 0;
}
-}
\ No newline at end of file
+}
diff --git a/src/components/ChallengesComponent/NoChallenge/NoChallenge.module.scss b/src/components/ChallengesComponent/NoChallenge/NoChallenge.module.scss
index adf4afb0..d3376d34 100644
--- a/src/components/ChallengesComponent/NoChallenge/NoChallenge.module.scss
+++ b/src/components/ChallengesComponent/NoChallenge/NoChallenge.module.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/includes';
+@use '../../../styles/includes' as *;
.noChallenge {
justify-content: center;
@@ -44,4 +44,3 @@
.blue {
background-color: $light-blue;
}
-
diff --git a/src/components/ChallengesComponent/ProjectStatus/ProjectStatus.module.scss b/src/components/ChallengesComponent/ProjectStatus/ProjectStatus.module.scss
index 23b7c893..eb08def7 100644
--- a/src/components/ChallengesComponent/ProjectStatus/ProjectStatus.module.scss
+++ b/src/components/ChallengesComponent/ProjectStatus/ProjectStatus.module.scss
@@ -1,5 +1,4 @@
-
-@import "../../../styles/includes";
+@use '../../../styles/includes' as *;
.container {
min-height: 22px;
width: 86px;
@@ -45,4 +44,4 @@
&.paused {
background-color: $tc-red;
}
- }
\ No newline at end of file
+ }
diff --git a/src/components/ChallengesComponent/index.js b/src/components/ChallengesComponent/index.js
index af5a36ea..4fbe77b6 100644
--- a/src/components/ChallengesComponent/index.js
+++ b/src/components/ChallengesComponent/index.js
@@ -181,7 +181,9 @@ ChallengesComponent.propTypes = {
fetchNextProjects: PropTypes.func.isRequired,
activeProject: PropTypes.shape({
id: PropTypes.number,
- name: PropTypes.string
+ name: PropTypes.string,
+ status: PropTypes.string,
+ members: PropTypes.arrayOf(PropTypes.shape())
}),
isLoading: PropTypes.bool,
warnMessage: PropTypes.string,
diff --git a/src/components/CopilotCard/CopilotCard.module.scss b/src/components/CopilotCard/CopilotCard.module.scss
index 3bcb2e25..9b75869e 100644
--- a/src/components/CopilotCard/CopilotCard.module.scss
+++ b/src/components/CopilotCard/CopilotCard.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.container {
display: flex;
diff --git a/src/components/DropdownMenu/styles.module.scss b/src/components/DropdownMenu/styles.module.scss
index a504c35b..ddedbc55 100644
--- a/src/components/DropdownMenu/styles.module.scss
+++ b/src/components/DropdownMenu/styles.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.menus {
outline: none;
@@ -34,4 +34,4 @@
outline: none !important;
padding: 0;
margin: 0;
-}
\ No newline at end of file
+}
diff --git a/src/components/DurationInput/DurationInput.module.scss b/src/components/DurationInput/DurationInput.module.scss
index 334612ac..bce87801 100644
--- a/src/components/DurationInput/DurationInput.module.scss
+++ b/src/components/DurationInput/DurationInput.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.container {
display: flex;
@@ -25,4 +25,4 @@
&[type=number] {
-moz-appearance: textfield;
}
-}
\ No newline at end of file
+}
diff --git a/src/components/FieldDescription/index.jsx b/src/components/FieldDescription/index.jsx
index 1dbfd516..50e8d538 100644
--- a/src/components/FieldDescription/index.jsx
+++ b/src/components/FieldDescription/index.jsx
@@ -6,7 +6,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import TuiEditor from '../TuiEditor'
-import styles from './styles.scss'
+import styles from './styles.module.scss'
const FieldDescription = props => (
- ( {challenge.legacyId ? Online Review
- :
- {/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
- Online Review
- }
- )
+ {/* Always show Review link for v5 challenges using v5 ID */}
+ <>
+ Review
+
{ challengeView && challenge.discussions && challenge.discussions.map(d => (
diff --git a/src/components/Modal/ConfirmationModal.module.scss b/src/components/Modal/ConfirmationModal.module.scss
index f8d5ffff..570e51cb 100644
--- a/src/components/Modal/ConfirmationModal.module.scss
+++ b/src/components/Modal/ConfirmationModal.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.contentContainer {
box-sizing: border-box;
diff --git a/src/components/Modal/Modal.module.scss b/src/components/Modal/Modal.module.scss
index cd50fb88..77b8be3b 100644
--- a/src/components/Modal/Modal.module.scss
+++ b/src/components/Modal/Modal.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
:global {
body.scrolling-disabled-by-modal {
diff --git a/src/components/PageHeader/PageHeader.module.scss b/src/components/PageHeader/PageHeader.module.scss
index 233174ca..962f3655 100644
--- a/src/components/PageHeader/PageHeader.module.scss
+++ b/src/components/PageHeader/PageHeader.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.container {
padding: 14px 30px;
background-color: $white;
diff --git a/src/components/PhaseInput/PhaseInput.module.scss b/src/components/PhaseInput/PhaseInput.module.scss
index b9d09e05..51478e9e 100644
--- a/src/components/PhaseInput/PhaseInput.module.scss
+++ b/src/components/PhaseInput/PhaseInput.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
:global {
div[data-reach-popover] {
diff --git a/src/components/PrizeInput/PrizeInput.module.scss b/src/components/PrizeInput/PrizeInput.module.scss
index 62403218..a1ff2e52 100644
--- a/src/components/PrizeInput/PrizeInput.module.scss
+++ b/src/components/PrizeInput/PrizeInput.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.container {
box-sizing: border-box;
@@ -26,4 +26,3 @@
color: $tc-black;
}
-
diff --git a/src/components/ProjectCard/ProjectCard.module.scss b/src/components/ProjectCard/ProjectCard.module.scss
index 168de868..0cd0aaf6 100644
--- a/src/components/ProjectCard/ProjectCard.module.scss
+++ b/src/components/ProjectCard/ProjectCard.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.container {
width: 100%;
diff --git a/src/components/ProjectForm/ProjectForm.module.scss b/src/components/ProjectForm/ProjectForm.module.scss
index b3f51b9b..5df2b4a7 100644
--- a/src/components/ProjectForm/ProjectForm.module.scss
+++ b/src/components/ProjectForm/ProjectForm.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
form {
width: 100%;
@@ -101,4 +101,4 @@ form {
display: flex;
gap: 5px;
align-items: center;
-}
\ No newline at end of file
+}
diff --git a/src/components/ProjectForm/index.js b/src/components/ProjectForm/index.js
index 7c18e393..45f81f15 100644
--- a/src/components/ProjectForm/index.js
+++ b/src/components/ProjectForm/index.js
@@ -1,4 +1,5 @@
import React, { useMemo, useState } from 'react'
+import PropTypes from 'prop-types'
import { useForm, Controller } from 'react-hook-form'
import cn from 'classnames'
import { get } from 'lodash'
@@ -285,4 +286,30 @@ const ProjectForm = ({
)
}
+ProjectForm.propTypes = {
+ projectTypes: PropTypes.arrayOf(
+ PropTypes.shape({
+ key: PropTypes.string.isRequired,
+ displayName: PropTypes.string.isRequired
+ })
+ ).isRequired,
+ createProject: PropTypes.func.isRequired,
+ updateProject: PropTypes.func.isRequired,
+ setActiveProject: PropTypes.func.isRequired,
+ history: PropTypes.shape({
+ push: PropTypes.func.isRequired
+ }).isRequired,
+ isEdit: PropTypes.bool.isRequired,
+ canManage: PropTypes.bool.isRequired,
+ projectDetail: PropTypes.shape({
+ id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+ name: PropTypes.string,
+ description: PropTypes.string,
+ status: PropTypes.string,
+ type: PropTypes.string,
+ terms: PropTypes.array,
+ groups: PropTypes.array
+ })
+}
+
export default ProjectForm
diff --git a/src/components/Select/index.js b/src/components/Select/index.js
index b8cd5adf..326e9e19 100644
--- a/src/components/Select/index.js
+++ b/src/components/Select/index.js
@@ -23,9 +23,15 @@ const menuList = ({ onMenuScrollBottom }) => {
}
menuListRef = ref
}
- return (props) => (
+ const MenuList = (props) => (
{ setMenuListRef(ref); props.innerRef(ref) } : props.innerRef} />
)
+
+ MenuList.propTypes = {
+ innerRef: PT.any
+ }
+
+ return MenuList
}
export default function Select (props) {
diff --git a/src/components/StartDateInput/StartDateInput.module.scss b/src/components/StartDateInput/StartDateInput.module.scss
index e16fc96b..efb759d0 100644
--- a/src/components/StartDateInput/StartDateInput.module.scss
+++ b/src/components/StartDateInput/StartDateInput.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
:global {
div[data-reach-popover] {
@@ -126,4 +126,3 @@
color: black;
}
-
diff --git a/src/components/TaaSProjectCard/styles.module.scss b/src/components/TaaSProjectCard/styles.module.scss
index dab1a372..8c07ed57 100644
--- a/src/components/TaaSProjectCard/styles.module.scss
+++ b/src/components/TaaSProjectCard/styles.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.container {
width: 100%;
diff --git a/src/components/Tab/Tab.module.scss b/src/components/Tab/Tab.module.scss
index 2af529ad..ff041d6d 100644
--- a/src/components/Tab/Tab.module.scss
+++ b/src/components/Tab/Tab.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.tabs {
margin: 0 20px;
diff --git a/src/components/Tab/index.js b/src/components/Tab/index.js
index 0d2db4c9..2628e907 100644
--- a/src/components/Tab/index.js
+++ b/src/components/Tab/index.js
@@ -56,7 +56,7 @@ const Tab = ({
}}
role='presentation'
>
- All Work
+ All Work
- Projects
+ Projects
- Users
+ Users
- Self-Service
+ Self-Service
- TaaS
+ TaaS
)
diff --git a/src/components/Table/Table.module.scss b/src/components/Table/Table.module.scss
index 75448e86..9d4ff848 100644
--- a/src/components/Table/Table.module.scss
+++ b/src/components/Table/Table.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
table {
border-spacing: 0;
diff --git a/src/components/Tag/Tag.module.scss b/src/components/Tag/Tag.module.scss
index de9fbe13..659e325e 100644
--- a/src/components/Tag/Tag.module.scss
+++ b/src/components/Tag/Tag.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.tag {
display: inline-block;
diff --git a/src/components/Tooltip/Tooltip.module.scss b/src/components/Tooltip/Tooltip.module.scss
index 2ef12b1c..15be6bfc 100644
--- a/src/components/Tooltip/Tooltip.module.scss
+++ b/src/components/Tooltip/Tooltip.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.popover {
background-color: $darker-gray;
diff --git a/src/components/TopcoderFooter/styles.module.scss b/src/components/TopcoderFooter/styles.module.scss
index d6960ed7..c4a3a6d8 100644
--- a/src/components/TopcoderFooter/styles.module.scss
+++ b/src/components/TopcoderFooter/styles.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.container {
margin-top: auto;
diff --git a/src/components/Track/Track.module.scss b/src/components/Track/Track.module.scss
index e50f0b95..fcf8fb19 100644
--- a/src/components/Track/Track.module.scss
+++ b/src/components/Track/Track.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.container {
display: flex;
diff --git a/src/components/TuiEditor/index.jsx b/src/components/TuiEditor/index.jsx
index 5cfb118b..52b1caf1 100644
--- a/src/components/TuiEditor/index.jsx
+++ b/src/components/TuiEditor/index.jsx
@@ -7,7 +7,7 @@ import React from 'react'
import _ from 'lodash'
import PropTypes from 'prop-types'
import Editor from '@toast-ui/editor'
-import styles from './styles.scss'
+import styles from './styles.module.scss'
import cn from 'classnames'
import 'codemirror/lib/codemirror.css'
import '@toast-ui/editor/dist/toastui-editor.css'
diff --git a/src/components/TuiEditor/styles.scss b/src/components/TuiEditor/styles.module.scss
similarity index 94%
rename from src/components/TuiEditor/styles.scss
rename to src/components/TuiEditor/styles.module.scss
index fcc6bed3..b827f187 100644
--- a/src/components/TuiEditor/styles.scss
+++ b/src/components/TuiEditor/styles.module.scss
@@ -1,7 +1,7 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
+
.editor {
- background: red;
> div {
h1 {
diff --git a/src/components/UpdateBillingAccount/UpdateBillingAccount.module.scss b/src/components/UpdateBillingAccount/UpdateBillingAccount.module.scss
index e915eeca..c5a52bac 100644
--- a/src/components/UpdateBillingAccount/UpdateBillingAccount.module.scss
+++ b/src/components/UpdateBillingAccount/UpdateBillingAccount.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.field {
@include upto-sm {
diff --git a/src/components/UpdateBillingAccount/index.js b/src/components/UpdateBillingAccount/index.js
index d45de764..71cca494 100644
--- a/src/components/UpdateBillingAccount/index.js
+++ b/src/components/UpdateBillingAccount/index.js
@@ -134,11 +134,11 @@ const UpdateBillingAccount = ({
{(isAdmin || (isManager && isMemberOfActiveProject)) && (
{' '}
- ({' '}
+ ({' '}
- Select Billing Account
+ Select Billing Account
{' '}
- )
+ )
)}
@@ -158,11 +158,11 @@ const UpdateBillingAccount = ({
{(isAdmin || (isManager && isMemberOfActiveProject)) && (
{' '}
- ({' '}
+ ({' '}
- Edit Billing Account
+ Edit Billing Account
{' '}
- )
+ )
)}
diff --git a/src/components/UserCard/UserCard.module.scss b/src/components/UserCard/UserCard.module.scss
index da47949c..7ea38983 100644
--- a/src/components/UserCard/UserCard.module.scss
+++ b/src/components/UserCard/UserCard.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.item {
display: flex;
diff --git a/src/components/Users/Users.module.scss b/src/components/Users/Users.module.scss
index 862679f3..31081862 100644
--- a/src/components/Users/Users.module.scss
+++ b/src/components/Users/Users.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.list {
width: 100%;
diff --git a/src/components/Users/index.js b/src/components/Users/index.js
index 2164338b..90bd4401 100644
--- a/src/components/Users/index.js
+++ b/src/components/Users/index.js
@@ -277,19 +277,19 @@ class Users extends Component {
<>
- User
+ User
- Read
+ Read
- Write
+ Write
- Full Access
+ Full Access
- Copilot
+ Copilot
-
diff --git a/src/config/constants.js b/src/config/constants.js
index 98b19109..5067c12a 100644
--- a/src/config/constants.js
+++ b/src/config/constants.js
@@ -4,12 +4,15 @@
export const {
COMMUNITY_APP_URL,
CHALLENGE_API_URL,
+ CHALLENGE_DEFAULT_REVIEWERS_URL,
COPILOTS_URL,
SUBMISSION_REVIEW_APP_URL,
+ SUBMISSIONS_API_URL,
STUDIO_URL,
CONNECT_APP_URL,
DIRECT_PROJECT_URL,
ONLINE_REVIEW_URL,
+ REVIEW_APP_URL,
DEFAULT_TERM_UUID,
DEFAULT_NDA_UUID,
SUBMITTER_ROLE_UUID,
@@ -28,6 +31,7 @@ export const {
API_V3,
API_V4,
API_V5,
+ API_V6,
SKILLS_V5_API_URL,
UPDATE_SKILLS_V5_API_URL,
SALESFORCE_BILLING_ACCOUNT_LINK,
@@ -227,10 +231,10 @@ export const PHASE_STATUS = {
// List of prize sets types
export const PRIZE_SETS_TYPE = {
- CHALLENGE_PRIZES: 'placement',
- COPILOT_PAYMENT: 'copilot',
- REVIEWER_PAYMENT: 'reviewer',
- CHECKPOINT_PRIZES: 'checkpoint'
+ CHALLENGE_PRIZES: 'PLACEMENT',
+ COPILOT_PAYMENT: 'COPILOT',
+ REVIEWER_PAYMENT: 'REVIEWER',
+ CHECKPOINT_PRIZES: 'CHECKPOINT'
}
export const REVIEW_TYPES = {
@@ -238,6 +242,22 @@ export const REVIEW_TYPES = {
COMMUNITY: 'COMMUNITY'
}
+export const REVIEW_OPPORTUNITY_TYPES = {
+ REGULAR_REVIEW: 'REGULAR_REVIEW',
+ COMPONENT_DEV_REVIEW: 'COMPONENT_DEV_REVIEW',
+ SPEC_REVIEW: 'SPEC_REVIEW',
+ ITERATIVE_REVIEW: 'ITERATIVE_REVIEW',
+ 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'
@@ -283,7 +303,14 @@ export const CHALLENGE_STATUS = {
DRAFT: 'DRAFT',
APPROVED: 'APPROVED',
COMPLETED: 'COMPLETED',
- CANCELLED: 'CANCELLED'
+ CANCELLED: 'CANCELLED',
+ CANCELLED_FAILED_REVIEW: 'CANCELLED_FAILED_REVIEW',
+ CANCELLED_FAILED_SCREENING: 'CANCELLED_FAILED_SCREENING',
+ CANCELLED_ZERO_SUBMISSIONS: 'CANCELLED_ZERO_SUBMISSIONS',
+ CANCELLED_WINNER_UNRESPONSIVE: 'CANCELLED_WINNER_UNRESPONSIVE',
+ CANCELLED_CLIENT_REQUEST: 'CANCELLED_CLIENT_REQUEST',
+ CANCELLED_REQUIREMENTS_INFEASIBLE: 'CANCELLED_REQUIREMENTS_INFEASIBLE',
+ CANCELLED_ZERO_REGISTRATIONS: 'CANCELLED_ZERO_REGISTRATIONS'
}
export const getTCMemberURL = (handle) => `${COMMUNITY_APP_URL}/members/${handle}`
@@ -362,7 +389,6 @@ export const CHALLENGE_TYPES_WITH_MULTIPLE_PRIZES = ['Challenge', 'Marathon Matc
* To have the same wording across the app.
*/
export const MESSAGE = {
- NO_LEGACY_CHALLENGE: 'Legacy challenge is not yet created',
NO_TASK_ASSIGNEE: 'Task is not assigned yet',
TASK_CLOSE_SUCCESS: 'Task closed successfully',
CHALLENGE_LAUNCH_SUCCESS: 'Challenge activated successfully',
@@ -375,13 +401,13 @@ export const MESSAGE = {
* Challenge cancel reasons
*/
export const CANCEL_REASONS = [
- 'Cancelled - Failed Review',
- 'Cancelled - Failed Screening',
- 'Cancelled - Zero Submissions',
- 'Cancelled - Winner Unresponsive',
- 'Cancelled - Client Request',
- 'Cancelled - Requirements Infeasible',
- 'Cancelled - Zero Registrations'
+ 'CANCELLED_FAILED_REVIEW',
+ 'CANCELLED_FAILED_SCREENING',
+ 'CANCELLED_ZERO_SUBMISSIONS',
+ 'CANCELLED_WINNER_UNRESPONSIVE',
+ 'CANCELLED_CLIENT_REQUEST',
+ 'CANCELLED_REQUIREMENTS_INFEASIBLE',
+ 'CANCELLED_ZERO_REGISTRATIONS'
]
/**
diff --git a/src/containers/ChallengeEditor/ChallengeEditor.module.scss b/src/containers/ChallengeEditor/ChallengeEditor.module.scss
index 4a837b17..3f9caa05 100644
--- a/src/containers/ChallengeEditor/ChallengeEditor.module.scss
+++ b/src/containers/ChallengeEditor/ChallengeEditor.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.errorContainer {
@@ -60,4 +60,4 @@
margin-right: 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/containers/ChallengeEditor/index.js b/src/containers/ChallengeEditor/index.js
index dffcc934..3dd79e45 100644
--- a/src/containers/ChallengeEditor/index.js
+++ b/src/containers/ChallengeEditor/index.js
@@ -140,6 +140,7 @@ class ChallengeEditor extends Component {
} else {
this.setState({ challengeDetails: nextProps.challengeDetails })
}
+
if (projectDetail && loggedInUser) {
const projectMembers = projectDetail.members
const loginUserProjectInfo = _.find(projectMembers, { userId: loggedInUser.userId })
@@ -673,7 +674,8 @@ ChallengeEditor.propTypes = {
projectDetail: PropTypes.object,
history: PropTypes.object,
metadata: PropTypes.shape({
- challengeTypes: PropTypes.array
+ challengeTypes: PropTypes.array,
+ resourceRoles: PropTypes.array
}),
isLoading: PropTypes.bool,
isBillingAccountExpired: PropTypes.bool,
diff --git a/src/containers/Challenges/Challenges.module.scss b/src/containers/Challenges/Challenges.module.scss
index 1fe2709a..f76caa57 100644
--- a/src/containers/Challenges/Challenges.module.scss
+++ b/src/containers/Challenges/Challenges.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use '../../styles/includes' as *;
.projectSearch {
padding: 20px 20px 0px;
@@ -82,4 +82,4 @@
min-width: 169px;
height: 40px;
text-decoration: none;
-}
\ No newline at end of file
+}
diff --git a/src/containers/ProjectAssets/styles.module.scss b/src/containers/ProjectAssets/styles.module.scss
index 6acf18b7..8639cb58 100644
--- a/src/containers/ProjectAssets/styles.module.scss
+++ b/src/containers/ProjectAssets/styles.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.container {
padding: 30px 20px;
diff --git a/src/containers/ProjectEditor/ProjectEditor.module.scss b/src/containers/ProjectEditor/ProjectEditor.module.scss
index 1a9587c2..6e84dc3d 100644
--- a/src/containers/ProjectEditor/ProjectEditor.module.scss
+++ b/src/containers/ProjectEditor/ProjectEditor.module.scss
@@ -1,4 +1,4 @@
-@import "../../styles/includes";
+@use "../../styles/includes" as *;
.wrapper {
box-sizing: border-box;
@@ -258,4 +258,4 @@
.btnOutline {
padding: 0 40px;
white-space: nowrap;
-}
\ No newline at end of file
+}
diff --git a/src/containers/ProjectInvitations/ProjectInvitations.module.scss b/src/containers/ProjectInvitations/ProjectInvitations.module.scss
index 865f95f9..a4765486 100644
--- a/src/containers/ProjectInvitations/ProjectInvitations.module.scss
+++ b/src/containers/ProjectInvitations/ProjectInvitations.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.modalContainer {
padding: 0;
@@ -117,4 +117,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/containers/ProjectInvitations/index.js b/src/containers/ProjectInvitations/index.js
index fc9c4e49..98059ce2 100644
--- a/src/containers/ProjectInvitations/index.js
+++ b/src/containers/ProjectInvitations/index.js
@@ -22,6 +22,7 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
const projectId = useMemo(() => parseInt(match.params.projectId), [match.params])
const invitation = useMemo(() => checkIsUserInvitedToProject(auth.token, projectDetail), [auth.token, projectDetail])
const [isUpdating, setIsUpdating] = useState(automaticAction || false)
+ const [isUpdateInprogress, setIsUpdateInprogress] = useState(false)
const isAccepting = isUpdating === PROJECT_MEMBER_INVITE_STATUS_ACCEPTED
const isDeclining = isUpdating === PROJECT_MEMBER_INVITE_STATUS_REFUSED
const queryParams = new URLSearchParams(window.location.search)
@@ -45,12 +46,16 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
}, [projectId, auth, projectDetail, isProjectLoading, history])
const updateInvite = useCallback(async (status, source) => {
+ if (isUpdateInprogress) {
+ return
+ }
setIsUpdating(status)
+ setIsUpdateInprogress(true)
try {
await updateProjectMemberInvite(projectId, invitation.id, status, source)
-
// await for the project details to propagate
await delay(1000)
+ setIsUpdateInprogress(false)
await loadProjectInvites(projectId)
toastr.success('Success', `Successfully ${status} the invitation.`)
@@ -62,7 +67,7 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
await delay(1000)
history.push('/projects')
}
- }, [projectId, invitation, loadProjectInvites, history])
+ }, [projectId, invitation, loadProjectInvites, history, isUpdateInprogress])
const acceptInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, source), [updateInvite, source])
const declineInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_REFUSED, source), [updateInvite, source])
@@ -106,7 +111,8 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
ProjectInvitations.propTypes = {
match: PropTypes.shape({
params: PropTypes.shape({
- projectId: PropTypes.string
+ projectId: PropTypes.string,
+ action: PropTypes.string
})
}).isRequired,
auth: PropTypes.object.isRequired,
diff --git a/src/containers/Projects/styles.module.scss b/src/containers/Projects/styles.module.scss
index 3fdceafb..0e8341b8 100644
--- a/src/containers/Projects/styles.module.scss
+++ b/src/containers/Projects/styles.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.container {
padding: 20px 20px 0px;
@@ -137,4 +137,4 @@
border-color: $white;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/containers/TaaSList/styles.module.scss b/src/containers/TaaSList/styles.module.scss
index acd9f703..ad673b83 100644
--- a/src/containers/TaaSList/styles.module.scss
+++ b/src/containers/TaaSList/styles.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.container {
padding: 20px 20px 0px;
@@ -42,4 +42,4 @@
margin: 0 20px;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/containers/TaaSProjectForm/styles.module.scss b/src/containers/TaaSProjectForm/styles.module.scss
index ae76582c..d71df534 100644
--- a/src/containers/TaaSProjectForm/styles.module.scss
+++ b/src/containers/TaaSProjectForm/styles.module.scss
@@ -1,4 +1,4 @@
-@import '../../styles/includes';
+@use '../../styles/includes' as *;
.wrapper {
box-sizing: border-box;
diff --git a/src/reducers/challengeSubmissions.js b/src/reducers/challengeSubmissions.js
index ab70bda7..c73ebf74 100644
--- a/src/reducers/challengeSubmissions.js
+++ b/src/reducers/challengeSubmissions.js
@@ -20,13 +20,18 @@ const initialState = {
export default function (state = initialState, action) {
switch (action.type) {
case LOAD_CHALLENGE_SUBMISSIONS_SUCCESS:
+ const headerTotal = action.payload.headers && action.payload.headers['x-total']
+ const totalCount = action.payload.totalCount
+ const totalSubmissions = totalCount != null
+ ? totalCount
+ : (headerTotal != null ? Number(headerTotal) : 0)
return {
...state,
challengeSubmissions: action.payload.data,
isLoading: false,
loadingId: null,
challengeId: state.loadingId,
- totalSubmissions: action.payload.headers['x-total'],
+ totalSubmissions,
page: action.payload.page,
submissionsPerPage: action.payload.perPage
}
@@ -37,6 +42,7 @@ export default function (state = initialState, action) {
loadingId: action.challengeId,
challengeId: null,
challengeSubmissions: [],
+ totalSubmissions: 0,
totalPages: 0
}
case LOAD_CHALLENGE_SUBMISSIONS_FAILURE:
@@ -46,6 +52,7 @@ export default function (state = initialState, action) {
loadingId: null,
challengeId: null,
challengeSubmissions: [],
+ totalSubmissions: 0,
totalPages: 0
}
default:
diff --git a/src/routes.js b/src/routes.js
index b830f9f6..61a2e197 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -27,19 +27,12 @@ import {
checkAdmin,
checkCopilot
} from './util/tc'
-import IdleTimer from 'react-idle-timer'
-import modalStyles from './styles/modal.module.scss'
-import ConfirmationModal from './components/Modal/ConfirmationModal'
import Users from './containers/Users'
import { isBetaMode, removeFromLocalStorage, saveToLocalStorage } from './util/localstorage'
import ProjectEditor from './containers/ProjectEditor'
import ProjectInvitations from './containers/ProjectInvitations'
-const { ACCOUNTS_APP_LOGIN_URL, IDLE_TIMEOUT_MINUTES, IDLE_TIMEOUT_GRACE_MINUTES, COMMUNITY_APP_URL } = process.env
-
-const theme = {
- container: modalStyles.modalContainer
-}
+const { ACCOUNTS_APP_LOGIN_URL } = process.env
class RedirectToChallenge extends React.Component {
componentWillMount () {
@@ -84,19 +77,6 @@ RedirectToChallenge.propTypes = {
const ConnectRedirectToChallenge = connect(mapStateToProps, mapDispatchToProps)(RedirectToChallenge)
class Routes extends React.Component {
- constructor (props) {
- super(props)
- this.idleTimer = null
- this.handleOnIdle = this.handleOnIdle.bind(this)
-
- this.logoutIntervalRef = null
- this.state = {
- showIdleModal: false,
- logsoutIn: IDLE_TIMEOUT_GRACE_MINUTES * 60, // convert to seconds
- logoutIntervalRef: null
- }
- }
-
componentWillMount () {
this.checkAuth()
}
@@ -129,20 +109,6 @@ class Routes extends React.Component {
}
}
- handleOnIdle () {
- this.idleTimer.pause()
- const intervalId = setInterval(() => {
- const remaining = this.state.logsoutIn
- if (remaining > 0) {
- this.setState(state => ({ ...state, logsoutIn: remaining - 1 }))
- } else {
- window.location = `${COMMUNITY_APP_URL}/logout`
- }
- }, 1000)
-
- this.setState(state => ({ ...state, showIdleModal: true, logoutIntervalRef: intervalId }))
- }
-
render () {
if (!this.props.isLoggedIn) {
return null
@@ -152,29 +118,9 @@ class Routes extends React.Component {
const isReadOnly = checkReadOnlyRoles(this.props.token)
const isCopilot = checkCopilot(this.props.token)
const isAdmin = checkAdmin(this.props.token)
- const modal = (