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

Integration v5 challenge api

Author: rashmi73

__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap

@@ -60,11 +60,6 @@ exports[`Matches shallow shapshot 1`] = `
   <div
     className="src-shared-components-Dashboard-SRM-___styles__srms-links___JFdeQ"
   >
-    <a
-      href="https://www.topcoder-dev.com/my-srms/"
-    >
-      View Past SRMS
-    </a>
     <a
       href="https://arena.topcoder-dev.com"
     >

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

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

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

@@ -89,7 +89,7 @@ exports[`Matches shallow shapshot 1`] = `
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
-    userHandle=""
+    userId=""
   />
 </StaticRouter>
 `;
@@ -240,7 +240,7 @@ exports[`Matches shallow shapshot 2`] = `
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
-    userHandle=""
+    userId=""
   />
 </StaticRouter>
 `;
@@ -278,7 +278,7 @@ exports[`Matches shallow shapshot 3`] = `
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
-    userHandle=""
+    userId=""
   />
 </StaticRouter>
 `;

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

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

@@ -140,14 +140,6 @@ export default function Challenges({
           />
         </Sticky>
       </div>
-      <div styleName="linksContainer">
-        <a
-          href={`${config.URL.BASE}/my-challenges/?status=completed`}
-          styleName="link"
-        >
-          Past Challenges
-        </a>
-      </div>
     </div>
   );
 }

src/shared/components/Dashboard/CurrentActivity/Challenges/style.scss

@@ -21,26 +21,6 @@
   }
 }
 
-.link {
-  @include tc-body-md;
-
-  &,
-  &:active,
-  &:focus,
-  &:visited {
-    color: $tc-dark-blue-110;
-  }
-
-  &:hover {
-    color: $tc-dark-blue-70;
-  }
-}
-
-.linksContainer {
-  padding: 30px 20px 0;
-  text-align: center;
-}
-
 .loading {
   margin: 40px 20px 30px;
 }

src/shared/components/Dashboard/SRM/index.jsx

@@ -43,9 +43,6 @@ const SRM = (props) => {
         </div>
       </section>
       <div styleName="srms-links">
-        <a href={`${config.URL.BASE}/my-srms/`}>
-          View Past SRMS
-        </a>
         <a href={config.URL.ARENA}>
           Launch Arena
         </a>

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

@@ -211,46 +211,9 @@ export default function ChallengeDetailsView(props) {
                 : (
                   <div>
                     {
-                      privateDescription
-                      && (
-                      <article>
-                        <h2 styleName="h2">
-                          Challenge Details
-                        </h2>
-                        {
-                          editMode ? (
-                            <Editor
-                              connector={toolbarConnector}
-                              id="privateDescription"
-                              initialMode={EDITOR_MODES.WYSIWYG}
-                              ref={n => n && n.setHtml(privateDescription)}
-                            />
-                          ) : (
-                            <SpecificationComponent
-                              bodyText={privateDescription}
-                              format={descriptionFormat}
-                            />
-                          )
-                        }
-                        <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>
-                      )
-                    }
-                    {
-                      privateDescription
+                      description
                       && (
                       <article>
-                        <h2 styleName="h2">
-                          Full Description & Project Guide
-                        </h2>
                         {
                           editMode ? (
                             <Editor
@@ -261,7 +224,7 @@ export default function ChallengeDetailsView(props) {
                             />
                           ) : (
                             <SpecificationComponent
-                              bodyText={privateDescription}
+                              bodyText={description}
                               format={descriptionFormat}
                             />
                           )

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

@@ -60,6 +60,7 @@ export default function ChallengeStatus(props) {
     newChallengeDetails,
     selectChallengeDetailsTab,
     openChallengesInNewTabs,
+    userId,
   } = props;
 
   /* TODO: Split into a separate ReactJS component! */
@@ -130,7 +131,7 @@ export default function ChallengeStatus(props) {
       challenge,
       detailLink,
     } = props;
-    const timeDiff = getTimeLeft((challenge.allPhases || challenge.phases || []).find(p => p.name === 'Registration'), 'to register');
+    const timeDiff = getTimeLeft((challenge.allPhases || challenge.phases || []).find(p => p.name === 'Registration'), 'to go');
     let timeNote = timeDiff.text;
     /* TODO: This is goofy, makes the trick, but should be improved. The idea
      * here is that the standard "getTimeLeft" method, for positive times,
@@ -210,28 +211,19 @@ export default function ChallengeStatus(props) {
     const allPhases = challenge.phases || [];
 
     let statusPhase = allPhases
-      .filter(p => p.name !== 'Registration')
+      .filter(p => p.name !== 'Registration' && p.isOpen)
       .sort((a, b) => moment(a.scheduledEndDate).diff(b.scheduledEndDate))[0];
 
     if (!statusPhase && subTrack === 'FIRST_2_FINISH' && allPhases.length) {
       statusPhase = _.clone(allPhases[0]);
       statusPhase.name = 'Submission';
     }
 
-    const registrationPhase = allPhases
-      .find(p => p.name === 'Registration');
-    const isRegistrationOpen = registrationPhase
-      && (
-        registrationPhase.isOpen
-        || moment(registrationPhase.scheduledEndDate).diff(new Date()) > 0);
-
-
     let phaseMessage = STALLED_MSG;
     if (statusPhase) phaseMessage = statusPhase.name;
     else if (status === 'Draft') phaseMessage = DRAFT_MSG;
 
-    // TODO: Find equivalent of !challenge.users[userHandle]
-    const showRegisterInfo = isRegistrationOpen;
+    const showRegisterInfo = challenge.registrationOpen === 'Yes' && !challenge.users[userId];
 
     return (
       <div styleName={showRegisterInfo ? 'challenge-progress with-register-button' : 'challenge-progress'}>
@@ -278,7 +270,7 @@ export default function ChallengeStatus(props) {
                   isLate={moment().isAfter(statusPhase.scheduledEndDate)}
                 />
                 <div styleName="time-left">
-                  {getTimeLeft(statusPhase, 'to register').text}
+                  {getTimeLeft(statusPhase, 'to go').text}
                 </div>
               </div>
             ) : <ChallengeProgressBar color="gray" value="100" />
@@ -304,6 +296,7 @@ ChallengeStatus.defaultProps = {
   detailLink: '',
   openChallengesInNewTabs: false,
   className: '',
+  userId: '',
 };
 
 ChallengeStatus.propTypes = {
@@ -314,4 +307,5 @@ ChallengeStatus.propTypes = {
   openChallengesInNewTabs: PT.bool, // eslint-disable-line react/no-unused-prop-types
   selectChallengeDetailsTab: PT.func.isRequired,
   className: PT.string,
+  userId: PT.string,
 };

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

@@ -33,7 +33,7 @@ function ChallengeCard({
   openChallengesInNewTabs,
   sampleWinnerProfile,
   selectChallengeDetailsTab,
-  userHandle,
+  userId,
   domRef,
 }) {
   const challenge = passedInChallenge;
@@ -116,7 +116,7 @@ function ChallengeCard({
           openChallengesInNewTabs={openChallengesInNewTabs}
           sampleWinnerProfile={sampleWinnerProfile}
           selectChallengeDetailsTab={selectChallengeDetailsTab}
-          userHandle={userHandle}
+          userId={userId}
         />
       </div>
     </div>
@@ -130,7 +130,7 @@ ChallengeCard.defaultProps = {
   onTechTagClicked: _.noop,
   openChallengesInNewTabs: false,
   sampleWinnerProfile: undefined,
-  userHandle: '',
+  userId: '',
   expandedTags: [],
   expandTag: null,
   domRef: null,
@@ -145,7 +145,7 @@ ChallengeCard.propTypes = {
   openChallengesInNewTabs: PT.bool,
   sampleWinnerProfile: PT.shape(),
   selectChallengeDetailsTab: PT.func.isRequired,
-  userHandle: PT.string,
+  userId: PT.string,
   expandedTags: PT.arrayOf(PT.number),
   expandTag: PT.func,
   domRef: PT.func,

src/shared/components/challenge-listing/LeaderboardAvatar/style.scss

@@ -68,6 +68,16 @@ $leader-radius-4: $corner-radius * 2;
       background: $tc-dark-blue-30;
       color: $tc-dark-blue-100;
     }
+
+    &.placement-5 {
+      background: $tc-dark-blue-30;
+      color: $tc-dark-blue-100;
+    }
+
+    &.placement-6 {
+      background: $tc-dark-blue-30;
+      color: $tc-dark-blue-100;
+    }
   }
 
   .hidden {

src/shared/components/challenge-listing/Listing/Bucket/index.jsx

@@ -42,7 +42,7 @@ export default function Bucket({
   setFilterState,
   setSort,
   sort,
-  userHandle,
+  userId,
   expandedTags,
   expandTag,
   activeBucket,
@@ -109,7 +109,7 @@ export default function Bucket({
       prizeMode={prizeMode}
       key={item.id}
       selectChallengeDetailsTab={selectChallengeDetailsTab}
-      userHandle={userHandle}
+      userId={userId}
       expandedTags={expandedTags}
       expandTag={expandTag}
       domRef={addToRefs}
@@ -187,7 +187,7 @@ Bucket.defaultProps = {
   newChallengeDetails: false,
   openChallengesInNewTabs: false,
   sort: null,
-  userHandle: '',
+  userId: '',
   expandedTags: [],
   expandTag: null,
   activeBucket: '',
@@ -214,7 +214,7 @@ Bucket.propTypes = {
   setFilterState: PT.func.isRequired,
   setSort: PT.func.isRequired,
   sort: PT.string,
-  userHandle: PT.string,
+  userId: PT.string,
   expandedTags: PT.arrayOf(PT.number),
   expandTag: PT.func,
   activeBucket: PT.string,

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

@@ -45,7 +45,7 @@ function Listing({
   expandTag,
   pastSearchTimestamp,
 }) {
-  const buckets = getBuckets(_.get(auth.user, 'handle'));
+  const buckets = getBuckets(_.get(auth.user, 'userId'));
   const isChallengesAvailable = (bucket) => {
     const filter = Filter.getFilterFunction(buckets[bucket].filter);
     const clonedChallenges = _.clone(challenges);
@@ -117,7 +117,7 @@ function Listing({
             setFilterState={setFilterState}
             setSort={sort => setSort(bucket, sort)}
             sort={sorts[bucket]}
-            userHandle={_.get(auth, 'user.handle')}
+            userId={_.get(auth, 'user.userId')}
             activeBucket={activeBucket}
             searchTimestamp={searchTimestamp}
           />
@@ -183,7 +183,7 @@ Listing.propTypes = {
   auth: PT.shape({
     tokenV3: PT.string,
     user: PT.shape({
-      handle: PT.string,
+      userId: PT.string,
     }),
   }).isRequired,
   challenges: PT.arrayOf(PT.shape()),

src/shared/containers/challenge-listing/Sidebar.jsx

@@ -62,7 +62,7 @@ export class SidebarContainer extends React.Component {
       user,
     } = this.props;
 
-    const buckets = getBuckets(user && user.handle);
+    const buckets = getBuckets(user && user.userId);
 
     if (extraBucket) {
       buckets[extraBucket.name] = extraBucket;

src/shared/utils/challenge-listing/buckets.js

@@ -132,13 +132,12 @@ export const NO_LIVE_CHALLENGES_CONFIG = {
 
 /**
  * Returns configuration of all possible challenge buckets.
- * @param {String} userHandle Handle of the authenticated
+ * @param {String} userId id of the authenticated
  * user to filter out My Challenges.
  */
-export function getBuckets(userHandle) {
+export function getBuckets(userId) {
   const res = _.cloneDeep(BUCKET_DATA);
-  // TODO: Find equivalent of users
-  res[BUCKETS.MY].filter.users = [userHandle];
+  res[BUCKETS.MY].filter.users = [userId];
   return res;
 }