Update to use challenge.track instead challenge.legacy.track

Author: luizrrodrigues

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

@@ -26,15 +26,15 @@ exports[`Matches shallow shapshot 2`] = `
   className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l"
 >
   <div
-    className="src-shared-components-TrackIcon-___style__data_science___3YlDf src-shared-components-TrackIcon-___style__main-icon___1q-1_"
+    className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__main-icon___1q-1_"
   >
     CH
   </div>
   <a
     href="https://www.topcoder-dev.com/tco"
   >
     <div
-      className="src-shared-components-TrackIcon-___style__data_science___3YlDf src-shared-components-TrackIcon-___style__tco-icon___18ZV7"
+      className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__tco-icon___18ZV7"
     >
       TCO
     </div>

__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap

@@ -18,7 +18,6 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
           "eventName": "Submit",
         },
       ],
-      "isDataScience": true,
       "legacy": Object {
         "track": "DEVELOP",
       },

__tests__/shared/components/challenge-listing/Listing/__snapshots__/Bucket.jsx.snap

@@ -47,7 +47,6 @@ exports[`Matches shallow shapshot 1`] = `
             },
           ],
           "id": "2",
-          "isDataScience": false,
           "legacy": Object {
             "track": "DEVELOP",
           },

src/shared/components/Dashboard/CurrentActivity/Challenges/ChallengeCard/index.jsx

