Skip to content

Commit 2b5f8c2

Browse files
committed
Fixed issue #1007
1 parent 6a1758e commit 2b5f8c2

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import { DES_TRACK_ID, REVIEW_TYPES, MESSAGE, QA_TRACK_ID } from '../../../confi
99
const ReviewTypeField = ({ reviewers, challenge, onUpdateOthers, onUpdateSelect }) => {
1010
const isDesignChallenge = challenge.trackId === DES_TRACK_ID
1111
const isQAChallenge = challenge.trackId === QA_TRACK_ID
12+
const isTask = challenge.type === 'Task'
1213
const defaultReviewType = isDesignChallenge ? REVIEW_TYPES.INTERNAL : REVIEW_TYPES.COMMUNITY
1314
const reviewType = challenge.reviewType ? challenge.reviewType.toUpperCase() : defaultReviewType
1415
const isCommunity = reviewType === REVIEW_TYPES.COMMUNITY
15-
const isInternal = reviewType === REVIEW_TYPES.INTERNAL
16+
const isInternal = reviewType === REVIEW_TYPES.INTERNAL || isTask
1617
const communityOption = (disabled) => (<div className={styles.tcRadioButton}>
1718
<input
1819
name='community'
@@ -59,7 +60,7 @@ const ReviewTypeField = ({ reviewers, challenge, onUpdateOthers, onUpdateSelect
5960
{ communityOption(true) }
6061
</Tooltip>
6162
}
62-
{ !isDesignChallenge &&
63+
{ !isDesignChallenge && !isTask &&
6364
communityOption()
6465
}
6566
</div>

src/components/ChallengeEditor/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ const getTitle = (isNew) => {
6363
return 'Set-Up Work'
6464
}
6565

66+
const checkTaskType = (type) => type === 'Task'
67+
6668
class ChallengeEditor extends Component {
6769
constructor (props) {
6870
super(props)
@@ -167,7 +169,8 @@ class ChallengeEditor extends Component {
167169
reviewer = challenge.reviewer
168170
}
169171
challengeData.copilot = copilot || copilotFromResources
170-
challengeData.reviewer = reviewer || reviewerFromResources
172+
challengeData.reviewer = reviewer || reviewerFromResources || (checkTaskType(challengeData.type) ? challengeData.createdBy : '')
173+
challengeData.startDate = (checkTaskType(challengeData.type) ? moment().format() : challengeData.startDate)
171174
const challengeDetail = { ...challengeData }
172175
const isOpenAdvanceSettings = challengeDetail.groups.length > 0
173176
setState({
@@ -1100,6 +1103,7 @@ class ChallengeEditor extends Component {
11001103
if (_.isEmpty(challenge)) {
11011104
return <div>Error loading challenge</div>
11021105
}
1106+
const isTaskType = checkTaskType(challenge.type)
11031107
const isTask = _.get(challenge, 'task.isTask', false)
11041108
const { assignedMemberDetails, error } = this.state
11051109
let isActive = false
@@ -1357,7 +1361,7 @@ class ChallengeEditor extends Component {
13571361
<GroupsField groups={metadata.groups} onUpdateMultiSelect={this.onUpdateMultiSelect} challenge={challenge} />
13581362
</React.Fragment>
13591363
)}
1360-
{
1364+
{!isTaskType && (
13611365
<div className={styles.PhaseRow}>
13621366
<PhaseInput
13631367
withDates
@@ -1372,7 +1376,7 @@ class ChallengeEditor extends Component {
13721376
readOnly={false}
13731377
/>
13741378
</div>
1375-
}
1379+
)}
13761380
{ showTimeline && (
13771381
<ChallengeScheduleField
13781382
templates={this.getAvailableTimelineTemplates()}

0 commit comments

Comments
 (0)