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

[Fix]: selected time in right container to be used in query-range (#4842)

Browse Source
This commit is contained in:
Rajat Dabade 2024-04-09 13:48:54 +05:30 committed by GitHub
parent 6815a96d29
commit 25b74b48a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/container/NewWidget/LeftContainer/index.tsx
View File

@ -25,6 +25,7 @@ function LeftContainer({
selectedTracesFields, selectedTracesFields,
setSelectedTracesFields, setSelectedTracesFields,
selectedWidget, selectedWidget,
selectedTime,
}: WidgetGraphProps): JSX.Element { }: WidgetGraphProps): JSX.Element {
const { stagedQuery, redirectWithQueryBuilderData } = useQueryBuilder(); const { stagedQuery, redirectWithQueryBuilderData } = useQueryBuilder();
const { selectedDashboard } = useDashboard(); const { selectedDashboard } = useDashboard();
@ -50,7 +51,7 @@ function LeftContainer({
return { return {
query: updatedQuery, query: updatedQuery,
graphType: PANEL_TYPES.LIST, graphType: PANEL_TYPES.LIST,
selectedTime: 'GLOBAL_TIME', selectedTime: selectedTime.enum || 'GLOBAL_TIME',
globalSelectedInterval, globalSelectedInterval,
tableParams: { tableParams: {
pagination: { pagination: {
@ -65,12 +66,13 @@ function LeftContainer({
if (stagedQuery) { if (stagedQuery) {
setRequestData((prev) => ({ setRequestData((prev) => ({
...prev, ...prev,
selectedTime: selectedTime.enum || prev.selectedTime,
graphType: getGraphType(selectedGraph || selectedWidget.panelTypes), graphType: getGraphType(selectedGraph || selectedWidget.panelTypes),
query: stagedQuery, query: stagedQuery,
})); }));
} }
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [stagedQuery]); }, [stagedQuery, selectedTime]);
const queryResponse = useGetQueryRange( const queryResponse = useGetQueryRange(
requestData, requestData,

1
frontend/src/container/NewWidget/index.tsx
View File

@ -401,6 +401,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
selectedTracesFields={selectedTracesFields} selectedTracesFields={selectedTracesFields}
setSelectedTracesFields={setSelectedTracesFields} setSelectedTracesFields={setSelectedTracesFields}
selectedWidget={selectedWidget} selectedWidget={selectedWidget}
selectedTime={selectedTime}
/> />
)} )}
</LeftContainerWrapper> </LeftContainerWrapper>

3
frontend/src/container/NewWidget/types.ts
View File

@ -6,6 +6,8 @@ import { SuccessResponse } from 'types/api';
import { Widgets } from 'types/api/dashboard/getAll'; import { Widgets } from 'types/api/dashboard/getAll';
import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange'; import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
import { timePreferance } from './RightContainer/timeItems';
export interface NewWidgetProps { export interface NewWidgetProps {
selectedGraph: PANEL_TYPES; selectedGraph: PANEL_TYPES;
yAxisUnit: Widgets['yAxisUnit']; yAxisUnit: Widgets['yAxisUnit'];
@ -21,6 +23,7 @@ export interface WidgetGraphProps {
>; >;
selectedWidget: Widgets; selectedWidget: Widgets;
selectedGraph: PANEL_TYPES; selectedGraph: PANEL_TYPES;
selectedTime: timePreferance;
} }
export type WidgetGraphContainerProps = { export type WidgetGraphContainerProps = {