@@ -13,6 +13,8 @@ import {
 
 import { config, Link } from 'topcoder-react-utils';
 
+import { COMPETITION_TRACKS } from 'utils/tc';
+
 import {
   Button,
   DataScienceTrackEventTag,
@@ -38,39 +40,33 @@ export default function ChallengeCard({
     status,
     userDetails,
     type,
+    track,
   } = challenge;
 
   const typeId = _.findKey(challengeTypesMap, { name: type });
 
-  const { track } = legacy;
-
   let EventTag;
-  // let TrackTag;
   switch (track) {
-    case 'DATA_SCIENCE':
+    case COMPETITION_TRACKS.DATA_SCIENCE:
       EventTag = DataScienceTrackEventTag;
-      // TrackTag = DataScienceTrackTag;
       break;
-    case 'DESIGN':
+    case COMPETITION_TRACKS.DESIGN:
       EventTag = DesignTrackEventTag;
-      // TrackTag = DesignTrackTag;
       break;
-    case 'DEVELOP':
+    case COMPETITION_TRACKS.DEVELOP:
       EventTag = DevelopmentTrackEventTag;
-      // TrackTag = DevelopmentTrackTag;
       break;
-    case 'QA':
+    case COMPETITION_TRACKS.QA:
       EventTag = QATrackEventTag;
-      // TrackTag = QATrackTag;
       break;
     default:
-      EventTag = DevelopmentTrackEventTag;
+      throw new Error('Wrong competition track value');
   }
 
   const STALLED_MSG = 'Stalled';
   const DRAFT_MSG = 'In Draft';
 
-  const forumEndpoint = _.toLower(legacy.track) === 'design'
+  const forumEndpoint = track === COMPETITION_TRACKS.DESIGN
     ? `/?module=ThreadList&forumID=${legacy.forumId}`
     : `/?module=Category&categoryID=${legacy.forumId}`;
 
@@ -256,7 +252,6 @@ ChallengeCard.defaultProps = {
 ChallengeCard.propTypes = {
   challenge: PT.shape({
     legacy: PT.shape({
-      track: PT.oneOf(['DATA_SCIENCE', 'DESIGN', 'DEVELOP', 'QA']).isRequired,
       forumId: PT.oneOfType([PT.number, PT.string]),
     }).isRequired,
     id: PT.oneOfType([PT.number, PT.string]).isRequired,
@@ -267,6 +262,7 @@ ChallengeCard.propTypes = {
     userDetails: PT.any,
     events: PT.any,
     type: PT.string,
+    track: PT.string.isRequired,
   }).isRequired,
   selectChallengeDetailsTab: PT.func.isRequired,
   setChallengeListingFilter: PT.func.isRequired,

src/shared/components/TrackIcon/index.jsx

@@ -10,30 +10,30 @@ export default function TrackIcon({
   subTrack,
   type,
   tcoEligible,
-  isDataScience,
   MAIN_URL,
   challengesUrl,
 }) {
   const TCO_URL = `${MAIN_URL}/tco`;
+  const trackStyle = track.replace(' ', '-').toLowerCase();
   return (
     <span styleName="trackIcon">
       {challengesUrl ? (
         <a
           href={`${challengesUrl}?filter[subtracks][0]=${
             encodeURIComponent(subTrack)}`}
-          styleName={`${(isDataScience ? 'data_science' : track.toLowerCase())} main-icon`}
+          styleName={`${trackStyle} main-icon`}
         >
           {type}
         </a>
       ) : (
         <div
-          styleName={`${(isDataScience ? 'data_science' : track.toLowerCase())} main-icon`}
+          styleName={`${trackStyle} main-icon`}
         >
           {type}
         </div>
       )}
       <a href={`${TCO_URL}`}>
-        <div styleName={tcoEligible ? `${(isDataScience ? 'data_science' : track.toLowerCase())} tco-icon` : 'hidden'}>
+        <div styleName={tcoEligible ? `${trackStyle} tco-icon` : 'hidden'}>
           TCO
         </div>
       </a>
@@ -42,7 +42,6 @@ export default function TrackIcon({
 }
 
 TrackIcon.defaultProps = {
-  isDataScience: false,
   MAIN_URL: config.URL.BASE,
   tcoEligible: '',
   challengesUrl: '',
@@ -52,7 +51,6 @@ TrackIcon.defaultProps = {
 };
 
 TrackIcon.propTypes = {
-  isDataScience: PT.bool,
   tcoEligible: PT.string,
   track: PT.string,
   subTrack: PT.string,

src/shared/components/TrackIcon/style.scss

@@ -34,11 +34,13 @@ $track-radius-4: $corner-radius * 2;
       background: $tc-light-blue-110;
     }
 
-    &.develop {
+    &.develop,
+    &.development {
       background: $tc-green-110;
     }
 
-    &.qa {
+    &.qa,
+    &.quality-assurance {
       background: $tc-purple-110;
     }
 
@@ -67,11 +69,17 @@ $track-radius-4: $corner-radius * 2;
     }
 
     &.develop,
-    &.qa {
+    &.development {
       color: $tc-green-110;
       background: $tc-green-10;
     }
 
+    &.qa,
+    &.quality-assurance {
+      color: $tc-purple-110;
+      background: $tc-purple-10;
+    }
+
     &.data_science,
     &.data-science,
     &.data {

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

@@ -71,9 +71,10 @@ export default function ChallengeHeader(props) {
     appealsEndDate,
     status,
     type,
+    track,
   } = challenge;
 
-  const { track, subTrack } = legacy;
+  const { subTrack } = legacy;
   const tags = challenge.tags || [];
 
   const allPhases = challenge.phases || [];
@@ -100,10 +101,7 @@ export default function ChallengeHeader(props) {
     registrationEnded = !regPhase.isOpen;
   }
 
-  let trackLower = track ? track.toLowerCase() : 'design';
-  if (tags.includes('Data Science')) {
-    trackLower = 'datasci';
-  }
+  const trackLower = track ? track.replace(' ', '-').toLowerCase() : 'design';
 
   const eventNames = (events || []).map((event => (event.eventName || '').toUpperCase()));
 
@@ -256,7 +254,7 @@ export default function ChallengeHeader(props) {
             <div styleName="tag-container">
               <ChallengeTags
                 subTrack={subTrack}
-                track={trackLower}
+                track={track}
                 type={type}
                 challengesUrl={challengesUrl}
                 challengeTypesMap={challengeTypesMap}
@@ -479,6 +477,7 @@ ChallengeHeader.propTypes = {
   challenge: PT.shape({
     id: PT.string.isRequired,
     type: PT.any,
+    track: PT.string,
     drPoints: PT.any,
     name: PT.any,
     subTrack: PT.any,
@@ -489,7 +488,6 @@ ChallengeHeader.propTypes = {
     tags: PT.any,
     prizes: PT.any,
     legacy: PT.shape({
-      track: PT.any,
       subTrack: PT.string,
     }),
     reliabilityBonus: PT.any,

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

@@ -4,7 +4,6 @@ import PT from 'prop-types';
 import TrackIcon from 'components/TrackIcon';
 import { TABS as DETAIL_TABS } from 'actions/page/challenge-details';
 import { Link } from 'topcoder-react-utils';
-import { isDevelopMM } from 'utils/challenge';
 import {
   getEndDate,
   getPrizePointsUI,
@@ -41,25 +40,16 @@ function ChallengeCard({
   const {
     id,
     legacy,
+    track,
+    type,
   } = challenge;
 
-  let { track } = legacy;
   const { subTrack } = legacy;
-  challenge.isDataScience = false;
-  if ((challenge.tags && challenge.tags.includes('Data Science')) || isDevelopMM(challenge)) {
-    challenge.isDataScience = true;
-    track = 'DATA_SCIENCE';
-  }
-  if (challenge.tags && challenge.tags.includes('QA')) {
-    track = 'QA';
-  }
+
   challenge.prize = challenge.prizes || [];
 
   const challengeDetailLink = `${challengesUrl}/${id}`;
-  const type = getChallengeTypeAbbr(challenge.type, challengeTypes);
-  if (subTrack === 'DEVELOP_MARATHON_MATCH') {
-    track = 'DATA_SCIENCE';
-  }
+  const typeAbbr = getChallengeTypeAbbr(type, challengeTypes);
 
   const registrationPhase = (challenge.phases || []).filter(phase => phase.name === 'Registration')[0];
   const isRegistrationOpen = registrationPhase ? registrationPhase.isOpen : false;
@@ -76,9 +66,8 @@ function ChallengeCard({
               <TrackIcon
                 track={track}
                 subTrack={subTrack}
-                type={type}
+                type={typeAbbr}
                 tcoEligible={challenge.events && challenge.events.length > 0 ? challenge.events[0].eventName : ''}
-                isDataScience={challenge.isDataScience}
               />
             </span>
           </TrackAbbreviationTooltip>

src/shared/components/tc-communities/ChallengesBlock/Card/index.jsx

@@ -7,6 +7,7 @@ import {
   DataScienceTrackTag,
   DesignTrackTag,
   DevelopmentTrackTag,
+  QATrackTag,
 } from 'topcoder-react-ui-kit';
 
 import { Link } from 'topcoder-react-utils';
@@ -24,11 +25,9 @@ export default function Card({
 }) {
   const {
     subTrack,
-    legacy,
+    track,
   } = challenge;
 
-  const { track } = legacy;
-
   let TrackTag;
   switch (track.toLowerCase()) {
     case 'datasci':
@@ -41,6 +40,9 @@ export default function Card({
     case COMPETITION_TRACKS.DEVELOP:
       TrackTag = DevelopmentTrackTag;
       break;
+    case COMPETITION_TRACKS.QA:
+      TrackTag = QATrackTag;
+      break;
     default:
       throw new Error('Wrong competition track value');
   }
@@ -101,10 +103,8 @@ Card.propTypes = {
     technologies: PT.string.isRequired,
     registrationStartDate: PT.string.isRequired,
     submissionEndDate: PT.string.isRequired,
-    legacy: PT.shape({
-      track: PT.string.isRequired,
-    }),
     subTrack: PT.string.isRequired,
+    track: PT.string.isRequired,
   }).isRequired,
   setChallengeListingFilter: PT.func.isRequired,
 };