Merge pull request #4873 from topcoder-platform/develop

Release 2020-09-08

Author: sushilshinde

.circleci/config.yml

@@ -230,7 +230,7 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -252,14 +252,16 @@ workflows:
           filters:
             branches:
               only:
+                - integration-v5-challenge-api
                 - hot-fix
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
           filters:
             branches:
               only:
-                - feature-contentful
+                - milestone-v1.3
+                - milestone-20200910
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master

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

src/shared/components/ProfilePage/Stats/HistoryGraph/index.jsx

@@ -211,7 +211,7 @@ export default class HistoryGraph extends React.Component {
       }
       if (track === 'DATA_SCIENCE') {
         if (subTrack === 'MARATHON_MATCH') {
-          return `/challenges/${challengeId}`;
+          return `${config.URL.COMMUNITY}/tc?module=MatchDetails&rd=${challengeId}`;
         }
         if (subTrack === 'SRM') {
           return `${config.URL.COMMUNITY}/stat?c=round_overview&rd=${challengeId}`;

src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx

@@ -19,6 +19,7 @@ import React from 'react';
 import PT from 'prop-types';
 import moment from 'moment';
 import { PrimaryButton } from 'topcoder-react-ui-kit';
+import { phaseEndDate } from 'utils/challenge-listing/helper';
 import SubmissionsTable from '../SubmissionsTable';
 
 import style from './styles.scss';
@@ -47,9 +48,11 @@ export default function SubmissionManagement(props) {
   const currentPhase = challenge.phases
     .filter(p => p.name !== 'Registration' && p.isOpen)
     .sort((a, b) => moment(a.scheduledEndDate).diff(b.scheduledEndDate))[0];
+  const submissionPhase = challenge.phases.filter(p => p.name === 'Submission')[0];
+  const submissionEndDate = submissionPhase && phaseEndDate(submissionPhase);
 
   const now = moment();
-  const end = moment(currentPhase.scheduledEndDate);
+  const end = moment(currentPhase && currentPhase.scheduledEndDate);
   const diff = end.isAfter(now) ? end.diff(now) : 0;
   const timeLeft = moment.duration(diff);
 
@@ -78,11 +81,15 @@ export default function SubmissionManagement(props) {
           </a>
         </div>
         <div styleName="right-col">
-          <p styleName="round">
-            {currentPhase.name}
-          </p>
           {
-            challenge.status !== 'COMPLETED' ? (
+            currentPhase && (
+            <p styleName="round">
+              {currentPhase.name}
+            </p>
+            )
+          }
+          {
+            challenge.status !== 'Completed' ? (
               <div>
                 <p styleName="time-left">
                   {days > 0 && (`${days}D`)}
@@ -111,7 +118,7 @@ export default function SubmissionManagement(props) {
             Manage your submissions
           </p>
           {
-            isDesign && (
+            isDesign && currentPhase && (
               <p styleName="round-ends">
                 <span styleName="ends-label">
                   {currentPhase.name}
@@ -159,7 +166,7 @@ export default function SubmissionManagement(props) {
           )
         }
       </div>
-      {now.isBefore(challenge.submissionEndDate) && (
+      {now.isBefore(submissionEndDate) && (
         <div styleName="btn-wrap">
           <PrimaryButton
             theme={{

src/shared/components/SubmissionPage/Submit/index.jsx

@@ -150,8 +150,8 @@ class Submit extends React.Component {
         const topGearCommunity = _.find(communitiesList.data, { mainSubdomain: 'topgear' });
         if (topGearCommunity) {
           // check the group info match with group list
-          _.forOwn(groups, (value, key) => {
-            if (value && _.includes(topGearCommunity.groupIds, key)) {
+          _.forOwn(groups, (value) => {
+            if (value && _.includes(topGearCommunity.groupIds, value)) {
               isChallengeBelongToTopgearGroup = true;
               return false;
             }

src/shared/components/tc-communities/communities/cognitive/GetStarted/index.jsx

@@ -20,8 +20,6 @@ import cardImg02 from
 
 import MarchMadnessBanner from '../MarchMadnessBanner';
 
-import NewsSignup from '../NewsSignup';
-
 import style from './style.scss';
 
 export default function GetStarted({ baseUrl }) {
@@ -88,7 +86,6 @@ export default function GetStarted({ baseUrl }) {
           />
         </ImageText>
       </div>
-      <NewsSignup />
     </main>
   );
 }

src/shared/components/tc-communities/communities/cognitive/Home/index.jsx

@@ -16,7 +16,6 @@ import { config, Link } from 'topcoder-react-utils';
 import davePhotoUrl from 'assets/images/communities/cognitive/home/dave.jpg';
 
 import IbmCloudBanner from '../IbmCloudBanner';
-import NewsletterSignup from '../NewsSignup';
 
 import style from './style.scss';
 
@@ -317,8 +316,6 @@ export default function Home({
           </div>
         </div>
       </div>
-
-      <NewsletterSignup />
     </main>
   );
 }

src/shared/components/tc-communities/communities/cognitive/IbmCloudPage/index.jsx

@@ -4,7 +4,6 @@ import React from 'react';
 import Differences from './Differences';
 import HeadBanner from './HeadBanner';
 import JoinBlock from './JoinBlock';
-import NewsSignup from '../NewsSignup';
 
 export default function IbmCloudPage() {
   return (
@@ -16,8 +15,6 @@ export default function IbmCloudPage() {
       {/* Hidden by the request from Trevor: the transition process won't start
         * until Feb 12. */}
       {/* <AutoTransition /> */}
-
-      <NewsSignup />
     </div>
   );
 }

src/shared/components/tc-communities/communities/cognitive/NewsSignup/index.jsx

@@ -24,7 +24,6 @@ import MsgsSvg from
 import { Button, PrimaryButton } from 'topcoder-react-ui-kit';
 
 import FaqItem from './FaqItem';
-import NewsSignup from '../NewsSignup';
 
 import style from './style.scss';
 
@@ -324,7 +323,6 @@ export default function Resources({
           </div>
         </div>
       </div>
-      <NewsSignup />
     </main>
   );
 }

src/shared/components/tc-communities/communities/cognitive/NewsSignup/theme.scss

@@ -244,7 +244,7 @@ class ChallengeDetailPageContainer extends React.Component {
     }
 
     const { track } = nextProps.challenge;
-    if (track === COMPETITION_TRACKS.DESIGN && thriveArticles.length === 0) {
+    if (track !== COMPETITION_TRACKS.DESIGN && thriveArticles.length === 0) {
       // filter all tags with value 'Other'
       const tags = _.filter(nextProps.challenge.tags, tag => tag !== 'Other');
       if (tags.length > 0) {
@@ -558,8 +558,8 @@ class ChallengeDetailPageContainer extends React.Component {
                 hasRegistered={challenge.isRegistered}
                 unregistering={unregistering}
                 submissionEnded={submissionEnded}
-                isMM
-                isLegacyMM
+                isMM={isMM}
+                isLegacyMM={isLegacyMM}
                 loadingMMSubmissionsForChallengeId={loadingMMSubmissionsForChallengeId}
                 auth={auth}
                 loadMMSubmissions={loadMMSubmissions}