Skip to content

Commit 2928705

Browse files
sushilshindesushilshinde
committed
Merge remote-tracking branch 'origin/develop' into fix_groups_payload-sync-with-develop
2 parents 85dc472 + 418b158 commit 2928705

34 files changed

+8914
-8709
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
at: .
3030
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
3131
- run: npm publish --tag test-release
32-
32+
# dont change anything
3333
workflows:
3434
version: 2
3535
build:

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The [Topcoder](https://www.topcoder.com) lib for internal ReactJS projects.
1010

1111
Change the property in `AV_SCAN_SCORER_REVIEW_TYPE_ID` in config.
1212

13+
### Configuration for AV-Scan scorer review type ID
14+
15+
Change the property in `PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID` in config.
16+
1317
### Development
1418
```shell
1519
# Install dependencies
@@ -19,7 +23,7 @@ npm install
1923
npm test
2024
npm run build
2125

22-
# Go to other project which depends on the topcoder-react-lib, config its package.json so
26+
# Go to other project which depends on the topcoder-react-lib, config its package.json so
2327
# that the 'topcoder-react-lib' points to the local foler path of topcoder-react-lib:
2428
#
2529
# "dependencies": {

‎__tests__/__snapshots__/index.js.snap

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,29 @@ Object {
6262
"getAllCountriesInit": [Function],
6363
"getCountriesDone": [Function],
6464
"getCountriesInit": [Function],
65+
"getManufacturersDone": [Function],
66+
"getManufacturersInit": [Function],
67+
"getModelsDone": [Function],
68+
"getModelsInit": [Function],
69+
"getOsesDone": [Function],
70+
"getOsesInit": [Function],
71+
"getReviewTypesDone": [Function],
72+
"getReviewTypesInit": [Function],
6573
"getSkillTagsDone": [Function],
6674
"getSkillTagsInit": [Function],
75+
"getTypesDone": [Function],
76+
"getTypesInit": [Function],
77+
},
78+
"memberSearch": Object {
79+
"checkIfSearchTermIsATag": [Function],
80+
"clearMemberSearch": [Function],
81+
"loadMoreUsernames": [Function],
82+
"memberSearchSuccess": [Function],
83+
"resetSearchTerm": [Function],
84+
"setSearchTag": [Function],
85+
"setSearchTerm": [Function],
86+
"topMemberSearchSuccess": [Function],
87+
"usernameSearchSuccess": [Function],
6788
},
6889
"memberTasks": Object {
6990
"dropAll": [Function],
@@ -93,6 +114,18 @@ Object {
93114
"getUserSrmDone": [Function],
94115
"getUserSrmInit": [Function],
95116
},
117+
"notifications": Object {
118+
"dismissChallengeNotificationsDone": [Function],
119+
"dismissChallengeNotificationsInit": [Function],
120+
"getNotificationsDone": [Function],
121+
"getNotificationsInit": [Function],
122+
"markAllNotificationAsReadDone": [Function],
123+
"markAllNotificationAsReadInit": [Function],
124+
"markAllNotificationAsSeenDone": [Function],
125+
"markAllNotificationAsSeenInit": [Function],
126+
"markNotificationAsReadDone": [Function],
127+
"markNotificationAsReadInit": [Function],
128+
},
96129
"profile": Object {
97130
"addSkillDone": [Function],
98131
"addSkillInit": [Function],
@@ -238,9 +271,11 @@ Object {
238271
"groups": [Function],
239272
"looker": [Function],
240273
"lookup": [Function],
274+
"memberSearch": [Function],
241275
"memberTasks": [Function],
242276
"members": [Function],
243277
"mySubmissionsManagement": [Function],
278+
"notifications": [Function],
244279
"profile": [Function],
245280
"reviewOpportunity": [Function],
246281
"settings": [Function],
@@ -290,10 +325,18 @@ Object {
290325
"default": undefined,
291326
"getService": [Function],
292327
},
328+
"memberSearch": Object {
329+
"default": undefined,
330+
"getService": [Function],
331+
},
293332
"members": Object {
294333
"default": undefined,
295334
"getService": [Function],
296335
},
336+
"notifications": Object {
337+
"default": undefined,
338+
"getService": [Function],
339+
},
297340
"reviewOpportunities": Object {
298341
"default": undefined,
299342
"getReviewOpportunitiesService": [Function],

‎__tests__/actions/__snapshots__/lookup.js.snap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@ Object {
77
"getAllCountriesInit": [Function],
88
"getCountriesDone": [Function],
99
"getCountriesInit": [Function],
10+
"getManufacturersDone": [Function],
11+
"getManufacturersInit": [Function],
12+
"getModelsDone": [Function],
13+
"getModelsInit": [Function],
14+
"getOsesDone": [Function],
15+
"getOsesInit": [Function],
16+
"getReviewTypesDone": [Function],
17+
"getReviewTypesInit": [Function],
1018
"getSkillTagsDone": [Function],
1119
"getSkillTagsInit": [Function],
20+
"getTypesDone": [Function],
21+
"getTypesInit": [Function],
1222
},
1323
}
1424
`;

‎__tests__/reducers/__snapshots__/lookup.js.snap

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,16 @@ Object {
99
"countryCode": "AFG",
1010
},
1111
],
12+
"hasMoreModels": false,
13+
"hasMoreOses": false,
1214
"loadingCountriesError": false,
1315
"loadingSkillTagsError": true,
16+
"manufacturers": Array [],
17+
"modelPage": 1,
18+
"models": Array [],
19+
"osPage": 1,
20+
"oses": Array [],
21+
"reviewTypes": Array [],
1422
"skillTags": Array [
1523
Object {
1624
"domain": "SKILLS",
@@ -19,6 +27,7 @@ Object {
1927
"status": "APPROVED",
2028
},
2129
],
30+
"types": Array [],
2231
}
2332
`;
2433

@@ -31,8 +40,16 @@ Object {
3140
"countryCode": "AFG",
3241
},
3342
],
43+
"hasMoreModels": false,
44+
"hasMoreOses": false,
3445
"loadingCountriesError": true,
3546
"loadingSkillTagsError": true,
47+
"manufacturers": Array [],
48+
"modelPage": 1,
49+
"models": Array [],
50+
"osPage": 1,
51+
"oses": Array [],
52+
"reviewTypes": Array [],
3653
"skillTags": Array [
3754
Object {
3855
"domain": "SKILLS",
@@ -41,14 +58,23 @@ Object {
4158
"status": "APPROVED",
4259
},
4360
],
61+
"types": Array [],
4462
}
4563
`;
4664

