Merge branch 'integration-v5-challenge-api' into issue_4435_new

Author: sushilshinde

package-lock.json

@@ -62,7 +62,6 @@
     "filestack-react": "^2.0.0",
     "flag-icon-css": "^3.3.0",
     "focus-trap-react": "^6.0.0",
-    "react-ga": "^2.7.0",
     "helmet": "^3.12.1",
     "highlight.js": "^9.18.1",
     "html-to-text": "^5.1.1",
@@ -100,12 +99,14 @@
     "react-dates": "^18.2.2",
     "react-dom": "^16.4.1",
     "react-dotdotdot": "^1.3.1",
+    "react-ga": "^2.7.0",
     "react-helmet": "^5.2.0",
     "react-html-parser": "^2.0.2",
     "react-image-fallback": "^7.1.0",
     "react-image-filter": "^0.1.2",
     "react-infinite-scroller": "^1.1.4",
     "react-inlinesvg": "^0.8.4",
+    "react-markdown": "^4.3.1",
     "react-player": "^0.24.1",
     "react-redux": "^5.0.7",
     "react-redux-toastr": "^7.2.6",
@@ -134,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.3",
+    "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

@@ -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

@@ -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

@@ -172,11 +172,14 @@ export default function SideBar({
               )
             }
             {
+              screeningScorecardId && screeningScorecardId.length > 0
+              && (
               <p styleName="link-like-paragraph">
                 <a href={`${scorecardURL}${screeningScorecardId}`}>
                   Screening Scorecard
                 </a>
               </p>
+              )
             }
             {
               <span styleName="link-like-paragraph tooltip-container">

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

@@ -0,0 +1,32 @@
+import PT from 'prop-types';
+import React from 'react';
+import Markdown from 'react-markdown';
+
+export default function SpecificationComponent({
+  bodyText,
+  format,
+}) {
+  if (format === 'markdown') {
+    return (<Markdown source={bodyText} />);
+  }
+  return (
+    <div
+    /* eslint-disable react/no-danger */
+      dangerouslySetInnerHTML={{
+        __html: bodyText,
+      }}
+    /* eslint-enable react/no-danger */
+      /* styleName="rawHtml" */
+    />
+  );
+}
+
+SpecificationComponent.defaultProps = {
+  bodyText: '',
+  format: 'HTML',
+};
+
+SpecificationComponent.propTypes = {
+  bodyText: PT.string,
+  format: PT.string,
+};

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

@@ -15,6 +15,7 @@ import { isMM } from 'utils/challenge';
 import PT from 'prop-types';
 import { DangerButton } from 'topcoder-react-ui-kit';
 import { SPECS_TAB_STATES } from 'actions/page/challenge-details';
+import SpecificationComponent from './SpecificationComponent';
 // import { editorStateToHTML } from 'utils/editor';
 
 import SaveConfirmationModal from './SaveConfirmationModal';
@@ -40,20 +41,31 @@ export default function ChallengeDetailsView(props) {
     groups,
     description,
     privateDescription,
+    descriptionFormat,
     legacy,
     documents,
     finalSubmissionGuidelines,
-    environment,
-    codeRepo,
     userDetails,
     metadata,
+    events,
   } = challenge;
 
   const tags = challenge.tags || [];
   const roles = (userDetails || {}).roles || [];
   const { track, reviewScorecardId, screeningScorecardId } = legacy;
 
   const allowStockArt = _.find(metadata, { type: 'allowStockArt' });
+  let environment = '';
+  const environmentData = _.find(metadata, { type: 'environment' });
+  if (environmentData) {
+    environment = environmentData.value;
+  }
+
+  let codeRepo = '';
+  const codeRepoData = _.find(metadata, { type: 'codeRepo' });
+  if (codeRepoData) {
+    codeRepo = codeRepoData.value;
+  }
 
   let forumLink = track.toLowerCase() === 'design'
     ? `/?module=ThreadList&forumID=${forumId}`
@@ -156,13 +168,9 @@ export default function ChallengeDetailsView(props) {
                               ref={n => n && n.setHtml(description)}
                             />
                           ) : (
-                            <div
-                              /* eslint-disable react/no-danger */
-                              dangerouslySetInnerHTML={{
-                                __html: description,
-                              }}
-                              /* eslint-enable react/no-danger */
-                              styleName="rawHtml"
+                            <SpecificationComponent
+                              bodyText={description}
+                              format={descriptionFormat}
                             />
                           )
                         }
@@ -218,13 +226,9 @@ export default function ChallengeDetailsView(props) {
                               ref={n => n && n.setHtml(privateDescription)}
                             />
                           ) : (
-                            <div
-                              /* eslint-disable react/no-danger */
-                              dangerouslySetInnerHTML={{
-                                __html: privateDescription,
-                              }}
-                              /* eslint-enable react/no-danger */
-                              styleName="rawHtml"
+                            <SpecificationComponent
+                              bodyText={privateDescription}
+                              format={descriptionFormat}
                             />
                           )
                         }
@@ -256,13 +260,9 @@ export default function ChallengeDetailsView(props) {
                               ref={n => n && n.setHtml(privateDescription)}
                             />
                           ) : (
-                            <div
-                              /* eslint-disable react/no-danger */
-                              dangerouslySetInnerHTML={{
-                                __html: privateDescription,
-                              }}
-                              /* eslint-enable react/no-danger */
-                              styleName="rawHtml"
+                            <SpecificationComponent
+                              bodyText={privateDescription}
+                              format={descriptionFormat}
                             />
                           )
                         }
