Skip to content

Develop #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 79 commits into from
Mar 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
31e84ed
Adds support for v4 API and updates challenge service to use it.
a-lowe Jun 27, 2018
156381b
Updates getUserChallenges to use v4.
a-lowe Jun 28, 2018
c65af46
Merge branch 'master' into new-develop-mm
a-lowe Jun 29, 2018
ba0098e
Fixes issues with track being null and TCO events not displaying on e…
a-lowe Jun 30, 2018
81a0e8b
Adds "prepack" script
birdofpreyru Jul 2, 2018
9379580
Allows "-rcXXX" suffix on release tags
birdofpreyru Jul 2, 2018
d2b3912
Fix previous commit
birdofpreyru Jul 2, 2018
aa1bc0c
Another fix
birdofpreyru Jul 2, 2018
7581820
Update of release config
birdofpreyru Jul 2, 2018
bffd66c
Adds delay to challenge refresh on register/unregister to allow time …
a-lowe Jul 9, 2018
0c39928
Merge branch 'develop' into new-develop-mm
birdofpreyru Jul 10, 2018
405ec60
Adds challenge normalizations for legacy Marathon Matches. Fixes sor…
a-lowe Jul 18, 2018
709de69
Update package lock.
a-lowe Jul 18, 2018
af28491
Update version.
a-lowe Jul 18, 2018
2fdbd85
Merge branch 'develop'
birdofpreyru Jul 31, 2018
4944880
Merge branch 'develop'
birdofpreyru Jul 31, 2018
622e627
Merge branch 'develop'
birdofpreyru Jul 31, 2018
7810efa
Merge branch 'develop'
birdofpreyru Aug 3, 2018
a865387
Merge branch 'develop'
birdofpreyru Aug 6, 2018
fd2a23a
Merge pull request #20 from topcoder-platform/develop
ThomasKranitsas Aug 7, 2018
0d95f10
Merge pull request #22 from topcoder-platform/develop
ThomasKranitsas Aug 15, 2018
8f45e42
Merge branch 'develop' into new-develop-mm
birdofpreyru Aug 16, 2018
fe6e0b4
Merge branch 'develop'
birdofpreyru Aug 27, 2018
1116be7
Merge pull request #26 from topcoder-platform/develop
ThomasKranitsas Oct 3, 2018
bb6b247
After merge
sushilshinde Oct 25, 2018
fabce7b
fixing build issues
sushilshinde Oct 31, 2018
52f94bb
fixing build issues
sushilshinde Oct 31, 2018
3c914fe
Merge pull request #28 from sushilshinde/new-develop-mm
sushilshinde Oct 31, 2018
f05e63e
pushing build artifact - this is for testing only
sushilshinde Oct 31, 2018
14646af
deleting prod build artifacts
sushilshinde Nov 1, 2018
e0250be
issue_1732 fixed linting issues
Nov 1, 2018
d6f3edb
Merge pull request #29 from rashmi73/issue_1732
sushilshinde Nov 3, 2018
ef07dd6
adding prod dist - for testign only
sushilshinde Nov 5, 2018
bc45c27
deleting prod dist
sushilshinde Nov 19, 2018
54b5b14
removing hardcoding
sushilshinde Nov 19, 2018
3e32332
building dev dist
sushilshinde Nov 19, 2018
c761a65
adding prod folder
sushilshinde Nov 22, 2018
726db44
Changed npm version
sushilshinde Nov 28, 2018
1e4b154
Deleting dist folder, updating gitignore
sushilshinde Nov 28, 2018
aae7bd1
Fix eslint configs and tests
ThomasKranitsas Nov 28, 2018
626aa51
Merge pull request #30 from topcoder-platform/new-develop-mm
ThomasKranitsas Nov 28, 2018
a584e81
Merge pull request #31 from topcoder-platform/develop
ThomasKranitsas Nov 28, 2018
6d8dfad
Update members.js
kkartunov Dec 10, 2018
097ccc8
Update package.json
kkartunov Dec 10, 2018
b5e045b
Fix code quality issues from V4 changes
ThomasKranitsas Dec 14, 2018
009d34c
Merge branch 'master' into develop
birdofpreyru Dec 16, 2018
17e070e
Adds `getTcM2mToken()` and `reduceGroupIds(..)` to API and Group serv…
birdofpreyru Dec 16, 2018
99e3a73
Adds `getGroupTreeIds(..)` method to the Groups service + fixes
birdofpreyru Dec 16, 2018
dd92d26
updating gitignore for dist folder - for testing
sushilshinde Dec 17, 2018
43b2ba6
updating gitignore for dist folder - for testing
sushilshinde Dec 17, 2018
26fd3db
updating gitignore for dist folder - for testing
sushilshinde Dec 17, 2018
1bdfa46
Fix DEVELOP_MARATHON_MATCH track
ThomasKranitsas Dec 20, 2018
1769c20
bump npm version
ThomasKranitsas Dec 20, 2018
0d005dd
meta for /challenges and npm bump
kkartunov Jan 8, 2019
79f8960
Fix broken snapshot
kkartunov Jan 8, 2019
3467063
pushing build files
sushilshinde Jan 25, 2019
5e098b5
Resolve conflicts
ThomasKranitsas Jan 29, 2019
f271382
Resolve conflicts
ThomasKranitsas Jan 29, 2019
7f3b805
Fix tests
ThomasKranitsas Jan 29, 2019
8c79b42
Merge pull request #33 from topcoder-platform/code-quality-fixes
ThomasKranitsas Jan 29, 2019
dec3050
Fix issue 39
ThomasKranitsas Feb 4, 2019
ff9341b
Merge pull request #40 from topcoder-platform/fix-39
ThomasKranitsas Feb 4, 2019
34456c3
Code quality improvements
ThomasKranitsas Feb 4, 2019
4067334
Merge pull request #41 from topcoder-platform/code-quality-fixes
sushilshinde Feb 7, 2019
b3bf8b3
deleting dist folder
sushilshinde Feb 7, 2019
b9919c5
upgrading version
sushilshinde Feb 7, 2019
e13c3e2
code 30086294
suppermancool Mar 20, 2019
b65a469
Merge pull request #47 from suppermancool/code-30086294
ThomasKranitsas Mar 20, 2019
0cabdb3
Fix community-app 2056
LieutenantRoger Mar 21, 2019
62ea4ea
Merge pull request #48 from LieutenantRoger/develop
ThomasKranitsas Mar 21, 2019
a614212
fixes community app issue 2259
sumitdaga Mar 24, 2019
480caef
for testing pushing dist folder - temp
sushilshinde Mar 26, 2019
a9c16dd
Update Email Change Flow
Mar 27, 2019
8729d61
Fixed snapshots of test
Mar 27, 2019
14c831f
Merge pull request #49 from sumitdaga/community-app-issue-2259
sushilshinde Mar 28, 2019
744191c
Merge pull request #50 from nauhil/develop
sushilshinde Mar 28, 2019
10cf02c
npm version upgrade
sushilshinde Mar 28, 2019
49c1db7
Fix tests
ThomasKranitsas Mar 28, 2019
cf6886e
Merge branch 'develop' of https://github.com/topcoder-platform/topcod…
ThomasKranitsas Mar 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ workflows:
branches:
ignore: /.*/
tags:
only: /v[0-9]+(\.[0-9]+)*/
only: /v[0-9]+(\.[0-9]+)*(-[0-9]+)?/
requires:
- test
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "./node_modules/topcoder-react-utils/config/eslint/default.json"
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__coverage__
.build-info
.sass-cache
dist
#dist
node_modules
_auto_doc_
.vscode
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.11.1
8.11.2
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Topcoder React Lib

