Upgrade redux-observable

package-lock.json

@@ -7945,11 +7945,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "gitbook-plugin-github": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gitbook-plugin-github/-/gitbook-plugin-github-2.0.0.tgz",
-      "integrity": "sha1-UWbnY8/MQC1DKIC3pshcHFS1ao0="
-    },
     "gl-mat3": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gl-mat3/-/gl-mat3-1.0.0.tgz",
@@ -13274,12 +13269,9 @@
       }
     },
     "redux-observable": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/redux-observable/-/redux-observable-0.18.0.tgz",
-      "integrity": "sha512-tu02n6jr6/bq/vyI9E/AHxIyIl0YsWloqvWqSBG0KqN6aQBujMBP6hlDAlQLj8hP+XQpqL293MLX6V612c0jSg==",
-      "requires": {
-        "gitbook-plugin-github": "^2.0.0"
-      }
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redux-observable/-/redux-observable-1.0.0.tgz",
+      "integrity": "sha512-6bXnpqWTBeLaLQjXHyN1giXq4nLxCmv+SUkdmiwBgvmVxvDbdmydvL1Z7DGo0WItyzI/kqXQKiucUuTxnrPRkA=="
     },
     "redux-responsive": {
       "version": "4.3.8",
@@ -13802,7 +13794,6 @@
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -13971,7 +13962,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }

package.json

@@ -87,7 +87,7 @@
     "react-virtualized": "^9.21.0",
     "recompose": "^0.28.2",
     "redux": "^4.0.1",
-    "redux-observable": "^0.18.0",
+    "redux-observable": "^1.0.0",
     "redux-responsive": "^4.3.8",
     "rxjs": "^6.3.3",
     "rxjs-compat": "^6.3.3",

src/client/epics/index.js

@@ -55,10 +55,12 @@ const getPlace = action$ => action$.pipe(
   })
 );
 
-const getFacet = action$ => action$.pipe(
+const getFacet = (action$, state$) => action$.pipe(
   ofType(FETCH_FACET),
-  mergeMap(() => {
+  withLatestFrom(state$),
+  mergeMap(([, state]) => {
     const requestUrl = `${apiUrl}facet`;
+    //console.log(state.facet)
     //const facetFilters = state$.getState().facet.facetFilters;
     //let str = Object.entries(facetFilters).map(([key, set]) => `${key}=${Array.from(set)}`).join('&');
     return ajax.getJSON(requestUrl).pipe(

src/client/index.js

@@ -17,18 +17,21 @@ import 'react-redux-toastr/lib/css/react-redux-toastr.min.css';
 import 'react-virtualized/styles.css';
 
 const history = createBrowserHistory();
+const epicMiddleware = createEpicMiddleware();
 
 const store = createStore(
   createRootReducer(history), // root reducer with router state
   compose(
     responsiveStoreEnhancer,
     applyMiddleware(
-      createEpicMiddleware(rootEpic),
+      epicMiddleware,
       routerMiddleware(history)
     )
   )
 );
 
+epicMiddleware.run(rootEpic);
+
 bindActionCreators(toastrActions, store.dispatch);
 
 render(