Skip to content

Commit 754b17e

Browse files
sushilshindesushilshinde
committed
resolved conflicts
2 parents a8db62a + 6f2df59 commit 754b17e

File tree

19 files changed

+4778
-11766
lines changed

19 files changed

+4778
-11766
lines changed

‎.circleci/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ jobs:
2828
- attach_workspace:
2929
at: .
3030
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
31+
<<<<<<< HEAD
3132
- run: npm publish --tag test-release
3233

34+
=======
35+
- run: npm publish
36+
# dont change anything
37+
>>>>>>> origin/develop-mm-sub-merge-fix
3338
workflows:
3439
version: 2
3540
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ Object {
6262
"getAllCountriesInit": [Function],
6363
"getCountriesDone": [Function],
6464
"getCountriesInit": [Function],
65+
"getReviewTypesDone": [Function],
66+
"getReviewTypesInit": [Function],
6567
"getSkillTagsDone": [Function],
6668
"getSkillTagsInit": [Function],
6769
},

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Object {
77
"getAllCountriesInit": [Function],
88
"getCountriesDone": [Function],
99
"getCountriesInit": [Function],
10+
"getReviewTypesDone": [Function],
11+
"getReviewTypesInit": [Function],
1012
"getSkillTagsDone": [Function],
1113
"getSkillTagsInit": [Function],
1214
},

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Object {
1111
],
1212
"loadingCountriesError": false,
1313
"loadingSkillTagsError": true,
14+
"reviewTypes": Array [],
1415
"skillTags": Array [
1516
Object {
1617
"domain": "SKILLS",
@@ -33,6 +34,7 @@ Object {
3334
],
3435
"loadingCountriesError": true,
3536
"loadingSkillTagsError": true,
37+
"reviewTypes": Array [],
3638
"skillTags": Array [
3739
Object {
3840
"domain": "SKILLS",
@@ -49,6 +51,7 @@ Object {
4951
"allCountries": Array [],
5052
"countries": Array [],
5153
"loadingSkillTagsError": false,
54+
"reviewTypes": Array [],
5255
"skillTags": Array [
5356
Object {
5457
"domain": "SKILLS",
@@ -65,6 +68,7 @@ Object {
6568
"allCountries": Array [],
6669
"countries": Array [],
6770
"loadingSkillTagsError": true,
71+
"reviewTypes": Array [],
6872
"skillTags": Array [
6973
Object {
7074
"domain": "SKILLS",
@@ -80,6 +84,7 @@ exports[`Default reducer Initial state 1`] = `
8084
Object {
8185
"allCountries": Array [],
8286
"countries": Array [],
87+
"reviewTypes": Array [],
8388
"skillTags": Array [],
8489
}
8590
`;
@@ -95,6 +100,7 @@ Object {
95100
],
96101
"loadingCountriesError": false,
97102
"loadingSkillTagsError": true,
103+
"reviewTypes": Array [],
98104
"skillTags": Array [
99105
Object {
100106
"domain": "SKILLS",
@@ -117,6 +123,7 @@ Object {
117123
],
118124
"loadingCountriesError": true,
119125
"loadingSkillTagsError": true,
126+
"reviewTypes": Array [],
120127
"skillTags": Array [
121128
Object {
122129
"domain": "SKILLS",
@@ -133,6 +140,7 @@ Object {
133140
"allCountries": Array [],
134141
"countries": Array [],
135142
"loadingSkillTagsError": false,
143+
"reviewTypes": Array [],
136144
"skillTags": Array [
137145
Object {
138146
"domain": "SKILLS",
@@ -149,6 +157,7 @@ Object {
149157
"allCountries": Array [],
150158
"countries": Array [],
151159
"loadingSkillTagsError": true,
160+
"reviewTypes": Array [],
152161
"skillTags": Array [
153162
Object {
154163
"domain": "SKILLS",
@@ -164,6 +173,7 @@ exports[`Factory without server side rendering Initial state 1`] = `
164173
Object {
165174
"allCountries": Array [],
166175
"countries": Array [],
176+
"reviewTypes": Array [],
167177
"skillTags": Array [],
168178
}
169179
`;

‎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
}

‎dist/dev/index.js

Lines changed: 0 additions & 6798 deletions
This file was deleted.

‎docs/actions.lookup.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Actions related to lookup data.
1111
* [.getCountriesDone()](#module_actions.lookup.getCountriesDone) ⇒ <code>Action</code>
1212
* [.getAllCountriesInit()](#module_actions.lookup.getCountriesInit) ⇒ <code>Action</code>
1313
* [.getAllCountriesDone(tokenV3)](#module_actions.lookup.getCountriesDone) ⇒ <code>Action</code>
14+
* [.getReviewTypesInit()](#module_actions.lookup.getReviewTypesInit) ⇒ <code>Action</code>
15+
* [.getReviewTypesDone(tokenV3)](#module_actions.lookup.ggetReviewTypesDone) ⇒ <code>Action</code>
1416

1517
<a name="module_actions.lookup.getSkillTagsInit"></a>
1618

@@ -40,3 +42,19 @@ Creates an action that gets all countries new version.
4042
| Param | Type | Description |
4143
| --- | --- | --- |
4244
| tokenV3 | <code>String</code> | Topcoder v3 auth token. |
45+
<a name="module_actions.lookup.getReviewTypesInit"></a>
46+
47+
### actions.lookup.getReviewTypesInit() ⇒ <code>Action</code>
48+
Creates an action that gets all reiview types.
49+
50+
**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)
51+
<a name="module_actions.lookup.getReviewTypesDone"></a>
52+
53+
### actions.lookup.getReviewTypesDone(tokenV3) ⇒ <code>Action</code>
54+
Creates an action that gets all review types.
55+
56+
**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)
57+
58+
| Param | Type | Description |
59+
| --- | --- | --- |
60+
| tokenV3 | <code>String</code> | Topcoder v3 auth token. |

0 commit comments

Comments
 (0)