Merge pull request #84 from kmiyauchi/master

Fixed the issue on switchurl middleware

Author: kmiyauchi

lib/util/visibilityFilter/middleware.js

@@ -22,7 +22,10 @@ var switchurl = function switchurl(state) {
     var mergedQuery = Object.assign({}, parsedURL.query, flattenedState);
     var urlString = Object.keys(mergedQuery).reduce(function (s, k) {
         if (mergedQuery[k]) {
-            return s + '&' + k + '=' + encodeURI(Array.isArray(mergedQuery[k]) ? mergedQuery[k].join(',') : mergedQuery[k]);
+            if (Array.isArray(mergedQuery[k])) {
+                return mergedQuery[k].length ? s + '&' + k + '=' + encodeURI(mergedQuery[k].join(',')) : s;
+            }
+            return s + '&' + k + '=' + encodeURI(mergedQuery[k]);
         }
         return s;
     }, '');

lib/util/visibilityFilter/reducer.js

@@ -28,7 +28,8 @@ var visibilityFilterReducer = exports.visibilityFilterReducer = function visibil
                 var idx = _state[action.key][action.filter.key].indexOf(action.filter.value);
                 if (idx !== -1) {
                     _state[action.key][action.filter.key].splice(idx, 1);
-                    if (_state[action.key][action.filter.key].length === 0) delete _state[action.key][action.filter.key];
+                    // if (_state[action.key][action.filter.key].length === 0)
+                    // delete _state[action.key][action.filter.key];
                 } else {
                     _state[action.key][action.filter.key].push(action.filter.value);
                 }

src/util/visibilityFilter/middleware.js

@@ -17,11 +17,10 @@ const switchurl = state => {
     const mergedQuery = Object.assign({}, parsedURL.query, flattenedState);
     const urlString = Object.keys(mergedQuery).reduce((s, k) => {
         if (mergedQuery[k]) {
-            return `${s}&${k}=${encodeURI(
-                Array.isArray(mergedQuery[k])
-                    ? mergedQuery[k].join(',')
-                    : mergedQuery[k],
-            )}`;
+            if (Array.isArray(mergedQuery[k])) {
+                return mergedQuery[k].length ? `${s}&${k}=${encodeURI(mergedQuery[k].join(','))}` : s;
+            }
+            return `${s}&${k}=${encodeURI(mergedQuery[k])}`;
         }
         return s;
     }, '');

src/util/visibilityFilter/reducer.js

@@ -22,8 +22,8 @@ export const visibilityFilterReducer = (state = defaultState, action) => {
             );
             if (idx !== -1) {
                 _state[action.key][action.filter.key].splice(idx, 1);
-                if (_state[action.key][action.filter.key].length === 0)
-                    delete _state[action.key][action.filter.key];
+                // if (_state[action.key][action.filter.key].length === 0)
+                    // delete _state[action.key][action.filter.key];
             } else {
                 _state[action.key][action.filter.key].push(action.filter.value);
             }