From 313c88f3e1fbf009d67d2e6578deb9b9fa4e4f08 Mon Sep 17 00:00:00 2001
From: Guilherme Caulada <guilherme.caulada@grafana.com>
Date: Mon, 17 Oct 2022 22:11:59 -0300
Subject: [PATCH] Reapply public dashboard granularity fix (#57129)

---
 public/app/features/query/state/PanelQueryRunner.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index 7ab528877b1..3f3a2c480b8 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -374,11 +374,10 @@ async function getDataSource(
     return datasource;
   }
 
-  // TODO: Retrieve datasource to pass as argument to PublicDashboardDataSource
-  // const ds = await getDatasourceSrv().get(datasource, scopedVars);
+  const ds = await getDatasourceSrv().get(datasource, scopedVars);
   if (publicDashboardAccessToken) {
-    return new PublicDashboardDataSource(datasource);
+    return new PublicDashboardDataSource(ds);
   }
 
-  return await getDatasourceSrv().get(datasource, scopedVars);
+  return ds;
 }