Skip to content

Commit 03e0bcc

Browse files
sushilshindesushilshinde
authored
Merge pull request topcoder-platform#4767 from topcoder-platform/i-v5-develop-17Aug
I v5 develop 17 aug
2 parents 75f0c02 + 5e9ef60 commit 03e0bcc

File tree

81 files changed

+1381
-1350
lines changed

Some content is hidden

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

81 files changed

+1381
-1350
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ workflows:
231231
branches:
232232
only:
233233
- hot-fix
234+
- integration-v5-develop
234235
# This is alternate dev env for parallel testing
235236
- "build-test":
236237
context : org-global
@@ -252,6 +253,7 @@ workflows:
252253
branches:
253254
only:
254255
- hot-fix
256+
- integration-v5-develop
255257
# This is stage env for production QA releases
256258
- "build-prod-staging":
257259
context : org-global

‎.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"extends": "./node_modules/topcoder-react-utils/config/eslint/default.json",
33
"rules": {
44
"jsx-a11y/anchor-is-valid": false,
5-
"import/no-cycle": [2, { "maxDepth": 1 }]
5+
"import/no-cycle": [2, { "maxDepth": 1 }],
6+
"react/forbid-prop-types": false
67
},
78
"env": {
89
"browser": true

‎__tests__/shared/components/ChallengeTile/__mocks__/design.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
"technologies": "",
1616
"status": "COMPLETED",
1717
"legacy": {
18-
"track": "DESIGN",
1918
"forumId": 599349
2019
},
21-
"subTrack": "LOGO_DESIGN",
20+
"track": "Design",
21+
"type": "Challenge",
22+
"tags": "Logo Design",
2223
"name": "Sunshot - MapMySolar - SunGiver - Brand Concept Logo Design Challenge",
2324
"reviewType": "INTERNAL",
2425
"id": 30051608,
@@ -320,10 +321,11 @@
320321
"technologies": "",
321322
"status": "COMPLETED",
322323
"legacy": {
323-
"track": "DESIGN",
324324
"forumId": 598066
325325
},
326-
"subTrack": "LOGO_DESIGN",
326+
"track": "Design",
327+
"type": "Challenge",
328+
"tags": ["Logo Design"],
327329
"name": "2016 Topcoder Open Logo Design Challenge",
328330
"reviewType": "INTERNAL",
329331
"id": 30051059,
@@ -532,10 +534,11 @@
532534
"technologies": "",
533535
"status": "COMPLETED",
534536
"legacy": {
535-
"track": "DESIGN",
536537
"forumId": 596557
537538
},
538-
"subTrack": "LOGO_DESIGN",
539+
"track": "Design",
540+
"type": "Challenge",
541+
"tags": "Logo Design",
539542
"name": "ACME Logos Design Challenge",
540543
"reviewType": "INTERNAL",
541544
"id": 30050375,

‎__tests__/shared/components/ChallengeTile/__mocks__/develop.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"technologies": "CSS, HTML, JavaScript",
2323
"status": "COMPLETED",
2424
"legacy": {
25-
"track": "DEVELOP",
2625
"forumId": 39153
2726
},
28-
"subTrack": "FIRST_2_FINISH",
27+
"track": "Development",
28+
"type": "First2Finish",
2929
"name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge",
3030
"reviewType": "INTERNAL",
3131
"id": 30060905,
@@ -165,10 +165,10 @@
165165
"technologies": "ReactJS",
166166
"status": "COMPLETED",
167167
"legacy": {
168-
"track": "DEVELOP",
169168
"forumId": 39151
170169
},
171-
"subTrack": "FIRST_2_FINISH",
170+
"track": "Development",
171+
"type": "First2Finish",
172172
"name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge",
173173
"reviewType": "INTERNAL",
174174
"id": 30060903,
@@ -323,10 +323,10 @@
323323
"technologies": "Angular 2+, Express, JSON, Node.js",
324324
"status": "COMPLETED",
325325
"legacy": {
326-
"track": "DEVELOP",
327326
"forumId": 38951
328327
},
329-
"subTrack": "FIRST_2_FINISH",
328+
"track": "Development",
329+
"type": "First2Finish",
330330
"name": "$500 BG800 Online Course Mock Rest API F2F Challenge",
331331
"reviewType": "INTERNAL",
332332
"id": 30060687,
@@ -630,11 +630,11 @@
630630
"updatedBy": "22841596",
631631
"technologies": "JavaScript, ReactJS",
632632
"status": "COMPLETED",
633-
"legacy": {
634-
"track": "DEVELOP",
633+
"legacy": {
635634
"forumId": 38702
636635
},
637-
"subTrack": "FIRST_2_FINISH",
636+
"track": "Development",
637+
"type": "First2Finish",
638638
"name": "John Hancock - Giving Tuesday - General image handling",
639639
"reviewType": "INTERNAL",
640640
"id": 30060425,

‎__tests__/shared/components/ChallengeTile/__mocks__/marathon.json

Lines changed: 12 additions & 20 deletions
Large diffs are not rendered by default.

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ exports[`renders design 1`] = `
1212
}
1313
>
1414
<div
15-
className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__DESIGN___Qvjqd"
15+
className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__design___1wk2u"
1616
>
1717
<div
1818
className="src-shared-components-ChallengeTile-___style__completed-challenge___3w5tT"
@@ -30,7 +30,7 @@ exports[`renders design 1`] = `
3030
<p
3131
className="src-shared-components-ChallengeTile-___style__subtrack-color___2AJaw"
3232
>
33-
LOGO DESIGN
33+
Challenge
3434
</p>
3535
<p
3636
className="src-shared-components-ChallengeTile-___style__date-completed___22F18"
@@ -42,7 +42,7 @@ exports[`renders design 1`] = `
4242
className="src-shared-components-ChallengeTile-___style__challenge-card__bottom___CYUWj"
4343
>
4444
<div
45-
className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
45+
className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__data-science___2SGr7"
4646
>
4747
<div
4848
className="src-shared-components-ChallengeTile-___style__design-challenge-user-place___3v-1O"
@@ -91,7 +91,7 @@ exports[`renders develop 1`] = `
9191
}
9292
>
9393
<div
94-
className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__DEVELOP___GgzgV"
94+
className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__development___19vlt"
9595
>
9696
<div
9797
className="src-shared-components-ChallengeTile-___style__completed-challenge___3w5tT"
@@ -109,7 +109,7 @@ exports[`renders develop 1`] = `
109109
<p
110110
className="src-shared-components-ChallengeTile-___style__subtrack-color___2AJaw"
111111
>
112-
FIRST 2 FINISH
112+
First2Finish
113113
</p>
114114
<p
115115
className="src-shared-components-ChallengeTile-___style__date-completed___22F18"
@@ -131,7 +131,7 @@ exports[`renders develop 1`] = `
131131
className="src-shared-components-ChallengeTile-___style__challenge-card__bottom___CYUWj"
132132
>
133133
<div
134-
className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
134+
className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__data-science___2SGr7"
135135
>
136136
<div
137137
className="src-shared-components-ChallengeTile-___style__dev-challenge-user-place___2tS8j"
@@ -196,7 +196,7 @@ exports[`renders marathon 1`] = `
196196
}
197197
>
198198
<div
199-
className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
199+
className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__data-science___2SGr7"
200200
>
201201
<div
202202
className="src-shared-components-ChallengeTile-___style__completed-challenge___3w5tT"
@@ -211,7 +211,7 @@ exports[`renders marathon 1`] = `
211211
<p
212212
className="src-shared-components-ChallengeTile-___style__subtrack-color___2AJaw"
213213
>
214-
MARATHON MATCH
214+
Challenge
215215
</p>
216216
<p
217217
className="src-shared-components-ChallengeTile-___style__date-completed___22F18"
@@ -223,7 +223,7 @@ exports[`renders marathon 1`] = `
223223
className="src-shared-components-ChallengeTile-___style__challenge-card__bottom___CYUWj"
224224
>
225225
<div
226-
className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
226+
className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__data-science___2SGr7"
227227
>
228228
<div
229229
className="src-shared-components-ChallengeTile-___style__marathon-score___V-afd"

‎__tests__/shared/components/Contentful/Image/__snapshots__/Image.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
exports[`Matches shallow shapshot 1`] = `
44
<div
55
id="image-1"
6+
style={Object {}}
67
>
78
<InlineSVG
89
baseURL=""

‎__tests__/shared/components/Contentful/MemberCard/__snapshots__/MemberCard.jsx.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Matches shallow shapshot 1`] = `
4-
<a>
4+
<a
5+
style={Object {}}
6+
>
57
<div>
68
<div
79
style={

‎__tests__/shared/components/Contentful/TracksTree/__snapshots__/TracksTree.jsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ exports[`Matches shallow shapshot 1`] = `
44
<div
55
className="undefined "
66
>
7-
<a
8-
href="/thrive"
7+
<Link
8+
to="/thrive"
99
>
1010
THRIVE
11-
</a>
11+
</Link>
1212
</div>
1313
`;

‎__tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,10 @@ exports[`Matches shallow shapshot 1`] = `
4444
<span
4545
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
4646
>
47-
<ThemedAvatar
48-
composeAdhocTheme="deeply"
49-
composeContextTheme="softly"
50-
mapThemrProps={[Function]}
51-
theme={
52-
Object {
53-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
54-
}
55-
}
56-
themePriority="adhoc-context-default"
47+
<DefaultAvatar
48+
data-name="Layer 1"
49+
viewBox="0 0 33 33.00137"
50+
xmlns="http://www.w3.org/2000/svg"
5751
/>
5852
</span>
5953
</td>
@@ -97,16 +91,10 @@ exports[`Matches shallow shapshot 1`] = `
9791
<span
9892
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
9993
>
100-
<ThemedAvatar
101-
composeAdhocTheme="deeply"
102-
composeContextTheme="softly"
103-
mapThemrProps={[Function]}
104-
theme={
105-
Object {
106-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
107-
}
108-
}
109-
themePriority="adhoc-context-default"
94+
<DefaultAvatar
95+
data-name="Layer 1"
96+
viewBox="0 0 33 33.00137"
97+
xmlns="http://www.w3.org/2000/svg"
11098
/>
11199
</span>
112100
</td>
@@ -150,16 +138,10 @@ exports[`Matches shallow shapshot 1`] = `
150138
<span
151139
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
152140
>
153-
<ThemedAvatar
154-
composeAdhocTheme="deeply"
155-
composeContextTheme="softly"
156-
mapThemrProps={[Function]}
157-
theme={
158-
Object {
159-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
160-
}
161-
}
162-
themePriority="adhoc-context-default"
141+
<DefaultAvatar
142+
data-name="Layer 1"
143+
viewBox="0 0 33 33.00137"
144+
xmlns="http://www.w3.org/2000/svg"
163145
/>
164146
</span>
165147
</td>
@@ -203,16 +185,10 @@ exports[`Matches shallow shapshot 1`] = `
203185
<span
204186
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
205187
>
206-
<ThemedAvatar
207-
composeAdhocTheme="deeply"
208-
composeContextTheme="softly"
209-
mapThemrProps={[Function]}
210-
theme={
211-
Object {
212-
"avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
213-
}
214-
}
215-
themePriority="adhoc-context-default"
188+
<DefaultAvatar
189+
data-name="Layer 1"
190+
viewBox="0 0 33 33.00137"
191+
xmlns="http://www.w3.org/2000/svg"
216192
/>
217193
</span>
218194
</td>

‎__tests__/shared/components/Leaderboard/__snapshots__/PodiumSpot.jsx.snap

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@ exports[`Matches shallow shapshot 1`] = `
77
<span
88
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__leaderboard-avatar___JjdZ_"
99
>
10-
<ThemedAvatar
11-
composeAdhocTheme="deeply"
12-
composeContextTheme="softly"
13-
mapThemrProps={[Function]}
14-
theme={
15-
Object {
16-
"avatar": "src-shared-components-Leaderboard-avatarStyles___gold___1KUGNq",
17-
}
18-
}
19-
themePriority="adhoc-context-default"
10+
<DefaultAvatar
11+
data-name="Layer 1"
12+
viewBox="0 0 33 33.00137"
13+
xmlns="http://www.w3.org/2000/svg"
2014
/>
2115
<div
2216
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__ranking___3eGBy"
@@ -72,16 +66,10 @@ exports[`Matches shallow shapshot 2`] = `
7266
<span
7367
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__leaderboard-avatar___JjdZ_"
7468
>
75-
<ThemedAvatar
76-
composeAdhocTheme="deeply"
77-
composeContextTheme="softly"
78-
mapThemrProps={[Function]}
79-
theme={
80-
Object {
81-
"avatar": "src-shared-components-Leaderboard-avatarStyles___gold___1KUGNq",
82-
}
83-
}
84-
themePriority="adhoc-context-default"
69+
<DefaultAvatar
70+
data-name="Layer 1"
71+
viewBox="0 0 33 33.00137"
72+
xmlns="http://www.w3.org/2000/svg"
8573
/>
8674
<div
8775
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__ranking___3eGBy"

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -348,15 +348,6 @@ exports[`Matches shallow shapshot 1`] = `
348348
Talk to Sales
349349
</a>
350350
</li>
351-
<li
352-
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
353-
>
354-
<a
355-
href="https://www.topcoder-dev.com/community/terms"
356-
>
357-
Terms
358-
</a>
359-
</li>
360351
</ul>
361352
</div>
362353
<div
@@ -613,7 +604,7 @@ exports[`Matches shallow shapshot 1`] = `
613604
© 2020 Topcoder
614605
<a
615606
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
616-
href="https://www.topcoder.com/privacy-policy/"
607+
href="https://www.topcoder-dev.com/policy"
617608
>
618609
Policies
619610
</a>

‎__tests__/shared/containers/__snapshots__/TopcoderHeader.jsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exports[`Matches shallow snapshot 1`] = `
1111
closeMobileMenu={[Function]}
1212
closeSearch={[Function]}
1313
dismissChallengeNotifications={[Function]}
14+
headerMenu={null}
1415
loadNotifications={[Function]}
1516
markAllNotificationAsRead={[Function]}
1617
markAllNotificationAsSeen={[Function]}

0 commit comments

Comments
 (0)