Merge pull request #20 from topcoder-platform/integration-v5-challenge-api

Integration v5 challenge api

Author: PrakashDurlabhji

package.json

@@ -134,7 +134,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.3",
+    "topcoder-react-lib": "1000.19.4",
     "topcoder-react-ui-kit": "^1.0.11",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

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

@@ -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/components/challenge-detail/Specification/SideBar/index.jsx

@@ -348,7 +348,7 @@ SideBar.defaultProps = {
   environment: '',
   codeRepo: '',
   isMM: false,
-  metadata: [],
+  metadata: {},
   reviewScorecardId: '',
   screeningScorecardId: '',
 };
@@ -370,7 +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/index.jsx

@@ -47,6 +47,7 @@ export default function ChallengeDetailsView(props) {
     codeRepo,
     userDetails,
     metadata,
+    events,
   } = challenge;
 
   const tags = challenge.tags || [];
@@ -410,6 +411,7 @@ 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)}
@@ -436,7 +438,8 @@ ChallengeDetailsView.defaultProps = {
     finalSubmissionGuidelines: '',
     environment: '',
     codeRepo: '',
-    metadata: [],
+    metadata: {},
+    events: [],
     reviewScorecardId: '',
     screeningScorecardId: '',
   },
@@ -467,7 +470,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-listing/ChallengeCard/index.jsx

@@ -91,12 +91,15 @@ function ChallengeCard({
               {challenge.status === 'Active' ? 'Ends ' : 'Ended '}
               {getEndDate(challenge, challengeTypes)}
             </span>
-            <Tags
-              tags={challenge.tags}
-              onTechTagClicked={onTechTagClicked}
-              isExpanded={expandedTags.includes(challenge.id)}
-              expand={() => expandTag(challenge.id)}
-            />
+            { challenge.tags.length > 0
+              && (
+              <Tags
+                tags={challenge.tags}
+                onTechTagClicked={onTechTagClicked}
+                isExpanded={expandedTags.includes(challenge.id)}
+                expand={() => expandTag(challenge.id)}
+              />
+              ) }
           </div>
         </div>
       </div>

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

@@ -48,7 +48,8 @@ function ReviewOpportunityCard({
 }) {
   const { challenge } = opportunity;
   const { subTrack, legacy } = challenge;
-  const tags = challenge.tags || challenge.technologies;
+  let tags = challenge.tags || challenge.technologies;
+  tags = tags.filter(tag => tag.trim().length);
   const track = legacy ? legacy.track : challenge.track;
   const start = moment(opportunity.startDate);
   return (
@@ -80,12 +81,15 @@ function ReviewOpportunityCard({
               {' '}
               {start.format('MMM DD')}
             </span>
-            <Tags
-              tags={tags}
-              isExpanded={(expandedTags || []).includes(challenge.id)}
-              expand={() => expandTag(challenge.id)}
-              onTechTagClicked={onTechTagClicked}
-            />
+            { tags.length > 0
+              && (
+              <Tags
+                tags={tags}
+                isExpanded={(expandedTags || []).includes(challenge.id)}
+                expand={() => expandTag(challenge.id)}
+                onTechTagClicked={onTechTagClicked}
+              />
+              ) }
           </div>
         </div>
       </div>

src/shared/components/challenge-listing/Tooltips/TrackAbbreviationTooltip/index.jsx

@@ -21,6 +21,13 @@ const DESCRIPTION = {
   BUG_HUNT: 'Quickly find Bugs in apps, websites',
   CODE: 'Develop code for apps, services, etc. Final fixes are not included',
   DEVELOPMENT: 'Develop code for apps, services, etc. Final fixes are not included',
+  TEST_SCENARIOS: 'Provide simple, easy information about what to test',
+  CONTENT_CREATION: 'Generate topic ideas as a blog, video, infographic, or other format',
+  SPECIFICATION: 'Document requirements to be satisfied for design, product, or service',
+  TASK: 'An assigned piece of work',
+  AUTOMATED_TESTING: 'Challenges were submissions are auto-scored against a set of automated test cases',
+  COPILOT_POSTING: 'A post made to the copilot community which asks them to come back with a proposal for your project. This proposal typically includes a suggested gameplan, an estimated budget and their take on what approach to use.',
+  DESIGN: 'Prepare the visual sketch or the plans for a website, feature, app, etc',
   TEST_SUITES: 'Develop test cases to be used to validate apps, website, etc.',
   CONCEPTUALIZATION: 'Discover and define user stories and requirements',
   DESIGN_FIRST_2_FINISH: 'Be the first to deliver the design solution',
@@ -47,6 +54,13 @@ const HEADER = {
   CODE: 'Code (Cd)',
   DEVELOPMENT: 'Development (Dv)',
   TEST_SUITES: 'Test Suites (TS)',
+  TEST_SCENARIOS: 'Test Scenarios (Ts)',
+  CONTENT_CREATION: 'Content Creation (CC)',
+  SPECIFICATION: 'Specification (Sp)',
+  TASK: 'Task (Tk)',
+  AUTOMATED_TESTING: 'Automated Testing (AT)',
+  COPILOT_POSTING: 'Copilot Posting (CP)',
+  DESIGN: 'Design (Ds)',
   CONCEPTUALIZATION: 'Conceptualization (Cn)',
   DESIGN_FIRST_2_FINISH: 'Design First2Finish(DF2F)',
   FIRST_2_FINISH: 'First2Finish (F2F)',

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

@@ -248,12 +248,12 @@ class ChallengeDetailPageContainer extends React.Component {
     const { legacy } = nextProps.challenge;
     const track = legacy ? legacy.track : nextProps.challenge.track;
     if (track && track.toLowerCase() !== 'design' && thriveArticles.length === 0) {
-      const { tags } = nextProps.challenge;
-      if (tags.length > 0 && !(tags.length === 1 && tags[0] === 'Other')) {
-        // for tags = ['Other', ...], if 'Other' is first, use second value
+      // filter all tags with value 'Other'
+      const tags = _.filter(nextProps.challenge.tags, tag => tag !== 'Other');
+      if (tags.length > 0) {
         this.apiService.getEDUContent({
           limit: 3,
-          phrase: tags[0] === 'Other' ? tags[1] : tags[0],
+          phrase: tags[0],
           types: ['Article'],
         }).then((content) => {
         // format image file data