From 01194dfd8b167191a716dd08aa816eca466392ea Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Mon, 31 Aug 2020 14:11:50 +0530 Subject: [PATCH 1/6] Merge pull request #232 from cagdas001/fix-4782-workaround Allows `page` and `perPage` parameters at `services/challenges.js#getUserResources` --- src/services/challenges.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/challenges.js b/src/services/challenges.js index 475d2f69..c3391cc8 100644 --- a/src/services/challenges.js +++ b/src/services/challenges.js @@ -522,10 +522,12 @@ class ChallengesService { /** * Gets user resources. * @param {String} userId User id whose challenges we want to fetch. + * @param {Number} page Current page for paginated API response (default 1) + * @param {Number} perPage Page size for paginated API response (default 1000) * @return {Promise} Resolves to the api response. */ - async getUserResources(userId) { - const res = await this.private.apiV5.get(`/resources/${userId}/challenges`); + async getUserResources(userId, page = 1, perPage = 1000) { + const res = await this.private.apiV5.get(`/resources/${userId}/challenges?page=${page}&perPage=${perPage}`); return res.json(); } From 1385996019ea105743ce7c49ec3c48cc458277cf Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 2 Sep 2020 14:59:31 +0530 Subject: [PATCH 2/6] fix: Test release for milestone v1.2 part 3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd1b0240..b768a2c2 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": "1.0.2", + "version": "1000.22.0", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 9d3d31d2eb94f5f6df0f9febd29624da039cd3d5 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 2 Sep 2020 15:01:29 +0530 Subject: [PATCH 3/6] fix: add dist tag --- .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 17aceb696d0060afc79206c9cfbe0878db71bfc7 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 2 Sep 2020 16:02:29 +0530 Subject: [PATCH 4/6] fix: milestone 1.2 part 3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b768a2c2..cd1b0240 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.0", + "version": "1.0.2", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From a260072a35e2fa4558183fe32ae5313ede41eaa5 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 2 Sep 2020 16:04:17 +0530 Subject: [PATCH 5/6] release: prod release for MS v1.2 part 3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd1b0240..89a100c2 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": "1.0.2", + "version": "1.0.3", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 33fbebb71db128db015fdc8db0d2a43a8fd0616c Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 2 Sep 2020 16:04:59 +0530 Subject: [PATCH 6/6] remove dist tag --tag test-release --- .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