Merge remote-tracking branch 'origin/integration-v5-challenge-api' into integration-v5-challenge-api-md

Author: sushilshinde

.circleci/config.yml

@@ -209,22 +209,21 @@ workflows:
           filters:
             branches:
               only:
-                - hot-fix
                 - integration-v5-challenge-api
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - develop
+                - integration-v5-challenge-api
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
           filters:
             branches:
               only:
-                - integration-v5-challenge-api
+                - develop
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

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

@@ -49,7 +49,6 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
   newChallengeDetails={false}
   onTechTagClicked={[Function]}
   openChallengesInNewTabs={false}
-  prizeMode="money-usd"
   userHandle=""
 />
 `;
@@ -93,7 +92,6 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
   newChallengeDetails={false}
   onTechTagClicked={[Function]}
   openChallengesInNewTabs={false}
-  prizeMode="money-usd"
   userHandle=""
 />
 `;
@@ -133,7 +131,6 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
   newChallengeDetails={false}
   onTechTagClicked={[Function]}
   openChallengesInNewTabs={false}
-  prizeMode="money-usd"
   userHandle=""
 />
 `;

package-lock.json

@@ -135,7 +135,7 @@
     "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "1000.19.0",
+    "topcoder-react-lib": "1000.19.4",
     "topcoder-react-ui-kit": "^1.0.11",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

package.json

@@ -221,7 +221,7 @@ function getAllRecommendedChallengesInit(uuid) {
 function getAllRecommendedChallengesDone(uuid, tokenV3, recommendedTags) {
   const filter = {
     status: 'Active',
-    tag: recommendedTags,
+    ...(!_.isEmpty(recommendedTags) && { tag: recommendedTags }),
   };
   return getAllActiveChallengesWithUsersDone(uuid, tokenV3, filter);
 }

src/shared/actions/challenge-listing/index.js

@@ -211,7 +211,7 @@ export default class HistoryGraph extends React.Component {
       }
       if (track === 'DATA_SCIENCE') {
         if (subTrack === 'MARATHON_MATCH') {
-          return `${config.URL.COMMUNITY}/tc?module=MatchDetails&rd=${challengeId}`;
+          return `/challenges/${challengeId}`;
         }
         if (subTrack === 'SRM') {
           return `${config.URL.COMMUNITY}/stat?c=round_overview&rd=${challengeId}`;

src/shared/components/ProfilePage/Stats/HistoryGraph/index.jsx

@@ -80,13 +80,13 @@ class Submit extends React.Component {
     let subPhaseId;
 
     // Submission type logic
-    if (checkpoint && checkpoint.isActive) {
+    if (checkpoint && checkpoint.isOpen) {
       subType = 'Checkpoint Submission';
       subPhaseId = checkpoint.id;
-    } else if (checkpoint && !checkpoint.isActive && submission && submission.isActive) {
+    } else if (checkpoint && !checkpoint.isOpen && submission && submission.isOpen) {
       subType = 'Contest Submission';
       subPhaseId = submission.id;
-    } else if (finalFix && finalFix.isActive) {
+    } else if (finalFix && finalFix.isOpen) {
       subType = 'Studio Final Fix Submission';
       subPhaseId = finalFix.id;
     } else {

src/shared/components/SubmissionPage/Submit/index.jsx

@@ -64,6 +64,8 @@ const Abbreviation = {
     SRM: 'SRM',
     MARATHON_MATCH: 'MM',
     DEVELOP_MARATHON_MATCH: 'MM',
+    FIRST2FINISH: 'F2F',
+    FIRST_2_FINISH: 'F2F',
   },
   DATA: {
     SRM: 'SRM',

src/shared/components/TrackIcon/Abbreviation.jsx

@@ -36,8 +36,10 @@ export default function ChallengeTags(props) {
   /* TODO: Probably, we don't need this anymore, if we use correct data from
    * APIs (they should contain human-readable names, I believe). */
   const stylizedSubTrack = (t) => {
-    if (challengeSubtracksMap[t]) {
-      return challengeSubtracksMap[t].name;
+    const filteredSubtrack = Object.values(challengeSubtracksMap)
+      .filter(subtrack => subtrack.abbreviation === t)[0];
+    if (filteredSubtrack) {
+      return filteredSubtrack.name;
     }
     return (t || '').replace(/_/g, ' ')
       .replace(/\w\S*/g, txt => _.capitalize(txt));

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import _ from 'lodash';
 import PT from 'prop-types';
-import { config, Link } from 'topcoder-react-utils';
+import { Link } from 'topcoder-react-utils';
 import moment from 'moment';
 import { TABS as DETAIL_TABS } from 'actions/page/challenge-details';
 import {
@@ -32,23 +32,18 @@ export default function ChallengesCard({
 }) {
   const {
     id,
-    subTrack,
     legacy,
-    status,
     allPhases,
-    currentPhases,
+    phases,
   } = challenge;
 
   const { track } = legacy;
 
-  let challengeDetailLink = `${challengesUrl}/${id}`;
-  if (track === 'DATA_SCIENCE' && subTrack === 'MARATHON_MATCH' && status === 'Active') {
-    challengeDetailLink = `${config.URL.COMMUNITY}/tc?module=MatchDetails&rd=${id}`;
-  }
+  const challengeDetailLink = `${challengesUrl}/${id}`;
 
-  const checkPhases = (currentPhases && currentPhases.length > 0 ? currentPhases : allPhases);
+  const checkPhases = (phases && phases.length > 0 ? phases : allPhases);
   const statusPhase = checkPhases
-    .filter(p => p.phaseType !== 'Registration')
+    .filter(p => p.name !== 'Registration')
     .sort((a, b) => moment(a.scheduledEndDate).diff(b.scheduledEndDate))[0];
 
   return (
@@ -127,7 +122,7 @@ ChallengesCard.defaultProps = {
 };
 
 ChallengesCard.propTypes = {
-  challenge: PT.arrayOf(PT.object).isRequired,
+  challenge: PT.shape().isRequired,
   challengeTypes: PT.arrayOf(PT.shape()),
   className: PT.string,
   challengesUrl: PT.string.isRequired,

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

@@ -29,12 +29,13 @@ export default function SideBar({
   codeRepo,
   isMM,
   metadata,
+  reviewScorecardId,
+  screeningScorecardId,
 }) {
   const scorecardURL = `${config.URL.ONLINE_REVIEW}/review/actions/ViewScorecard?scid=`;
   const faqURL = config.URL.INFO.DESIGN_CHALLENGE_SUBMISSION;
   let submissionLimitDisplay = 'Unlimited';
   const submissionLimit = _.find(metadata, { type: 'submissionLimit' });
-  const screeningScorecardId = _.find(metadata, { type: 'screeningScorecardId' });
   const fileTypes = _.find(metadata, { type: 'fileTypes' });
 
   if (submissionLimit) {
@@ -172,14 +173,14 @@ export default function SideBar({
             }
             {
               <p styleName="link-like-paragraph">
-                <a href={`${scorecardURL}${screeningScorecardId ? screeningScorecardId.value : ''}`}>
+                <a href={`${scorecardURL}${screeningScorecardId}`}>
                   Screening Scorecard
                 </a>
               </p>
             }
             {
               <span styleName="link-like-paragraph tooltip-container">
-                <a href={`${scorecardURL}${screeningScorecardId ? screeningScorecardId.value : ''}`}>
+                <a href={`${scorecardURL}${reviewScorecardId}`}>
                   Review Scorecard
                 </a>
                 <Tooltip id="reviewscorecard-tip" content={reviewScorecardTip} className={styles['tooltip-overlay']} trigger={['hover', 'focus']}>
@@ -347,7 +348,9 @@ SideBar.defaultProps = {
   environment: '',
   codeRepo: '',
   isMM: false,
-  metadata: [],
+  metadata: {},
+  reviewScorecardId: '',
+  screeningScorecardId: '',
 };
 
 SideBar.propTypes = {
@@ -367,5 +370,7 @@ SideBar.propTypes = {
   environment: PT.string,
   codeRepo: PT.string,
   isMM: PT.bool,
-  metadata: PT.arrayOf(PT.shape()),
+  metadata: PT.shape(),
+  reviewScorecardId: PT.string,
+  screeningScorecardId: PT.string,
 };

src/shared/components/challenge-detail/Specification/SideBar/index.jsx

@@ -49,11 +49,12 @@ export default function ChallengeDetailsView(props) {
     codeRepo,
     userDetails,
     metadata,
+    events,
   } = challenge;
 
   const tags = challenge.tags || [];
   const roles = (userDetails || {}).roles || [];
-  const { track } = legacy;
+  const { track, reviewScorecardId, screeningScorecardId } = legacy;
 
   const allowStockArt = _.find(metadata, { type: 'allowStockArt' });
 
@@ -400,12 +401,15 @@ export default function ChallengeDetailsView(props) {
           hasRegistered={hasRegistered}
           isDesign={track.toLowerCase() === 'design'}
           isDevelop={track.toLowerCase() === 'develop'}
+          eventDetail={_.isEmpty(events) ? null : events[0]}
           isMM={isMM(challenge)}
           terms={terms}
           shareable={_.isEmpty(groups)}
           environment={environment}
           codeRepo={codeRepo}
           metadata={metadata}
+          reviewScorecardId={reviewScorecardId}
+          screeningScorecardId={screeningScorecardId}
         />
       </div>
     </div>
@@ -425,7 +429,10 @@ ChallengeDetailsView.defaultProps = {
     environment: '',
     descriptionFormat: 'HTML',
     codeRepo: '',
-    metadata: [],
+    metadata: {},
+    events: [],
+    reviewScorecardId: '',
+    screeningScorecardId: '',
   },
 };
 
@@ -441,6 +448,8 @@ ChallengeDetailsView.propTypes = {
     privateDescription: PT.string,
     legacy: PT.shape({
       track: PT.string.isRequired,
+      reviewScorecardId: PT.string,
+      screeningScorecardId: PT.string,
     }),
     groups: PT.any,
     forumId: PT.number,
@@ -453,7 +462,8 @@ ChallengeDetailsView.propTypes = {
     userDetails: PT.shape({
       roles: PT.arrayOf(PT.string).isRequired,
     }),
-    metadata: PT.arrayOf(PT.shape()),
+    metadata: PT.shape(),
+    events: PT.arrayOf(PT.string),
   }),
   challengesUrl: PT.string.isRequired,
   communitiesList: PT.arrayOf(PT.shape({

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

@@ -245,7 +245,7 @@ class SubmissionsComponent extends React.Component {
 
     let isReviewPhaseComplete = false;
     _.forEach(allPhases, (phase) => {
-      if (phase.name === 'Review' && !phase.isActive) {
+      if (phase.name === 'Review' && !phase.isOpen) {
         isReviewPhaseComplete = true;
       }
     });