From 874f2fafb2fa4c56423773902af419335390f140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 7 Dec 2020 15:37:30 +0100
Subject: [PATCH] Expressions: Restore showing expression query editor even if
 main data source is not mixed (#29656)

---
 public/app/features/query/components/QueryEditorRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index e0af8a410c5..e0722709db3 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -90,7 +90,7 @@ export class QueryEditorRow extends PureComponent<Props, State> {
 
   getQueryDataSourceIdentifier(): string | null | undefined {
     const { query, dsSettings } = this.props;
-    return dsSettings.meta.mixed ? query.datasource : dsSettings.uid;
+    return query.datasource ?? dsSettings.uid;
   }
 
   async loadDatasource() {