From 57af725277c151fefc5acdd9d6be497628fcae92 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 21 Oct 2020 15:09:59 -0300 Subject: [PATCH 1/3] Fix challenge status check --- src/shared/containers/challenge-detail/index.jsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx index 1dc074aee0..c2c1f185f2 100644 --- a/src/shared/containers/challenge-detail/index.jsx +++ b/src/shared/containers/challenge-detail/index.jsx @@ -406,7 +406,7 @@ class ChallengeDetailPageContainer extends React.Component { } - const submissionEnded = status === 'COMPLETED' + const submissionEnded = status === CHALLENGE_STATUS.COMPLETED || (!_.some(phases, { name: 'Submission', isOpen: true }) && !_.some(phases, { name: 'Checkpoint Submission', isOpen: true })); @@ -849,9 +849,7 @@ const mapDispatchToProps = (dispatch) => { dispatch(a.fetchCheckpointsDone(tokens.tokenV2, ch.legacyId)); } else dispatch(a.dropCheckpoints()); } else dispatch(a.dropCheckpoints()); - if (ch.status === 'COMPLETED') { - dispatch(a.loadResultsInit(challengeId)); - dispatch(a.loadResultsDone(tokens, challengeId, ch.track.toLowerCase())); + if (ch.status === CHALLENGE_STATUS.COMPLETED) { } else dispatch(a.dropResults()); return res; }); From de0b0d5a537ea285ffc8dddb8b215f647ed00087 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 21 Oct 2020 15:10:30 -0300 Subject: [PATCH 2/3] Pass legacyid to v2 results call --- src/shared/containers/challenge-detail/index.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx index c2c1f185f2..3c2efdf568 100644 --- a/src/shared/containers/challenge-detail/index.jsx +++ b/src/shared/containers/challenge-detail/index.jsx @@ -38,6 +38,7 @@ import { COMPETITION_TRACKS, COMPETITION_TRACKS_V3, SUBTRACKS, + CHALLENGE_STATUS, } from 'utils/tc'; import { config, MetaTags } from 'topcoder-react-utils'; import { actions } from 'topcoder-react-lib'; @@ -850,6 +851,8 @@ const mapDispatchToProps = (dispatch) => { } else dispatch(a.dropCheckpoints()); } else dispatch(a.dropCheckpoints()); if (ch.status === CHALLENGE_STATUS.COMPLETED) { + dispatch(a.loadResultsInit(ch.legacyId)); + dispatch(a.loadResultsDone(tokens, ch.legacyId, ch.track.toLowerCase())); } else dispatch(a.dropResults()); return res; }); From a4a78d0d5157c0c191fdd9968d40397fd9db6b17 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 21 Oct 2020 15:56:20 -0300 Subject: [PATCH 3/3] fix: for issue #5121 Issue #5121 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f459e3c1c..7c2fb734d9 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "supertest": "^3.1.0", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1000.23.2", + "topcoder-react-lib": "1000.23.3", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2",