Merge pull request #236 from cagdas001/fix-4782-workaround

luizrrodrigues · web-flow · commit c3ce0ff9dae3 · 2020-09-01T23:17:02.000-03:00
Revert "fix(challenge-utils): update `filterByUsers` to use `userId`"
diff --git 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);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -180,11 +180,8 @@ function filterByUpcoming(challenge, state) {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`function filterByUsers(challenge, state) {`
`183`		`- const userId = _.get(state, 'userId', null);`
`184`		`- if (userId) {`
`185`		`- return _.get(challenge, ['users', userId], false);`
`186`		`- }`
`187`		`- return true;`
	`183`	`+ if (!state.userChallenges) return true;`
	`184`	`+ return state.userChallenges.find(ch => challenge.id === ch);`
`188`	`185`	`}`
`189`	`186`
`190`	`187`	`/**`