Merge pull request #5652 from topcoder-platform/tco21-leaderboard-fix

Tco21 leaderboard fix

Author: luizrrodrigues

.circleci/config.yml

@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - tco21-leaderboard-fix
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

src/shared/components/Contentful/ContentSlider/ContentSlider.jsx

@@ -101,7 +101,7 @@ ContentSlider.defaultProps = {
   cellSpacing: null,
   cellAlign: 'center',
   wrapAround: true,
-  heightMode: 'current',
+  heightMode: 'max',
   arrowTheme: 'Gray',
 };
 

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

@@ -28,6 +28,7 @@ class ChallengeHistoryModal extends Component {
       loading,
       isCopilot,
       isAlgo,
+      themeName,
     } = this.props;
     const { sortParam } = this.state;
     const challengesOrdered = _.orderBy(challenges, [sortParam.field], [sortParam.order]);
@@ -44,7 +45,7 @@ class ChallengeHistoryModal extends Component {
             competitor={competitor}
             isCopilot={isCopilot}
             isAlgo={isAlgo}
-            themeName="TCO22"
+            themeName={themeName}
           />
         </div>
         <table styleName="history-table">
@@ -178,6 +179,7 @@ ChallengeHistoryModal.propTypes = {
   loading: PT.bool.isRequired,
   isAlgo: PT.bool,
   isCopilot: PT.bool,
+  themeName: PT.string.isRequired,
 };
 
 export default ChallengeHistoryModal;

src/shared/components/Leaderboard/ChallengeHistoryModal/styles.scss

@@ -12,7 +12,7 @@ $light-gray: #d4d4d4;
   width: 70%;
   max-height: 90%;
   overflow-y: auto;
-  padding: 80px 78px;
+  padding: 60px 78px 80px;
 
   @media (max-width: 768px) {
     width: 90%;
@@ -26,7 +26,7 @@ $light-gray: #d4d4d4;
     font-weight: 500;
     line-height: 38px;
     text-align: center;
-    margin-bottom: 60px;
+    margin-bottom: 40px;
     text-transform: uppercase;
 
     @media (max-width: 768px) {

src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx

@@ -13,6 +13,7 @@ function ChallengeHistoryModalContainer({
   loading,
   isCopilot,
   isAlgo,
+  themeName,
 }) {
   useEffect(() => {
     getChallengesHistory(dataUrl, competitor);
@@ -26,6 +27,7 @@ function ChallengeHistoryModalContainer({
       loading={loading}
       isCopilot={isCopilot}
       isAlgo={isAlgo}
+      themeName={themeName}
     />
   );
 }
@@ -36,6 +38,7 @@ ChallengeHistoryModalContainer.defaultProps = {
   loading: false,
   isCopilot: false,
   isAlgo: false,
+  themeName: 'Default',
 };
 
 const CHALLENGES_TYPE = PT.arrayOf(PT.shape({
@@ -61,6 +64,7 @@ ChallengeHistoryModalContainer.propTypes = {
   loading: PT.bool,
   isAlgo: PT.bool,
   isCopilot: PT.bool,
+  themeName: PT.string,
 };
 
 function mapStateToProps(state, ownProps) {

src/shared/containers/tco/Leaderboard/index.jsx

@@ -97,6 +97,7 @@ class LeaderboardPageContainer extends React.Component {
                   dataUrl={tcoPointsApiUrl}
                   isCopilot={isCopilot}
                   isAlgo={isAlgo}
+                  themeName={themeName}
                 />
               ) : null
             }