From d33b1e65611cc1aab9add2788f81914a74b05862 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 29 Mar 2021 10:06:19 +0100
Subject: [PATCH] DashboardQueryEditor: Run query after selecting source panel
 (#32383) (#32395)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a4b0ad39375045795cf8409b0c0751f1040f324c)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
---
 public/app/features/query/components/QueryGroup.tsx      | 9 ++++++++-
 .../datasource/dashboard/DashboardQueryEditor.tsx        | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 086561780e9..dc164555440 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -277,7 +277,14 @@ export class QueryGroup extends PureComponent<Props, State> {
     const { data } = this.state;
 
     if (isSharedDashboardQuery(dsSettings.name)) {
-      return <DashboardQueryEditor queries={options.queries} panelData={data} onChange={this.onQueriesChange} />;
+      return (
+        <DashboardQueryEditor
+          queries={options.queries}
+          panelData={data}
+          onChange={this.onQueriesChange}
+          onRunQueries={onRunQueries}
+        />
+      );
     }
 
     return (
diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
index de9dd0ac39d..7e5ea4ddab4 100644
--- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
+++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
@@ -21,6 +21,7 @@ interface Props {
   queries: DataQuery[];
   panelData: PanelData;
   onChange: (queries: DataQuery[]) => void;
+  onRunQueries: () => void;
 }
 
 type State = {
@@ -97,6 +98,7 @@ export class DashboardQueryEditor extends PureComponent<Props, State> {
         panelId: id,
       } as DashboardQuery,
     ]);
+    this.props.onRunQueries();
   };
 
   renderQueryData(editURL: string) {