diff --git a/frontend/src/container/NewWidget/LeftContainer/index.tsx b/frontend/src/container/NewWidget/LeftContainer/index.tsx index 31363fc201..6bc429c1c7 100644 --- a/frontend/src/container/NewWidget/LeftContainer/index.tsx +++ b/frontend/src/container/NewWidget/LeftContainer/index.tsx @@ -25,6 +25,7 @@ function LeftContainer({ selectedTracesFields, setSelectedTracesFields, selectedWidget, + selectedTime, }: WidgetGraphProps): JSX.Element { const { stagedQuery, redirectWithQueryBuilderData } = useQueryBuilder(); const { selectedDashboard } = useDashboard(); @@ -50,7 +51,7 @@ function LeftContainer({ return { query: updatedQuery, graphType: PANEL_TYPES.LIST, - selectedTime: 'GLOBAL_TIME', + selectedTime: selectedTime.enum || 'GLOBAL_TIME', globalSelectedInterval, tableParams: { pagination: { @@ -65,12 +66,13 @@ function LeftContainer({ if (stagedQuery) { setRequestData((prev) => ({ ...prev, + selectedTime: selectedTime.enum || prev.selectedTime, graphType: getGraphType(selectedGraph || selectedWidget.panelTypes), query: stagedQuery, })); } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [stagedQuery]); + }, [stagedQuery, selectedTime]); const queryResponse = useGetQueryRange( requestData, diff --git a/frontend/src/container/NewWidget/index.tsx b/frontend/src/container/NewWidget/index.tsx index 17802d4658..91a87d05dc 100644 --- a/frontend/src/container/NewWidget/index.tsx +++ b/frontend/src/container/NewWidget/index.tsx @@ -401,6 +401,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element { selectedTracesFields={selectedTracesFields} setSelectedTracesFields={setSelectedTracesFields} selectedWidget={selectedWidget} + selectedTime={selectedTime} /> )} diff --git a/frontend/src/container/NewWidget/types.ts b/frontend/src/container/NewWidget/types.ts index cf19131ea3..b6a86ad483 100644 --- a/frontend/src/container/NewWidget/types.ts +++ b/frontend/src/container/NewWidget/types.ts @@ -6,6 +6,8 @@ import { SuccessResponse } from 'types/api'; import { Widgets } from 'types/api/dashboard/getAll'; import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange'; +import { timePreferance } from './RightContainer/timeItems'; + export interface NewWidgetProps { selectedGraph: PANEL_TYPES; yAxisUnit: Widgets['yAxisUnit']; @@ -21,6 +23,7 @@ export interface WidgetGraphProps { >; selectedWidget: Widgets; selectedGraph: PANEL_TYPES; + selectedTime: timePreferance; } export type WidgetGraphContainerProps = {