adjust the groups param

Author: LieutenantRoger

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

@@ -17,7 +17,9 @@ const mockDatas = [{
       communityName: 'Sample community',
     },
   ],
-  filterState: {},
+  filterState: {
+    groups: []
+  },
   hidden: true,
   onSaveFilter,
   selectCommunity,
@@ -34,7 +36,9 @@ const mockDatas = [{
       communityName: 'Sample community',
     },
   ],
-  filterState: {},
+  filterState: {
+    groups: []
+  },
   hidden: false,
   onSaveFilter,
   selectCommunity,

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

@@ -96,6 +96,7 @@ exports[`Matches shallow shapshot 1`] = `
           }
           selectRef={[Function]}
           simpleValue={true}
+          value=""
           valueRenderer={[Function]}
         />
       </div>
@@ -291,6 +292,7 @@ exports[`Matches shallow shapshot 2`] = `
           }
           selectRef={[Function]}
           simpleValue={true}
+          value=""
           valueRenderer={[Function]}
         />
       </div>

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

@@ -241,11 +241,11 @@ export default function FiltersPanel({
               // onChange={selectCommunity}
               onChange={(value) => {
                 const group = value;
-                setFilterState({ ..._.clone(filterState), group });
+                setFilterState({ ..._.clone(filterState), groups: group === '' ? [] : [group] });
               }}
               options={communityOps}
               simpleValue
-              value={filterState.group}
+              value={filterState.groups.length === 0 ? '' : filterState.groups[0]}
               valueRenderer={option => (
                 <span styleName="active-community">
                   {option.name}
@@ -355,7 +355,7 @@ export default function FiltersPanel({
               name: '',
               tags: [],
               types: [],
-              group: '',
+              groups: [],
               startDateStart: null,
               endDateEnd: null,
             });

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

@@ -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', 'group'],
+    ['tags', 'types', 'name', 'startDateStart', 'endDateEnd', 'groups'],
   ), 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: [],
-      group: '',
+      groups: [],
       startDateStart: null,
       endDateEnd: null,
     },

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

@@ -174,7 +174,8 @@ export function filterChanged(filter, prevFilter) {
   || (filter.name !== prevFilter.name)
   || (filter.startDateStart !== prevFilter.startDateStart)
   || (filter.endDateEnd !== prevFilter.endDateEnd)
-  || (filter.group !== prevFilter.group)
+  // eslint-disable-next-line max-len
+  || (filter.groups.length !== prevFilter.groups.length || filter.groups[0] !== prevFilter.groups[0])
   || _.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

@@ -46,8 +46,9 @@ export function updateQuery(update) {
    * set as undefined in the objects to be merged, rather than deleting such
    * fields in the target object. */
   _.forIn(update, (value, key) => {
-    if (_.isArray(value)) filterArray.push(value.map(item => `${key}[]=${item}`).join('&'));
-    else if (_.isUndefined(value) || _.isEmpty(value)) delete query[key];
+    if (_.isArray(value) && value.length > 0) filterArray.push(value.map(item => `${key}[]=${item}`).join('&'));
+    // eslint-disable-next-line max-len
+    else if (_.isUndefined(value) || _.isEmpty(value) || (_.isArray(value) && value.length === 0)) delete query[key];
     else query += `${key}=${value}`;
   });
   if (query === '?') {