fix last commit breaking other filters

Author: lightmare

src/containers/Filter/ChallengeFilter/index.jsx

@@ -214,6 +214,8 @@ const ChallengeFilter = ({
               <span key={subCommunity.communityName}>
                 <Checkbox
                   checked={
+                    // select all if query filters neither events nor groups
+                    events.length + groups.length === 0 ||
                     events.includes(
                       utils.challenge.getCommunityEvent(subCommunity)
                     ) ||
@@ -227,22 +229,40 @@ const ChallengeFilter = ({
                     );
                     const filterChange = { events, groups };
 
+                    if (events.length + groups.length === 0) {
+                      // select all if query filters neither events nor groups
+                      filterChange.events = challengeSubCommunities
+                        .filter(utils.challenge.isTCOEventCommunity)
+                        .map(utils.challenge.getCommunityEvent);
+                      filterChange.groups = challengeSubCommunities
+                        .filter(utils.challenge.isGroupCommunity)
+                        .map(utils.challenge.getCommunityGroup);
+                    }
+
                     if (isTCOEvent) {
                       const scEvent = utils.challenge.getCommunityEvent(
                         subCommunity
                       );
                       filterChange.events = checked
-                        ? _.union(events, [scEvent])
-                        : _.without(events, scEvent);
+                        ? _.union(filterChange.events, [scEvent])
+                        : _.without(filterChange.events, scEvent);
                     } else {
                       const scGroup = utils.challenge.getCommunityGroup(
                         subCommunity
                       );
                       filterChange.groups = checked
-                        ? _.union(groups, [scGroup])
-                        : _.without(groups, scGroup);
+                        ? _.union(filterChange.groups, [scGroup])
+                        : _.without(filterChange.groups, scGroup);
                     }
 
+                    // turn off community filters if all sub-communities are selected
+                    if (
+                      filterChange.groups.length + filterChange.events.length >=
+                      challengeSubCommunities.length
+                    ) {
+                      filterChange.events = [];
+                      filterChange.groups = [];
+                    }
                     updateFilter(filterChange);
                   }}
                 />

src/containers/Filter/index.jsx

@@ -58,12 +58,6 @@ const Filter = ({
         updateQuery(filterChange);
       }}
       updateFilter={(filterChange) => {
-        // turn off community filters if all sub-communities are selected
-        const n = filterChange.groups.length + filterChange.events.length;
-        if (n >= challengeSubCommunities.length) {
-          filterChange.events = [];
-          filterChange.groups = [];
-        }
         updateFilter(filterChange);
         updateQuery(filterChange);
       }}
@@ -96,32 +90,6 @@ Filter.propTypes = {
   updateQuery: PT.func,
 };
 
-function getSelectedCommunityEvents(state) {
-  if (
-    state.filter.challenge.events.length > 0 ||
-    state.filter.challenge.groups.length > 0
-  ) {
-    return state.filter.challenge.events;
-  } else {
-    return state.lookup.subCommunities
-      .filter(utils.challenge.isTCOEventCommunity)
-      .map(utils.challenge.getCommunityEvent);
-  }
-}
-
-function getSelectedCommunityGroups(state) {
-  if (
-    state.filter.challenge.events.length > 0 ||
-    state.filter.challenge.groups.length > 0
-  ) {
-    return state.filter.challenge.groups;
-  } else {
-    return state.lookup.subCommunities
-      .filter(utils.challenge.isGroupCommunity)
-      .map(utils.challenge.getCommunityGroup);
-  }
-}
-
 const mapStateToProps = (state) => ({
   state: state,
   bucket: state.filter.challenge.bucket,
@@ -131,8 +99,8 @@ const mapStateToProps = (state) => ({
   totalPrizesFrom: state.filter.challenge.totalPrizesFrom,
   totalPrizesTo: state.filter.challenge.totalPrizesTo,
   recommended: state.filter.challenge.recommended,
-  events: getSelectedCommunityEvents(state),
-  groups: getSelectedCommunityGroups(state),
+  events: state.filter.challenge.events,
+  groups: state.filter.challenge.groups,
   challengeBuckets: state.lookup.buckets,
   challengeTypes: state.lookup.types,
   challengeTracks: state.lookup.tracks,