From 40c49911d8cf24fb332612d496372961f7a5465f Mon Sep 17 00:00:00 2001
From: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com>
Date: Wed, 30 Oct 2024 13:52:59 +0530
Subject: [PATCH 1/2] fix: datasopurce name not reflecting in schema pane

---
 .../src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
index 7d283d140f59..54d13072d079 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
@@ -21,6 +21,7 @@ import type { SourceEntity } from "entities/AppsmithConsole";
 import type { Action } from "entities/Action";
 import QueryResponseTab from "PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab";
 import {
+  getDatasource,
   getDatasourceStructureById,
   getPluginDatasourceComponentFromId,
 } from "ee/selectors/entitiesSelector";
@@ -97,6 +98,10 @@ function QueryDebuggerTabs({
     ),
   );
 
+  const datasource = useSelector((state) =>
+    getDatasource(state, currentActionConfig?.datasource?.id ?? ""),
+  );
+
   useEffect(() => {
     if (
       currentActionConfig?.datasource?.id &&
@@ -252,7 +257,7 @@ function QueryDebuggerTabs({
         <Schema
           currentActionId={currentActionConfig.id}
           datasourceId={currentActionConfig.datasource.id || ""}
-          datasourceName={currentActionConfig.datasource.name || ""}
+          datasourceName={datasource?.name || ""}
         />
       ),
     });

From 7ce9eecc394ba81c0ee692c474bbec29c3093310 Mon Sep 17 00:00:00 2001
From: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:37:26 +0530
Subject: [PATCH 2/2] fix: unit test failure

---
 .../src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
index 23de0834cd0d..6b6097e1b5b9 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
@@ -24,6 +24,7 @@ const storeState = {
     },
     datasources: {
       structure: {},
+      list: [],
     },
   },
   ui: {