Skip to content
Snippets Groups Projects
Commit 0939f36c authored by esikkala's avatar esikkala
Browse files

Simplify stateToUrl function

parent f1e0c6e8
No related branches found
No related tags found
No related merge requests found
...@@ -83,10 +83,6 @@ const fetchResultsEpic = (action$, state$) => action$.pipe( ...@@ -83,10 +83,6 @@ const fetchResultsEpic = (action$, state$) => action$.pipe(
const params = stateToUrl({ const params = stateToUrl({
facets: state[`${facetClass}Facets`].facets, facets: state[`${facetClass}Facets`].facets,
facetClass: facetClass, facetClass: facetClass,
page: null,
pagesize: null,
sortBy: null,
sortDirection: null,
}); });
const requestUrl = `${apiUrl}${resultClass}/all?${params}`; const requestUrl = `${apiUrl}${resultClass}/all?${params}`;
return ajax.getJSON(requestUrl).pipe( return ajax.getJSON(requestUrl).pipe(
...@@ -105,6 +101,7 @@ const fetchResultsEpic = (action$, state$) => action$.pipe( ...@@ -105,6 +101,7 @@ const fetchResultsEpic = (action$, state$) => action$.pipe(
} }
})) }))
); );
}) })
); );
...@@ -116,10 +113,6 @@ const fetchResultCountEpic = (action$, state$) => action$.pipe( ...@@ -116,10 +113,6 @@ const fetchResultCountEpic = (action$, state$) => action$.pipe(
const params = stateToUrl({ const params = stateToUrl({
facets: state[`${facetClass}Facets`].facets, facets: state[`${facetClass}Facets`].facets,
facetClass: facetClass, facetClass: facetClass,
page: null,
pagesize: null,
sortBy: null,
sortDirection: null
}); });
const requestUrl = `${apiUrl}${resultClass}/count?${params}`; const requestUrl = `${apiUrl}${resultClass}/count?${params}`;
return ajax.getJSON(requestUrl).pipe( return ajax.getJSON(requestUrl).pipe(
...@@ -183,10 +176,6 @@ const fetchByURIEpic = (action$, state$) => action$.pipe( ...@@ -183,10 +176,6 @@ const fetchByURIEpic = (action$, state$) => action$.pipe(
const params = stateToUrl({ const params = stateToUrl({
facets: facetClass == null ? null : state[`${facetClass}Facets`].facets, facets: facetClass == null ? null : state[`${facetClass}Facets`].facets,
facetClass: facetClass, facetClass: facetClass,
page: null,
pagesize: null,
sortBy: null,
sortDirection: null,
}); });
const requestUrl = `${apiUrl}${resultClass}/instance/${encodeURIComponent(uri)}?${params}`; const requestUrl = `${apiUrl}${resultClass}/instance/${encodeURIComponent(uri)}?${params}`;
return ajax.getJSON(requestUrl).pipe( return ajax.getJSON(requestUrl).pipe(
...@@ -218,9 +207,6 @@ const fetchFacetEpic = (action$, state$) => action$.pipe( ...@@ -218,9 +207,6 @@ const fetchFacetEpic = (action$, state$) => action$.pipe(
const { sortBy, sortDirection } = facet; const { sortBy, sortDirection } = facet;
const params = stateToUrl({ const params = stateToUrl({
facets: facets, facets: facets,
facetClass: null,
page: null,
pagesize: null,
sortBy: sortBy, sortBy: sortBy,
sortDirection: sortDirection, sortDirection: sortDirection,
}); });
...@@ -249,11 +235,12 @@ const fetchFacetEpic = (action$, state$) => action$.pipe( ...@@ -249,11 +235,12 @@ const fetchFacetEpic = (action$, state$) => action$.pipe(
export const stateToUrl = ({ export const stateToUrl = ({
facets, facets,
facetClass, facetClass = null,
page, page = null,
pagesize, pagesize = null,
sortBy, sortBy = null,
sortDirection, sortDirection = null,
resultFormat = null
}) => { }) => {
let params = {}; let params = {};
if (facetClass !== null) { params.facetClass = facetClass; } if (facetClass !== null) { params.facetClass = facetClass; }
...@@ -261,6 +248,7 @@ export const stateToUrl = ({ ...@@ -261,6 +248,7 @@ export const stateToUrl = ({
if (pagesize !== null) { params.pagesize = pagesize; } if (pagesize !== null) { params.pagesize = pagesize; }
if (sortBy !== null) { params.sortBy = sortBy; } if (sortBy !== null) { params.sortBy = sortBy; }
if (sortDirection !== null) { params.sortDirection = sortDirection; } if (sortDirection !== null) { params.sortDirection = sortDirection; }
if (resultFormat !== null) { params.resultFormat = resultFormat; }
if (facets !== null) { if (facets !== null) {
let constraints = {}; let constraints = {};
for (const [key, value] of Object.entries(facets)) { for (const [key, value] of Object.entries(facets)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment