Skip to content

Mm leaderboard misc fixes v2 #3303

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
12,677 changes: 6,390 additions & 6,287 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"slick-carousel": "^1.8.1",
"supertest": "^3.1.0",
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
"topcoder-react-lib": "0.7.11-6",
"topcoder-react-lib": "0.7.11-7",
"topcoder-react-ui-kit": "^1.0.11",
"topcoder-react-utils": "0.7.8",
"turndown": "^4.0.2",
Expand Down
13 changes: 12 additions & 1 deletion src/shared/actions/page/challenge-details.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Actions related to the UI state of challenge details page.
*/

import _ from 'lodash';
import { createActions } from 'redux-actions';

/**
Expand Down Expand Up @@ -62,6 +62,15 @@ function toggleCheckpointFeedback(id, open) {
return { id, open };
}

/**
* Creates action that toggle the submission testcase..
* @param {Number} index of submission testcase.
* @return {Action}
*/
function toggleSubmissionTestCase(index) {
return index;
}

export default createActions({
PAGE: {
CHALLENGE_DETAILS: {
Expand All @@ -70,6 +79,8 @@ export default createActions({
TOGGLE_CHECKPOINT_FEEDBACK: toggleCheckpointFeedback,
SUBMISSIONS: {
TOGGLE_SUBMISSION_HISTORY: toggleSubmissionHistory,
TOGGLE_SUBMISSION_TESTCASE: toggleSubmissionTestCase,
CLEAR_SUBMISSION_TESTCASE_OPEN: _.identity,
},
},
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
/* eslint-disable jsx-a11y/click-events-have-key-events */
import _ from 'lodash';
import React from 'react';
import PT from 'prop-types';
import moment from 'moment';
import { Modal, PrimaryButton } from 'topcoder-react-ui-kit';
import ArrowUp from 'assets/images/icon-arrow-up.svg';
import ArrowDown from 'assets/images/icon-arrow-down.svg';
import LoadingIndicator from 'components/LoadingIndicator';

import modal from './style.scss';

class SubmissionInformationModal extends React.Component {
constructor(props) {
super(props);

this.getTestCaseOpen = this.getTestCaseOpen.bind(this);
this.getSubmissionBasicInfo = this.getSubmissionBasicInfo.bind(this);
this.getTestcases = this.getTestcases.bind(this);
}

componentWillUnmount() {
const { clearTestcaseOpen } = this.props;
clearTestcaseOpen();
}

getTestCaseOpen(index) {
const { openTestcase } = this.props;
return openTestcase[index.toString()] || false;
}


getSubmissionBasicInfo() {
const { submission, submissionInformation } = this.props;
return _.find(submission.submissions, item => item.submissionId === submissionInformation.id);
}

getTestcases() {
const { submissionInformation } = this.props;

let list = [];
_.forEach(submissionInformation.review, (item) => {
if (_.has(item, 'metadata.public.testcases') && item.metadata.public.testcases.length > 0) {
list = list.concat(item.metadata.public.testcases);
}
});

return list;
}

/* eslint-disable class-methods-use-this */
renderCase(key, value) {
return (
<React.Fragment>
<span>{key}</span>
<span>{value}</span>
</React.Fragment>
);
}

render() {
const {
toggleTestcase, onClose, isLoadingSubmissionInformation,
submissionInformation, isReviewPhaseComplete,
} = this.props;
const submissionBasicInfo = isLoadingSubmissionInformation
? null : this.getSubmissionBasicInfo();
const testcases = isLoadingSubmissionInformation ? [] : this.getTestcases();

return (
<Modal theme={{ container: modal.container }} onCancel={() => onClose(false)}>
{
!isLoadingSubmissionInformation && (
<React.Fragment>
<div styleName="modal.submission-information-title">Advanced Details</div>
{
submissionBasicInfo ? (
<div styleName="modal.submission-information-details">
<div styleName="modal.submission-information-details-row1">
<span styleName="modal.submission-information-details-title">Submission:&nbsp;</span>
<span styleName="modal.submission-information-details-id">{submissionInformation.id}</span>
</div>
<div styleName="modal.submission-information-details-row2">
<div styleName="modal.details-header">
<div styleName="modal.header-item">Final Score</div>
<div styleName="modal.header-item">Provissional Score</div>
<div styleName="modal.header-item">Time</div>
</div>
<div styleName="modal.details-grid">
<div
styleName="modal.details-item"
>
{(!submissionBasicInfo.finalScore && submissionBasicInfo.finalScore !== 0) || !isReviewPhaseComplete ? '-' : submissionBasicInfo.finalScore}
</div>
<div
styleName="modal.details-item"
>
{(!submissionBasicInfo.provisionalScore && submissionBasicInfo.provisionalScore !== 0) ? '-' : submissionBasicInfo.provisionalScore}
</div>
<div styleName="modal.details-item">
{moment(submissionBasicInfo.submissionTime)
.format('DD MMM YYYY')} {moment(submissionBasicInfo.submissionTime)
.format('HH:mm:ss')}
</div>
</div>
</div>
</div>
) : (
<div styleName="modal.submission-information-error">
You don&#39;t have permission to view the advanced details for this submission
</div>
)
}
{
testcases.length > 0 && (
<React.Fragment>
<div styleName="modal.testcase-title">
Test cases executed
</div>
{
_.map(testcases, (item, index) => (
<div styleName="modal.testcase-items" key={`Test case #${index + 1}`}>
<div styleName="modal.testcase-header">
<div>Test case #{index + 1}</div>
<span onClick={() => toggleTestcase(index)} role="button" tabIndex={0}>
{
this.getTestCaseOpen(index) ? <ArrowUp /> : <ArrowDown />
}
</span>
</div>
{
_.keys(item).length > 0 && (
<div styleName={`modal.testcase-grid ${this.getTestCaseOpen(index) ? 'active' : ''}`}>
{
_.map(_.keys(item), (key, caseIndex) => (
<div styleName="modal.testcase-row" key={`case-${caseIndex}-${key}`}>
{
this.renderCase(key, item[key])
}
</div>
))
}
</div>
)
}
</div>
))
}
</React.Fragment>
)
}
<div styleName="modal.submission-information-buttons">
<div styleName="modal.submission-information-button-close">
<PrimaryButton onClick={() => onClose(false)}>Dismiss</PrimaryButton>
</div>
</div>
</React.Fragment>
)
}
{
isLoadingSubmissionInformation && (
<LoadingIndicator />
)
}
</Modal>
);
}
}

SubmissionInformationModal.defaultProps = {
isLoadingSubmissionInformation: false,
submissionInformation: null,
};

SubmissionInformationModal.propTypes = {
isLoadingSubmissionInformation: PT.bool,
submissionInformation: PT.shape(),
onClose: PT.func.isRequired,
toggleTestcase: PT.func.isRequired,
openTestcase: PT.shape({}).isRequired,
clearTestcaseOpen: PT.func.isRequired,
submission: PT.shape().isRequired,
isReviewPhaseComplete: PT.bool.isRequired,
};

export default SubmissionInformationModal;
Loading