From 9e966464dc05d47c7bac75251a77b2b5f2d27308 Mon Sep 17 00:00:00 2001
From: Cagdas U <cagdasugurlu01@gmail.com>
Date: Mon, 31 Aug 2020 15:02:44 +0300
Subject: [PATCH 1/5] Revert "fix(challenge-utils): update `filterByUsers` to
use `userId`"
This reverts commit c34961cf758b63c1d0cd87b00634a05262a534c7.
---
src/utils/challenge/filter.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/utils/challenge/filter.js b/src/utils/challenge/filter.js
index 549a36c3..117e0609 100644
--- a/src/utils/challenge/filter.js
+++ b/src/utils/challenge/filter.js
@@ -180,11 +180,8 @@ function filterByUpcoming(challenge, state) {
}
function filterByUsers(challenge, state) {
- const userId = _.get(state, 'userId', null);
- if (userId) {
- return _.get(challenge, ['users', userId], false);
- }
- return true;
+ if (!state.userChallenges) return true;
+ return state.userChallenges.find(ch => challenge.id === ch);
}
/**
From 85c25f82be3327d3a9b3072508956ef29c9991d6 Mon Sep 17 00:00:00 2001
From: narekcat <narekcat@gmail.com>
Date: Mon, 31 Aug 2020 16:20:06 +0400
Subject: [PATCH 2/5] Fix for issue #4752
---
src/services/terms.js | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/services/terms.js b/src/services/terms.js
index 224f825a..82184f1b 100644
--- a/src/services/terms.js
+++ b/src/services/terms.js
@@ -31,18 +31,14 @@ class TermsService {
* @return {Promise} promise of the request result
*/
async getChallengeTerms(terms) {
- if (this.private.tokenV3) {
- const challengeService = getChallengeService(this.private.tokenV3);
- const roleId = await challengeService.getRoleId('Submitter');
- const registerTerms = _.filter(terms, t => t.roleId === roleId);
-
- return Promise.all(_.map(registerTerms, term => this.getTermDetails(term.id)))
- .then(challengeTerms => (
- _.map(challengeTerms, term => _.pick(term, 'id', 'title', 'agreed'))
- ));
- }
-
- return [];
+ const challengeService = getChallengeService(this.private.tokenV3);
+ const roleId = await challengeService.getRoleId('Submitter');
+ const registerTerms = _.filter(terms, t => t.roleId === roleId);
+
+ return Promise.all(_.map(registerTerms, term => this.getTermDetails(term.id)))
+ .then(challengeTerms => (
+ _.map(challengeTerms, term => _.pick(term, 'id', 'title', 'agreed'))
+ ));
}
/**
From c9cd37ea89049d7312f0e2ea6924e42dc226af22 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Tue, 1 Sep 2020 23:20:14 -0300
Subject: [PATCH 3/5] fix: for #4782
https://github.com/topcoder-platform/community-app/issues/4782
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9312e245..47aab80e 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.21.3",
+ "version": "1000.21.4",
"dependencies": {
"auth0-js": "^6.8.4",
"config": "^3.2.0",
From 7eee20186586c0abba181a0a938b9c1cb04665f7 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Tue, 1 Sep 2020 23:24:09 -0300
Subject: [PATCH 4/5] fix: for #4782
Issue: https://github.com/topcoder-platform/community-app/issues/4782
note: committed again because previous version already used.
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 47aab80e..5afba0dc 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.21.4",
+ "version": "1000.21.7",
"dependencies": {
"auth0-js": "^6.8.4",
"config": "^3.2.0",
From c59092ba318e467cdaacd9335383b3cb69520e09 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Thu, 3 Sep 2020 12:19:09 -0300
Subject: [PATCH 5/5] fix: for #4752
Issue: https://github.com/topcoder-platform/community-app/issues/4752
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 5afba0dc..d1bb01a6 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.21.7",
+ "version": "1000.22.1",
"dependencies": {
"auth0-js": "^6.8.4",
"config": "^3.2.0",