Skip to content

Enable dashboard on data science #6639

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 4 commits into from
Sep 20, 2022
Merged

Enable dashboard on data science #6639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6f6e8b
Test for enabling dashboard on data science challenge
jmgasper Sep 4, 2022
5d71dad
Fix lint complaint
jmgasper Sep 4, 2022
05a8f2e
Fix lint again
jmgasper Sep 4, 2022
028fd7a
When switching to Submissions and Registrants tab from Dashboard tab,…
jmgasper Sep 9, 2022
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
2 changes: 1 addition & 1 deletion src/shared/components/challenge-detail/Header/TabSelector/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ export default function ChallengeViewSelector(props) {
return '';
})()}
{
isMM && (
(isMM || challenge.track.toLowerCase() === 'data science') && (
<a
tabIndex="0"
role="tab"
Expand Down
18 changes: 10 additions & 8 deletions src/shared/components/challenge-detail/Submissions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class SubmissionsComponent extends React.Component {

componentDidMount() {
const { challenge, loadMMSubmissions, auth } = this.props;
const isMM = checkIsMM(challenge);
const isMM = this.isMM();

// Check auth token, go to login page if invalid
if (isMM && (_.isEmpty(auth) || _.isEmpty(auth.tokenV3) || isTokenExpired(auth.tokenV3))) {
Expand All @@ -73,8 +73,7 @@ class SubmissionsComponent extends React.Component {
}

componentDidUpdate(prevProps) {
const { challenge } = this.props;
const isMM = checkIsMM(challenge);
const isMM = this.isMM();

const { submissions, mmSubmissions, submissionsSort } = this.props;
if (
Expand Down Expand Up @@ -144,8 +143,7 @@ class SubmissionsComponent extends React.Component {
* Update sorted submission array
*/
updateSortedSubmissions() {
const { challenge } = this.props;
const isMM = checkIsMM(challenge);
const isMM = this.isMM();
const { submissions, mmSubmissions } = this.props;
const sortedSubmissions = _.cloneDeep(isMM ? mmSubmissions : submissions);
this.sortSubmissions(sortedSubmissions);
Expand All @@ -157,8 +155,7 @@ class SubmissionsComponent extends React.Component {
* @param {Array} submissions array of submission
*/
sortSubmissions(submissions) {
const { challenge } = this.props;
const isMM = checkIsMM(challenge);
const isMM = this.isMM();
const isReviewPhaseComplete = this.checkIsReviewPhaseComplete();
const { field, sort } = this.getSubmissionsSortParam(isMM, isReviewPhaseComplete);
let isHaveFinalScore = false;
Expand Down Expand Up @@ -251,6 +248,11 @@ class SubmissionsComponent extends React.Component {
});
}

isMM() {
const { challenge } = this.props;
return challenge.track.toLowerCase() === 'data science' || checkIsMM(challenge);
}

/**
* Check if review phase complete
*/
Expand Down Expand Up @@ -299,7 +301,7 @@ class SubmissionsComponent extends React.Component {
tags,
} = challenge;

const isMM = checkIsMM(challenge);
const isMM = this.isMM();
const isReviewPhaseComplete = this.checkIsReviewPhaseComplete();

const { field, sort } = this.getSubmissionsSortParam(isMM, isReviewPhaseComplete);
Expand Down
3 changes: 2 additions & 1 deletion src/shared/containers/challenge-detail/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ class ChallengeDetailPageContainer extends React.Component {
history.push(history.location.pathname, history.state);
}

if (!checkIsMM(challenge) && selectedTab === DETAIL_TABS.MM_DASHBOARD) {
if (!checkIsMM(challenge) && COMPETITION_TRACKS_V3.DS !== challenge.track
&& selectedTab === DETAIL_TABS.MM_DASHBOARD) {
onSelectorClicked(DETAIL_TABS.DETAILS);
}

Expand Down