Self-service prod release

src/actions/challenges.js

@@ -46,7 +46,8 @@ import {
   DELETE_CHALLENGE_PENDING,
   DELETE_CHALLENGE_SUCCESS,
   DELETE_CHALLENGE_FAILURE,
-  LOAD_CHALLENGE_RESOURCES
+  LOAD_CHALLENGE_RESOURCES,
+  CHALLENGE_STATUS
 } from '../config/constants'
 import { loadProject } from './projects'
 import { removeChallengeFromPhaseProduct, saveChallengeAsPhaseProduct } from '../services/projects'
@@ -58,7 +59,7 @@ import { removeChallengeFromPhaseProduct, saveChallengeAsPhaseProduct } from '..
 /**
  * Loads active challenges of project by page
  */
-export function loadChallengesByPage (page, projectId, status, filterChallengeName = null) {
+export function loadChallengesByPage (page, projectId, status, filterChallengeName = null, selfService = false, userHandle = null) {
   return (dispatch, getState) => {
     dispatch({
       type: LOAD_CHALLENGES_PENDING,
@@ -85,6 +86,12 @@ export function loadChallengesByPage (page, projectId, status, filterChallengeNa
     } else if (!(_.isInteger(projectId) && projectId > 0)) {
       filters['status'] = 'Active'
     }
+    if (selfService) {
+      filters.selfService = true
+      if (userHandle && filters.status.toUpperCase() !== CHALLENGE_STATUS.DRAFT) {
+        filters.selfServiceCopilot = userHandle
+      }
+    }
 
     return fetchChallenges(filters, {
       page,

src/actions/sidebar.js

@@ -52,6 +52,18 @@ export function loadProjects (filterProjectName = '', myProjects = true) {
   }
 }
 
+/**
+ * Unloads projects of the authenticated user
+ */
+export function unloadProjects () {
+  return (dispatch) => {
+    dispatch({
+      type: LOAD_PROJECTS_SUCCESS,
+      projects: []
+    })
+  }
+}
+
 /**
  * Reset active params. e.g activeProjectId
  */

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

@@ -100,14 +100,12 @@ class ChallengeScheduleField extends Component {
       phase.scheduledStartDate = startDate
       phase.scheduledEndDate = moment(startDate).add(phase.duration || 0, 'hours').toDate()
       phase.actualStartDate = phase.scheduledStartDate
-      phase.actualEndDate = phase.scheduledEndDate
     } else {
       const preIndex = _.findIndex(phases, (p) => p.id === phase.predecessor)
       // `Invalid phase predecessor: ${phase.predecessor}`
       phase.scheduledStartDate = phases[preIndex].scheduledEndDate
       phase.scheduledEndDate = moment(phase.scheduledStartDate).add(phase.duration || 0, 'hours').toDate()
       phase.actualStartDate = phase.scheduledStartDate
-      phase.actualEndDate = phase.scheduledEndDate
     }
   }
 

src/components/ChallengeEditor/ChallengeView/index.js

@@ -37,7 +37,10 @@ const ChallengeView = ({
   enableEdit,
   onLaunchChallenge,
   onCloseTask,
-  projectPhases
+  projectPhases,
+  assignYourselfCopilot,
+  showRejectChallengeModal,
+  loggedInUser
 }) => {
   const selectedType = _.find(metadata.challengeTypes, { id: challenge.typeId })
   const challengeTrack = _.find(metadata.challengeTracks, { id: challenge.trackId })
@@ -74,7 +77,7 @@ const ChallengeView = ({
   const reviewerFromResources = reviewerResource ? reviewerResource.memberHandle : ''
   let copilot, reviewer
   if (challenge) {
-    copilot = challenge.copilot
+    copilot = challenge.copilot || (challenge.legacy && challenge.legacy.selfServiceCopilot)
     reviewer = challenge.reviewer
   }
   copilot = copilot || copilotFromResources
@@ -103,18 +106,18 @@ const ChallengeView = ({
                 </span>
               </div>
               {selectedMilestone &&
-              <div className={styles.col}>
-                <span><span className={styles.fieldTitle}>Milestone:</span> {selectedMilestone ? (
-                  <a href={`${CONNECT_APP_URL}/projects/${projectDetail.id}`} target='_blank'
-                    rel='noopener noreferrer'>
-                    {selectedMilestone.name}
-                  </a>
-                ) : ''}</span>
-              </div>
+                <div className={styles.col}>
+                  <span><span className={styles.fieldTitle}>Milestone:</span> {selectedMilestone ? (
+                    <a href={`${CONNECT_APP_URL}/projects/${projectDetail.id}`} target='_blank'
+                      rel='noopener noreferrer'>
+                      {selectedMilestone.name}
+                    </a>
+                  ) : ''}</span>
+                </div>
               }
               <div className={styles.col}>
                 <span className={styles.fieldTitle}>Track:</span>
-                <Track disabled type={challengeTrack} isActive key={challenge.trackId} onUpdateOthers={() => {}} />
+                <Track disabled type={challengeTrack} isActive key={challenge.trackId} onUpdateOthers={() => { }} />
               </div>
               <div className={styles.col}>
                 <span><span className={styles.fieldTitle}>Type:</span> {selectedType ? selectedType.name : ''}</span>
@@ -130,10 +133,11 @@ const ChallengeView = ({
               </div>
             </div>
             {isTask &&
-            <AssignedMemberField challenge={challenge} assignedMemberDetails={assignedMemberDetails} readOnly />}
+              <AssignedMemberField challenge={challenge} assignedMemberDetails={assignedMemberDetails} readOnly />}
             <CopilotField challenge={{
-              copilot
-            }} copilots={metadata.members} readOnly />
+              copilot,
+              selfService: challenge.legacy.selfService
+            }} copilots={challengeResources} assignYourselfCopilot={assignYourselfCopilot} showRejectChallengeModal={showRejectChallengeModal} readOnly loggedInUser={loggedInUser} />
             <div className={cn(styles.row, styles.topRow)}>
               <div className={styles.col}>
                 <span><span
@@ -259,7 +263,10 @@ ChallengeView.propTypes = {
   enableEdit: PropTypes.bool,
   onLaunchChallenge: PropTypes.func,
   onCloseTask: PropTypes.func,
-  projectPhases: PropTypes.arrayOf(PropTypes.object)
+  projectPhases: PropTypes.arrayOf(PropTypes.object),
+  assignYourselfCopilot: PropTypes.func.isRequired,
+  showRejectChallengeModal: PropTypes.func.isRequired,
+  loggedInUser: PropTypes.object
 }
 
 export default withRouter(ChallengeView)

src/components/ChallengeEditor/ChallengeViewTabs/index.js

@@ -13,8 +13,8 @@ import LegacyLinks from '../../LegacyLinks'
 import ForumLink from '../../ForumLink'
 import Registrants from '../Registrants'
 import Submissions from '../Submissions'
-import { getResourceRoleByName } from '../../../util/tc'
-import { MESSAGE } from '../../../config/constants'
+import { checkAdmin, getResourceRoleByName } from '../../../util/tc'
+import { CHALLENGE_STATUS, MESSAGE } from '../../../config/constants'
 import Tooltip from '../../Tooltip'
 import CancelDropDown from '../Cancel-Dropdown'
 import 'react-tabs/style/react-tabs.css'
@@ -43,7 +43,11 @@ const ChallengeViewTabs = ({
   onLaunchChallenge,
   cancelChallenge,
   onCloseTask,
-  projectPhases
+  projectPhases,
+  assignYourselfCopilot,
+  showRejectChallengeModal,
+  loggedInUser,
+  onApproveChallenge
 }) => {
   const [selectedTab, setSelectedTab] = useState(0)
 
@@ -80,6 +84,22 @@ const ChallengeViewTabs = ({
 
   const isTask = _.get(challenge, 'task.isTask', false)
 
+  const isSelfService = challenge.legacy.selfService
+  const isDraft = challenge.status.toUpperCase() === CHALLENGE_STATUS.DRAFT
+  const isSelfServiceCopilot = challenge.legacy.selfServiceCopilot === loggedInUser.handle
+  const isAdmin = checkAdmin(token)
+  const canApprove = isSelfServiceCopilot && isDraft && isSelfService
+  const hasBillingAccount = _.get(projectDetail, 'billingAccountId') !== null
+  // only challenges that have a billing account can be launched AND
+  // if this isn't self-service, permit launching if the challenge is draft
+  // OR if this isn't a non-self-service draft, permit launching if:
+  // a) the current user is either the self-service copilot or is an admin AND
+  // b) the challenge is approved
+  const canLaunch = hasBillingAccount &&
+    ((!isSelfService && isDraft) ||
+      ((isSelfServiceCopilot || isAdmin) &&
+        challenge.status.toUpperCase() === CHALLENGE_STATUS.APPROVED))
+
   return (
     <div className={styles.list}>
       <Helmet title='View Details' />
@@ -94,7 +114,7 @@ const ChallengeViewTabs = ({
               styles.actionButtonsLeft
             )}
           >
-            { isTask ? (<ForumLink challenge={challenge} />)
+            {isTask ? (<ForumLink challenge={challenge} />)
               : (<LegacyLinks challenge={challenge} challengeView />)
             }
           </div>
@@ -107,13 +127,14 @@ const ChallengeViewTabs = ({
             styles.actionButtonsRight
           )}
         >
-          {(challenge.status === 'Draft' || challenge.status === 'New') && <div className={styles['cancel-button']}><CancelDropDown challenge={challenge} onSelectMenu={cancelChallenge} /></div>}
-          {challenge.status === 'Draft' && (
+          {(isDraft || challenge.status === 'New') && !isSelfService &&
+            (<div className={styles['cancel-button']}><CancelDropDown challenge={challenge} onSelectMenu={cancelChallenge} /></div>)}
+          {canLaunch && (
             <div className={styles.button}>
               {challenge.legacyId || isTask ? (
                 <PrimaryButton
-                  text={'Launch'}
-                  type={'info'}
+                  text='Launch'
+                  type='info'
                   onClick={onLaunchChallenge}
                 />
               ) : (
@@ -124,6 +145,15 @@ const ChallengeViewTabs = ({
               )}
             </div>
           )}
+          {canApprove && (
+            <div className={styles.button}>
+              <PrimaryButton
+                text='Approve'
+                type='info'
+                onClick={onApproveChallenge}
+              />
+            </div>
+          )}
           {isTask && challenge.status === 'Active' && (
             <div className={styles.button}>
               {assignedMemberDetails ? (
@@ -138,9 +168,18 @@ const ChallengeViewTabs = ({
               )}
             </div>
           )}
-          {enableEdit && (
+          {enableEdit && !isSelfService && (
             <PrimaryButton text={'Edit'} type={'info'} submit link={`./edit`} />
           )}
+          {isSelfService && isDraft && (isAdmin || isSelfServiceCopilot) && (
+            <div className={styles.button}>
+              <PrimaryButton
+                text='Reject challenge'
+                type='danger'
+                onClick={showRejectChallengeModal}
+              />
+            </div>
+          )}
           <PrimaryButton text={'Back'} type={'info'} submit link={`..`} />
         </div>
       </div>
@@ -208,6 +247,10 @@ const ChallengeViewTabs = ({
           onLaunchChallenge={onLaunchChallenge}
           onCloseTask={onCloseTask}
           projectPhases={projectPhases}
+          assignYourselfCopilot={assignYourselfCopilot}
+          showRejectChallengeModal={showRejectChallengeModal}
+          onApproveChallenge={onApproveChallenge}
+          loggedInUser={loggedInUser}
         />
       )}
       {selectedTab === 1 && (
@@ -244,7 +287,11 @@ ChallengeViewTabs.propTypes = {
   onLaunchChallenge: PropTypes.func,
   cancelChallenge: PropTypes.func.isRequired,
   onCloseTask: PropTypes.func,
-  projectPhases: PropTypes.arrayOf(PropTypes.object)
+  projectPhases: PropTypes.arrayOf(PropTypes.object),
+  assignYourselfCopilot: PropTypes.func.isRequired,
+  showRejectChallengeModal: PropTypes.func.isRequired,
+  loggedInUser: PropTypes.object.isRequired,
+  onApproveChallenge: PropTypes.func
 }
 
 export default ChallengeViewTabs

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

@@ -44,6 +44,7 @@
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
+      width: 100%;
 
         div {
           margin-right: 13px;