Merge pull request #5028 from topcoder-platform/tcx-202010

Smoke Testing 2020-10-01

Author: luizrrodrigues

.circleci/config.yml

@@ -245,7 +245,6 @@ workflows:
           filters:
             branches:
               only:
-                - milestone-20200917
                 - develop
       # This is beta env for production soft releases
       - "build-prod-beta":
@@ -262,6 +261,7 @@ workflows:
             branches:
               only:
                 - develop
+                - tcx-202010
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

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

src/shared/components/ChallengeTile/index.jsx

@@ -108,7 +108,7 @@ class ChallengeTile extends React.Component {
                 {underscoreReplace(type)}
               </p>
               <p styleName="date-completed">
-                {formatDate(challenge.submissionEndDate)}
+                {challenge.submissionEndDate && formatDate(challenge.submissionEndDate)}
               </p>
               { challenge.wonFirst && !challenge.isPrivate
               && (

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

@@ -9,13 +9,18 @@ import Option from './Option';
 import './style.scss';
 
 export default function Header({
-  numChallenges,
+  // numChallenges,
   numCommunities,
   switchTab,
   tab,
 }) {
+  /**
+   * Temporary hide My Active Challenges - community-app#5004
+   */
+  /*
   let myChallengesTitle = 'My Active Challenges';
   if (numChallenges) myChallengesTitle += ` (${numChallenges})`;
+  */
 
   let myCommunitiesTitle = 'My Communities';
   if (numCommunities) myCommunitiesTitle += ` (${numCommunities})`;
@@ -25,11 +30,13 @@ export default function Header({
       <Carousel
         alignItems="start"
       >
+        {/* {/* Temporary hide My Active Challenges - community-app#5004
         <Option
           selected={tab === TABS.MY_ACTIVE_CHALLENGES}
           select={() => switchTab(TABS.MY_ACTIVE_CHALLENGES)}
           title={myChallengesTitle}
         />
+        */}
         <Option
           selected={tab === TABS.COMMUNITIES}
           select={() => switchTab(TABS.COMMUNITIES)}
@@ -46,7 +53,7 @@ export default function Header({
 }
 
 Header.propTypes = {
-  numChallenges: PT.number.isRequired,
+  // numChallenges: PT.number.isRequired,
   numCommunities: PT.number.isRequired,
   switchTab: PT.func.isRequired,
   tab: PT.string.isRequired,

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

@@ -15,7 +15,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
 import { config } from 'topcoder-react-utils';
-import { COMPETITION_TRACKS } from 'utils/tc';
+import { COMPETITION_TRACKS, CHALLENGE_STATUS } from 'utils/tc';
 
 import PT from 'prop-types';
 
@@ -85,7 +85,8 @@ export default function Submission(props) {
             onClick={() => onDownload(submissionObject.id)}
           ><DownloadIcon /></button>
           */ }
-          {status !== 'COMPLETED'
+          {status !== CHALLENGE_STATUS.COMPLETED
+            && track !== COMPETITION_TRACKS.DESIGN
             && (
             <button
               styleName="delete-icon"

src/shared/reducers/page/dashboard.js

@@ -93,7 +93,7 @@ function create(state = {}) {
     [a.switchTab]: onSwitchTab,
   }, _.defaults(state, {
     challengeFilter: '',
-    tab: TABS.MY_ACTIVE_CHALLENGES,
+    tab: TABS.COMMUNITIES, // Temporary hide MY ACTIVE CHALLENGES - community-app#5004
     showAnnouncement: true,
     showChallengeFilter: false,
     xlBadge: '',

src/shared/utils/tc.js

@@ -10,7 +10,11 @@ import { config, isomorphy } from 'topcoder-react-utils';
 
 import { tc } from 'topcoder-react-lib';
 
-export const { COMPETITION_TRACKS, REVIEW_OPPORTUNITY_TYPES } = tc;
+export const {
+  COMPETITION_TRACKS,
+  CHALLENGE_STATUS,
+  REVIEW_OPPORTUNITY_TYPES,
+} = tc;
 
 /**
  * Possible phase types (at the moment, this map does not cover all