Removed getChallengeSubTrack and added getChallengeTypeAbbr

Author: luizrrodrigues

__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap

@@ -7,7 +7,7 @@ exports[`Matches shallow shapshot 1`] = `
   <div
     className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__main-icon___1q-1_"
   >
-    Cd
+    CH
   </div>
   <a
     href="https://www.topcoder-dev.com/tco"
@@ -28,7 +28,7 @@ exports[`Matches shallow shapshot 2`] = `
   <div
     className="src-shared-components-TrackIcon-___style__data_science___3YlDf src-shared-components-TrackIcon-___style__main-icon___1q-1_"
   >
-    Cd
+    CH
   </div>
   <a
     href="https://www.topcoder-dev.com/tco"
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 3`] = `
   <div
     className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__main-icon___1q-1_"
   >
-    Cd
+    CH
   </div>
   <a
     href="https://www.topcoder-dev.com/tco"

src/shared/components/TrackIcon/Abbreviation.jsx

@@ -3,12 +3,12 @@ import PT from 'prop-types';
 
 import { config } from 'topcoder-react-utils';
 
-import Abbreviation from './Abbreviation';
 import './style.scss';
 
 export default function TrackIcon({
   track,
   subTrack,
+  type,
   tcoEligible,
   isDataScience,
   MAIN_URL,
@@ -23,13 +23,13 @@ export default function TrackIcon({
             encodeURIComponent(subTrack)}`}
           styleName={`${(isDataScience ? 'data_science' : track.toLowerCase())} main-icon`}
         >
-          {Abbreviation[track.toUpperCase()][subTrack]}
+          {type}
         </a>
       ) : (
         <div
           styleName={`${(isDataScience ? 'data_science' : track.toLowerCase())} main-icon`}
         >
-          {Abbreviation[track.toUpperCase()][subTrack]}
+          {type}
         </div>
       )}
       <a href={`${TCO_URL}`}>
@@ -48,13 +48,15 @@ TrackIcon.defaultProps = {
   challengesUrl: '',
   track: 'DEVELOP',
   subTrack: 'DEVELOPMENT',
+  type: 'CH',
 };
 
 TrackIcon.propTypes = {
   isDataScience: PT.bool,
   tcoEligible: PT.string,
   track: PT.string,
   subTrack: PT.string,
+  type: PT.string,
   MAIN_URL: PT.string,
   challengesUrl: PT.string,
 };

src/shared/components/TrackIcon/index.jsx

@@ -9,7 +9,6 @@ import _ from 'lodash';
 import moment from 'moment';
 import 'moment-duration-format';
 import { isMM } from 'utils/challenge';
-import { getChallengeSubTrack } from 'utils/challenge-detail/helper';
 
 import PT from 'prop-types';
 import React from 'react';
@@ -37,7 +36,6 @@ export default function ChallengeHeader(props) {
     isLoggedIn,
     challenge,
     challengesUrl,
-    challengeTypes,
     checkpoints,
     hasRegistered,
     numWinners,
@@ -74,9 +72,8 @@ export default function ChallengeHeader(props) {
     status,
   } = challenge;
 
-  const { track } = legacy;
+  const { track, subTrack } = legacy;
   const tags = challenge.tags || [];
-  const subTrack = getChallengeSubTrack(challenge.type, challengeTypes);
 
   const allPhases = challenge.phases || [];
   const { prizes } = prizeSets && prizeSets.length ? prizeSets[0] : [];
@@ -472,7 +469,6 @@ ChallengeHeader.defaultProps = {
   isMenuOpened: false,
   hasThriveArticles: false,
   hasRecommendedChallenges: false,
-  challengeTypes: [],
 };
 
 ChallengeHeader.propTypes = {
@@ -492,6 +488,7 @@ ChallengeHeader.propTypes = {
     prizes: PT.any,
     legacy: PT.shape({
       track: PT.any,
+      subTrack: PT.string,
     }),
     reliabilityBonus: PT.any,
     userDetails: PT.any,
@@ -505,7 +502,6 @@ ChallengeHeader.propTypes = {
     prizeSets: PT.any,
   }).isRequired,
   challengesUrl: PT.string.isRequired,
-  challengeTypes: PT.arrayOf(PT.shape()),
   hasRegistered: PT.bool.isRequired,
   hasThriveArticles: PT.bool,
   hasRecommendedChallenges: PT.bool,

src/shared/components/challenge-detail/Header/index.jsx

@@ -9,7 +9,6 @@ import {
   PRIZE_MODE,
   getPrizePurseUI,
   getTimeLeft,
-  getChallengeSubTrack,
 } from 'utils/challenge-detail/helper';
 
 import TrackIcon from 'components/TrackIcon';
@@ -21,7 +20,6 @@ import styles from './style.scss';
 
 export default function ChallengesCard({
   challenge,
-  challengeTypes,
   className,
   challengesUrl,
   selectChallengeDetailsTab,
@@ -38,7 +36,7 @@ export default function ChallengesCard({
   } = challenge;
 
   let { track } = legacy;
-  const subTrack = getChallengeSubTrack(challenge.type, challengeTypes);
+  const { subTrack } = legacy;
   if (subTrack === 'DEVELOP_MARATHON_MATCH') {
     track = 'DATA_SCIENCE';
   }
@@ -87,7 +85,7 @@ export default function ChallengesCard({
             <div styleName="endtime-prize-container">
               <span styleName="end-date">
                 {challenge.status === 'Active' ? 'Ends ' : 'Ended '}
-                {getEndDate(challenge, challengeTypes)}
+                {getEndDate(challenge)}
               </span>
               <div styleName="prizes">
                 {getPrizePurseUI(challenge, prizeMode, true, 'Prize Purse')}
@@ -121,12 +119,10 @@ ChallengesCard.defaultProps = {
   userHandle: '',
   expandedTags: [],
   expandTag: null,
-  challengeTypes: [],
 };
 
 ChallengesCard.propTypes = {
   challenge: PT.shape().isRequired,
-  challengeTypes: PT.arrayOf(PT.shape()),
   className: PT.string,
   challengesUrl: PT.string.isRequired,
   selectChallengeDetailsTab: PT.func.isRequired,

src/shared/components/challenge-detail/RecommendedActiveChallenges/ChallengesCard/index.jsx

@@ -8,7 +8,7 @@ import { isDevelopMM } from 'utils/challenge';
 import {
   getEndDate,
   getPrizePointsUI,
-  getChallengeSubTrack,
+  getChallengeTypeAbbr,
 } from 'utils/challenge-detail/helper';
 
 import Tags from '../Tags';
@@ -44,15 +44,15 @@ function ChallengeCard({
   } = challenge;
 
   let { track } = legacy;
+  const { subTrack } = legacy;
   challenge.isDataScience = false;
   if ((challenge.tags && challenge.tags.includes('Data Science')) || isDevelopMM(challenge)) {
     challenge.isDataScience = true;
   }
   challenge.prize = challenge.prizes || [];
 
   const challengeDetailLink = `${challengesUrl}/${id}`;
-
-  const subTrack = getChallengeSubTrack(challenge.type, challengeTypes);
+  const type = getChallengeTypeAbbr(challenge.type, challengeTypes);
   if (subTrack === 'DEVELOP_MARATHON_MATCH') {
     track = 'DATA_SCIENCE';
   }
@@ -72,6 +72,7 @@ function ChallengeCard({
               <TrackIcon
                 track={track}
                 subTrack={subTrack}
+                type={type}
                 tcoEligible={challenge.events && challenge.events.length > 0 ? challenge.events[0].eventName : ''}
                 isDataScience={challenge.isDataScience}
               />
@@ -90,7 +91,7 @@ function ChallengeCard({
           <div styleName="details-footer">
             <span styleName="date">
               {challenge.status === 'Active' ? 'Ends ' : 'Ended '}
-              {getEndDate(challenge, challengeTypes)}
+              {getEndDate(challenge)}
             </span>
             { challenge.tags.length > 0
               && (

src/shared/components/challenge-listing/ChallengeCard/index.jsx

@@ -38,7 +38,6 @@ import { actions } from 'topcoder-react-lib';
 import { getService } from 'services/contentful';
 import {
   getDisplayRecommendedChallenges,
-  getChallengeSubTrack,
   getRecommendedTags,
 } from 'utils/challenge-detail/helper';
 
@@ -79,18 +78,16 @@ const DAY = 24 * 60 * MIN;
  * @param {Object} challenge
  * @return {String}
  */
-function getOgImage(challenge, challengeTypes) {
+function getOgImage(challenge) {
   const { legacy } = challenge;
-  const { track } = legacy;
+  const { track, subTrack } = legacy;
   if (challenge.name.startsWith('LUX -')) return ogLuxChallenge;
   if (challenge.name.startsWith('RUX -')) return ogRuxChallenge;
   if (challenge.prizes) {
     const totalPrize = challenge.prizes.reduce((p, sum) => p + sum, 0);
     if (totalPrize > 2500) return ogBigPrizesChallenge;
   }
 
-  const subTrack = getChallengeSubTrack(challenge.type, challengeTypes);
-
   switch (subTrack) {
     case SUBTRACKS.FIRST_2_FINISH: return ogFirst2Finish;
     case SUBTRACKS.UI_PROTOTYPE_COMPETITION: {
@@ -430,7 +427,7 @@ class ChallengeDetailPageContainer extends React.Component {
             && (
               <MetaTags
                 description={description.slice(0, 155)}
-                image={getOgImage(challenge, challengeTypes)}
+                image={getOgImage(challenge)}
                 siteName="Topcoder"
                 socialDescription={description.slice(0, 200)}
                 socialTitle={`${prizesStr}${title}`}

src/shared/containers/challenge-detail/index.jsx

@@ -21,10 +21,10 @@ export const PRIZE_MODE = {
 };
 
 /**
- * Get challenge subTrack from type id
+ * Get challenge type abbreviation
  * @param {Object} challenge challenge info
  */
-export function getChallengeSubTrack(track, challengeTypes) {
+export function getChallengeTypeAbbr(track, challengeTypes) {
   const subTrack = _.find(challengeTypes, { name: track });
   if (subTrack) {
     return subTrack.abbreviation;
@@ -36,8 +36,8 @@ export function getChallengeSubTrack(track, challengeTypes) {
  * Get end date
  * @param {Object} challenge challenge info
  */
-export function getEndDate(challenge, challengeTypes) {
-  const subTrack = getChallengeSubTrack(challenge.type, challengeTypes);
+export function getEndDate(challenge) {
+  const { subTrack } = challenge.legacy;
   let phases = challenge.phases || [];
   if (subTrack === 'FIRST_2_FINISH' && challenge.status === 'COMPLETED') {
     phases = challenge.phases.filter(p => p.phaseType === 'Iterative Review' && p.phaseStatus === 'Closed');