From 6f4bedda341b76e01fd8f7e088b0e1d8f1e3cf68 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 12:41:51 +0100
Subject: [PATCH] [v10.0.x] Variables: Remount query editor when datasource
 changed (#70745)

Variables: Remount query editor when datasource changed (#70615)

(cherry picked from commit 6c900b84bd6334b1169ba53bb5853d82e2c7281b)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 public/app/features/variables/query/QueryVariableEditor.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/features/variables/query/QueryVariableEditor.tsx b/public/app/features/variables/query/QueryVariableEditor.tsx
index 49b239fac1c..50bd589a9e5 100644
--- a/public/app/features/variables/query/QueryVariableEditor.tsx
+++ b/public/app/features/variables/query/QueryVariableEditor.tsx
@@ -152,6 +152,7 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
       return (
         <Field label="Query">
           <VariableQueryEditor
+            key={datasource.uid}
             datasource={datasource}
             query={query}
             templateSrv={getTemplateSrv()}
@@ -167,6 +168,7 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
       return (
         <Field label="Query">
           <VariableQueryEditor
+            key={datasource.uid}
             datasource={datasource}
             query={query}
             onChange={this.onQueryChange}