Merge pull request #4872 from topcoder-platform/gig-work-fix

Gig work fix

Author: sushilshinde

.circleci/config.yml

@@ -230,22 +230,21 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
                 - feature-contentful
-                - hot-fix
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
-                - hot-fix
+                - community-app-tests-poc
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
@@ -259,7 +258,6 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master

Dockerfile

@@ -64,6 +64,8 @@ ARG TC_M2M_AUTH0_PROXY_SERVER_URL
 ARG TC_M2M_AUTH0_URL
 ARG AUTH_SECRET
 
+ARG COMMUNITY_APP_URL
+
 ################################################################################
 # Setting of environment variables in the Docker image.
 
@@ -117,6 +119,7 @@ ENV CONTENTFUL_EDU_SPACE_ID=$CONTENTFUL_EDU_SPACE_ID
 ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY
 ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
 ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY
+ENV COMMUNITY_APP_URL=$COMMUNITY_APP_URL
 
 ################################################################################
 # Testing and build of the application inside the container.

build.sh

@@ -43,7 +43,8 @@ docker build -t $TAG \
   --build-arg CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID \
   --build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \
   --build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY \
-  --build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY .
+  --build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY \
+  --build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL .
 
 # Copies "node_modules" from the created image, if necessary for caching.
 docker create --name app $TAG

package-lock.json

@@ -137,7 +137,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": "1.0.0",
+    "topcoder-react-lib": "1.0.3",
     "topcoder-react-ui-kit": "2.0.0",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

package.json

