Skip to content

issue_1759 fixed #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2018
Merged

issue_1759 fixed #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff79f9e
issue_1759 fixed
rashmi73 Nov 17, 2018
158ee29
linting fixed
rashmi73 Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/shared/components/SubmissionPage/Submit/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,16 @@ class Submit extends React.Component {
getSubDetails() {
const {
currentPhases,
allPhases,
} = this.props;
const checkpoint = _.find(currentPhases, {
const statusPhases = (currentPhases && currentPhases.length > 0 ? currentPhases : allPhases);
const checkpoint = _.find(statusPhases, {
phaseType: 'Checkpoint Submission',
});
const submission = _.find(currentPhases, {
const submission = _.find(statusPhases, {
phaseType: 'Submission',
});
const finalFix = _.find(currentPhases, {
const finalFix = _.find(statusPhases, {
phaseType: 'Final Fix',
});
let subType;
Expand Down Expand Up @@ -365,6 +367,7 @@ const filestackDataProp = PT.shape({
*/
Submit.propTypes = {
currentPhases: PT.arrayOf(PT.object).isRequired,
allPhases: PT.arrayOf(PT.object).isRequired,
userId: PT.string.isRequired,
challengeId: PT.number.isRequired,
challengeName: PT.string.isRequired,
Expand Down
3 changes: 2 additions & 1 deletion src/shared/components/SubmissionPage/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function SubmissionsPage(props) {

const submissionEnded = status === 'COMPLETED'
|| (!_.some(currentPhases, { phaseType: 'Submission', phaseStatus: 'Open' })
&& !_.some(currentPhases, { phaseType: 'Checkpoint Submission', phaseStatus: 'Open' }));
&& !_.some(currentPhases, { phaseType: 'Checkpoint Submission', phaseStatus: 'Open' }));

const hasFirstPlacement = !_.isEmpty(winners) && _.some(winners, { placement: 1, handle });

Expand Down Expand Up @@ -109,6 +109,7 @@ SubmissionsPage.propTypes = {
winners: PT.arrayOf(PT.object).isRequired,
handle: PT.string.isRequired,
currentPhases: PT.arrayOf(PT.object).isRequired,
allPhases: PT.arrayOf(PT.object).isRequired,
};

export default SubmissionsPage;
3 changes: 2 additions & 1 deletion src/shared/containers/SubmissionPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class SubmissionsPageContainer extends React.Component {
// and the communitiesList is not up-to-date
// then will load the communitiesList
if (!_.isEmpty(groups) && !communitiesList.loadingUuid
&& (Date.now() - communitiesList.timestamp > 10 * MIN)) {
&& (Date.now() - communitiesList.timestamp > 10 * MIN)) {
getCommunitiesList(auth);
}
}
Expand Down Expand Up @@ -152,6 +152,7 @@ const mapStateToProps = (state, ownProps) => {
return {
auth: state.auth,
currentPhases: state.challenge.details.currentPhases,
allPhases: state.challenge.details.allPhases,
communitiesList: state.tcCommunities.list,
/* Older stuff below. */
userId: state.auth.user.userId,
Expand Down