Merge pull request #150 from yoution/issue-126

Issue #126
Issue #110

Author: LieutenantRoger

src/routers/challenge-list/index.jsx

@@ -36,7 +36,8 @@ const App = () => {
       return;
     }
 
-    const params = utils.url.parseUrlQuery(location.search);
+    let search = location.href.split('?').length ? '?' + location.href.split('?')[1]: ''
+    const params = utils.url.parseUrlQuery(search);
     const toUpdate = utils.challenge.createChallengeFilter(params);
 
     if (!toUpdate.types) toUpdate.types = [];

src/services/challenges.js

@@ -17,7 +17,7 @@ import { getService as getSubmissionsService } from "./submissions";
  * @return {Array<Object>} challenges
  */
 async function getChallenges(filter, cancellationSignal) {
-  const challengeQuery = util.buildQueryString(filter);
+  const challengeQuery = util.buildQueryString(filter, true);
   return api.get(
     `/challenges/${challengeQuery}`,
     undefined,

src/utils/url.js

@@ -15,9 +15,11 @@ import qs from "qs";
  * @params {Object<{[key: string]: any}>} params Query string parameters
  * @return {String}
  */
-export function buildQueryString(params) {
+export function buildQueryString(params, disableEncode) {
   params = _.omitBy(params, (p) => p == null || p === "" || p.length === 0);
-
+  if (!disableEncode) {
+    params.tags = _.map(params.tags, (t) => encodeURIComponent(t))
+  }
   let queryString = qs.stringify(params, {
     encode: false,
     arrayFormat: "brackets",
@@ -28,7 +30,11 @@ export function buildQueryString(params) {
 }
 
 export function parseUrlQuery(queryString) {
-  return qs.parse(queryString, { ignoreQueryPrefix: true });
+  let params =  qs.parse(queryString, { ignoreQueryPrefix: true });
+  if (params.tags) {
+    params.tags = _.map(params.tags, (t) => decodeURIComponent(t))
+  }
+  return params
 }
 
 export function updateQuery(params) {