Skip to content

Commit d50d174

Browse files
luizrrodriguesluizrrodrigues
authored
Merge branch 'develop' into new-forums
2 parents 4f90c37 + b2952f7 commit d50d174

File tree

111 files changed

+1912
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1912
-246
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,22 +230,21 @@ workflows:
230230
filters:
231231
branches:
232232
only:
233-
- hot-fix
233+
- develop
234234
# This is alternate dev env for parallel testing
235235
- "build-test":
236236
context : org-global
237237
filters:
238238
branches:
239-
only:
240-
- develop
239+
only:
240+
- free
241241
# This is alternate dev env for parallel testing
242242
- "build-qa":
243243
context : org-global
244244
filters:
245245
branches:
246246
only:
247-
- develop
248-
- new-forums
247+
- free
249248
# This is beta env for production soft releases
250249
- "build-prod-beta":
251250
context : org-global

‎__tests__/client/client.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const mockTcAccounts = {
106106
decodeToken: () => ({ exp: Date.now() }),
107107
getFreshToken: () => Promise.resolve(tokenV3),
108108
};
109-
jest.setMock('tc-accounts', mockTcAccounts);
109+
jest.setMock('@topcoder-platform/tc-auth-lib', mockTcAccounts);
110110
111111
/* Mock auth actions */
112112
/*

‎__tests__/shared/components/ChallengeTile/__snapshots__/index.jsx.snap

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ exports[`renders marathon 1`] = `
241241
</p>
242242
</div>
243243
</div>
244-
<p
245-
className="src-shared-components-ChallengeTile-___style__roles___1V-WA"
246-
/>
247244
</div>
248245
</div>
249246
</div>

‎__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
4949
</a>
5050
<a
5151
className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost src-shared-components-Dashboard-SRM-___styles__tc-btn___3no83"
52-
href="https://www.topcoder-dev.com/member-onboarding/learning-practicing-skills/"
52+
href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs"
5353
>
5454
Learn More
5555
</a>

‎__tests__/shared/components/GUIKit/TextInput/__snapshots__/index.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ exports[`Default render 1`] = `
99
defaultValue=""
1010
onBlur={[Function]}
1111
onChange={[Function]}
12+
onKeyPress={[Function]}
1213
placeholder=""
1314
type="text"
1415
/>

‎__tests__/shared/components/Header/__snapshots__/index.jsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ exports[`Default render 1`] = `
165165
auth={null}
166166
authURLs={
167167
Object {
168-
"href": "https://accounts.topcoder-dev.com/member/registration?utm_source=community-app-main",
169-
"location": "https://accounts.topcoder-dev.com/member?retUrl=%S&utm_source=community-app-main",
168+
"href": "https://accounts-auth0.topcoder-dev.com?utm_source=community-app-main",
169+
"location": "https://accounts-auth0.topcoder-dev.com?retUrl=%S&utm_source=community-app-main",
170170
}
171171
}
172172
loggedIn={true}

‎__tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ exports[`renders a full Profile correctly 1`] = `
1616
>
1717
<Sticky
1818
activeClass="active"
19-
bottomBoundary={-250}
19+
bottomBoundary={0}
2020
enableTransforms={true}
2121
enabled={true}
2222
onStateChange={null}
@@ -630,7 +630,7 @@ exports[`renders an empty Profile correctly 1`] = `
630630
>
631631
<Sticky
632632
activeClass="active"
633-
bottomBoundary={-250}
633+
bottomBoundary={0}
634634
enableTransforms={true}
635635
enabled={true}
636636
onStateChange={null}

‎__tests__/shared/components/SubmissionManagement/Submission.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Submission from 'components/SubmissionManagement/Submission';
44
import TU from 'react-dom/test-utils';
55

66
const mockOnDelete = jest.fn();
7+
const mockOnDownload = jest.fn();
78
const mockOnShowDetails = jest.fn();
89

910
const rnd = new Rnd();
@@ -12,6 +13,7 @@ test('Snapshot match', () => {
1213
rnd.render((
1314
<Submission
1415
onDelete={mockOnDelete}
16+
onDownload={mockOnDownload}
1517
onShowDetails={mockOnShowDetails}
1618
showScreeningDetails
1719
type="develop"
@@ -21,6 +23,7 @@ test('Snapshot match', () => {
2123
rnd.render((
2224
<Submission
2325
onDelete={mockOnDelete}
26+
onDownload={mockOnDownload}
2427
onShowDetails={mockOnShowDetails}
2528
submissionObject={{
2629
id: '12345',
@@ -49,6 +52,7 @@ class Wrapper extends React.Component {
4952
const page = TU.renderIntoDocument((
5053
<Wrapper
5154
onDelete={mockOnDelete}
55+
onDownload={mockOnDownload}
5256
onShowDetails={mockOnShowDetails}
5357
submissionObject={{
5458
id: '12345',

‎__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ exports[`Snapshot match 1`] = `
2121
className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
2222
>
2323
<div>
24-
<a>
24+
<button
25+
onClick={[Function]}
26+
type="button"
27+
>
2528
<DownloadIcon
2629
height="16"
2730
viewBox="0 0 16 16"
2831
width="16"
2932
xmlns="http://www.w3.org/2000/svg"
3033
/>
31-
</a>
34+
</button>
3235
<button
3336
className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
3437
disabled={true}
@@ -81,14 +84,17 @@ exports[`Snapshot match 2`] = `
8184
className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
8285
>
8386
<div>
84-
<a>
87+
<button
88+
onClick={[Function]}
89+
type="button"
90+
>
8591
<DownloadIcon
8692
height="16"
8793
viewBox="0 0 16 16"
8894
width="16"
8995
xmlns="http://www.w3.org/2000/svg"
9096
/>
91-
</a>
97+
</button>
9298
<button
9399
className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
94100
disabled={true}

‎__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 1`] = `
106106
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
107107
>
108108
<a
109-
href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science"
109+
href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="
110110
>
111111
Data Science
112112
</a>
@@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
115115
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
116116
>
117117
<a
118-
href="https://www.topcoder-dev.com/thrive/tracks?track=Design"
118+
href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="
119119
>
120120
Design
121121
</a>
@@ -124,7 +124,7 @@ exports[`Matches shallow shapshot 1`] = `
124124
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
125125
>
126126
<a
127-
href="https://www.topcoder-dev.com/thrive/tracks?track=Development"
127+
href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="
128128
>
129129
Development
130130
</a>
@@ -133,7 +133,7 @@ exports[`Matches shallow shapshot 1`] = `
133133
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
134134
>
135135
<a
136-
href="https://www.topcoder-dev.com/thrive/tracks?track=QA"
136+
href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="
137137
>
138138
QA
139139
</a>
@@ -316,7 +316,7 @@ exports[`Matches shallow shapshot 1`] = `
316316
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
317317
>
318318
<a
319-
href="https://accounts.topcoder.com/member/registration?utm_source=community&utm_campaign=tc-footer&utm_medium=promotion"
319+
href="https://accounts-auth0.topcoder-dev.com?utm_source=community&utm_campaign=tc-footer&utm_medium=promotion&retUrl="
320320
>
321321
Join Community
322322
</a>

‎__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ exports[`Matches shallow shapshot 1`] = `
1616
/>
1717
</div>
1818
<Footer
19-
hideTcLinksInFooter={false}
19+
hideTcLinksInFooter={true}
2020
/>
2121
</div>
2222
`;
@@ -37,7 +37,7 @@ exports[`Matches shallow shapshot 2`] = `
3737
/>
3838
</div>
3939
<Footer
40-
hideTcLinksInFooter={false}
40+
hideTcLinksInFooter={true}
4141
/>
4242
</div>
4343
`;

‎__tests__/shared/components/tc-communities/Footer.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ test('render properly', () => {
4141
<Wrapper
4242
menuItems={[]}
4343
communityId="wipro"
44-
registerUrl="https://accounts.topcoder-dev.com/member/registration"
45-
loginUrl="https://accounts.topcoder-dev.com/member"
44+
registerUrl="https://accounts-auth0.topcoder-dev.com/member/registration"
45+
loginUrl="https://accounts-auth0.topcoder-dev.com/member"
4646
isAuthorized
4747
/>
4848
));
@@ -63,8 +63,8 @@ test('render properly', () => {
6363
url: 'leaderboard',
6464
}]}
6565
communityId="wipro"
66-
registerUrl="https://accounts.topcoder-dev.com/member/registration"
67-
loginUrl="https://accounts.topcoder-dev.com/member"
66+
registerUrl="https://accounts-auth0.topcoder-dev.com/member/registration"
67+
loginUrl="https://accounts-auth0.topcoder-dev.com/member"
6868
isAuthorized={false}
6969
theme={{
7070
container: 'container',

‎__tests__/shared/components/tc-communities/__snapshots__/AccessDenied.jsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`Matches shallow shapshot 1`] = `
2020
>
2121
<a
2222
className="tc-btn-md tc-btn-primary"
23-
href="http://accounts.topcoder-dev.com/member?utm_source="
23+
href="https://accounts-auth0.topcoder-dev.com/member?utm_source="
2424
onClick={[Function]}
2525
>
2626
Log In Here

‎__tests__/shared/reducers/auth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const mockActions = {
2424
2525
_.merge(actions, mockActions);
2626
27-
jest.setMock('tc-accounts', {
27+
jest.setMock('@topcoder-platform/tc-auth-lib', {
2828
decodeToken: () => 'User object',
2929
isTokenExpired: () => false,
3030
});

‎__tests__/shared/reducers/challenge-listing/sidebar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const defaultReducer = require('reducers/challenge-listing/sidebar').default;
22

33
const expectedState = {
4-
activeBucket: 'all',
4+
activeBucket: 'openForRegistration',
55
};
66

77
function testReducer(reducer) {

‎__tests__/shared/reducers/challenge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { mock, actions } from 'topcoder-react-lib';
1111
1212
const { mockAction } = mock;
1313
14-
jest.setMock('tc-accounts', {
14+
jest.setMock('@topcoder-platform/tc-auth-lib', {
1515
decodeToken: () => 'User object',
1616
isTokenExpired: () => false,
1717
});

‎bin/www

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* Enables Babel for the server-side code (with exception of this very file). */
66
require('babel-register')({
77
ignore: [
8-
/node_modules\/(?!appirio-tech.*|topcoder|tc-)/,
8+
/node_modules\/(?!appirio-tech.*|topcoder|tc-|@topcoder)/,
99
/node_modules\/topcoder-react-utils/,
1010
],
1111
});

