integrate sub-community filter

Author: LieutenantRoger

__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap

@@ -81,7 +81,7 @@ exports[`Matches shallow shapshot 1`] = `
           autoBlur={true}
           clearable={false}
           id="community-select"
-          onChange={[MockFunction]}
+          onChange={[Function]}
           options={
             Array [
               Object {
@@ -96,7 +96,6 @@ exports[`Matches shallow shapshot 1`] = `
           }
           selectRef={[Function]}
           simpleValue={true}
-          value="1"
           valueRenderer={[Function]}
         />
       </div>
@@ -277,7 +276,7 @@ exports[`Matches shallow shapshot 2`] = `
           autoBlur={true}
           clearable={false}
           id="community-select"
-          onChange={[MockFunction]}
+          onChange={[Function]}
           options={
             Array [
               Object {
@@ -292,7 +291,6 @@ exports[`Matches shallow shapshot 2`] = `
           }
           selectRef={[Function]}
           simpleValue={true}
-          value="1"
           valueRenderer={[Function]}
         />
       </div>

src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx

@@ -51,7 +51,7 @@ export default function FiltersPanel({
   onClose,
   // onSaveFilter,
   selectCommunity,
-  selectedCommunityId,
+  // selectedCommunityId,
   setFilterState,
   setSearchText,
   validKeywords,
@@ -238,10 +238,14 @@ export default function FiltersPanel({
               autoBlur
               clearable={false}
               id="community-select"
-              onChange={selectCommunity}
+              // onChange={selectCommunity}
+              onChange={(value) => {
+                const group = value;
+                setFilterState({ ..._.clone(filterState), group });
+              }}
               options={communityOps}
               simpleValue
-              value={selectedCommunityId}
+              value={filterState.group}
               valueRenderer={option => (
                 <span styleName="active-community">
                   {option.name}
@@ -351,7 +355,7 @@ export default function FiltersPanel({
               name: '',
               tags: [],
               types: [],
-              communityId: 'All',
+              group: '',
               startDateStart: null,
               endDateEnd: null,
             });
@@ -403,7 +407,7 @@ FiltersPanel.propTypes = {
   isReviewOpportunitiesBucket: PT.bool,
   // onSaveFilter: PT.func,
   selectCommunity: PT.func.isRequired,
-  selectedCommunityId: PT.string.isRequired,
+  // selectedCommunityId: PT.string.isRequired,
   setFilterState: PT.func.isRequired,
   setSearchText: PT.func.isRequired,
   validKeywords: PT.arrayOf(PT.string).isRequired,

src/shared/reducers/challenge-listing/index.js

@@ -381,8 +381,8 @@ function onSelectCommunity(state, { payload }) {
       * the code simple we just reset them each time a filter is modified.
       * (This community selection defines community-specific filter for
       * challenges). */
-    allPastChallengesLoaded: false,
-    lastRequestedPageOfPastChallenges: -1,
+    // allPastChallengesLoaded: false,
+    // lastRequestedPageOfPastChallenges: -1,
     // pastSearchTimestamp: -1,
   };
 }
@@ -400,7 +400,7 @@ function onSetFilter(state, { payload }) {
    * do it very carefuly (many params are not validated). */
   const filter = _.pickBy(_.pick(
     payload,
-    ['tags', 'types', 'name', 'startDateStart', 'endDateEnd'],
+    ['tags', 'types', 'name', 'startDateStart', 'endDateEnd', 'group'],
   ), value => (!_.isArray(value) && value && value !== '') || (_.isArray(value) && value.length > 0));
   // if (_.isPlainObject(filter.tags)) {
   //   filter.tags = _.values(filter.tags);
@@ -802,7 +802,7 @@ function create(initialState) {
       name: '',
       tags: [],
       types: [],
-      communityId: 'All',
+      group: '',
       startDateStart: null,
       endDateEnd: null,
     },

src/shared/utils/challenge-listing/buckets.js

@@ -174,6 +174,7 @@ export function filterChanged(filter, prevFilter) {
   || (filter.name !== prevFilter.name)
   || (filter.startDateStart !== prevFilter.startDateStart)
   || (filter.endDateEnd !== prevFilter.endDateEnd)
+  || (filter.group !== prevFilter.group)
   || _.filter(filter.tags, val => _.indexOf(prevFilter.tags, val) < 0).length > 0
   || _.filter(prevFilter.tags, val => _.indexOf(filter.tags, val) < 0).length > 0
   || _.filter(filter.types, val => _.indexOf(prevFilter.types, val) < 0).length > 0

src/shared/utils/url.js

@@ -47,7 +47,7 @@ export function updateQuery(update) {
    * fields in the target object. */
   _.forIn(update, (value, key) => {
     if (_.isArray(value)) filterArray.push(value.map(item => `${key}[]=${item}`).join('&'));
-    else if (_.isUndefined(value)) delete query[key];
+    else if (_.isUndefined(value) || _.isEmpty(value)) delete query[key];
     else query += `${key}=${value}`;
   });
   if (query === '?') {