From 6579001d94538fdbe970625a90b99cd4203fd5dc Mon Sep 17 00:00:00 2001 From: nqv Date: Fri, 4 Dec 2020 20:39:51 +0700 Subject: [PATCH 1/7] filter update --- src/services/challenges.js | 3 ++- src/utils/challenge/filter.js | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/services/challenges.js b/src/services/challenges.js index 8d9268cf..bd11afed 100644 --- a/src/services/challenges.js +++ b/src/services/challenges.js @@ -174,7 +174,8 @@ class ChallengesService { filter, ) => { let res = {}; - if (_.some(filter.frontFilter.tracks, val => val)) { + if (_.some(filter.frontFilter.tracks, val => val) + && !_.isEqual(filter.frontFilter.types, [])) { const query = getFilterUrl(filter.backendFilter, filter.frontFilter); const url = `${endpoint}?${query}`; res = await this.private.apiV5.get(url).then(checkErrorV5); diff --git a/src/utils/challenge/filter.js b/src/utils/challenge/filter.js index 0728dc15..4d151429 100644 --- a/src/utils/challenge/filter.js +++ b/src/utils/challenge/filter.js @@ -106,8 +106,8 @@ function filterByRegistrationOpen(challenge, state) { * @return {Boolean} True if opp satifies the filter */ function filterByReviewOpportunityType(opp, state) { - if (!state.reviewOpportunityType) return true; - return opp.type === state.reviewOpportunityType; + if (state.reviewOpportunityTypes.length === 0) return false; + return state.reviewOpportunityTypes.includes(opp.type); } function filterByStartDate(challenge, state) { @@ -447,14 +447,16 @@ export function setEndDate(state, date) { /** * Clones the state and sets the review opportunity type. * @param {Object} state - * @param {Array} reviewOpportunityType Possible values found in utils/tc REVIEW_OPPORTUNITY_TYPES + * @param {Array} reviewOpportunityTypes Possible values found in utils/tc REVIEW_OPPORTUNITY_TYPES * @return {Object} */ -export function setReviewOpportunityType(state, reviewOpportunityType) { - if (reviewOpportunityType) return { ...state, reviewOpportunityType }; - if (!state.reviewOpportunityType) return state; +export function setReviewOpportunityType(state, reviewOpportunityTypes) { + if (reviewOpportunityTypes && reviewOpportunityTypes.length) { + return { ...state, reviewOpportunityTypes }; + } + if (!state.reviewOpportunityTypes) return state; const res = _.clone(state); - delete res.reviewOpportunityType; + delete res.reviewOpportunityTypes; return res; } From 5e8a39d797d9ea4066f1d89de7a2aea762da97c0 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Mon, 7 Dec 2020 06:51:05 -0300 Subject: [PATCH 2/7] ci: added 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 95a7688bdf2d1c25cc8f1e03804bc9b79ab6816e Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Mon, 7 Dec 2020 06:51:43 -0300 Subject: [PATCH 3/7] ci: test release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba920e0d..b041f9e2 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.1.3", + "version": "1000.26.0", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 4a0f25ff65ca0f599036e8bfcd3f06c6b311b0a0 Mon Sep 17 00:00:00 2001 From: nqv Date: Wed, 9 Dec 2020 15:39:38 +0700 Subject: [PATCH 4/7] fix for issue https://github.com/topcoder-platform/community-app/issues/5068 --- src/utils/challenge/filter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/challenge/filter.js b/src/utils/challenge/filter.js index 4d151429..ea86826d 100644 --- a/src/utils/challenge/filter.js +++ b/src/utils/challenge/filter.js @@ -158,10 +158,10 @@ function filterByEvents(challenge, state) { } function filterByText(challenge, state) { - if (!state.name) return true; + if (!state.search) return true; const str = `${challenge.name} ${challenge.tags} ${challenge.platforms} ${challenge.tags}` .toLowerCase(); - return str.includes(state.name.toLowerCase()); + return str.includes(state.search.toLowerCase()); } function filterByTrack(challenge, state) { From d8f9fffd9b090ac73d5193f7f0255a1a41a3aecc Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 9 Dec 2020 08:01:52 -0300 Subject: [PATCH 5/7] ci: test release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b041f9e2..a0314867 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.26.0", + "version": "1000.26.1", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 5e4b64436851a40e0d25aad46756f3f5441fd5ef Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 15 Dec 2020 01:13:24 -0300 Subject: [PATCH 6/7] ci: test release (smoke testing) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0314867..deba50e7 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.26.1", + "version": "1000.26.2", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From ad6f23f71db32df63029e09cd09402615ad58979 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 15 Dec 2020 03:38:55 -0300 Subject: [PATCH 7/7] fix: for issue #5068 Issue: https://github.com/topcoder-platform/community-app/issues/5068 Dependency: https://github.com/topcoder-platform/community-app/pull/5257 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index deba50e7..5602136d 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.26.2", + "version": "1.1.4", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0",