From 3527f529605050832e18b03fa94dbc95997f121a Mon Sep 17 00:00:00 2001 From: QooQooDass Date: Thu, 28 Mar 2024 12:02:01 +0900 Subject: [PATCH] [#noissue] Fix route query in switching pages --- .../src/main/v3/packages/ui/src/pages/Inspector.tsx | 8 +++++++- .../src/main/v3/packages/utils/src/helper/route.ts | 13 +++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/web-frontend/src/main/v3/packages/ui/src/pages/Inspector.tsx b/web-frontend/src/main/v3/packages/ui/src/pages/Inspector.tsx index 90ca56a811ca..e6a22b2ed9a1 100644 --- a/web-frontend/src/main/v3/packages/ui/src/pages/Inspector.tsx +++ b/web-frontend/src/main/v3/packages/ui/src/pages/Inspector.tsx @@ -47,7 +47,13 @@ export const InspectorPage = () => { navigate(getInspectorPath(application, { version }))} + onClickApplication={(application) => + navigate( + `${getInspectorPath(application)}?${convertParamsToQueryString({ + version, + })}`, + ) + } /> {application && (
diff --git a/web-frontend/src/main/v3/packages/utils/src/helper/route.ts b/web-frontend/src/main/v3/packages/utils/src/helper/route.ts index b85b3e86df63..4fdcac68e3ba 100644 --- a/web-frontend/src/main/v3/packages/utils/src/helper/route.ts +++ b/web-frontend/src/main/v3/packages/utils/src/helper/route.ts @@ -27,15 +27,12 @@ export const getApplicationPath = let queryString = ''; if (application?.applicationName && application.serviceType) { subPath = `/${application.applicationName}@${application.serviceType}`; - if (queryParams) { - queryString = `${convertParamsToQueryString({ ...queryParams })}`; + if (queryParams?.from && queryParams?.to) { + queryString = `${convertParamsToQueryString({ + from: queryParams.from, + to: queryParams.to, + })}`; } - // if (queryParams?.from && queryParams?.to) { - // queryString = `${convertParamsToQueryString({ - // from: queryParams.from, - // to: queryParams.to, - // })}`; - // } return `${pagePath}${subPath}${queryString ? `?${queryString}` : queryString}`; }