fixed for enabling/disabling Clear button

Author: nqviet

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

@@ -225,8 +225,6 @@ export default function FiltersPanel({
       data: getLabel(community),
     }));
 
-  const disableClearFilterButtons = isFilterEmpty(filterState);
-
   // const mapOps = item => ({ label: item, value: item });
   const mapTypes = item => ({ label: item.name, value: item.abbreviation });
   const getCommunityOption = () => {
@@ -249,6 +247,7 @@ export default function FiltersPanel({
 
   const staticRanges = createStaticRanges();
   const past = isPastBucket(activeBucket);
+  const disableClearFilterButtons = isFilterEmpty(filterState, past ? 'past' : '', activeBucket);
 
   return (
     <div styleName="FiltersPanel">

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

@@ -907,7 +907,7 @@ function create(initialState) {
         DS: true,
         QA: true,
       },
-      name: '',
+      search: '',
       tags: [],
       types: [],
       groups: [],

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

@@ -211,21 +211,51 @@ export function sortChangedBucket(sorts, prevSorts) {
   return '';
 }
 
-export function isFilterEmpty(filter) {
-  const f = _.pick(filter, 'tracks', 'search', 'types', 'startDateEnd', 'endDateStart', 'reviewOpportunityTypes');
-  const empty = {
-    tracks: {
-      Dev: true,
-      Des: true,
-      DS: true,
-      QA: true,
-    },
-    search: '',
-    types: ['CH', 'F2F', 'TSK'],
-    startDateEnd: null,
-    endDateStart: null,
-    reviewOpportunityTypes: _.keys(REVIEW_OPPORTUNITY_TYPES),
-  };
+export function isFilterEmpty(filter, tab, bucket) {
+  let f;
+  let empty;
+
+  if (tab === 'past') {
+    f = _.pick(filter, 'tracks', 'search', 'types', 'startDateEnd', 'endDateStart');
+    if (f.types) f.types = [...f.types].sort();
+    empty = {
+      tracks: {
+        Dev: true,
+        Des: true,
+        DS: true,
+        QA: true,
+      },
+      search: '',
+      types: ['CH', 'F2F', 'TSK'],
+      startDateEnd: null,
+      endDateStart: null,
+    };
+  } else if (bucket === BUCKETS.REVIEW_OPPORTUNITIES) {
+    f = _.pick(filter, 'tracks', 'search', 'reviewOpportunityTypes');
+    empty = {
+      tracks: {
+        Dev: true,
+        Des: true,
+        DS: true,
+        QA: true,
+      },
+      search: '',
+      reviewOpportunityTypes: _.keys(REVIEW_OPPORTUNITY_TYPES),
+    };
+  } else {
+    f = _.pick(filter, 'tracks', 'search', 'types');
+    if (f.types) f.types = [...f.types].sort();
+    empty = {
+      tracks: {
+        Dev: true,
+        Des: true,
+        DS: true,
+        QA: true,
+      },
+      search: '',
+      types: ['CH', 'F2F', 'TSK'],
+    };
+  }
 
   return _.isEqual(f, empty);
 }