Merge branch 'develop' into gig-application

kkartunov · web-flow · commit 0a44c843f74f · 2020-10-01T12:26:24.000+03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -230,8 +230,7 @@ workflows:
           filters:
             branches:
               only:
-                - milestone-20200924
-                - develop
+                - hot-fix
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -261,7 +260,7 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - develop
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Default render 1`] = `
-<div>
+<div
+  className="src-shared-components-Header-___style__nav-header-wrapper___3oH9J"
+>
   <TopNav
     loggedIn={true}
     logo={
diff --git a/__tests__/shared/components/Settings/Preferences/Email/__snapshots__/index.jsx.snap b/__tests__/shared/components/Settings/Preferences/Email/__snapshots__/index.jsx.snap
@@ -65,6 +65,14 @@ exports[`renders email preferences setting page correctly 1`] = `
       secondaryText="For all the latest updates surrounding the <a href=\\"https://www.topcoder.com/community/member-programs/topcoder-open\\" style=\\"color:#0d61bf;text-decoration:underline\\">Topcoder Open</a> you should definitely be subscribing to this one. Expect an update in your mailbox every Tuesday!"
       value="TCO Tuesdays"
     />
+    <ToggleableItem
+      checked={false}
+      id="RDM"
+      onToggle={[Function]}
+      primaryText="Rapid Development Match (RDM) Reminders"
+      secondaryText="Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!"
+      value="RDM"
+    />
   </div>
 </div>
 `;
diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
@@ -6,7 +6,11 @@ exports[`Snapshot match 1`] = `
 >
   <td
     className="src-shared-components-SubmissionManagement-Submission-___styles__id-col___zC6Hi"
-  />
+  >
+    <div
+      className="src-shared-components-SubmissionManagement-Submission-___styles__legacy-id___3T2Ay"
+    />
+  </td>
   <td />
   <td
     className="src-shared-components-SubmissionManagement-Submission-___styles__date-col___3XOxK"
@@ -63,6 +67,9 @@ exports[`Snapshot match 2`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__id-col___zC6Hi"
   >
     12345
+    <div
+      className="src-shared-components-SubmissionManagement-Submission-___styles__legacy-id___3T2Ay"
+    />
   </td>
   <td />
   <td
@@ -110,4 +117,4 @@ exports[`Snapshot match 2`] = `
     </div>
   </td>
 </tr>
-`;
+`;
diff --git a/package.json b/package.json
@@ -140,7 +140,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.5",
+    "topcoder-react-lib": "1000.22.13",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",
diff --git a/src/shared/components/ChallengeTile/index.jsx b/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
               && (
diff --git a/src/shared/components/Dashboard/CurrentActivity/Header/index.jsx b/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,
diff --git a/src/shared/components/Header/index.jsx b/src/shared/components/Header/index.jsx
@@ -5,6 +5,8 @@ import { config } from 'topcoder-react-utils';
 import Logo from 'assets/images/tc-logo.svg';
 import { tracking } from '../../actions';
 
+import './style.scss';
+
 let TopNavRef;
 let LoginNavRef;
 
@@ -69,7 +71,7 @@ const Header = ({
 
   if (TopNavRef) {
     return (
-      <div>
+      <div styleName="nav-header-wrapper">
         <TopNavRef
           menu={headerMenu || config.HEADER_MENU}
           rightMenu={(
diff --git a/src/shared/components/Header/style.scss b/src/shared/components/Header/style.scss
@@ -0,0 +1,3 @@
+.nav-header-wrapper {
+  z-index: 2;
+}
diff --git a/src/shared/components/ProfilePage/Header/index.jsx b/src/shared/components/ProfilePage/Header/index.jsx
@@ -72,6 +72,7 @@ class ProfileHeader extends React.Component {
             <span>
               {' '}
               |
+              {' '}
               {wins}
               {' '}
               Wins
diff --git a/src/shared/components/Settings/Preferences/Email/index.jsx b/src/shared/components/Settings/Preferences/Email/index.jsx
@@ -55,6 +55,11 @@ const newsletters = [
     name: 'TCO Newsletter',
     desc: 'For all the latest updates surrounding the <a href="https://www.topcoder.com/community/member-programs/topcoder-open" style="color:#0d61bf;text-decoration:underline">Topcoder Open</a> you should definitely be subscribing to this one. Expect an update in your mailbox every Tuesday!',
   },
+  {
+    id: 'RDM',
+    name: 'Rapid Development Match (RDM) Reminders',
+    desc: 'Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!',
+  },
 ];
 
 export default class EmailPreferences extends React.Component {
diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/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';
 
@@ -42,6 +42,7 @@ export default function Submission(props) {
     <tr styleName="submission-row">
       <td styleName="id-col">
         {submissionObject.id}
+        <div styleName="legacy-id">{submissionObject.legacySubmissionId}</div>
       </td>
       <td>
         {submissionObject.type}
@@ -84,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"
@@ -118,6 +120,7 @@ Submission.defaultProps = {
 Submission.propTypes = {
   submissionObject: PT.shape({
     id: PT.string,
+    legacySubmissionId: PT.string,
     warpreviewnings: PT.string,
     screening: PT.shape({
       status: PT.string,
diff --git a/src/shared/components/SubmissionManagement/Submission/styles.scss b/src/shared/components/SubmissionManagement/Submission/styles.scss
@@ -77,6 +77,10 @@ $submission-space-50: $base-unit * 10;
     }
   }
 
+  .legacy-id {
+    color: $tc-gray-50;
+  }
+
   .status-col {
     text-align: center;
 
diff --git a/src/shared/components/TopcoderFooter/style.scss b/src/shared/components/TopcoderFooter/style.scss
@@ -72,6 +72,7 @@
   font-weight: 400;
   line-height: 21px;
   position: relative;
+  z-index: 0;
 
   @include xs-to-sm {
     padding: 30px 30px 21px 30px;
diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -62,7 +62,9 @@ export default function ChallengeTags(props) {
         challengeType
         && (
           <TrackTag
-            onClick={() => setImmediate(() => setChallengeListingFilter(challengeType.id))
+            onClick={() => (
+              setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
+            )
             }
             to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
           >
diff --git a/src/shared/components/challenge-detail/Specification/styles.scss b/src/shared/components/challenge-detail/Specification/styles.scss
diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx
diff --git a/src/shared/containers/terms-detail/index.jsx b/src/shared/containers/terms-detail/index.jsx
diff --git a/src/shared/reducers/page/dashboard.js b/src/shared/reducers/page/dashboard.js
diff --git a/src/shared/routes/Topcoder/styles.scss b/src/shared/routes/Topcoder/styles.scss
diff --git a/src/shared/utils/tc.js b/src/shared/utils/tc.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.nav-header-wrapper {`
	`2`	`+ z-index: 2;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ class ProfileHeader extends React.Component {`
`72`	`72`	`<span>`
`73`	`73`	`{' '}`
`74`	`74`	`\|`
	`75`	`+ {' '}`
`75`	`76`	`{wins}`
`76`	`77`	`{' '}`
`77`	`78`	`Wins`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,10 @@ $submission-space-50: $base-unit * 10;`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ .legacy-id {`
	`81`	`+ color: $tc-gray-50;`
	`82`	`+ }`
	`83`	`+`
`80`	`84`	`.status-col {`
`81`	`85`	`text-align: center;`
`82`	`86`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ export default function ChallengeTags(props) {`
`62`	`62`	`challengeType`
`63`	`63`	`&& (`
`64`	`64`	`<TrackTag`
`65`		`- onClick={() => setImmediate(() => setChallengeListingFilter(challengeType.id))`
	`65`	`+ onClick={() => (`
	`66`	`+ setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))`
	`67`	`+ )`
`66`	`68`	`}`
`67`	`69`	to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
`68`	`70`	`>`