Merge pull request #6674 from topcoder-platform/develop

Release v1.18.5
topcoder-platform · Oct 12, 2022 · a038209 · a038209
2 parents de5eec8 + ae588c3
commit a038209
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -349,6 +349,7 @@ workflows:
           filters:
             branches:
               only:
+                - enable_dashboard_on_data_science
                 - free
       # This is alternate dev env for parallel testing
       - "build-test":

diff --git a/__tests__/shared/__snapshots__/index.jsx.snap b/__tests__/shared/__snapshots__/index.jsx.snap
@@ -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) />
@@ -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) />

diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -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",
         },

diff --git a/config/default.js b/config/default.js
@@ -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,
+        },
       ],
     },
   ],

diff --git a/config/production.js b/config/production.js
@@ -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,
+        },
       ],
     },
   ],

diff --git a/src/shared/app.jsx b/src/shared/app.jsx
@@ -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 />

diff --git a/src/shared/components/Dashboard/TCOLeaderboards/index.jsx b/src/shared/components/Dashboard/TCOLeaderboards/index.jsx
@@ -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 />;
 

diff --git a/src/shared/components/challenge-detail/Header/TabSelector/index.jsx b/src/shared/components/challenge-detail/Header/TabSelector/index.jsx
@@ -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);
@@ -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"
@@ -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,