From d2cf13a9a242a5bf8bb0f530b78665ebcdddc7af Mon Sep 17 00:00:00 2001 From: dannyrb Date: Thu, 7 May 2020 23:08:19 -0400 Subject: [PATCH] simplify useQuery --- platform/viewer/src/hooks/useQuery.js | 47 ++------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/platform/viewer/src/hooks/useQuery.js b/platform/viewer/src/hooks/useQuery.js index 0542e656b..53cd66595 100644 --- a/platform/viewer/src/hooks/useQuery.js +++ b/platform/viewer/src/hooks/useQuery.js @@ -1,48 +1,5 @@ -import { useCallback } from 'react'; -import { useLocation, useHistory } from 'react-router-dom'; - -const isEmpty = str => str === undefined || str === null || str === ''; +import { useLocation } from 'react-router-dom'; export default function useQuery() { - const location = useLocation(); - const history = useHistory(); - - const _getQueryStringValues = values => { - const qs = getQueryString(); - - Object.keys(values).forEach(name => { - const value = values[name]; - - if (name === 'studyDate') return null; - - if (!isEmpty(value)) { - qs.set(name, value); - } else { - qs.delete(name); - } - }); - - return qs; - }; - - const getQueryString = () => { - return new URLSearchParams(location.search); - }; - - const setQueryString = values => { - const queryParams = _getQueryStringValues(values); - _updateUrl(queryParams.toString()); - }; - - const _updateUrl = queryValues => { - const url = `${location.pathname}?${queryValues}`; - console.log('url', url); - /** - * TODO: when history.push is called, there's an infinite loop happening. - * Figure out why it's happening to fix. Maybe some callback? useCallback? - */ - // history.push(url); - }; - - return { getQueryString, setQueryString }; + return new URLSearchParams(useLocation().search); }