GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 07:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: added new function to decide new path based on button clicked

Browse Source
This commit is contained in:
rahulkeswani101 2024-09-26 17:26:14 +05:30
parent 6685482ea6
commit f4fbe62169
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/container/MetricsApplication/Tabs/Overview.tsx
View File

@ -46,6 +46,7 @@ import TopOperationMetrics from './Overview/TopOperationMetrics';
import { Button, Card } from './styles'; import { Button, Card } from './styles';
import { IServiceName } from './types'; import { IServiceName } from './types';
import { import {
generateExplorerPath,
handleNonInQueryRange, handleNonInQueryRange,
onGraphClickHandler, onGraphClickHandler,
onViewTracePopupClick, onViewTracePopupClick,
@ -208,7 +209,7 @@ function Application(): JSX.Element {
const urlParams = new URLSearchParams(search); const urlParams = new URLSearchParams(search);
urlParams.set(QueryParams.startTime, currentTime.toString()); urlParams.set(QueryParams.startTime, currentTime.toString());
urlParams.set(QueryParams.endTime, tPlusOne.toString()); urlParams.set(QueryParams.endTime, tPlusOne.toString());
urlParams.delete('relativeTime'); urlParams.delete(QueryParams.relativeTime);
const avialableParams = routeConfig[ROUTES.TRACE]; const avialableParams = routeConfig[ROUTES.TRACE];
const queryString = getQueryString(avialableParams, urlParams); const queryString = getQueryString(avialableParams, urlParams);
@ -216,12 +217,14 @@ function Application(): JSX.Element {
JSON.stringify(apmToTraceQuery), JSON.stringify(apmToTraceQuery),
); );
const basePath = isViewLogsClicked const newPath = generateExplorerPath(
? ROUTES.LOGS_EXPLORER isViewLogsClicked,
: ROUTES.TRACES_EXPLORER; urlParams,
const newPath = `${basePath}?${urlParams.toString()}&selected={"serviceName":["${servicename}"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&${ servicename,
QueryParams.compositeQuery selectedTraceTags,
}=${JSONCompositeQuery}&${queryString.join('&')}`; JSONCompositeQuery,
queryString,
);
history.push(newPath); history.push(newPath);
}, },

34
frontend/src/container/MetricsApplication/Tabs/util.ts
View File

@ -36,6 +36,24 @@ interface OnViewTracePopupClickProps {
apmToTraceQuery: Query; apmToTraceQuery: Query;
isViewLogsClicked?: boolean; isViewLogsClicked?: boolean;
} }
export function generateExplorerPath(
isViewLogsClicked: boolean | undefined,
urlParams: URLSearchParams,
servicename: string | undefined,
selectedTraceTags: string,
JSONCompositeQuery: string,
queryString: string[],
): string {
const basePath = isViewLogsClicked
? ROUTES.LOGS_EXPLORER
: ROUTES.TRACES_EXPLORER;
return `${basePath}?${urlParams.toString()}&selected={"serviceName":["${servicename}"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&${
QueryParams.compositeQuery
}=${JSONCompositeQuery}&${queryString.join('&')}`;
}
export function onViewTracePopupClick({ export function onViewTracePopupClick({
selectedTraceTags, selectedTraceTags,
servicename, servicename,
@ -51,7 +69,7 @@ export function onViewTracePopupClick({
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
urlParams.set(QueryParams.startTime, currentTime.toString()); urlParams.set(QueryParams.startTime, currentTime.toString());
urlParams.set(QueryParams.endTime, tPlusOne.toString()); urlParams.set(QueryParams.endTime, tPlusOne.toString());
urlParams.delete('relativeTime'); urlParams.delete(QueryParams.relativeTime);
const avialableParams = routeConfig[ROUTES.TRACE]; const avialableParams = routeConfig[ROUTES.TRACE];
const queryString = getQueryString(avialableParams, urlParams); const queryString = getQueryString(avialableParams, urlParams);
@ -59,12 +77,14 @@ export function onViewTracePopupClick({
JSON.stringify(apmToTraceQuery), JSON.stringify(apmToTraceQuery),
); );
const basePath = isViewLogsClicked const newPath = generateExplorerPath(
? ROUTES.LOGS_EXPLORER isViewLogsClicked,
: ROUTES.TRACES_EXPLORER; urlParams,
const newPath = `${basePath}?${urlParams.toString()}&selected={"serviceName":["${servicename}"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&${ servicename,
QueryParams.compositeQuery selectedTraceTags,
}=${JSONCompositeQuery}&${queryString.join('&')}`; JSONCompositeQuery,
queryString,
);
history.push(newPath); history.push(newPath);
}; };