Merge pull request #6921 from topcoder-platform/develop

October CA release

.circleci/config.yml

@@ -351,6 +351,7 @@ workflows:
               only:
                 - PROD-4183
                 - changelog
+                - remove_submission_review
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global

config/backup-default.js

@@ -115,7 +115,6 @@ module.exports = {
     FORUMS: 'https://apps.topcoder-dev.com/forums',
     FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
-    SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
 
     THRIVE: 'https://community-app.topcoder-dev.com/thrive',
 
@@ -473,5 +472,4 @@ module.exports = {
   },
   /* development id - makes surveys have warning about environment */
   UNIVERSAL_NAV_URL: '//uni-nav.topcoder-dev.com/v1/tc-universal-nav.js',
-  SPRIG_ENVIRONMENT_ID: 'bUcousVQ0-yF',
 };

config/default.js

@@ -116,7 +116,6 @@ module.exports = {
     FORUMS: 'https://apps.topcoder-dev.com/forums',
     FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
-    SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
 
     THRIVE: 'https://community-app.topcoder-dev.com/thrive',
 
@@ -477,5 +476,4 @@ module.exports = {
   MEMBER_PROFILE_REDIRECT_URL: 'https://profiles.topcoder-dev.com',
   MEMBER_SEARCH_REDIRECT_URL: 'https://talent-search.topcoder-dev.com',
   ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder-dev.com',
-  SPRIG_ENVIRONMENT_ID: 'bUcousVQ0-yF',
 };

config/production.js

@@ -35,7 +35,6 @@ module.exports = {
     FORUMS: 'https://apps.topcoder.com/forums',
     FORUMS_VANILLA: 'https://discussions.topcoder.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
-    SUBMISSION_REVIEW: 'https://submission-review.topcoder.com',
     MEMBER: 'https://member.topcoder.com',
     ONLINE_REVIEW: 'https://software.topcoder.com',
     PAYMENT_TOOL: 'https://payment.topcoder.com',
@@ -238,6 +237,5 @@ module.exports = {
   UNIVERSAL_NAV_URL: '//uni-nav.topcoder.com/v1/tc-universal-nav.js',
   MEMBER_PROFILE_REDIRECT_URL: 'https://profiles.topcoder.com',
   MEMBER_SEARCH_REDIRECT_URL: 'https://talent-search.topcoder.com',
-  SPRIG_ENVIRONMENT_ID: 'a-IZBZ6-r7bU',
   ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder.com',
 };

package.json

@@ -39,7 +39,6 @@
   "dependencies": {
     "@hapi/joi": "^16.1.4",
     "@optimizely/react-sdk": "^2.5.0",
-    "@sprig-technologies/sprig-browser": "^2.20.1",
     "@topcoder-platform/tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4",
     "aos": "^2.3.4",
     "atob": "^2.1.1",

src/client/index.jsx

@@ -13,15 +13,10 @@ import {
   getFreshToken,
 } from '@topcoder-platform/tc-auth-lib';
 import { actions, logger, errors } from 'topcoder-react-lib';
-import { client, redux, config } from 'topcoder-react-utils';
-import { sprig } from '@sprig-technologies/sprig-browser/dist';
+import { client, redux } from 'topcoder-react-utils';
 
 import './styles.scss';
 
-const Sprig = sprig.configure({
-  environmentId: config.SPRIG_ENVIRONMENT_ID,
-});
-
 const { setErrorsStore } = errors;
 
 /**
@@ -60,7 +55,6 @@ function identify(profile, roles, userIdHash) {
       integrations: { All: false, Chameleon: true },
     },
   );
-  Sprig('setUserId', profile.handle);
 }
 
 /**

src/shared/components/Gigs/GigDetails/index.jsx

@@ -134,7 +134,7 @@ function GigDetails(props) {
                     ** USA Visa Holders - Please consult an attorney before applying to any Topcoder Gig. Some visa statuses will or will not allow you to conduct freelance work with Topcoder.
                   </strong>
                   <strong>
-                    *** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:support@topcoder.com">support@topcoder.com</a>.
+                    *** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:gigwork@topcoder.com">gigwork@topcoder.com</a>.
                   </strong>
                 </div>
                 <div styleName="cta-buttons">
@@ -255,7 +255,7 @@ function GigDetails(props) {
                     </li>
                   </ul>
                 </div>
-                <div styleName="support">If you have any questions or doubts, don’t hesitate  to email <a href="mailto:support@topcoder.com">support@topcoder.com</a>.</div>
+                <div styleName="support">If you have any questions or doubts, don’t hesitate  to email <a href="mailto:gigwork@topcoder.com">gigwork@topcoder.com</a>.</div>
                 <div styleName="referral">
                   {
                     isModalOpen

src/shared/components/challenge-detail/Header/TabSelector/index.jsx

@@ -10,7 +10,7 @@ import React, { useState } from 'react';
 import PT from 'prop-types';
 import cn from 'classnames';
 import { TABS as DETAIL_TABS } from 'actions/page/challenge-details';
-import { config } from 'topcoder-react-utils';
+import { config, Link } from 'topcoder-react-utils';
 import { useMediaQuery } from 'react-responsive';
 import ArrowIcon from 'assets/images/ico-arrow-down.svg';
 import CloseIcon from 'assets/images/icon-close-green.svg';
@@ -247,15 +247,13 @@ export default function ChallengeViewSelector(props) {
         ) : null
       }
       {
-        (hasRegistered && mySubmissions.length > 0) && (
-          <a
-            href={`${config.URL.SUBMISSION_REVIEW}/challenges/${challenge.id}`}
+        (hasRegistered && !isMM && mySubmissions && mySubmissions.length > 0) && (
+          <Link
+            to={`/challenges/${challenge.id}/my-submissions`}
             styleName="challenge-selector-common challenge-unselected-view"
-            target="_blank"
-            rel="oopener noreferrer"
           >
-            SUBMISSION REVIEW
-          </a>
+            MY SUBMISSIONS
+          </Link>
         )
       }
       {

src/shared/containers/SubmissionPage.jsx

@@ -8,7 +8,6 @@
  */
 import actions from 'actions/page/submission';
 import { actions as api } from 'topcoder-react-lib';
-import { config } from 'topcoder-react-utils';
 import { isMM } from 'utils/challenge';
 import communityActions from 'actions/tc-communities';
 import { PrimaryButton } from 'topcoder-react-ui-kit';
@@ -19,11 +18,6 @@ import { connect } from 'react-redux';
 import SubmissionsPage from 'components/SubmissionPage';
 import AccessDenied, { CAUSE as ACCESS_DENIED_REASON } from 'components/tc-communities/AccessDenied';
 import LoadingIndicator from 'components/LoadingIndicator';
-import { sprig } from '@sprig-technologies/sprig-browser/dist';
-
-export const Sprig = sprig.configure({
-  environmentId: config.SPRIG_ENVIRONMENT_ID,
-});
 
 /**
  * SubmissionsPage Container
@@ -71,8 +65,6 @@ class SubmissionsPageContainer extends React.Component {
       track,
     } = this.props;
 
-    // On final upload, the survey should appear
-    Sprig('track', 'onUploadSubmission');
     submit(tokenV3, tokenV2, challengeId, body, isMM(challenge) ? 'DEVELOP' : track);
   }