Skip to content

Commit 972203b

Browse files
dedywahyudidedywahyudi
committed
Merge branch 'develop' into reskin-profile-settings
2 parents b56d3c8 + 639a553 commit 972203b

Some content is hidden

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

66 files changed

+1152
-179
lines changed

‎.circleci/config.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@ workflows:
349349
filters:
350350
branches:
351351
only:
352-
- develop
352+
- free
353353
# This is alternate dev env for parallel testing
354354
- "build-test":
355355
context : org-global
356356
filters:
357357
branches:
358358
only:
359-
- tco23
359+
- free
360360
# This is alternate dev env for parallel testing
361361
- "build-qa":
362362
context : org-global
@@ -370,14 +370,15 @@ workflows:
370370
filters:
371371
branches:
372372
only:
373-
- reskin-profile
373+
- footer-update
374374
# This is stage env for production QA releases
375375
- "build-prod-staging":
376376
context : org-global
377377
filters: &filters-staging
378378
branches:
379379
only:
380380
- develop
381+
- old-mm-fix
381382
# Production builds are exectuted
382383
# when PR is merged to the master
383384
# Don't change anything in this configuration
@@ -397,6 +398,7 @@ workflows:
397398
branches:
398399
ignore:
399400
- develop
401+
- submission_delete_button
400402

401403
Smoke Testing:
402404
when: << pipeline.parameters.run_smoketesting >>

‎Dockerfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ ARG GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY
7878
# Optimizely
7979
ARG OPTIMIZELY_SDK_KEY
8080

81+
# Gamification
82+
ARG GAMIFICATION_ORG_ID
83+
8184
################################################################################
8285
# Setting of environment variables in the Docker image.
8386

@@ -143,6 +146,8 @@ ENV GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY=$GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY
143146
# Optimizely
144147
ENV OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY
145148

