Skip to content

Commit 89adf0c

Browse files
committed
fix: timeline improvements
1 parent e88be08 commit 89adf0c

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/shared/components/challenge-detail/Header/DeadlinesPanel/index.jsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,20 @@ export default function DeadlinesPanel({ deadlines }) {
1616
const getCardProps = (deadline, index) => {
1717
let { name } = deadline;
1818
let showRange = true;
19-
name = name.replace(/\bCheckpoint\b/, 'Checkpoints');
19+
name = name.replace(/\bCheckpoint\b/, 'Checkpoint');
2020
if (/.+submission/i.test(name)) {
2121
hasSubmissionPhase = true;
22-
name = name.replace(/submission/i, 'Due');
23-
showRange = false;
22+
name = name.replace(/submission/i, 'Round');
2423
} else {
2524
switch (name) {
2625
case 'Submission':
27-
name = hasSubmissionPhase ? 'Finals Due' : 'Submission Due';
28-
showRange = false;
26+
name = hasSubmissionPhase ? 'Finals' : 'Submission';
2927
break;
3028
case 'Review':
3129
name = hasSubmissionPhase ? 'Finals Review' : name;
3230
break;
3331
case 'Appeals':
3432
name = hasSubmissionPhase ? 'Appeals Due' : name;
35-
showRange = false;
3633
break;
3734
default:
3835
}

src/shared/components/challenge-detail/Header/index.jsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,18 @@ export default function ChallengeHeader(props) {
153153

154154
if (trackLower === 'design') {
155155
// condition for 2 round challenge for now
156-
if (relevantPhases.length === 8) {
156+
let finalStartDate;
157+
if (relevantPhases.length === 8 || challenge.timelineTemplateId === 'd4201ca4-8437-4d63-9957-3f7708184b07') {
157158
relevantPhases = _.filter(relevantPhases, p => !(p.name.toLowerCase().includes('checkpoint screening') || p.name.toLowerCase().includes('screening')));
159+
_.map(relevantPhases, (phase) => {
160+
if (phase.name === 'Checkpoint Review') {
161+
finalStartDate = phase.scheduledEndDate;
162+
}
163+
if (phase.name === 'Submission') {
164+
// eslint-disable-next-line no-param-reassign
165+
phase.scheduledStartDate = finalStartDate;
166+
}
167+
});
158168
}
159169
}
160170
if (trackLower === 'quality-assurance') {
@@ -449,6 +459,7 @@ ChallengeHeader.propTypes = {
449459
platforms: PT.any,
450460
tags: PT.any,
451461
prizes: PT.any,
462+
timelineTemplateId: PT.string,
452463
reliabilityBonus: PT.any,
453464
userDetails: PT.any,
454465
currentPhases: PT.any,

0 commit comments

Comments
 (0)