Merge pull request #4807 from topcoder-platform/develop

V5 Integration fixes

Author: sushilshinde

.circleci/config.yml

@@ -237,7 +237,7 @@ workflows:
           filters:
             branches:
               only:                
-                - integration-v5-challenge-api
+                - hot-fix
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -251,14 +251,14 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - hot-fix
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
           filters:
             branches:
               only:
-                - hot-fix
+                - develop
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

package-lock.json

@@ -12,7 +12,7 @@
   "communityId": "zurich",
   "communityName": "Zurich Community",
   "groupIds": ["20000145"],
-  "authorizedGroupIdsCatalog": ["20000160", "20000161"],
+  "authorizedGroupIdsCatalog": ["c40767a9-e02e-4872-87eb-d50dcb946055", "a1bcb865-7235-481f-ae62-b82dd958fc4c"],
   "competitorsGroupIds": ["20000226"],
   "logos": [{
     "img": "/community-app-assets/themes/zurich/zurich.svg",

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

@@ -36,13 +36,13 @@ export default function SideBar({
   const scorecardURL = `${config.URL.ONLINE_REVIEW}/review/actions/ViewScorecard?scid=`;
   const faqURL = config.URL.INFO.DESIGN_CHALLENGE_SUBMISSION;
   let submissionLimitDisplay = 'Unlimited';
-  const submissionLimit = _.find(metadata, { type: 'submissionLimit' });
+  const submissionLimit = _.find(metadata, { name: 'submissionLimit' });
   const fileTypes = _.find(metadata, { name: 'fileTypes' });
 
   if (submissionLimit) {
     if (submissionLimit.value === 1) {
       submissionLimitDisplay = '1 submission';
-    } else if (submissionLimit > 1) {
+    } else if (submissionLimit.value > 1) {
       submissionLimitDisplay = `${submissionLimit.value} submissions`;
     }
   }

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

@@ -59,7 +59,12 @@ export default function ChallengeDetailsView(props) {
     forumId,
   } = legacy;
 
-  const allowStockArt = _.find(metadata, { type: 'allowStockArt' });
+  let stockArtValue = '';
+  const allowStockArt = _.find(metadata, { name: 'allowStockArt' });
+  if (allowStockArt) {
+    stockArtValue = allowStockArt.value;
+  }
+
   let environment = '';
   const environmentData = _.find(metadata, { name: 'environment' });
   if (environmentData) {
@@ -103,7 +108,7 @@ export default function ChallengeDetailsView(props) {
   const toolbarConnector = new ToolbarConnector();
   const isSaving = specsTabState === SPECS_TAB_STATES.SAVING;
 
-  const stockArtText = allowStockArt
+  const stockArtText = stockArtValue
     ? 'Stock photography is allowed in this challenge.'
     : 'Stock photography is not allowed in this challenge. All submitted elements must be designed solely by you.';
 
@@ -170,7 +175,7 @@ export default function ChallengeDetailsView(props) {
                       description
                       && (
                       <article>
-                        <h2 styleName="h2">
+                        <h2>
                           Challenge Overview
                         </h2>
                         {
@@ -195,7 +200,7 @@ export default function ChallengeDetailsView(props) {
                       finalSubmissionGuidelines
                       && (
                       <article>
-                        <h2 styleName="h2">
+                        <h2>
                           Final Submission Guidelines
                         </h2>
                         {
@@ -228,7 +233,7 @@ export default function ChallengeDetailsView(props) {
                       description
                       && (
                       <article>
-                        <h2 styleName="h2">
+                        <h2>
                           Challenge Summary
                         </h2>
                         {
@@ -246,8 +251,8 @@ export default function ChallengeDetailsView(props) {
                             />
                           )
                         }
-                        <p styleName="p" />
-                        <p styleName="p note">
+                        <p />
+                        <p styleName="note">
                           Please read the challenge specification carefully and
                           watch the forums for any questions or feedback
                           concerning this challenge. It is important that you
@@ -259,10 +264,10 @@ export default function ChallengeDetailsView(props) {
                       )
                     }
                     <article>
-                      <h2 styleName="h2">
+                      <h2>
                         Stock Photography
                       </h2>
-                      <p styleName="p">
+                      <p>
                         {stockArtText}
 &nbsp;
                         <a href={config.URL.INFO.STOCK_ART_POLICY}>
@@ -271,10 +276,10 @@ export default function ChallengeDetailsView(props) {
                       </p>
                     </article>
                     <article>
-                      <h2 styleName="h2">
+                      <h2>
                         How To Submit
                       </h2>
-                      <ul styleName="ul">
+                      <ul>
                         <li>
                           New to Studio?
                           &zwnj;
@@ -311,10 +316,10 @@ export default function ChallengeDetailsView(props) {
                     </article>
 
                     <article>
-                      <h2 styleName="h2">
+                      <h2>
                         Winner Selection
                       </h2>
-                      <p styleName="p">
+                      <p>
                         Submissions are viewable to the client as they are entered
                         into the challenge. Winners are selected by the client and
                         are chosen solely at the client&apos;s discretion.
@@ -324,13 +329,13 @@ export default function ChallengeDetailsView(props) {
                 )
             }
             <article>
-              <h2 styleName="h2">
+              <h2>
                 Payments
               </h2>
               {
                 isWipro ? (
                   <div>
-                    <p styleName="p">
+                    <p>
                       For employees of Wipro Technologies, following are the
                       payment terms. Winner/s would be awarded the prize money on
                       successful completion and acceptance of the submission by
@@ -354,7 +359,7 @@ export default function ChallengeDetailsView(props) {
                     </p>
                   </div>
                 ) : (
-                  <p styleName="p">
+                  <p>
                     Topcoder will compensate members in accordance with our standard payment policies, unless
                     otherwise specified in this challenge. For information on payment policies, setting up your profile to
                     receive payments, and general payment questions, please refer to

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

@@ -78,6 +78,8 @@ $tc-link-visited: #0c4e98;
   align-items: baseline;
   word-break: break-word;
 
+  @include linkStyle;
+
   @include xs-to-sm {
     flex-direction: column;
   }
@@ -118,7 +120,7 @@ $tc-link-visited: #0c4e98;
   }
 }
 
-.h2 {
+h2 {
   @include roboto-bold;
 
   font-size: 20px;
@@ -127,7 +129,7 @@ $tc-link-visited: #0c4e98;
   margin: (6 * $base-unit) 0 (2 * $base-unit);
 }
 
-.h3 {
+h3 {
   @include roboto-bold;
 
   font-size: 15px;
@@ -137,7 +139,17 @@ $tc-link-visited: #0c4e98;
   text-transform: uppercase;
 }
 
-.p {
+p,
+em,
+strong {
+  @include roboto-regular;
+
+  font-size: 15px;
+  color: $tc-gray-90;
+  line-height: 25px;
+}
+
+p {
   @include roboto-regular;
 
   font-size: 15px;
@@ -149,7 +161,7 @@ $tc-link-visited: #0c4e98;
   margin: (2 * $base-unit) 0 (3 * $base-unit);
 }
 
-.ul {
+ul {
   @include roboto-regular;
 
   margin: 0 0 5px 20px;

src/shared/components/challenge-detail/Specification/styles.scss

@@ -175,8 +175,8 @@ class SubmissionsComponent extends React.Component {
             valueA = `${a.member || ''}`.toLowerCase();
             valueB = `${b.member || ''}`.toLowerCase();
           } else {
-            valueA = `${a.createdBy}`.toLowerCase();
-            valueB = `${b.createdBy}`.toLowerCase();
+            valueA = _.get(a.registrant, 'memberHandle', '');
+            valueB = _.get(b.registrant, 'memberHandle', '');
           }
           valueIsString = true;
           break;
@@ -314,12 +314,12 @@ class SubmissionsComponent extends React.Component {
               {`#${s.id}`}
             </a>
             <a
-              href={`${window.origin}/members/${s.createdBy}`}
+              href={`${window.origin}/members/${_.get(s.registrant, 'memberHandle', '')}`}
               target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
               rel="noopener noreferrer"
               styleName={`level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}
             >
-              {s.createdBy}
+              {_.get(s.registrant, 'memberHandle', '')}
             </a>
           </div>
           <div>
@@ -705,7 +705,7 @@ class SubmissionsComponent extends React.Component {
         {
           !isMM && (
             sortedSubmissions.map(s => (
-              <div key={s.createdBy + s.created} styleName="row">
+              <div key={_.get(s.registrant, 'memberHandle', '') + s.created} styleName="row">
                 {
                   !isF2F && !isBugHunt && (
                     <div styleName={`col-2 level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}>
@@ -715,12 +715,12 @@ class SubmissionsComponent extends React.Component {
                 }
                 <div styleName="col-3">
                   <a
-                    href={`${window.origin}/members/${s.createdBy}`}
+                    href={`${window.origin}/members/${_.get(s.registrant, 'memberHandle', '')}`}
                     target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
                     rel="noopener noreferrer"
                     styleName={`handle level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}
                   >
-                    {s.createdBy}
+                    {_.get(s.registrant, 'memberHandle', '')}
                   </a>
                 </div>
                 <div styleName="col-4">

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

@@ -6,6 +6,7 @@ import LeaderboardAvatar from 'components/challenge-listing/LeaderboardAvatar';
 import { config, Link } from 'topcoder-react-utils';
 import { TABS as DETAIL_TABS } from 'actions/page/challenge-details';
 import 'moment-duration-format';
+import { phaseEndDate } from 'utils/challenge-listing/helper';
 import {
   getTimeLeft,
 } from 'utils/challenge-detail/helper';
@@ -271,7 +272,7 @@ export default function ChallengeStatus(props) {
                 <ChallengeProgressBar
                   color="green"
                   value={getPhaseProgress(statusPhase)}
-                  isLate={moment().isAfter(statusPhase.scheduledEndDate)}
+                  isLate={moment().isAfter(phaseEndDate(statusPhase))}
                 />
                 <div styleName="time-left">
                   {getTimeLeft(statusPhase, 'to go').text}

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

@@ -17,6 +17,7 @@ import _ from 'lodash';
 import React from 'react';
 import PT from 'prop-types';
 import Tooltip from 'components/Tooltip';
+import { phaseStartDate, phaseEndDate } from 'utils/challenge-listing/helper';
 import LoaderIcon from '../../../Loader/Loader';
 import './style.scss';
 
@@ -95,31 +96,32 @@ function Tip(props) {
   if (!c || _.isEmpty(c)) return <div />;
 
   const allPhases = c.phases || [];
-  const endPhaseDate = Math.max(...allPhases.map(d => new Date(d.scheduledEndDate)));
+  const endPhaseDate = Math.max(...allPhases.map(d => phaseEndDate(d)));
   const registrationPhase = allPhases.find(phase => phase.name === 'Registration');
   const submissionPhase = allPhases.find(phase => phase.name === 'Submission');
+  const checkpointPhase = allPhases.find(phase => phase.name === 'Checkpoint Submission');
 
   if (registrationPhase) {
     steps.push({
-      date: new Date(registrationPhase.scheduledStartDate),
+      date: phaseStartDate(registrationPhase),
       name: 'Start',
     });
   }
-  if (c.checkpointSubmissionEndDate) {
+  if (checkpointPhase) {
     steps.push({
-      date: new Date(c.checkpointSubmissionEndDate),
+      date: phaseEndDate(checkpointPhase),
       name: 'Checkpoint',
     });
   }
   const iterativeReviewPhase = allPhases.find(phase => phase.isOpen && phase.name === 'Iterative Review');
   if (iterativeReviewPhase) {
     steps.push({
-      date: new Date(iterativeReviewPhase.scheduledEndDate),
+      date: phaseEndDate(iterativeReviewPhase),
       name: 'Iterative Review',
     });
   } else if (submissionPhase) {
     steps.push({
-      date: new Date(submissionPhase.scheduledEndDate),
+      date: phaseEndDate(submissionPhase),
       name: 'Submission',
     });
   }

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

@@ -55,7 +55,7 @@ function Header(props) {
   const AUTH_URL = config.URL.AUTH;
   const normalizedProfile = profile && _.clone(profile);
   const isZurichCompetitor = (profile && profile.groups) ? _.intersection(
-    _.map(profile.groups, 'id'),
+    _.map(profile.groups, 'oldId'),
     meta.competitorsGroupIds,
   ) : [];