@@ -1,9 +1,6 @@
 {
   "challengeFilter": {
-    "groupIds": ["20000078"],
-    "or": [{
-      "tags": ["TCO", "TCO19"]
-    }]
+    "events": ["tco19"]
   },
   "communityId": "tco19",
   "communityName": "TCO19",

src/assets/images/gig-blob.svg

@@ -1,6 +1,6 @@
 {
   "challengeFilter": {
-    "tags": ["TCO", "TCO20"]
+    "events": ["tco20"]
   },
   "communityId": "tco20",
   "communityName": "TCO20",

src/assets/images/img-gig-work.png

@@ -1,6 +1,6 @@
 {
   "challengeFilter": {
-    "tags": ["TCO", "TCO21"]
+    "events": ["tco21"]
   },
   "communityId": "tco21",
   "communityName": "TCO21",

src/server/tc-communities/tco19/metadata.json

@@ -339,7 +339,7 @@ function getUserChallengesInit(uuid) {
 function getUserChallengesDone(userId, tokenV3) {
   const service = getService(tokenV3);
 
-  return service.getUserResources(userId)
+  return service.getUserResources(userId, 1, 10000)
     .then(item => item)
     .catch((error) => {
       fireErrorMessage('Error Getting User Challenges', error.content || error);

src/server/tc-communities/tco20/metadata.json

@@ -38,7 +38,7 @@ function getListInit(uuid) {
  * @return {Promise}
  */
 function getListDone(uuid, auth) {
-  const groups = _.get(auth, 'profile.groups', []).map(g => g.oldId);
+  const groups = _.get(auth, 'profile.groups', []).map(g => g.id);
   return getCommunitiesService(auth.tokenV3)
     .getList(groups).then(list => ({ list, uuid }));
 }

src/server/tc-communities/tco21/metadata.json

@@ -14,6 +14,7 @@ import { errors } from 'topcoder-react-lib';
 import { themr } from 'react-css-super-themr';
 import classnames from 'classnames';
 
+import defaultModalTheme from 'components/Leaderboard/ChallengeHistoryModal/styles.scss';
 import defaultStyle from './style.scss';
 
 const { fireErrorMessage } = errors;
@@ -102,7 +103,10 @@ class ContentfulModal extends React.Component {
                 className: classnames(theme.modalTrigger, child.props.className),
               }))}
               {isOpen && (
-              <Modal onCancel={this.onCloseModal}>
+              <Modal
+                onCancel={this.onCloseModal}
+                theme={defaultModalTheme}
+              >
                 <div
                   className={theme.dismissButton}
                   onClick={this.onCloseModal}

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

@@ -49,7 +49,7 @@
       }
 
       &:first-child {
-        width: 200px;
+        width: 250px;
       }
 
       &:nth-child(2) {

src/shared/actions/tc-communities/index.js

@@ -137,7 +137,7 @@ export default function GigDetails(props) {
                     </li>
                     <li>
                       <img src={iconLabel2} alt="label 2" />
-                      <div><strong>Subscribe to our <a target="_blank" rel="noreferrer" href="https://www.topcoder.com/community/taas">Gig notifications email.</a>.</strong> We’ll send you a weekly update on gigs available so you don’t miss a beat.</div>
+                      <div><strong>Subscribe to our <a target="_blank" rel="noreferrer" href="https://www.topcoder.com/community/taas">Gig notifications email</a>.</strong> We’ll send you a weekly update on gigs available so you don’t miss a beat.</div>
                     </li>
                     <li>
                       <img src={iconLabel3} alt="label 3" />

src/shared/components/Contentful/Modal/index.jsx

@@ -142,6 +142,7 @@
 
               img {
                 margin-right: 16px;
+                min-width: 40px;
               }
 
               &:last-child {
@@ -163,6 +164,7 @@
           font-weight: 600;
           font-family: Barlow, sans-serif;
           margin-top: 20px;
+          line-height: 20px;
         }
       }
 
@@ -189,6 +191,7 @@
         .skills {
           display: flex;
           align-items: center;
+          line-height: 21px;
           /* stylelint-disable */
           img {
             margin-right: 8px;

src/shared/components/GUIKit/JobListCard/style.scss

@@ -29,24 +29,6 @@ const ChallengeSpecTab = ({ challenge }) => (
       </article>
       )
     }
-    {
-      challenge.finalSubmissionGuidelines
-      && (
-      <article>
-        <h2 styleName="h2">
-          Final Submission Guidelines
-        </h2>
-        <div
-          /* eslint-disable react/no-danger */
-          dangerouslySetInnerHTML={{
-            __html: challenge.finalSubmissionGuidelines,
-          }}
-          /* eslint-enable react/no-danger */
-          styleName="rawHtml"
-        />
-      </article>
-      )
-    }
   </div>
 );
 

src/shared/components/Gigs/GigDetails.jsx

@@ -6,14 +6,15 @@ import moment from 'moment-timezone';
 import PT from 'prop-types';
 import React from 'react';
 
+import { phaseEndDate, phaseStartDate } from 'utils/challenge-listing/helper';
 import Card from './Card';
 import './style.scss';
 
 export default function DeadlinesPanel({ deadlines }) {
   /* Calculates challenge start time. */
   let start = deadlines[0] || {};
-  start = start.actualStartDate || start.scheduledStartDate;
-  const started = moment(start).isBefore(moment());
+  start = phaseStartDate(start);
+  const started = moment(start).isBefore();
 
   return (
     <div styleName="panel" tabIndex="0" role="tabpanel">
@@ -29,7 +30,7 @@ export default function DeadlinesPanel({ deadlines }) {
       { deadlines.map((d, index) => (
         <Card
           key={d.name}
-          time={d.scheduledEndDate || d.actualEndDate}
+          time={phaseEndDate(d)}
           title={index === deadlines.length - 1 ? 'Winners' : d.name}
         />
       ))}

src/shared/components/Gigs/style.scss

@@ -15,6 +15,7 @@ import React from 'react';
 import { DangerButton, PrimaryButton } from 'topcoder-react-ui-kit';
 import { Link } from 'topcoder-react-utils';
 import { COMPETITION_TRACKS } from 'utils/tc';
+import { phaseEndDate } from 'utils/challenge-listing/helper';
 
 import LeftArrow from 'assets/images/arrow-prev.svg';
 
@@ -69,16 +70,17 @@ export default function ChallengeHeader(props) {
     numOfRegistrants,
     numOfCheckpointSubmissions,
     numOfSubmissions,
-    endDate,
     status,
     type,
     track,
   } = challenge;
 
   const tags = challenge.tags || [];
-  const appealsEndDate = endDate;
 
   const allPhases = challenge.phases || [];
+  const sortedAllPhases = _.cloneDeep(allPhases)
+    .sort((a, b) => moment(phaseEndDate(a)).diff(phaseEndDate(b)));
+
   const { prizes } = prizeSets && prizeSets.length ? prizeSets[0] : [];
 
   const checkpointPrizes = _.find(prizeSets, { type: 'checkpoint' });
@@ -122,14 +124,14 @@ export default function ChallengeHeader(props) {
   */
   const hasSubmissions = !_.isEmpty(mySubmissions);
 
-  let nextPhase = allPhases.filter(p => p.isOpen)
-    .sort((a, b) => moment(a.scheduledEndDate).diff(b.scheduledEndDate))[0];
-  if (hasRegistered && allPhases[0] && allPhases[0].name === 'Registration') {
-    nextPhase = allPhases[1] || {};
+  const openPhases = sortedAllPhases.filter(p => p.isOpen);
+  let nextPhase = openPhases[0];
+  if (hasRegistered && openPhases[0] && openPhases[0].name === 'Registration') {
+    nextPhase = openPhases[1] || {};
   }
   const nextDeadline = nextPhase && nextPhase.name;
 
-  const deadlineEnd = moment(nextPhase && nextPhase.scheduledEndDate);
+  const deadlineEnd = moment(nextPhase && phaseEndDate(nextPhase));
   const currentTime = moment();
 
   let timeLeft = deadlineEnd.isAfter(currentTime)
@@ -147,8 +149,8 @@ export default function ChallengeHeader(props) {
   if (showDeadlineDetail) {
     relevantPhases = (allPhases || []).filter((phase) => {
       if (phase.name === 'Iterative Review') {
-        const end = phase.actualEndDate || phase.scheduledEndDate;
-        return moment(end).isAfter(moment());
+        const end = phaseEndDate(phase);
+        return moment(end).isAfter();
       }
       const phaseLowerCase = phase.name.toLowerCase();
       if (phaseLowerCase.includes('screening') || phaseLowerCase.includes('specification')) {
@@ -168,30 +170,34 @@ export default function ChallengeHeader(props) {
       if (b.name.toLowerCase().includes('registration')) {
         return 1;
       }
-      return (new Date(a.scheduledEndDate || a.actualEndDate)).getTime()
-        - (new Date(b.scheduledEndDate || b.actualEndDate)).getTime();
+      const aEndDate = phaseEndDate(a);
+      const bEndDate = phaseEndDate(b);
+      return moment(aEndDate).diff(bEndDate);
     });
     if (type === 'First2Finish' && status === 'Completed') {
       const phases2 = allPhases.filter(p => p.name === 'Iterative Review' && !p.isOpen);
-      const endPhaseDate = Math.max(...phases2.map(d => new Date(d.scheduledEndDate)));
+      const endPhaseDate = Math.max(...phases2.map(d => phaseEndDate(d)));
       relevantPhases = _.filter(relevantPhases, p => (p.name.toLowerCase().includes('registration')
-        || new Date(p.scheduledEndDate).getTime() < endPhaseDate));
+        || phaseEndDate(p).getTime() < endPhaseDate));
       relevantPhases.push({
         id: -1,
         name: 'Winners',
+        isOpen: false,
+        actualEndDate: endPhaseDate,
         scheduledEndDate: endPhaseDate,
       });
     } else if (relevantPhases.length > 1) {
       const lastPhase = relevantPhases[relevantPhases.length - 1];
-      const lastPhaseTime = (
-        new Date(lastPhase.actualEndDate || lastPhase.scheduledEndDate)
-      ).getTime();
+      const lastPhaseTime = phaseEndDate(lastPhase).getTime();
 
-      const appealsEnd = (new Date(appealsEndDate).getTime());
-      if (lastPhaseTime < appealsEnd && lastPhase.name !== 'Review') {
+      const appealsEndDate = phaseEndDate(sortedAllPhases[sortedAllPhases.length - 1]);
+      const appealsEnd = appealsEndDate.getTime();
+      if (lastPhaseTime < appealsEnd) {
         relevantPhases.push({
           id: -1,
           name: 'Winners',
+          isOpen: false,
+          actualEndDate: appealsEndDate,
           scheduledEndDate: appealsEndDate,
         });
       }
@@ -495,7 +501,6 @@ ChallengeHeader.propTypes = {
     numOfCheckpointSubmissions: PT.any,
     numOfSubmissions: PT.any,
     status: PT.any,
-    endDate: PT.any,
     phases: PT.any,
     roundId: PT.any,
     prizeSets: PT.any,

src/shared/components/ReviewOpportunityDetailsPage/ChallengeSpecTab/index.jsx

@@ -41,7 +41,7 @@ class MySubmissionsView extends React.Component {
     }
 
     if (isMM) {
-      loadMMSubmissions(challenge.id, challenge.registrants, auth.tokenV3);
+      loadMMSubmissions(challenge.id, auth.tokenV3);
     }
   }