‎config/default.js

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,6 @@ module.exports = {
7878
},
7979
},
8080

81-
/* Amount of time [seconds] before expiration of authentication tokens,
82-
* when the frontend will automatically trigger their refreshment. Once
83-
* ready, it will either write to the Redux store fresh token, or will
84-
* remove auth tokens from the store.
85-
* NOTE: With the current implementation of accounts-app this value must be
86-
* smaller than 60 seconds (earlier than 60 seconds before expiration of an
87-
* auth token, a call to the getFreshToken() method returns the old token,
88-
* due to caching). */
89-
REAUTH_TIME: 55,
90-
9181
/* API key for Segment.io. For development environment the value is set inside
9282
* development.json, for production environment it is set via CircleCI
9383
* variables. */
@@ -104,7 +94,7 @@ module.exports = {
10494
* platform. */
10595
URL: {
10696
/* Connector URL of the TC accounts App. */
107-
ACCOUNTS_APP_CONNECTOR: 'https://accounts.topcoder-dev.com/connector.html',
97+
ACCOUNTS_APP_CONNECTOR: 'https://accounts-auth0.topcoder-dev.com',
10898

10999
/* The remote address where the app is deployed. */
110100
APP: 'https://community-app.topcoder-dev.com',
@@ -114,7 +104,7 @@ module.exports = {
114104
COMMUNITY_APP: 'https://community-app.topcoder-dev.com',
115105

116106
ARENA: 'https://arena.topcoder-dev.com',
117-
AUTH: 'http://accounts.topcoder-dev.com',
107+
AUTH: 'https://accounts-auth0.topcoder-dev.com',
118108
BASE: 'https://www.topcoder-dev.com',
119109
HOME: '/my-dashboard',
120110
BLOG: 'https://www.topcoder-dev.com/blog',
@@ -129,6 +119,8 @@ module.exports = {
129119
BLOCKCHAIN: 'https://blockchain.topcoder-dev.com',
130120
COGNITIVE: 'https://cognitive.topcoder-dev.com',
131121
ZURICH: 'https://community-app.topcoder-dev.com/__community__/zurich',
122+
COMCAST: 'https://community-app.topcoder-dev.com/__community__/comcast',
123+
CS: 'https://community-app.topcoder-dev.com/__community__/cs',
132124
},
133125

134126
/* Dedicated section to group together links to various articles in
@@ -143,6 +135,9 @@ module.exports = {
143135
STUDIO_FONTS_POLICY:
144136
'http://help.topcoder.com/hc/en-us/articles/217959447-Font-Policy-for-Design-Challenges',
145137
TOPCODER_TERMS: 'https://www.topcoder.com/community/how-it-works/terms/',
138+
HOWTOCOMPETEINMARATHON: 'https://www.topcoder.com/thrive/articles/How%20To%20Compete%20in%20a%20Marathon%20Match',
139+
USABLECODEDEV: 'https://www.topcoder.com/thrive/articles/Usable%20Code%20in%20Dev%20Challenges',
140+
EXTENSIONVSCODE: 'https://marketplace.visualstudio.com/items?itemName=Topcoder.topcoder-workflow&ssr=false#overview',
146141
},
147142

148143
IOS: 'https://ios.topcoder-dev.com',
@@ -152,6 +147,7 @@ module.exports = {
152147
STUDIO: 'https://studio.topcoder-dev.com',
153148
TCO: 'https://www.topcoder.com/tco',
154149
TCO17: 'https://tco17.topcoder.com/',
150+
TCO19: 'https://community-app.topcoder-dev.com/__community__/tco19',
155151

156152
TOPGEAR: 'https://dev-topgear.wipro.com',
157153

@@ -384,8 +380,8 @@ module.exports = {
384380
],
385381
HEADER_MENU_THEME: 'light',
386382
HEADER_AUTH_URLS: {
387-
href: 'https://accounts.topcoder-dev.com/member/registration?utm_source=community-app-main',
388-
location: 'https://accounts.topcoder-dev.com/member?retUrl=%S&utm_source=community-app-main',
383+
href: 'https://accounts-auth0.topcoder-dev.com?utm_source=community-app-main',
384+
location: 'https://accounts-auth0.topcoder-dev.com?retUrl=%S&utm_source=community-app-main',
389385
},
390386
ACCOUNT_MENU: [
391387
{

‎config/jest/default.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const config = require('topcoder-react-utils/config/jest/default');
22
const nodeConfig = require('config');
33

4-
config.transformIgnorePatterns[0] = '/node_modules/(?!appirio-tech|topcoder|tc-)';
4+
config.transformIgnorePatterns[0] = '/node_modules/(?!appirio-tech|topcoder|tc-|@topcoder)';
55
// config.testMatch[0] = '**/__tests__/shared/containers/challenge-listing/FilterPanel.jsx';
66

77
// Include the directories whose tests has been written to minimize coverage time

0 commit comments

Comments
 (0)