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

Integration v5 challenge api

Author: PrakashDurlabhji

config/default.js

@@ -401,4 +401,9 @@ module.exports = {
   TC_EDU_ARTICLES_PATH: '/articles',
   TC_EDU_SEARCH_PATH: '/search',
   TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
+
+  ENV: {
+    HOST: process.env.HOST,
+    PORT: process.env.PORT,
+  },
 };

package.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.13",
+    "topcoder-react-lib": "1000.19.14",
     "topcoder-react-ui-kit": "^1.0.11",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/server/index.js

@@ -9,7 +9,7 @@ import Application from 'shared';
 import config from 'config';
 import express from 'express';
 import fetch from 'isomorphic-fetch';
-import { logger } from 'topcoder-react-lib';
+import { logger, services } from 'topcoder-react-lib';
 import fs from 'fs';
 import moment from 'moment';
 import path from 'path';
@@ -145,6 +145,69 @@ async function onExpressJsSetup(server) {
     tcCommunitiesDemoApi,
   );
 
+  // Get roleId by name
+  server.use(
+    '/community-app-assets/api/challenges/roleId',
+    async (req, res, next) => {
+      let tokenM2M = '';
+      try {
+        tokenM2M = await services.api.getTcM2mToken();
+      } catch (err) {
+        logger.error('proxyApi-roleId-getTcM2mToken : ', err);
+      }
+
+      const params = {
+        name: req.query.name,
+        isActive: true,
+      };
+      const url = `${config.API.V5}/resource-roles?${qs.stringify(params)}`;
+      try {
+        let data = await fetch(url, {
+          headers: { Authorization: `Bearer ${tokenM2M}` },
+        });
+        data = await data.text();
+        res.send(data);
+      } catch (err) {
+        next(err);
+      }
+    },
+  );
+
+  // Get registrants from challenge
+  server.use(
+    '/community-app-assets/api/challenges/:challengeId/registrants',
+    async (req, res, next) => {
+      let tokenM2M = '';
+      let roleId = '';
+      try {
+        tokenM2M = await services.api.getTcM2mToken();
+      } catch (err) {
+        logger.error('proxyApi-registrants-getTcM2mToken : ', err);
+      }
+
+      try {
+        roleId = await services.challenge.getService().getRoleId('Submitter');
+      } catch (err) {
+        logger.error('proxyApi-registrants-getRoleId : ', err);
+      }
+
+      const params = {
+        challengeId: req.params.challengeId,
+        roleId,
+      };
+      const url = `${config.API.V5}/resources?${qs.stringify(params)}`;
+      try {
+        let data = await fetch(url, {
+          headers: { Authorization: `Bearer ${tokenM2M}` },
+        });
+        data = await data.text();
+        res.send(data);
+      } catch (err) {
+        next(err);
+      }
+    },
+  );
+
   server.use(
     '/community-app-assets/api/edit-contentful-entry/:id',
     (req, res) => res.redirect(`${CMS_BASE_URL}/entries/${req.params.id}`),

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

@@ -214,6 +214,9 @@ export default function ChallengeDetailsView(props) {
                       description
                       && (
                       <article>
+                        <h2 styleName="h2">
+                          Challenge Summary
+                        </h2>
                         {
                           editMode ? (
                             <Editor
@@ -229,6 +232,15 @@ export default function ChallengeDetailsView(props) {
                             />
                           )
                         }
+                        <p styleName="p" />
+                        <p styleName="p note">
+                          Please read the challenge specification carefully and
+                          watch the forums for any questions or feedback
+                          concerning this challenge. It is important that you
+                          monitor any updates provided by the client or Studio
+                          Admins in the forums. Please post any questions you
+                          might have for the client in the forums.
+                        </p>
                       </article>
                       )
                     }

src/shared/components/challenge-detail/Winners/Winner/index.jsx

@@ -15,7 +15,6 @@ function getId(submissions, placement) {
 export default function Winner({
   isDesign,
   last,
-  pointPrizes,
   prizes,
   submissions,
   viewable,
@@ -32,12 +31,9 @@ export default function Winner({
       encodeURIComponent(avatarUrl)}?size=65`;
   }
 
-  const pair = [];
-  const prizeIndex = winner.placement - 1;
-  if (prizes[prizeIndex]) pair.push(prizes[prizeIndex].toLocaleString());
-  if (pointPrizes[prizeIndex]) pair.push(`${pointPrizes[prizeIndex]}pts`);
-
-  const prize = pair.join(' + ') || 'N/A';
+  let prize = 'N/A';
+  const prizeIndex = parseInt(winner.placement, 10) - 1;
+  if (prizes[prizeIndex]) prize = prizes[prizeIndex].value;
 
   return (
     <div styleName={`winner ${placeStyle}`}>
@@ -125,14 +121,12 @@ export default function Winner({
 }
 
 Winner.defaultProps = {
-  pointPrizes: [],
   prizes: [],
 };
 
 Winner.propTypes = {
   isDesign: PT.bool.isRequired,
   last: PT.bool.isRequired,
-  pointPrizes: PT.arrayOf(PT.number),
   prizes: PT.arrayOf(PT.number),
   submissions: PT.arrayOf(PT.object).isRequired,
   viewable: PT.bool.isRequired,

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

@@ -10,7 +10,6 @@ import './style.scss';
 
 export default function Winners({
   winners,
-  pointPrizes,
   prizes,
   submissions,
   viewable,
@@ -24,7 +23,6 @@ export default function Winners({
             isDesign={isDesign}
             key={`${w.handle}-${w.placement}`}
             last={index === winners.length - 1}
-            pointPrizes={pointPrizes}
             prizes={prizes}
             submissions={submissions}
             viewable={viewable}
@@ -38,7 +36,6 @@ export default function Winners({
 
 Winners.defaultProps = {
   winners: [],
-  pointPrizes: [],
   prizes: [],
   submissions: [],
   viewable: false,
@@ -47,7 +44,6 @@ Winners.defaultProps = {
 
 Winners.propTypes = {
   winners: PT.arrayOf(PT.shape()),
-  pointPrizes: PT.arrayOf(PT.number),
   prizes: PT.arrayOf(PT.number),
   submissions: PT.arrayOf(PT.shape()),
   viewable: PT.bool,

src/shared/containers/SubmissionManagement/index.jsx

@@ -65,7 +65,7 @@ class SubmissionManagementPageContainer extends React.Component {
       showModal,
       toBeDeletedId,
     } = this.props;
-    const isRegistered = registrants.find(r => _.toString(r.handle) === _.toString(handle));
+    const isRegistered = registrants.find(r => _.toString(r.memberHandle) === _.toString(handle));
     if (!isRegistered) return <AccessDenied redirectLink={`${challengesUrl}/${challenge.id}`} cause={ACCESS_DENIED_REASON.HAVE_NOT_SUBMITTED_TO_THE_CHALLENGE} />;
 
     const isEmpty = _.isEmpty(challenge);

src/shared/containers/SubmissionPage.jsx

@@ -53,7 +53,7 @@ class SubmissionsPageContainer extends React.Component {
 
   render() {
     const { registrants, handle, challengeId } = this.props;
-    const isRegistered = registrants.find(r => _.toString(r.handle) === _.toString(handle));
+    const isRegistered = registrants.find(r => _.toString(r.memberHandle) === _.toString(handle));
     if (!isRegistered) {
       return (
         <React.Fragment>

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

@@ -112,11 +112,8 @@ function getOgImage(challenge, challengeTypes) {
   }
 }
 
-function isRegistered(details, registrants, handle) {
-  if (details && details.roles && details.roles.includes('Submitter')) {
-    return true;
-  }
-  if (_.find(registrants, r => _.toString(r.handle) === _.toString(handle))) {
+function isRegistered(registrants, handle) {
+  if (_.find(registrants, r => _.toString(r.memberHandle) === _.toString(handle))) {
     return true;
   }
   return false;
@@ -398,7 +395,6 @@ class ChallengeDetailPageContainer extends React.Component {
     const isLegacyMM = isMM(challenge) && Boolean(challenge.roundId);
 
     const hasRegistered = isRegistered(
-      challenge.userDetails,
       challenge.registrants,
       (auth.user || {}).handle,
     );
@@ -427,6 +423,12 @@ class ChallengeDetailPageContainer extends React.Component {
       || (_.get(phases, 'submission.phaseStatus') !== 'Open'
         && _.get(phases, 'checkpointSubmission.phaseStatus') !== 'Open');
 
+    const { prizeSets } = challenge;
+    let challengePrizes = [];
+    if (prizeSets && prizeSets[0] && prizeSets[0].type === 'placement') {
+      challengePrizes = prizeSets[0].prizes;
+    }
+
     return (
       <div styleName="outer-container">
         <div styleName="challenge-detail-container" role="main">
@@ -585,8 +587,7 @@ class ChallengeDetailPageContainer extends React.Component {
             && (
               <Winners
                 winners={winners}
-                pointPrizes={challenge.pointPrizes}
-                prizes={challenge.prizes}
+                prizes={challengePrizes}
                 viewable={submissionsViewable ? submissionsViewable.value === 'true' : false}
                 submissions={challenge.submissions}
                 isDesign={track.toLowerCase() === 'design'}

src/shared/utils/challenge-detail/helper.jsx

@@ -202,14 +202,13 @@ export function getDisplayRecommendedChallenges(
   const displayRecommendedChallenges = recommendedChallenges[recommendedTag]
     ? recommendedChallenges[recommendedTag].challenges : [];
   const filterParams = getBuckets(null)[BUCKETS.OPEN_FOR_REGISTRATION].filter;
-  const userHandle = _.get(auth.user, 'handle');
+  const userId = _.get(auth.user, 'userId');
   const filter = Filter.getFilterFunction(filterParams);
 
   let results = _.filter(displayRecommendedChallenges, (c) => {
     let isValid = filter(c);
-    if (isValid && userHandle) {
-      // TODO: Find equivalent of !c.users[userHandle]
-      isValid = c.id !== challenge.id;
+    if (isValid && userId) {
+      isValid = !c.users[userId] && c.id !== challenge.id;
     }
     return isValid;
   });