Merge pull request #1293 from doctorhilarius/self-service-fixes

Fix Assign Copilot Issues; Unassign Copilot

Author: ThomasKranitsas

src/components/ChallengeEditor/ChallengeView/index.js

@@ -136,7 +136,7 @@ const ChallengeView = ({
             <CopilotField challenge={{
               copilot,
               selfService: challenge.legacy.selfService
-            }} copilots={metadata.members} assignYourselfCopilot={assignYourselfCopilot} showRejectChallengeModal={showRejectChallengeModal} readOnly />
+            }} copilots={challengeResources} assignYourselfCopilot={assignYourselfCopilot} showRejectChallengeModal={showRejectChallengeModal} readOnly />
             <div className={cn(styles.row, styles.topRow)}>
               <div className={styles.col}>
                 <span><span

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

@@ -8,7 +8,9 @@ import CopilotCard from '../../CopilotCard'
 
 const CopilotField = ({ copilots, challenge, onUpdateOthers, readOnly, assignYourselfCopilot }) => {
   let errMessage = 'Please set a copilot'
-  const selectedCopilot = _.find(copilots, { handle: challenge.copilot })
+  const handleProperty = copilots.handle ? 'handle' : 'memberHandle'
+  const selectedCopilot = _.find(copilots, { [handleProperty]: challenge.copilot })
+  const selectedCopilotHandle = selectedCopilot ? selectedCopilot[handleProperty] : undefined
   const copilotFee = _.find(challenge.prizeSets, p => p.type === 'copilot', [])
   const selfService = challenge.selfService
 
@@ -19,10 +21,10 @@ const CopilotField = ({ copilots, challenge, onUpdateOthers, readOnly, assignYou
           <label htmlFor='copilot'>Copilot:</label>
         </div>
         {(selectedCopilot || selfService) && (<div className={cn(styles.field, styles.col2)}>
-          {(selectedCopilot && <CopilotCard copilot={selectedCopilot} selectedCopilot='' key={selectedCopilot.handle} />)}
+          {(selectedCopilot && <CopilotCard copilot={selectedCopilot} selectedCopilot={challenge.copilot} key={selectedCopilotHandle} />)}
           {(selfService && !selectedCopilot && <PrimaryButton
-            text={'Assign Yourself'}
-            type={'info'}
+            text='Assign Yourself'
+            type='info'
             onClick={assignYourselfCopilot}
           />)}
         </div>)}

src/components/ChallengeEditor/index.js

@@ -1234,7 +1234,8 @@ class ChallengeEditor extends Component {
       attachments,
       projectPhases,
       challengeId,
-      assignYourselfCopilot
+      assignYourselfCopilot,
+      challengeResources
     } = this.props
     if (_.isEmpty(challenge)) {
       return <div>Error loading challenge</div>
@@ -1466,6 +1467,7 @@ class ChallengeEditor extends Component {
     const activeProjectMilestones = projectPhases.filter(phase => phase.status === MILESTONE_STATUS.ACTIVE)
     const currentChallengeId = this.getCurrentChallengeId()
     const showTimeline = false // disables the timeline for time being https://github.com/topcoder-platform/challenge-engine-ui/issues/706
+    const copilotResources = metadata.members || challengeResources
     const challengeForm = isNew
       ? (
         <form name='challenge-new-form' noValidate autoComplete='off' onSubmit={this.createChallengeHandler}>
@@ -1515,7 +1517,7 @@ class ChallengeEditor extends Component {
               />
             )}
             {projectDetail.version === 'v4' && <MilestoneField milestones={activeProjectMilestones} onUpdateSelect={this.onUpdateSelect} projectId={projectDetail.id} selectedMilestoneId={selectedMilestoneId} />}
-            <CopilotField challenge={challenge} copilots={metadata.members} onUpdateOthers={this.onUpdateOthers} assignYourselfCopilot={assignYourselfCopilot} />
+            <CopilotField challenge={challenge} copilots={copilotResources} onUpdateOthers={this.onUpdateOthers} assignYourselfCopilot={assignYourselfCopilot} />
             <ReviewTypeField
               reviewers={metadata.members}
               challenge={challenge}

src/components/CopilotCard/index.js

@@ -8,11 +8,12 @@ const assets = require.context('../../assets/images', false, /svg/)
 
 const CopilotCard = ({ copilot, selectedCopilot, onUpdateOthers }) => {
   const icon = './user.svg'
+  const copilotHandle = copilot.handle || copilot.memberHandle
   return (
-    <div className={cn(styles.container, { [styles.active]: copilot.handle === selectedCopilot })} onClick={() => onUpdateOthers({ field: 'copilot', value: copilot.handle })}>
+    <div className={cn(styles.container, { [styles.active]: copilotHandle === selectedCopilot })} onClick={() => onUpdateOthers({ field: 'copilot', value: copilotHandle })}>
       {copilot.photoURL && <img src={copilot.photoURL} alt='copilot' />}
       {!copilot.photoURL && <ReactSVG path={assets(`${icon}`)} />}
-      <span className={cn(styles.handle, styles[copilot.color])}>{copilot.handle}</span>
+      <span className={cn(styles.handle, styles[copilot.color])}>{copilotHandle}</span>
     </div>
   )
 }

src/containers/ChallengeEditor/index.js

@@ -405,7 +405,6 @@ class ChallengeEditor extends Component {
       loggedInUser,
       projectPhases,
       isProjectPhasesLoading,
-      rejectChallenge,
       showRejectChallengeModal
       // members
     } = this.props
@@ -529,7 +528,7 @@ class ChallengeEditor extends Component {
               partiallyUpdateChallengeDetails={partiallyUpdateChallengeDetails}
               projectPhases={projectPhases}
               assignYourselfCopilot={this.assignYourselfCopilot}
-              rejectChallenge={rejectChallenge}
+              rejectChallenge={this.rejectChallenge}
               showRejectChallengeModal={showRejectChallengeModal}
               loggedInUser={loggedInUser}
             />
@@ -656,7 +655,6 @@ ChallengeEditor.propTypes = {
   loadProject: PropTypes.func,
   projectPhases: PropTypes.arrayOf(PropTypes.object),
   isProjectPhasesLoading: PropTypes.bool,
-  rejectChallenge: PropTypes.func.isRequired,
   showRejectChallengeModal: PropTypes.func
   // members: PropTypes.arrayOf(PropTypes.shape())
 }