@@ -410,6 +410,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)}
@@ -435,8 +436,10 @@ ChallengeDetailsView.defaultProps = {
     numberOfCheckpointsPrizes: 0,
     finalSubmissionGuidelines: '',
     environment: '',
+    descriptionFormat: 'HTML',
     codeRepo: '',
     metadata: {},
+    events: [],
     reviewScorecardId: '',
     screeningScorecardId: '',
   },
@@ -447,6 +450,7 @@ ChallengeDetailsView.propTypes = {
   hasRegistered: PT.bool.isRequired,
   challenge: PT.shape({
     description: PT.string,
+    descriptionFormat: PT.string,
     documents: PT.any,
     id: PT.any,
     subTrack: PT.any,
@@ -468,6 +472,7 @@ ChallengeDetailsView.propTypes = {
       roles: PT.arrayOf(PT.string).isRequired,
     }),
     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;
       }
     });

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

@@ -57,7 +57,7 @@ function ChallengeCard({
   }
 
   const registrationPhase = (challenge.allPhases || challenge.phases || []).filter(phase => phase.name === 'Registration')[0];
-  const isRegistrationOpen = registrationPhase ? registrationPhase.isActive : false;
+  const isRegistrationOpen = registrationPhase ? registrationPhase.isOpen : false;
 
   return (
     <div ref={domRef} styleName="challengeCard">

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

@@ -111,7 +111,7 @@ function Tip(props) {
       name: 'Checkpoint',
     });
   }
-  const iterativeReviewPhase = allPhases.find(phase => phase.isActive && phase.name === 'Iterative Review');
+  const iterativeReviewPhase = allPhases.find(phase => phase.isOpen && phase.name === 'Iterative Review');
   if (iterativeReviewPhase) {
     steps.push({
       date: new Date(iterativeReviewPhase.scheduledEndDate),

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

@@ -21,17 +21,30 @@ 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',
+  IDEA_GENERATION: 'Generate feasible concepts for products, apps, features, etc',
+  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.',
+  SPEC_REVIEW: 'Review of technical writing of requirements for the scope of work',
+  MARATHON: 'Programming competition',
+  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_FIRST2FINISH: 'Be the first to deliver the design solution',
   DESIGN_FIRST_2_FINISH: 'Be the first to deliver the design solution',
   FIRST_2_FINISH: 'Be the first to deliver the development solution',
+  FIRST2FINISH: 'Be the first to deliver the development solution',
   LOGO_DESIGN: 'Logo Design',
   MARATHON_MATCH: 'Write algorithms to solve complex problems, often for real world issues',
   DEVELOP_MARATHON_MATCH: 'Write algorithms to solve complex problems, often for real world issues',
   PRINT_OR_PRESENTATION: 'Design print and presentation assets',
   SRM: 'Single Round Match - quickly write code to solve algorythm problems head to head against other competitors',
   STUDIO_OTHER: 'Studio other',
   UI_PROTOTYPE_COMPETITION: 'Develop the front end of a UX',
+  WEB_DESIGN: 'Design UI and front end experiences for web experiences',
   WEB_DESIGNS: 'Design UI and front end experiences for web experiences',
   WIDGET_OR_MOBILE_SCREEN_DESIGN: 'Design UI and front end experiences for mobile',
   WIREFRAMES: 'Produce the information architecture for user experiences',
@@ -47,15 +60,28 @@ const HEADER = {
   CODE: 'Code (Cd)',
   DEVELOPMENT: 'Development (Dv)',
   TEST_SUITES: 'Test Suites (TS)',
+  TEST_SCENARIOS: 'Test Scenarios (Ts)',
+  CONTENT_CREATION: 'Content Creation (CC)',
+  IDEA_GENERATION: 'Idea Generation (IG)',
+  SPECIFICATION: 'Specification (Sp)',
+  TASK: 'Task (Tk)',
+  AUTOMATED_TESTING: 'Automated Testing (AT)',
+  COPILOT_POSTING: 'Copilot Posting (CP)',
+  SPEC_REVIEW: 'Specification Review (SR)',
+  MARATHON: 'Marathon (MM)',
+  DESIGN: 'Design (Ds)',
   CONCEPTUALIZATION: 'Conceptualization (Cn)',
+  DESIGN_FIRST2FINISH: 'Design First2Finish(DF2F)',
   DESIGN_FIRST_2_FINISH: 'Design First2Finish(DF2F)',
+  FIRST2FINISH: 'First2Finish (F2F)',
   FIRST_2_FINISH: 'First2Finish (F2F)',
   LOGO_DESIGN: 'Logo Design (Lg)',
   MARATHON_MATCH: 'Marathon Match (MM)',
   DEVELOP_MARATHON_MATCH: 'Marathon Match (MM)',
   PRINT_OR_PRESENTATION: 'Print/Presentation (PP)',
   SRM: 'Single Round Match (SRM)',
   UI_PROTOTYPE_COMPETITION: 'UI Prototype (Pr)',
+  WEB_DESIGN: 'Web Design (Wb)',
   WEB_DESIGNS: 'Web Design (Wb)',
   WIDGET_OR_MOBILE_SCREEN_DESIGN: 'Widget or Mobile Screen Design (Wg)',
   STUDIO_OTHER: 'Generic design challenge (D)',

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

@@ -249,12 +249,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