4765
exports[`Default reducer Get skill tags 1`] = `
4866
Object {
4967
"allCountries": Array [],
5068
"countries": Array [],
69+
"hasMoreModels": false,
70+
"hasMoreOses": false,
5171
"loadingSkillTagsError": false,
72+
"manufacturers": Array [],
73+
"modelPage": 1,
74+
"models": Array [],
75+
"osPage": 1,
76+
"oses": Array [],
77+
"reviewTypes": Array [],
5278
"skillTags": Array [
5379
Object {
5480
"domain": "SKILLS",
@@ -57,14 +83,23 @@ Object {
5783
"status": "APPROVED",
5884
},
5985
],
86+
"types": Array [],
6087
}
6188
`;
6289

6390
exports[`Default reducer Get skill tags error 1`] = `
6491
Object {
6592
"allCountries": Array [],
6693
"countries": Array [],
94+
"hasMoreModels": false,
95+
"hasMoreOses": false,
6796
"loadingSkillTagsError": true,
97+
"manufacturers": Array [],
98+
"modelPage": 1,
99+
"models": Array [],
100+
"osPage": 1,
101+
"oses": Array [],
102+
"reviewTypes": Array [],
68103
"skillTags": Array [
69104
Object {
70105
"domain": "SKILLS",
@@ -73,14 +108,24 @@ Object {
73108
"status": "APPROVED",
74109
},
75110
],
111+
"types": Array [],
76112
}
77113
`;
78114

79115
exports[`Default reducer Initial state 1`] = `
80116
Object {
81117
"allCountries": Array [],
82118
"countries": Array [],
119+
"hasMoreModels": false,
120+
"hasMoreOses": false,
121+
"manufacturers": Array [],
122+
"modelPage": 1,
123+
"models": Array [],
124+
"osPage": 1,
125+
"oses": Array [],
126+
"reviewTypes": Array [],
83127
"skillTags": Array [],
128+
"types": Array [],
84129
}
85130
`;
86131

