Merge pull request appirio-tech#206 from royshouvik/fix-1140

Fix issue #1140

Author: tladendo

components/ChallengeFilters/ChallengeFiltersExample.jsx

@@ -68,11 +68,16 @@ const serialize = filter => filter.getURLEncoded();
 
 
 // helper function to de-serialize query string to filter object
-const deserialize = queryString => new SideBarFilter({
-  filter: queryString,
-  isSavedFilter: true, // So that we can reuse constructor for deserializing
-  isCustomFilter: true,
-});
+const deserialize = queryString => {
+  const filter = new SideBarFilter({
+    filter: queryString,
+    isSavedFilter: true, // So that we can reuse constructor for deserializing
+  });
+  if (!_.values(SideBarFilterModes).includes(filter.name)) {
+    filter.isCustomFilter = true;
+  }
+  return filter;
+}
 
 // The demo component itself.
 class ChallengeFiltersExample extends React.Component {

components/SideBarFilters/SideBarFilters.jsx

@@ -104,10 +104,18 @@ class SideBarFilters extends React.Component {
     // A fancy staff: if the parent has passed a filter, which does not exists
     // (it is taken from a deep link), we add it to the list of filters and
     // also select it.
-    const f = new SideBarFilter(props.filter);
-    f.count = props.challenges.filter(f.getFilterFunction()).length;
-    this.state.currentFilter = f;
-    this.state.filters.push(f);
+    // if the filter is one of the default filters then 
+    // select it by default. We check on name and assume that 
+    // a custom filter will never be named the same as a default filter.
+    if (_.values(MODE).includes(props.filter.name)) {
+      this.state.currentFilter = DEFAULT_FILTERS[_.values(MODE).indexOf(props.filter.name)]
+    }
+    else {
+      const f = new SideBarFilter(props.filter);
+      f.count = props.challenges.filter(f.getFilterFunction()).length;
+      this.state.currentFilter = f;
+      this.state.filters.push(f);
+    }
   }
 
 
@@ -401,6 +409,7 @@ class SideBarFilters extends React.Component {
     if (currentFilter.mode === "Open for review") {
       // Jump to Development Review Opportunities page
       window.location.href = `${this.props.config.MAIN_URL}/review/development-review-opportunities/`;
+      return;
     }
     this.setState({ currentFilter }, () => this.props.onFilter(currentFilter));
   }