Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

October CA release #6921

Merged
merged 11 commits into from
Oct 4, 2023
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions config/backup-default.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand Down Expand Up @@ -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',
};
2 changes: 0 additions & 2 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand Down Expand Up @@ -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',
};
2 changes: 0 additions & 2 deletions config/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
};
5 changes: 0 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 1 addition & 7 deletions src/client/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -60,7 +55,6 @@ function identify(profile, roles, userIdHash) {
integrations: { All: false, Chameleon: true },
},
);
Sprig('setUserId', profile.handle);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/Gigs/GigDetails/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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>
)
}
{
Expand Down
8 changes: 0 additions & 8 deletions src/shared/containers/SubmissionPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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
Expand Down Expand Up @@ -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);
}

Expand Down
Loading