149+
ENV GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID
150+
146151
################################################################################
147152
# Testing and build of the application inside the container.
148153

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ exports[`Matches shallow shapshot 1`] = `
7070
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
7171
>
7272
<span>
73-
0
7473
points
7574
</span>
7675
<span>
@@ -84,7 +83,7 @@ exports[`Matches shallow shapshot 1`] = `
8483
<td
8584
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
8685
>
87-
0.00
86+
NaN
8887
</td>
8988
</tr>
9089
<tr>
@@ -125,7 +124,6 @@ exports[`Matches shallow shapshot 1`] = `
125124
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
126125
>
127126
<span>
128-
0
129127
points
130128
</span>
131129
<span>
@@ -139,7 +137,7 @@ exports[`Matches shallow shapshot 1`] = `
139137
<td
140138
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
141139
>
142-
0.00
140+
NaN
143141
</td>
144142
</tr>
145143
<tr>
@@ -180,7 +178,6 @@ exports[`Matches shallow shapshot 1`] = `
180178
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
181179
>
182180
<span>
183-
0
184181
points
185182
</span>
186183
<span>
@@ -194,7 +191,7 @@ exports[`Matches shallow shapshot 1`] = `
194191
<td
195192
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
196193
>
197-
0.00
194+
NaN
198195
</td>
199196
</tr>
200197
<tr>
@@ -235,7 +232,6 @@ exports[`Matches shallow shapshot 1`] = `
235232
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__winnings-info___PBqQk"
236233
>
237234
<span>
238-
0
239235
points
240236
</span>
241237
<span>
@@ -249,7 +245,7 @@ exports[`Matches shallow shapshot 1`] = `
249245
<td
250246
className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-points___2-5d7"
251247
>
252-
0.00
248+
NaN
253249
</td>
254250
</tr>
255251
</tbody>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exports[`Matches shallow shapshot 1`] = `
55
className="src-shared-components-Leaderboard-Podium-themes-___default__Podium___1qIZm"
66
>
77
<div
8-
className="src-shared-components-Leaderboard-Podium-themes-___default__PodiumWrap___2hDWP"
8+
className="src-shared-components-Leaderboard-Podium-themes-___default__PodiumWrapCondense___3aV24"
99
style={
1010
Object {
1111
"justify-content": "space-between",
@@ -29,6 +29,7 @@ exports[`Matches shallow shapshot 1`] = `
2929
isCopilot={false}
3030
isTopGear={false}
3131
onUsernameClick={null}
32+
podiumPlaces={4}
3233
themeName="Default"
3334
/>
3435
</div>
@@ -49,6 +50,7 @@ exports[`Matches shallow shapshot 1`] = `
4950
isCopilot={false}
5051
isTopGear={false}
5152
onUsernameClick={null}
53+
podiumPlaces={4}
5254
themeName="Default"
5355
/>
5456
</div>
@@ -69,6 +71,7 @@ exports[`Matches shallow shapshot 1`] = `
6971
isCopilot={false}
7072
isTopGear={false}
7173
onUsernameClick={null}
74+
podiumPlaces={4}
7275
themeName="Default"
7376
/>
7477
</div>
@@ -89,6 +92,7 @@ exports[`Matches shallow shapshot 1`] = `
8992
isCopilot={false}
9093
isTopGear={false}
9194
onUsernameClick={null}
95+
podiumPlaces={4}
9296
themeName="Default"
9397
/>
9498
</div>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ exports[`Matches shallow shapshot 1`] = `
4747
<span
4848
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value___2shA5"
4949
>
50-
0.00
50+
NaN
5151
</span>
5252
<span
5353
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value-title___1Jf_7"
@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 2`] = `
106106
<span
107107
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value___2shA5"
108108
>
109-
0.00
109+
NaN
110110
</span>
111111
<span
112112
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value-title___1Jf_7"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ exports[`renders a full Profile correctly 1`] = `
5858
},
5959
]
6060
}
61+
badges={Object {}}
6162
challenges={null}
6263
clearSubtrackChallenges={[Function]}
6364
copilot={true}
@@ -720,6 +721,7 @@ exports[`renders a full Profile correctly 1`] = `
720721
exports[`renders an empty Profile correctly 1`] = `
721722
<ProfilePage
722723
achievements={Array []}
724+
badges={Object {}}
723725
challenges={null}
724726
clearSubtrackChallenges={[Function]}
725727
copilot={false}

‎build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ docker build -t $TAG \
5353
--build-arg OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY \
5454
--build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL \
5555
--build-arg GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY=$GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY \
56+
--build-arg GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID \
5657
--build-arg VALID_ISSUERS=$VALID_ISSUERS .
5758

5859
# Copies "node_modules" from the created image, if necessary for caching.

‎config/custom-environment-variables.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,8 @@ module.exports = {
114114
SDK_KEY: 'OPTIMIZELY_SDK_KEY',
115115
},
116116
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY: 'GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY',
117+
GAMIFICATION: {
118+
ORG_ID: 'GAMIFICATION_ORG_ID',
119+
ENABLE_BADGE_UI: 'GAMIFICATION_ENABLE_BADGE_UI',
120+
},
117121
};

‎config/default.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,9 @@ module.exports = {
452452
OPTIMIZELY: {
453453
SDK_KEY: '7V4CJhurXT3Y3bnzv1hv1',
454454
},
455-
PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com',
455+
GAMIFICATION: {
456+
ORG_ID: '6052dd9b-ea80-494b-b258-edd1331e27a3',
457+
ENABLE_BADGE_UI: true,
458+
},
456459
PLATFORMUI_SITE_URL: 'https://platform-ui.topcoder-dev.com',
457460
};

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"supertest": "^3.1.0",
154154
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
155155
"tc-ui": "^1.0.12",
156-
"topcoder-react-lib": "1.2.8",
156+
"topcoder-react-lib": "1.2.10",
157157
"topcoder-react-ui-kit": "2.0.1",
158158
"topcoder-react-utils": "0.7.8",
159159
"turndown": "^4.0.2",

0 commit comments

Comments
 (0)