From 7b228a71d54adb959ec33b931787f15510bd8640 Mon Sep 17 00:00:00 2001 From: narekcat Date: Thu, 10 Sep 2020 19:01:31 +0400 Subject: [PATCH 1/8] fix: for issue #2069. --- src/actions/members.js | 16 +++++++++------- src/services/challenges.js | 8 +++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/actions/members.js b/src/actions/members.js index 13a14fdb..4cc23a1c 100644 --- a/src/actions/members.js +++ b/src/actions/members.js @@ -331,6 +331,7 @@ async function getUserMarathonInit(handle, uuid) { * @desc Create an action that loads the member marathon. * @param {String} uuid Operation UUID. * @param {String} handle Member handle. + * @param {String} memberId Member id. * @param {String} tokenV3 v3 auth token. * @param {Number} start page. * @param {Number} page size. @@ -338,20 +339,21 @@ async function getUserMarathonInit(handle, uuid) { * @return {Action} */ async function getUserMarathonDone( - uuid, handle, tokenV3, pageNum, pageSize, + uuid, handle, memberId, tokenV3, pageNum, pageSize, refresh, ) { - const filter = { status: 'PAST', isRatedForMM: 'true' }; + const filter = { status: 'Completed' }; const params = {}; - params.orderBy = 'endDate desc'; - params.limit = pageSize; - params.offset = pageNum * pageSize; + params.sortBy = 'endDate'; + params.sortOrder = 'desc'; + params.perPage = pageSize; + params.page = pageNum; const service = getChallengesService(tokenV3); - return service.getUserMarathonMatches(handle, filter, params) + return service.getUserMarathonMatches(memberId, filter, params) .then(res => ({ uuid, - marathons: res, + marathons: { challenges: res }, refresh, handle, })); diff --git a/src/services/challenges.js b/src/services/challenges.js index d3e4b3c8..0db8ee84 100644 --- a/src/services/challenges.js +++ b/src/services/challenges.js @@ -534,18 +534,20 @@ class ChallengesService { /** * Gets marathon matches of the specified user. * @param {String} memberId User whose challenges we want to fetch. + * @param {Object} filter * @param {Object} params * @return {Promise} Resolves to the api response. */ - async getUserMarathonMatches(memberId, params) { + async getUserMarathonMatches(memberId, filter, params) { const newParams = { + ...filter, ...params, - tag: 'Marathon Match', + tags: ['Marathon Match'], memberId, }; const res = await this.private.apiV5.get(`/challenges?${qs.stringify(newParams)}`); - return getApiResponsePayload(res); + return res.json(); } /** From 3198fcfb4632062383a6d995265d11c93aea887c Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Sun, 13 Sep 2020 16:38:15 -0300 Subject: [PATCH 2/8] Updated tags to tag When pass just one tag need to use `tag` instead `tags` --- src/services/challenges.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/challenges.js b/src/services/challenges.js index 0db8ee84..5dc24d7f 100644 --- a/src/services/challenges.js +++ b/src/services/challenges.js @@ -542,7 +542,7 @@ class ChallengesService { const newParams = { ...filter, ...params, - tags: ['Marathon Match'], + tag: 'Marathon Match', memberId, }; From c7eebb3ba859d2ca141187098b1f9fd8700eb208 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Sun, 13 Sep 2020 17:01:17 -0300 Subject: [PATCH 3/8] fix: for issue #2069 Issue: https://github.com/topcoder-platform/community-app/issues/2069 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 649af1ea..fd4258a9 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1000.22.3", + "version": "1000.22.5", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 8130fd172b9ed47ff6f5b136ef33e5538bf85b39 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Sun, 13 Sep 2020 23:35:09 -0300 Subject: [PATCH 4/8] ci: removing dist tag Issue: https://github.com/topcoder-platform/community-app/issues/2069 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e161844..e8eac28e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: - attach_workspace: at: . - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm publish + - run: npm publish --tag test-release # dont change anything workflows: version: 2 From b4d6c364953b86d68159fd00b6f960f19cc5db35 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Sun, 13 Sep 2020 23:47:56 -0300 Subject: [PATCH 5/8] fix: for issue #2069 https://github.com/topcoder-platform/community-app/issues/2069 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd4258a9..3cf11723 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1000.22.5", + "version": "1000.22.6", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 384732415853abef590eddde3cad1a78d7eddb01 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 15 Sep 2020 01:02:55 -0300 Subject: [PATCH 6/8] fix: smoke test release Issue: https://github.com/topcoder-platform/community-app/issues/2069 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cf11723..fbc58cf6 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1000.22.6", + "version": "1000.22.7", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 20fe0d877fa986808cf125a48210bf9ec992ad71 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 15 Sep 2020 13:10:38 +0530 Subject: [PATCH 7/8] ci: removed dist tag --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8eac28e..0e161844 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: - attach_workspace: at: . - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm publish --tag test-release + - run: npm publish # dont change anything workflows: version: 2 From 4eed324447ee4145f85a076593fa2c836f49d143 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 15 Sep 2020 13:11:34 +0530 Subject: [PATCH 8/8] fix: for #2069 - Issue: #2069 - PR: https://github.com/topcoder-platform/topcoder-react-lib/pull/253 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fbc58cf6..20f49c6f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1000.22.7", + "version": "1.0.5", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0",