### v0.7.4
- Added `getTcM2mToken()` function to API service, to facilitate handling of
TC M2M token;
- Added `getGroupTreeIds(..)`, `getTokenV3()`, and `reduceGroupIds(..)`
functions to the Groups service, to facilitate deduction of all IDs in a group
(sub-)tree, rooted at a specified group.

### v0.6.0
A few changes related to fetch of projests visitble to users, and creation of
new challenges. Minor release to guard against any side-effects.
Expand Down
12 changes: 9 additions & 3 deletions __tests__/__snapshots__/index.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Object {
"getLookerDone": [Function],
},
"lookup": Object {
"getCountriesDone": [Function],
"getCountriesInit": [Function],
"getSkillTagsDone": [Function],
"getSkillTagsInit": [Function],
},
Expand Down Expand Up @@ -127,6 +129,8 @@ Object {
"updateProfileInit": [Function],
"uploadPhotoDone": [Function],
"uploadPhotoInit": [Function],
"verifyMemberNewEmailDone": [Function],
"verifyMemberNewEmailInit": [Function],
},
"reviewOpportunity": Object {
"cancelApplicationsDone": [Function],
Expand Down Expand Up @@ -237,9 +241,11 @@ Object {
"services": Object {
"api": Object {
"default": [Function],
"getApi": [Function],
"getApiV2": [Function],
"getApiV3": [Function],
"getApiV4": [Function],
"getTcM2mToken": [Function],
},
"billing": Object {
"default": [Function],
Expand All @@ -253,7 +259,6 @@ Object {
"getService": [Function],
"normalizeChallenge": [Function],
"normalizeChallengeDetails": [Function],
"normalizeMarathonMatch": [Function],
},
"communities": Object {
"default": undefined,
Expand All @@ -269,6 +274,7 @@ Object {
"checkUserGroups": [Function],
"default": undefined,
"getService": [Function],
"reduceGroupIds": [Function],
},
"lookup": Object {
"default": undefined,
Expand Down Expand Up @@ -310,8 +316,8 @@ Object {
"Iterative Review": "Iterative Review",
"Spec Review": "Specification Review",
},
"getApiResponsePayloadV3": [Function],
"getApiResponsePayloadV4": [Function],
"getApiResponsePayload": [Function],
"getLookerApiResponsePayload": [Function],
},
"time": Object {
"default": undefined,
Expand Down
20 changes: 20 additions & 0 deletions __tests__/actions/__snapshots__/lookup.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,32 @@
exports[`Module exports 1`] = `
Object {
"lookup": Object {
"getCountriesDone": [Function],
"getCountriesInit": [Function],
"getSkillTagsDone": [Function],
"getSkillTagsInit": [Function],
},
}
`;

exports[`lookup.getCountriesDone 1`] = `
Object {
"payload": Array [
Object {
"country": "Afghanistan",
"countryCode": "AFG",
},
],
"type": "LOOKUP/GET_COUNTRIES_DONE",
}
`;

exports[`lookup.getCountriesInit 1`] = `
Object {
"type": "LOOKUP/GET_COUNTRIES_INIT",
}
`;

exports[`lookup.getSkillTagsDone 1`] = `
Object {
"payload": Array [
Expand Down
2 changes: 2 additions & 0 deletions __tests__/actions/__snapshots__/profile.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ Object {
"updateProfileInit": [Function],
"uploadPhotoDone": [Function],
"uploadPhotoInit": [Function],
"verifyMemberNewEmailDone": [Function],
"verifyMemberNewEmailInit": [Function],
},
}
`;
Expand Down
17 changes: 17 additions & 0 deletions __tests__/actions/lookup.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@ const tag = {
status: 'APPROVED',
};

const country = {
country: 'Afghanistan',
countryCode: 'AFG',
};

// Mock services
const mockLookupService = {
getTags: jest.fn().mockReturnValue(Promise.resolve([tag])),
getCountries: jest.fn().mockReturnValue(Promise.resolve([country])),
};
LookupService.getService = jest.fn().mockReturnValue(mockLookupService);

Expand All @@ -28,3 +34,14 @@ test('lookup.getSkillTagsDone', async () => {
expect(actionResult).toMatchSnapshot();
expect(mockLookupService.getTags).toBeCalled();
});

test('lookup.getCountriesInit', async () => {
const actionResult = actions.lookup.getCountriesInit();
expect(actionResult).toMatchSnapshot();
});

test('lookup.getCountriesDone', async () => {
const actionResult = await redux.resolveAction(actions.lookup.getCountriesDone());
expect(actionResult).toMatchSnapshot();
expect(mockLookupService.getCountries).toBeCalled();
});
90 changes: 90 additions & 0 deletions __tests__/reducers/__snapshots__/lookup.js.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,50 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Default reducer Get countries 1`] = `
Object {
"countries": Array [
Object {
"country": "Afghanistan",
"countryCode": "AFG",
},
],
"loadingCountriesError": false,
"loadingSkillTagsError": true,
"skillTags": Array [
Object {
"domain": "SKILLS",
"id": 251,
"name": "Jekyll",
"status": "APPROVED",
},
],
}
`;

exports[`Default reducer Get countries error 1`] = `
Object {
"countries": Array [
Object {
"country": "Afghanistan",
"countryCode": "AFG",
},
],
"loadingCountriesError": true,
"loadingSkillTagsError": true,
"skillTags": Array [
Object {
"domain": "SKILLS",
"id": 251,
"name": "Jekyll",
"status": "APPROVED",
},
],
}
`;

exports[`Default reducer Get skill tags 1`] = `
Object {
"countries": Array [],
"loadingSkillTagsError": false,
"skillTags": Array [
Object {
Expand All @@ -16,6 +59,7 @@ Object {

exports[`Default reducer Get skill tags error 1`] = `
Object {
"countries": Array [],
"loadingSkillTagsError": true,
"skillTags": Array [
Object {
Expand All @@ -30,12 +74,56 @@ Object {

exports[`Default reducer Initial state 1`] = `
Object {
"countries": Array [],
"skillTags": Array [],
}
`;

exports[`Factory without server side rendering Get countries 1`] = `
Object {
"countries": Array [
Object {
"country": "Afghanistan",
"countryCode": "AFG",
},
],
"loadingCountriesError": false,
"loadingSkillTagsError": true,
"skillTags": Array [
Object {
"domain": "SKILLS",
"id": 251,
"name": "Jekyll",
"status": "APPROVED",
},
],
}
`;

exports[`Factory without server side rendering Get countries error 1`] = `
Object {
"countries": Array [
Object {
"country": "Afghanistan",
"countryCode": "AFG",
},
],
"loadingCountriesError": true,
"loadingSkillTagsError": true,
"skillTags": Array [
Object {
"domain": "SKILLS",
"id": 251,
"name": "Jekyll",
"status": "APPROVED",
},
],
}
`;

exports[`Factory without server side rendering Get skill tags 1`] = `
Object {
"countries": Array [],
"loadingSkillTagsError": false,
"skillTags": Array [
Object {
Expand All @@ -50,6 +138,7 @@ Object {

exports[`Factory without server side rendering Get skill tags error 1`] = `
Object {
"countries": Array [],
"loadingSkillTagsError": true,
"skillTags": Array [
Object {
Expand All @@ -64,6 +153,7 @@ Object {

exports[`Factory without server side rendering Initial state 1`] = `
Object {
"countries": Array [],
"skillTags": Array [],
}
`;
Loading