From 33d8a4d34c880ac3fcacfe7409bc3e10f1154353 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Sun, 31 May 2020 13:13:37 +0300 Subject: [PATCH] Changes phase.isActive to phase.isOpen --- package-lock.json | 6 +++--- src/shared/components/SubmissionPage/Submit/index.jsx | 6 +++--- .../components/challenge-detail/Submissions/index.jsx | 2 +- .../components/challenge-listing/ChallengeCard/index.jsx | 2 +- .../challenge-listing/Tooltips/ProgressBarTooltip/index.jsx | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42862e9e02..19db80a648 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32966,9 +32966,9 @@ "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, "topcoder-react-lib": { - "version": "1000.19.2", - "resolved": "https://registry.npmjs.org/topcoder-react-lib/-/topcoder-react-lib-1000.19.2.tgz", - "integrity": "sha512-yOYPIXD1FD2DKXiu2mXChQhuvwA4bQaJhu5UFPfGpsNrCe1gg3Fe4glJUT5kJpU7SuKTf4ML6tu3wi+G1W09GA==", + "version": "1000.19.3", + "resolved": "https://registry.npmjs.org/topcoder-react-lib/-/topcoder-react-lib-1000.19.3.tgz", + "integrity": "sha512-1hzSToSBEZQZ2VL20ZPdIGWBDjWdzbThe0IEemSLxVv5F1AplIx9YXLsiTa7AxiN+Iu6+ZFUkKiF2HqcOfSbgg==", "requires": { "auth0-js": "^6.8.4", "config": "^3.2.0", diff --git a/src/shared/components/SubmissionPage/Submit/index.jsx b/src/shared/components/SubmissionPage/Submit/index.jsx index bc3f883909..c1b509b2a7 100644 --- a/src/shared/components/SubmissionPage/Submit/index.jsx +++ b/src/shared/components/SubmissionPage/Submit/index.jsx @@ -80,13 +80,13 @@ class Submit extends React.Component { let subPhaseId; // Submission type logic - if (checkpoint && checkpoint.isActive) { + if (checkpoint && checkpoint.isOpen) { subType = 'Checkpoint Submission'; subPhaseId = checkpoint.id; - } else if (checkpoint && !checkpoint.isActive && submission && submission.isActive) { + } else if (checkpoint && !checkpoint.isOpen && submission && submission.isOpen) { subType = 'Contest Submission'; subPhaseId = submission.id; - } else if (finalFix && finalFix.isActive) { + } else if (finalFix && finalFix.isOpen) { subType = 'Studio Final Fix Submission'; subPhaseId = finalFix.id; } else { diff --git a/src/shared/components/challenge-detail/Submissions/index.jsx b/src/shared/components/challenge-detail/Submissions/index.jsx index ee1abe9df8..a7936abc70 100644 --- a/src/shared/components/challenge-detail/Submissions/index.jsx +++ b/src/shared/components/challenge-detail/Submissions/index.jsx @@ -245,7 +245,7 @@ class SubmissionsComponent extends React.Component { let isReviewPhaseComplete = false; _.forEach(allPhases, (phase) => { - if (phase.name === 'Review' && !phase.isActive) { + if (phase.name === 'Review' && !phase.isOpen) { isReviewPhaseComplete = true; } }); diff --git a/src/shared/components/challenge-listing/ChallengeCard/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/index.jsx index 1458b05d1b..7a08e0d451 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/index.jsx +++ b/src/shared/components/challenge-listing/ChallengeCard/index.jsx @@ -57,7 +57,7 @@ function ChallengeCard({ } const registrationPhase = (challenge.allPhases || challenge.phases || []).filter(phase => phase.name === 'Registration')[0]; - const isRegistrationOpen = registrationPhase ? registrationPhase.isActive : false; + const isRegistrationOpen = registrationPhase ? registrationPhase.isOpen : false; return (
diff --git a/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/index.jsx b/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/index.jsx index 1a6c1d7634..ebec5a4584 100644 --- a/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/index.jsx +++ b/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/index.jsx @@ -111,7 +111,7 @@ function Tip(props) { name: 'Checkpoint', }); } - const iterativeReviewPhase = allPhases.find(phase => phase.isActive && phase.name === 'Iterative Review'); + const iterativeReviewPhase = allPhases.find(phase => phase.isOpen && phase.name === 'Iterative Review'); if (iterativeReviewPhase) { steps.push({ date: new Date(iterativeReviewPhase.scheduledEndDate),