From 8e58d94bee1752c8004554829f724180f46f8369 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Sat, 2 Jul 2022 11:19:29 +0700 Subject: [PATCH 1/6] improvement(reskin-profile): modal dup data --- src/actions/members.js | 7 ++++--- src/reducers/members.js | 32 ++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/actions/members.js b/src/actions/members.js index dee9e193..e3614361 100644 --- a/src/actions/members.js +++ b/src/actions/members.js @@ -257,10 +257,11 @@ async function getStatsDistributionDone(handle, track, subTrack, uuid, tokenV3) * @desc Create an action that signals beginning of subtrack challenges loading. * @param {String} handle Member handle. * @param {String} uuid Operation UUID. + * @param {Number} pageNum Page index. * @return {Action} */ -async function getSubtrackChallengesInit(handle, uuid) { - return { handle, uuid }; +async function getSubtrackChallengesInit(handle, uuid, pageNum) { + return { handle, uuid, pageNum }; } /** @@ -340,7 +341,7 @@ async function getSubtrackChallengesV4Done( challenges: res.challenges, refresh, handle, - })); + })).catch(e => ({ handle, error: e })); } /** diff --git a/src/reducers/members.js b/src/reducers/members.js index 76c70d52..6355d776 100644 --- a/src/reducers/members.js +++ b/src/reducers/members.js @@ -289,10 +289,16 @@ function onGetActiveChallengesDone(state, { error, payload }) { * @return {Object} New state. */ function onGetSubtrackChallengesInit(state, { payload }) { - const { handle, uuid } = payload; + const { handle, uuid, pageNum } = payload; + return { ...state, - [handle]: { ...state[handle], loadingSubTrackChallengesUUID: uuid }, + [handle]: { + ...state[handle], + loadingSubTrackChallengesUUID: uuid, + subtrackChallengesHasMore: false, + ...(pageNum === 1 ? { subtrackChallenges: [] } : {}), + }, }; } @@ -303,18 +309,28 @@ function onGetSubtrackChallengesInit(state, { payload }) { * @return {Object} New state. */ function onGetSubtrackChallengesDone(state, { error, payload }) { - if (error) { - logger.error('Failed to get member subtrack challenges', payload); - fireErrorMessage('Failed to get member subtrack challenges', ''); - return state; - } - const { uuid, challenges, refresh, handle, + error: payloadError, } = payload; + + if (error || payloadError) { + logger.error('Failed to get member subtrack challenges', payload); + fireErrorMessage('Failed to get member subtrack challenges', ''); + + return { + ...state, + [handle]: { + ...state[handle], + subtrackChallengesHasMore: false, + loadingSubTrackChallengesUUID: '', + }, + }; + } + if (uuid !== state[handle].loadingSubTrackChallengesUUID) return state; return { From cbd3117e4f588a7f010c39d95c6a3a3b536ef63c Mon Sep 17 00:00:00 2001 From: lunarkid Date: Sat, 2 Jul 2022 11:22:27 +0700 Subject: [PATCH 2/6] bump version 1000.29.3 From 2dc141f5d4b369df1ecbb2c428babd70ca8ae473 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 20 Jul 2022 10:04:05 -0300 Subject: [PATCH 3/6] ci: added 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 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 4e6049ba579d71a46558504e16cdc0ed051e371a Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 20 Jul 2022 10:04:54 -0300 Subject: [PATCH 4/6] fix; for issue https://topcoder.atlassian.net/browse/PROD-1984 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54641997..be7da971 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.2.6", + "version": "1000.29.4", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 70c853fab3749073988e100d5f38f0cdf01c4f6c Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 20 Jul 2022 11:05:13 -0300 Subject: [PATCH 5/6] ci: remove 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 From 26f4d4c67c9701c650257ceb407e6c512ff29dc4 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 20 Jul 2022 11:05:52 -0300 Subject: [PATCH 6/6] fix; for issue https://topcoder.atlassian.net/browse/PROD-1984 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index be7da971..f1328538 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.29.4", + "version": "1.2.7", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0",