From e272e239d0b21eebc9db8be90828ebda6c263d38 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 20 Sep 2021 04:11:51 -0400
Subject: [PATCH] Explore: Fixed default data source loading (#37059) (#39379)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
(cherry picked from commit 64f898c5f6287f4f1b79d7c9cd093e5652ec4980)

Co-authored-by: Assaf Dayan <asfdyn@gmail.com>
---
 public/app/features/explore/ExploreToolbar.tsx  | 2 +-
 public/app/features/explore/state/datasource.ts | 4 ++--
 public/app/features/explore/state/utils.ts      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index e505251eea6..d3e42087edb 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -31,7 +31,7 @@ type Props = OwnProps & ConnectedProps<typeof connector>;
 
 export class UnConnectedExploreToolbar extends PureComponent<Props> {
   onChangeDatasource = async (dsSettings: DataSourceInstanceSettings) => {
-    this.props.changeDatasource(this.props.exploreId, dsSettings.name, { importQueries: true });
+    this.props.changeDatasource(this.props.exploreId, dsSettings.uid, { importQueries: true });
   };
 
   onClearAll = () => {
diff --git a/public/app/features/explore/state/datasource.ts b/public/app/features/explore/state/datasource.ts
index 54755dd5208..c1db1b22fff 100644
--- a/public/app/features/explore/state/datasource.ts
+++ b/public/app/features/explore/state/datasource.ts
@@ -35,12 +35,12 @@ export const updateDatasourceInstanceAction = createAction<UpdateDatasourceInsta
  */
 export function changeDatasource(
   exploreId: ExploreId,
-  datasourceName: string,
+  datasourceUid: string,
   options?: { importQueries: boolean }
 ): ThunkResult<void> {
   return async (dispatch, getState) => {
     const orgId = getState().user.orgId;
-    const { history, instance } = await loadAndInitDatasource(orgId, datasourceName);
+    const { history, instance } = await loadAndInitDatasource(orgId, datasourceUid);
     const currentDataSourceInstance = getState().explore[exploreId]!.datasourceInstance;
 
     dispatch(
diff --git a/public/app/features/explore/state/utils.ts b/public/app/features/explore/state/utils.ts
index f6215106ec2..9f959f975fe 100644
--- a/public/app/features/explore/state/utils.ts
+++ b/public/app/features/explore/state/utils.ts
@@ -60,11 +60,11 @@ export const createEmptyQueryResponse = (): PanelData => ({
 
 export async function loadAndInitDatasource(
   orgId: number,
-  datasourceName?: string
+  datasourceUid?: string
 ): Promise<{ history: HistoryItem[]; instance: DataSourceApi }> {
   let instance;
   try {
-    instance = await getDatasourceSrv().get(datasourceName);
+    instance = await getDatasourceSrv().get(datasourceUid);
   } catch (error) {
     // Falling back to the default data source in case the provided data source was not found.
     // It may happen if last used data source or the data source provided in the URL has been