@@ -93,8 +138,16 @@ Object {
93138
"countryCode": "AFG",
94139
},
95140
],
141+
"hasMoreModels": false,
142+
"hasMoreOses": false,
96143
"loadingCountriesError": false,
97144
"loadingSkillTagsError": true,
145+
"manufacturers": Array [],
146+
"modelPage": 1,
147+
"models": Array [],
148+
"osPage": 1,
149+
"oses": Array [],
150+
"reviewTypes": Array [],
98151
"skillTags": Array [
99152
Object {
100153
"domain": "SKILLS",
@@ -103,6 +156,7 @@ Object {
103156
"status": "APPROVED",
104157
},
105158
],
159+
"types": Array [],
106160
}
107161
`;
108162

@@ -115,8 +169,16 @@ Object {
115169
"countryCode": "AFG",
116170
},
117171
],
172+
"hasMoreModels": false,
173+
"hasMoreOses": false,
118174
"loadingCountriesError": true,
119175
"loadingSkillTagsError": true,
176+
"manufacturers": Array [],
177+
"modelPage": 1,
178+
"models": Array [],
179+
"osPage": 1,
180+
"oses": Array [],
181+
"reviewTypes": Array [],
120182
"skillTags": Array [
121183
Object {
122184
"domain": "SKILLS",
@@ -125,14 +187,23 @@ Object {
125187
"status": "APPROVED",
126188
},
127189
],
190+
"types": Array [],
128191
}
129192
`;
130193

131194
exports[`Factory without server side rendering Get skill tags 1`] = `
132195
Object {
133196
"allCountries": Array [],
134197
"countries": Array [],
198+
"hasMoreModels": false,
199+
"hasMoreOses": false,
135200
"loadingSkillTagsError": false,
201+
"manufacturers": Array [],
202+
"modelPage": 1,
203+
"models": Array [],
204+
"osPage": 1,
205+
"oses": Array [],
206+
"reviewTypes": Array [],
136207
"skillTags": Array [
137208
Object {
138209
"domain": "SKILLS",
@@ -141,14 +212,23 @@ Object {
141212
"status": "APPROVED",
142213
},
143214
],
215+
"types": Array [],
144216
}
145217
`;
146218

147219
exports[`Factory without server side rendering Get skill tags error 1`] = `
148220
Object {
149221
"allCountries": Array [],
150222
"countries": Array [],
223+
"hasMoreModels": false,
224+
"hasMoreOses": false,
151225
"loadingSkillTagsError": true,
226+
"manufacturers": Array [],
227+
"modelPage": 1,
228+
"models": Array [],
229+
"osPage": 1,
230+
"oses": Array [],
231+
"reviewTypes": Array [],
152232
"skillTags": Array [
153233
Object {
154234
"domain": "SKILLS",
@@ -157,13 +237,23 @@ Object {
157237
"status": "APPROVED",
158238
},
159239
],
240+
"types": Array [],
160241
}
161242
`;
162243

163244
exports[`Factory without server side rendering Initial state 1`] = `
164245
Object {
165246
"allCountries": Array [],
166247
"countries": Array [],
248+
"hasMoreModels": false,
249+
"hasMoreOses": false,
250+
"manufacturers": Array [],
251+
"modelPage": 1,
252+
"models": Array [],
253+
"osPage": 1,
254+
"oses": Array [],
255+
"reviewTypes": Array [],
167256
"skillTags": Array [],
257+
"types": Array [],
168258
}
169259
`;

‎config/default.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"AV_SCAN_SCORER_REVIEW_TYPE_ID": "",
3+
"PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "",
34
"PAGE_SIZE": 50,
45
"REVIEW_OPPORTUNITY_PAGE_SIZE": 1000
56
}

‎config/development.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"AV_SCAN_SCORER_REVIEW_TYPE_ID": "68c5a381-c8ab-48af-92a7-7a869a4ee6c3"
2+
"AV_SCAN_SCORER_REVIEW_TYPE_ID": "68c5a381-c8ab-48af-92a7-7a869a4ee6c3",
3+
"PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "52c91e85-745f-4e62-b592-9879a2dfe9fd"
34
}

‎config/production.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"AV_SCAN_SCORER_REVIEW_TYPE_ID": "55bbb17d-aac2-45a6-89c3-a8d102863d05"
2+
"AV_SCAN_SCORER_REVIEW_TYPE_ID": "55bbb17d-aac2-45a6-89c3-a8d102863d05",
3+
"PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "df51ca7d-fb0a-4147-9569-992fcf5aae48"
34
}

‎config/test.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,12 @@ module.exports = {
55
V5: 'https://api.topcoder-dev.com/v5',
66
},
77
dummyConfigKey: 'Dummy config value',
8+
SECRET: {
9+
TC_M2M: {
10+
AUTH0_URL: '',
11+
AUTH0_AUDIENCE: '',
12+
TOKEN_CACHE_TIME: '',
13+
AUTH0_PROXY_SERVER_URL: '',
14+
},
15+
},
816
};

0 commit comments

Comments
 (0)