Merge pull request #235 from royshouvik/fix-tc-1188

Fix issue #1188

Author: tladendo

components/ChallengeFilters/ChallengeFiltersExample.jsx

@@ -307,9 +307,11 @@ class ChallengeFiltersExample extends React.Component {
 
   onFilterByTopFilter(filter, isSidebarFilter) {
     const mergedFilter = Object.assign({}, this.state.filter, filter);
-    const updatedFilter = new SideBarFilter(mergedFilter);
+    let updatedFilter = new SideBarFilter(mergedFilter);
     if (!isSidebarFilter) {
       updatedFilter.mode = SideBarFilterModes.CUSTOM;
+    } else {
+      updatedFilter = this.state.filter.copySidebarFilterProps(updatedFilter);
     }
     this.setState({ filter: updatedFilter }, this.saveFiltersToHash.bind(this, updatedFilter));
   }

components/SideBarFilters/SideBarFilter.js

@@ -104,6 +104,13 @@ class SideBarFilter extends ChallengeFilter {
     return this;
   }
 
+  copySidebarFilterProps(filter) {
+    if (!filter._isSideBarFilter) return this;
+    this.name = _.clone(filter.name);
+    this.uuid = _.clone(filter.uuid);
+    return this;
+  }
+
   stringify() {
     return btoa(JSON.stringify([
       super.stringify(),

components/SideBarFilters/SideBarFilters.jsx

@@ -425,13 +425,14 @@ class SideBarFilters extends React.Component {
    */
   selectFilterWithName(filterName) {
     // find a filter with matching name
-    const currentFilter = _.find(this.state.filters, filter => filter.name === filterName);
-    if (currentFilter.mode === 'Open for review') {
+    const selectedFilter = _.find(this.state.filters, filter => filter.name === filterName);
+    if (selectedFilter.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));
+    const mergedFilter = this.props.filter.copySidebarFilterProps(selectedFilter);
+    this.setState({ currentFilter: mergedFilter }, () => this.props.onFilter(mergedFilter));
   }
 
   /**