Merge branch 'praveeno-issue/47' into bugbash

Author: luizrrodrigues

src/containers/Challenges/Listing/index.jsx

@@ -27,6 +27,7 @@ const Listing = ({
   bucket,
   sortByLabels,
   isLoggedIn,
+  tags,
 }) => {
   const sortByOptions = utils.createDropdownOptions(
     sortByLabels,
@@ -106,7 +107,7 @@ const Listing = ({
             <ChallengeItem
               challenge={challenge}
               onClickTag={(tag) => {
-                const filterChange = { search: tag };
+                const filterChange = { tags: [tag] };
                 updateFilter(filterChange);
               }}
               onClickTrack={(track) => {

src/containers/Challenges/index.jsx

@@ -28,6 +28,7 @@ const Challenges = ({
   updateQuery,
   userLoggedIn,
   isLoggedIn,
+  tags,
 }) => {
   const latestPropsRef = useRef(null);
   latestPropsRef.current = { userLoggedIn };
@@ -84,6 +85,7 @@ const Challenges = ({
               updateQuery(filterChange);
             }}
             bucket={bucket}
+            tags={tags}
             sortByLabels={sortByLabels}
             isLoggedIn={isLoggedIn}
           />
@@ -109,6 +111,7 @@ Challenges.propTypes = {
   initialized: PT.bool,
   updateQuery: PT.func,
   isLoggedIn: PT.bool,
+  tags: PT.arrayOf(PT.string),
 };
 
 const mapStateToProps = (state) => ({
@@ -126,6 +129,7 @@ const mapStateToProps = (state) => ({
   recommendedChallenges: state.challenges.recommendedChallenges,
   initialized: state.challenges.initialized,
   isLoggedIn: state.lookup.isLoggedIn,
+  tags: state.filter.challenge.tags,
 });
 
 const mapDispatchToProps = {

src/containers/Filter/ChallengeFilter/index.jsx

@@ -33,7 +33,7 @@ const ChallengeFilter = ({
   openForRegistrationCount,
 }) => {
   // const BUCKET_OPEN_FOR_REGISTRATION = constants.FILTER_BUCKETS[1];
-  const tagOptions = utils.createDropdownTermOptions(challengeTags);
+  const tagOptions = utils.createDropdownTermOptions(challengeTags, tags);
   const bucketOptions = utils.createRadioOptions(challengeBuckets, bucket);
 
   const caseSensitive = false;

src/utils/index.js

@@ -48,7 +48,7 @@ export function setSelectedDropdownOptions(options, selectedValues) {
 export function createDropdownTermOptions(values, selectedValues) {
   return values.map((value) => ({
     label: `${value}`,
-    selected: !!selectedValues && selectedValues.includes[value],
+    selected: !!selectedValues && selectedValues.includes(value),
   }));
 }