Skip to content

Release v1.18.5 #6674

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 11 commits into from
Oct 12, 2022
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ workflows:
filters:
branches:
only:
- enable_dashboard_on_data_science
- free
# This is alternate dev env for parallel testing
- "build-test":
Expand Down
8 changes: 8 additions & 0 deletions __tests__/shared/__snapshots__/index.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ exports[`Snapshot match 1`] = `
async={true}
src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
/>
<script
src="//cdn-3.convertexperiments.com/js/10005965-10006774.js"
type="text/javascript"
/>
</HelmetWrapper>
<withRouter(Connect(Routes)) />
<Connect(ErrorMessageContainer) />
Expand Down Expand Up @@ -62,6 +66,10 @@ exports[`Snapshot match 2`] = `
async={true}
src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
/>
<script
src="//cdn-3.convertexperiments.com/js/10005965-10006774.js"
type="text/javascript"
/>
</HelmetWrapper>
<withRouter(Connect(Routes)) />
<Connect(ErrorMessageContainer) />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ exports[`Default render 1`] = `
"openNewTab": true,
"title": "Discord",
},
Object {
"href": "https://platform-ui.topcoder-dev.com/learn",
"openNewTab": true,
"title": "Learn",
},
],
"title": "COMMUNITY",
},
Expand Down
5 changes: 5 additions & 0 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,11 @@ module.exports = {
href: 'https://discord.gg/topcoder',
openNewTab: true,
},
{
title: 'Learn',
href: 'https://platform-ui.topcoder-dev.com/learn',
openNewTab: true,
},
],
},
],
Expand Down
5 changes: 5 additions & 0 deletions config/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ module.exports = {
href: 'https://discord.gg/topcoder?ref=nav',
openNewTab: true,
},
{
title: 'Learn',
href: 'https://platform-ui.topcoder.com/learn',
openNewTab: true,
},
],
},
],
Expand Down
1 change: 1 addition & 0 deletions src/shared/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export default function App() {
<meta name="theme-color" content="#FFFFFF" />
<link rel="manifest" href="/challenges/manifest.json" />
<script src={config.URL.ABANDONMENT_EMBED} async />
<script type="text/javascript" src="//cdn-3.convertexperiments.com/js/10005965-10006774.js" />
</Helmet>
<Routes />
<ErrorMessage />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default class TCOLeaderboards extends React.Component {
<div styleName="handle">
<a href={`https://topcoder.com/members/${row['member_profile_basic.handle']}`} target="_blank" rel="noreferrer">{row['member_profile_basic.handle']}</a>
</div>
<span styleName="tcoPoints">{row['tco_leaderboard.tco_points'].toLocaleString('en-US', { maximumFractionDigits: 2 })}</span>
<span styleName="tcoPoints">{(row['tco23_leaderboard.tco_points'] ? row['tco23_leaderboard.tco_points'] : row['tco_leaderboard.tco_points']).toLocaleString('en-US', { maximumFractionDigits: 2 })}</span>
</div>
)) : <LoadingIndicator />;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ export default function ChallengeViewSelector(props) {
viewAsTable,
} = props;

const { type, tags } = challenge;
let showDashboard;
const { type, tags, metadata } = challenge;
const dashboardMetadata = _.find(metadata, { name: 'show_data_dashboard' });
if (dashboardMetadata) {
showDashboard = dashboardMetadata.value;
}

const [currentSelected, setCurrentSelected] = useState('Details');
const [isTabClosed, setIsTabClosed] = useState(true);
Expand Down Expand Up @@ -300,7 +305,7 @@ export default function ChallengeViewSelector(props) {
return '';
})()}
{
(isMM || challenge.track.toLowerCase() === 'data science') && (
(challenge.track.toLowerCase() === 'data science' && showDashboard) && (
<a
tabIndex="0"
role="tab"
Expand Down Expand Up @@ -455,6 +460,7 @@ ChallengeViewSelector.propTypes = {
type: PT.string,
track: PT.string,
tags: PT.arrayOf(PT.shape()),
metadata: PT.arrayOf(PT.string),
submissionViewable: PT.string,
}),
isMM: PT.bool,
Expand Down