Merge pull request #5058 from gets0ul/issue-5050

fix: issue #5050

Author: luizrrodrigues

src/shared/components/challenge-detail/Header/ChallengeTags.jsx

@@ -63,10 +63,10 @@ export default function ChallengeTags(props) {
         && (
           <TrackTag
             onClick={() => (
-              setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
+              setImmediate(() => setChallengeListingFilter({ types: [challengeType.abbreviation] }))
             )
             }
-            to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
+            to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.abbreviation)}`}
           >
             {challengeType.name}
           </TrackTag>

src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx

@@ -50,7 +50,7 @@ export default function ChallengeFilters({
   if (filterState.endDateEnd || filterState.startDateStart) filterRulesCount += 1;
   if (isReviewOpportunitiesBucket && filterState.reviewOpportunityType) filterRulesCount += 1;
   if (selectedCommunityId !== '' && selectedCommunityId !== 'All') filterRulesCount += 1;
-  const isTrackOn = track => filterState.tracks[track];
+  const isTrackOn = track => filterState.tracks && filterState.tracks[track];
 
   const switchTrack = (track, on) => {
     const newFilter = _.cloneDeep(filterState);

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

@@ -250,7 +250,7 @@ export default function FiltersPanel({
               }}
               options={communityOps}
               simpleValue
-              value={filterState.groups.length === 0 ? '' : filterState.groups[0]}
+              value={filterState.groups && filterState.groups.length ? filterState.groups[0] : ''}
               valueRenderer={option => (
                 <span styleName="active-community">
                   {option.name}

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

@@ -423,7 +423,7 @@ function onSetFilter(state, { payload }) {
   // console.log(`======`);
   return {
     ...state,
-    filter: payload,
+    filter: _.assign({}, state.filter, payload),
 
     /* Page numbers of past/upcoming challenges depend on the filters. To keep
      * the code simple we just reset them each time a filter is modified. */

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

@@ -167,15 +167,12 @@ export function filterChanged(filter, prevFilter) {
   if (!filter || !prevFilter) {
     return true;
   }
-  return (filter.tracks.Dev !== prevFilter.tracks.Dev)
-  || (filter.tracks.Des !== prevFilter.tracks.Des)
-  || (filter.tracks.DS !== prevFilter.tracks.DS)
-  || (filter.tracks.QA !== prevFilter.tracks.QA)
+  return (!_.isEqual(filter.tracks, prevFilter.tracks))
   || (filter.name !== prevFilter.name)
   || (filter.startDateStart !== prevFilter.startDateStart)
   || (filter.endDateEnd !== prevFilter.endDateEnd)
   // eslint-disable-next-line max-len
-  || (filter.groups.length !== prevFilter.groups.length || filter.groups[0] !== prevFilter.groups[0])
+  || (!_.isEqual(filter.groups, prevFilter.groups))
   || _.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