From fb5e6ef9cfcfa61a652c20eb51c4fef403f7dfe4 Mon Sep 17 00:00:00 2001 From: jacovinus Date: Fri, 24 Feb 2023 13:03:03 +0100 Subject: [PATCH] fix: decode url bug --- src/components/QueryItem/QueriesContainer.tsx | 11 ++++++----- src/helpers/UpdateStateFromQueryParams.ts | 4 +++- src/views/Main/helpers.ts | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/QueryItem/QueriesContainer.tsx b/src/components/QueryItem/QueriesContainer.tsx index 559b75fb..5d6ad697 100644 --- a/src/components/QueryItem/QueriesContainer.tsx +++ b/src/components/QueryItem/QueriesContainer.tsx @@ -11,15 +11,16 @@ const QueriesContainerStyled = styled.div` `; export default function QueriesContainer(props: any) { const { queries } = props; - const queriesLoad = useMemo(()=>queries,[queries]) + + const queriesLoad = useMemo(() => { + return queries; + }, [queries]); return ( {queriesLoad && + queriesLoad?.length > 0 && queriesLoad.map((query: any, idx: number) => ( - + ))} ); diff --git a/src/helpers/UpdateStateFromQueryParams.ts b/src/helpers/UpdateStateFromQueryParams.ts index 1d1ccf9d..8b53a699 100644 --- a/src/helpers/UpdateStateFromQueryParams.ts +++ b/src/helpers/UpdateStateFromQueryParams.ts @@ -162,7 +162,9 @@ export function UpdateStateFromQueryParams() { [] ); - dispatch(STORE_ACTIONS[param](parsed)); + if(parsed?.length > 0) { + dispatch(STORE_ACTIONS[param](parsed)); + } } catch (e) { console.log(e); } diff --git a/src/views/Main/helpers.ts b/src/views/Main/helpers.ts index b4518c06..f2263f84 100644 --- a/src/views/Main/helpers.ts +++ b/src/views/Main/helpers.ts @@ -53,7 +53,7 @@ export function updateDataSourcesWithUrl( if (apiUrl === "") { urlApi = true; - apiUrl = url; + apiUrl = decodeURIComponent(url); } const dsCP = [...dataSources];