From 99721cb03f803530e23adeab53b0e28a47c7164a Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 21 Oct 2020 11:06:10 +0300 Subject: [PATCH 1/6] Fix #4897 --- .../components/Leaderboard/LeaderboardTable/index.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx index 33c49b62e9..f4ae9cd2fc 100644 --- a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx +++ b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx @@ -122,7 +122,7 @@ export default function LeaderboardTable(props) { } { isAlgo ? ( - {competitor['srm_tco19.score']} + {competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']} ) : null } @@ -141,7 +141,13 @@ export default function LeaderboardTable(props) { Fulfillment ) : null } - # of Challenges + { + isAlgo ? ( + # of Matches + ) : ( + # of Challenges + ) + } Points { isTopGear ? ( From 2f4d297198638d2e947efb7860bc33a3e8a6c919 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 21 Oct 2020 11:19:35 +0300 Subject: [PATCH 2/6] Fix #5132 --- .../components/Leaderboard/ChallengeHistoryModal/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx index 8ebdbb6725..b54a261a93 100644 --- a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx +++ b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx @@ -116,7 +116,7 @@ class ChallengeHistoryModal extends Component { challengesOrdered.map(challenge => ( - + {challenge.challenge_name || challenge['challenge.challenge_name'] || challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id} From c1f1297d5a4128d19365a4c9489f0752b3eab36e Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 27 Oct 2020 09:40:56 +0200 Subject: [PATCH 3/6] Fixed copilot fulfillment --- src/shared/components/Leaderboard/LeaderboardTable/index.jsx | 5 ++++- src/shared/components/Leaderboard/PodiumSpot/index.jsx | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx index f4ae9cd2fc..9b46aa65d1 100644 --- a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx +++ b/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 ( {competitor.rank} @@ -105,7 +108,7 @@ export default function LeaderboardTable(props) { { isCopilot ? ( - {competitor.fulfillment} + {fulfillment} ) : null } {competitor['tco_leaderboard.challenge_count'] || competitor.challengecount} diff --git a/src/shared/components/Leaderboard/PodiumSpot/index.jsx b/src/shared/components/Leaderboard/PodiumSpot/index.jsx index 72fc4869d8..6b9c5cf90f 100644 --- a/src/shared/components/Leaderboard/PodiumSpot/index.jsx +++ b/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 (
@@ -175,7 +178,7 @@ export default function PodiumSpot(props) { { isCopilot ? (
- {competitor.fulfillment} + {fulfillment} fulfillment
) : null From dcfdad738fb435789e7ecd39baec195ddfa1475f Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 4 Nov 2020 10:31:44 +0530 Subject: [PATCH 4/6] ci: deploying on test env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e58d6ae06..49dd2adefb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -237,7 +237,7 @@ workflows: filters: branches: only: - - hot-fix + - leaderboards-fixes # This is alternate dev env for parallel testing - "build-qa": context : org-global From 968961a0458df2faab4a816e45da33e3a4668d66 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 4 Nov 2020 09:36:29 +0200 Subject: [PATCH 5/6] #4897 fixed podium too --- src/shared/components/Leaderboard/PodiumSpot/index.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/shared/components/Leaderboard/PodiumSpot/index.jsx b/src/shared/components/Leaderboard/PodiumSpot/index.jsx index 6b9c5cf90f..ad1795e42e 100644 --- a/src/shared/components/Leaderboard/PodiumSpot/index.jsx +++ b/src/shared/components/Leaderboard/PodiumSpot/index.jsx @@ -185,7 +185,13 @@ export default function PodiumSpot(props) { }
{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount} - challenges + { + isAlgo ? ( + # of matches + ) : ( + challenges + ) + }
{formatPoints(competitor['tco_leaderboard.tco_points'] || competitor.points)} @@ -210,7 +216,7 @@ export default function PodiumSpot(props) { { isAlgo ? (
- {competitor['srm_tco19.score']} + {competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']} total score
) : null From b64abf40e7d45a4229f12115c39fdb9aa217bfb4 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 4 Nov 2020 09:40:22 +0200 Subject: [PATCH 6/6] #4897 fixed tco20 challenge id bug --- .../components/Leaderboard/ChallengeHistoryModal/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx index b54a261a93..f9e83ed626 100644 --- a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx +++ b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx @@ -116,7 +116,7 @@ class ChallengeHistoryModal extends Component { challengesOrdered.map(challenge => ( - + {challenge.challenge_name || challenge['challenge.challenge_name'] || challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}