From 9b05220e4eb74a4c12c20e82411e6ed448d3c975 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:13:07 +0100 Subject: [PATCH] [v10.0.x] CloudMonitoring: Correctly set new query on type change (#69577) CloudMonitoring: Correctly set new query on type change (#69573) Correctly set new query on type change (cherry picked from commit 7bd85faa7fd67604e9082870b6b8be878c90cd7e) Co-authored-by: Andreas Christou --- .../components/MetricQueryEditor.tsx | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx index 3375a3dd17d..62970cf97f9 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx @@ -69,19 +69,24 @@ function Editor({ useEffect(() => { if (query.queryType === QueryType.TIME_SERIES_LIST && !query.timeSeriesList) { - onChangeTimeSeriesList(defaultTimeSeriesList(datasource)); + onQueryChange({ + refId: query.refId, + datasource: query.datasource, + queryType: QueryType.TIME_SERIES_LIST, + intervalMs: query.intervalMs, + timeSeriesList: defaultTimeSeriesList(datasource), + }); } if (query.queryType === QueryType.TIME_SERIES_QUERY && !query.timeSeriesQuery) { - onChangeTimeSeriesQuery(defaultTimeSeriesQuery(datasource)); + onQueryChange({ + refId: query.refId, + datasource: query.datasource, + queryType: QueryType.TIME_SERIES_QUERY, + intervalMs: query.intervalMs, + timeSeriesQuery: defaultTimeSeriesQuery(datasource), + }); } - }, [ - onChangeTimeSeriesList, - onChangeTimeSeriesQuery, - query.queryType, - query.timeSeriesList, - query.timeSeriesQuery, - datasource, - ]); + }, [onQueryChange, query, datasource]); return (