Merge pull request #5161 from topcoder-platform/leaderboards-fixes

Leaderboards fixes

Author: luizrrodrigues

src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx

@@ -116,7 +116,7 @@ class ChallengeHistoryModal extends Component {
               challengesOrdered.map(challenge => (
                 <tr styleName="row" key={`${challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}`}>
                   <td styleName="name">
-                    <a href={`${config.URL.BASE}/challenges/${challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}/`} styleName="link" target="_blank" rel="noopener noreferrer">
+                    <a href={`${config.URL.BASE}/challenges/${challenge['tco_leaderboard.challenge_id'] || challenge['challenge.challenge_id'] || challenge.challenge_id}/`} styleName="link" target="_blank" rel="noopener noreferrer">
                       {challenge.challenge_name || challenge['challenge.challenge_name'] || challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}
                     </a>
                   </td>

src/shared/components/Leaderboard/LeaderboardTable/index.jsx

@@ -65,6 +65,9 @@ export default function LeaderboardTable(props) {
         photoUrl = `${config.CDN.PUBLIC}/avatar/${
           encodeURIComponent(photoUrl)}?size=40`;
       }
+      const fulfillment = competitor['tco_leaderboard.fulfillment']
+        ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+        : competitor.fulfillment;
       return (
         <tr key={competitor.rank}>
           <td styleName={`${stylesName}.col-rank`}>{competitor.rank}</td>
@@ -105,7 +108,7 @@ export default function LeaderboardTable(props) {
           </td>
           {
             isCopilot ? (
-              <td styleName={`${stylesName}.col-fulfillment`}>{competitor.fulfillment}</td>
+              <td styleName={`${stylesName}.col-fulfillment`}>{fulfillment}</td>
             ) : null
           }
           <td styleName={`${stylesName}.col-challenges`}>{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount}</td>
@@ -122,7 +125,7 @@ export default function LeaderboardTable(props) {
           }
           {
             isAlgo ? (
-              <td styleName={`${stylesName}.col-points`}>{competitor['srm_tco19.score']}</td>
+              <td styleName={`${stylesName}.col-points`}>{competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']}</td>
             ) : null
           }
         </tr>
@@ -141,7 +144,13 @@ export default function LeaderboardTable(props) {
               <th styleName={`${stylesName}.col-fulfillment`}>Fulfillment</th>
             ) : null
           }
-          <th styleName={`${stylesName}.col-challenges`}># of Challenges</th>
+          {
+            isAlgo ? (
+              <th styleName={`${stylesName}.col-challenges`}># of Matches</th>
+            ) : (
+              <th styleName={`${stylesName}.col-challenges`}># of Challenges</th>
+            )
+          }
           <th styleName={`${stylesName}.col-points`}>Points</th>
           {
             isTopGear ? (

src/shared/components/Leaderboard/PodiumSpot/index.jsx

@@ -107,6 +107,9 @@ export default function PodiumSpot(props) {
   }
   let rootStyle = `${stylesName}.PodiumSpot`;
   if (PODIUM_ITEM_MODIFIER[competitor.rank]) rootStyle += ` ${stylesName}.PodiumSpot--${PODIUM_ITEM_MODIFIER[competitor.rank]}`;
+  const fulfillment = competitor['tco_leaderboard.fulfillment']
+    ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+    : competitor.fulfillment;
 
   return (
     <div styleName={rootStyle}>
@@ -175,14 +178,20 @@ export default function PodiumSpot(props) {
         {
           isCopilot ? (
             <div styleName={`${stylesName}.stats`}>
-              <span styleName={`${stylesName}.value`}>{competitor.fulfillment}</span>
+              <span styleName={`${stylesName}.value`}>{fulfillment}</span>
               <span styleName={`${stylesName}.value-title`}>fulfillment</span>
             </div>
           ) : null
         }
         <div styleName={`${stylesName}.stats`}>
           <span styleName={`${stylesName}.value`}>{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount}</span>
-          <span styleName={`${stylesName}.value-title`}>challenges</span>
+          {
+            isAlgo ? (
+              <span styleName={`${stylesName}.value-title`}># of matches</span>
+            ) : (
+              <span styleName={`${stylesName}.value-title`}>challenges</span>
+            )
+          }
         </div>
         <div styleName={`${stylesName}.stats`}>
           <span styleName={`${stylesName}.value`}>{formatPoints(competitor['tco_leaderboard.tco_points'] || competitor.points)}</span>
@@ -207,7 +216,7 @@ export default function PodiumSpot(props) {
         {
           isAlgo ? (
             <div styleName={`${stylesName}.stats`}>
-              <span styleName={`${stylesName}.value`}>{competitor['srm_tco19.score']}</span>
+              <span styleName={`${stylesName}.value`}>{competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']}</span>
               <span styleName={`${stylesName}.value-title`}>total score</span>
             </div>
           ) : null