diff --git a/package-lock.json b/package-lock.json index a6fcdf7175ef6be565ade439af9c16b1abf7dfc6..69eeb13b8dcbe044c4d1ec612e5f125b1b85535e 100644 --- a/package-lock.json +++ b/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" } diff --git a/package.json b/package.json index d88b51401f73841bf3a179427d06c899f1971af1..6aa2be3be397cd28cb95a82dc8a32fa2f039c3bd 100644 --- a/package.json +++ b/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", diff --git a/src/client/epics/index.js b/src/client/epics/index.js index 083ca292daae089f68613843b014429b10c21a94..a3e106dfb0314b5d88edb5df34c2e88e1f4e761e 100644 --- a/src/client/epics/index.js +++ b/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( diff --git a/src/client/index.js b/src/client/index.js index c2c4bca8b075d94995f6bb4b766aeb30d2dc1508..315c9e11292137fb788401ce38f6dc2b11d71279 100644 --- a/src/client/index.js +++ b/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(