diff --git a/src/client/epics/index.js b/src/client/epics/index.js index c3e199c9c4cb1aa0e49df873b6263579b32d725f..52690b300ad37b2098b8e91224162ba06be1de8f 100644 --- a/src/client/epics/index.js +++ b/src/client/epics/index.js @@ -83,10 +83,6 @@ const fetchResultsEpic = (action$, state$) => action$.pipe( const params = stateToUrl({ facets: state[`${facetClass}Facets`].facets, facetClass: facetClass, - page: null, - pagesize: null, - sortBy: null, - sortDirection: null, }); const requestUrl = `${apiUrl}${resultClass}/all?${params}`; return ajax.getJSON(requestUrl).pipe( @@ -105,6 +101,7 @@ const fetchResultsEpic = (action$, state$) => action$.pipe( } })) ); + }) ); @@ -116,10 +113,6 @@ const fetchResultCountEpic = (action$, state$) => action$.pipe( const params = stateToUrl({ facets: state[`${facetClass}Facets`].facets, facetClass: facetClass, - page: null, - pagesize: null, - sortBy: null, - sortDirection: null }); const requestUrl = `${apiUrl}${resultClass}/count?${params}`; return ajax.getJSON(requestUrl).pipe( @@ -183,10 +176,6 @@ const fetchByURIEpic = (action$, state$) => action$.pipe( const params = stateToUrl({ facets: facetClass == null ? null : state[`${facetClass}Facets`].facets, facetClass: facetClass, - page: null, - pagesize: null, - sortBy: null, - sortDirection: null, }); const requestUrl = `${apiUrl}${resultClass}/instance/${encodeURIComponent(uri)}?${params}`; return ajax.getJSON(requestUrl).pipe( @@ -218,9 +207,6 @@ const fetchFacetEpic = (action$, state$) => action$.pipe( const { sortBy, sortDirection } = facet; const params = stateToUrl({ facets: facets, - facetClass: null, - page: null, - pagesize: null, sortBy: sortBy, sortDirection: sortDirection, }); @@ -249,11 +235,12 @@ const fetchFacetEpic = (action$, state$) => action$.pipe( export const stateToUrl = ({ facets, - facetClass, - page, - pagesize, - sortBy, - sortDirection, + facetClass = null, + page = null, + pagesize = null, + sortBy = null, + sortDirection = null, + resultFormat = null }) => { let params = {}; if (facetClass !== null) { params.facetClass = facetClass; } @@ -261,6 +248,7 @@ export const stateToUrl = ({ if (pagesize !== null) { params.pagesize = pagesize; } if (sortBy !== null) { params.sortBy = sortBy; } if (sortDirection !== null) { params.sortDirection = sortDirection; } + if (resultFormat !== null) { params.resultFormat = resultFormat; } if (facets !== null) { let constraints = {}; for (const [key, value] of Object.entries(facets)) {