diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSource.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSource.tsx
index e2ed7ece141d..59ed5b49a27e 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSource.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSource.tsx
@@ -1,32 +1,30 @@
 import React from "react";
-import { Flex } from "@appsmith/ads";
+import { Flex, Icon } from "@appsmith/ads";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
 import { EntityIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import { useSelector } from "react-redux";
-import {
-  getPluginIdFromDatasourceId,
-  getPluginImages,
-} from "ee/selectors/entitiesSelector";
+import { getPluginImages } from "ee/selectors/entitiesSelector";
 
 interface Props {
-  datasourceId: string;
   datasourceName: string;
+  pluginId: string;
 }
 
-const CurrentDataSource = ({ datasourceId, datasourceName }: Props) => {
-  const { pluginId, pluginImages } = useSelector((state) => ({
-    pluginId: getPluginIdFromDatasourceId(state, datasourceId),
-    pluginImages: getPluginImages(state),
-  }));
+const CurrentDataSource = ({ datasourceName, pluginId }: Props) => {
+  const pluginImages = useSelector((state) => getPluginImages(state));
 
   const datasourceIcon = pluginId ? pluginImages?.[pluginId] : undefined;
 
   return (
     <Flex alignItems="center" gap="spaces-2">
       <EntityIcon height="16px" width="16px">
-        <img alt="entityIcon" src={getAssetUrl(datasourceIcon)} />
+        {datasourceIcon ? (
+          <img alt="entityIcon" src={getAssetUrl(datasourceIcon)} />
+        ) : (
+          <Icon name="datasource-v3" />
+        )}
       </EntityIcon>
-      {datasourceName}
+      {datasourceName || "NA"}
     </Flex>
   );
 };
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSourceLink.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSourceLink.tsx
index 8ba3acdf1e1c..e23378a47455 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSourceLink.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/CurrentDataSourceLink.tsx
@@ -6,9 +6,11 @@ import { useGoToDatasource } from "PluginActionEditor/components/PluginActionRes
 const CurrentDataSourceLink = ({
   datasourceId,
   datasourceName,
+  pluginId,
 }: {
   datasourceId: string;
   datasourceName: string;
+  pluginId: string;
 }) => {
   const { goToDatasource } = useGoToDatasource();
 
@@ -19,10 +21,7 @@ const CurrentDataSourceLink = ({
 
   return (
     <Link onClick={handleClick}>
-      <CurrentDataSource
-        datasourceId={datasourceId}
-        datasourceName={datasourceName}
-      />
+      <CurrentDataSource datasourceName={datasourceName} pluginId={pluginId} />
     </Link>
   );
 };
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
index acfa33571870..6c4dac8e1c68 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
@@ -55,7 +55,7 @@ const DatasourceInfo = ({
         datasourceName={datasourceName}
         plugin={plugin}
       />
-      {showEditButton && (
+      {showEditButton && datasourceName && (
         <Tooltip content={createMessage(EDIT_DS_CONFIG)} placement="top">
           <Button
             isIconButton
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/PluginDatasourceSelector.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/PluginDatasourceSelector.tsx
index b29c750f07db..b59d26ea397f 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/PluginDatasourceSelector.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/PluginDatasourceSelector.tsx
@@ -1,7 +1,11 @@
 import React from "react";
 import { useSelector } from "react-redux";
 import { Flex } from "@appsmith/ads";
-import { CREATE_NEW_DATASOURCE, createMessage } from "ee/constants/messages";
+import {
+  CREATE_NEW_DATASOURCE,
+  createMessage,
+  NOT_FOUND,
+} from "ee/constants/messages";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import {
@@ -66,7 +70,7 @@ export const PluginDatasourceSelector = ({
   const userWorkspacePermissions = useSelector(
     (state: AppState) => getCurrentAppWorkspace(state).userPermissions ?? [],
   );
-  const isChangePermitted = getHasManageActionPermission(
+  const isActionChangePermitted = getHasManageActionPermission(
     isFeatureEnabled,
     currentActionConfig?.userPermissions,
   );
@@ -108,15 +112,23 @@ export const PluginDatasourceSelector = ({
     });
   }
 
-  if (!showDatasourceSelector || !isChangePermitted) {
+  if (!showDatasourceSelector || !isActionChangePermitted) {
     return (
       <CurrentDataSourceLink
         datasourceId={datasourceId}
         datasourceName={datasourceName}
+        pluginId={plugin?.id || ""}
       />
     );
   }
 
+  if (DATASOURCES_OPTIONS.length < 1) {
+    DATASOURCES_OPTIONS.push({
+      label: createMessage(NOT_FOUND),
+      value: "not found",
+    });
+  }
+
   return (
     <Flex>
       <MenuField
@@ -126,8 +138,8 @@ export const PluginDatasourceSelector = ({
         options={DATASOURCES_OPTIONS}
       >
         <CurrentDataSource
-          datasourceId={datasourceId}
           datasourceName={datasourceName}
+          pluginId={plugin?.id || ""}
         />
       </MenuField>
     </Flex>
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
index 252643232aaf..605120debccb 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
@@ -19,13 +19,12 @@ export interface DatasourceProps {
 }
 
 const DatasourceSelector = (props: DatasourceProps) => {
-  return props.plugin ? (
+  return props.plugin &&
     API_FORM_COMPONENTS.includes(props.plugin.uiComponent) ? (
-      <ApiDatasourceSelector {...props} formName={API_EDITOR_FORM_NAME} />
-    ) : (
-      <QueryDatasourceSelector {...props} formName={QUERY_EDITOR_FORM_NAME} />
-    )
-  ) : null;
+    <ApiDatasourceSelector {...props} formName={API_EDITOR_FORM_NAME} />
+  ) : (
+    <QueryDatasourceSelector {...props} formName={QUERY_EDITOR_FORM_NAME} />
+  );
 };
 
 export default DatasourceSelector;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTab.tsx
similarity index 72%
rename from app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
rename to app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTab.tsx
index 1162f39978a0..1d59b34583a2 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTab.tsx
@@ -7,6 +7,7 @@ import {
   getIsFetchingDatasourceStructure,
   getPluginIdFromDatasourceId,
   getPluginDatasourceComponentFromId,
+  getDatasource,
 } from "ee/selectors/entitiesSelector";
 import type { AppState } from "ee/reducers";
 import { fetchDatasourceStructure } from "actions/datasourceActions";
@@ -26,6 +27,13 @@ import { useEditorType } from "ee/hooks";
 import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
 import DatasourceInfo from "./DatasourceInfo";
 import { getPlugin } from "ee/selectors/entitiesSelector";
+import {
+  getHasCreateDatasourceActionPermission,
+  getHasManageDatasourcePermission,
+  getHasReadDatasourcePermission,
+} from "ee/utils/BusinessFeatures/permissionPageHelpers";
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 
 interface Props {
   datasourceId: string;
@@ -33,17 +41,19 @@ interface Props {
   currentActionId: string;
 }
 
-const Datasource = (props: Props) => {
+const DatasourceTab = (props: Props) => {
   const dispatch = useDispatch();
 
+  const { datasourceId, datasourceName } = props;
+
   const datasourceStructure = useSelector((state) =>
-    getDatasourceStructureById(state, props.datasourceId),
+    getDatasourceStructureById(state, datasourceId),
   );
 
   const { responseTabHeight } = useSelector(getPluginActionDebuggerState);
 
   const pluginId = useSelector((state) =>
-    getPluginIdFromDatasourceId(state, props.datasourceId),
+    getPluginIdFromDatasourceId(state, datasourceId),
   );
 
   const plugin = useSelector((state) => getPlugin(state, pluginId || ""));
@@ -54,32 +64,51 @@ const Datasource = (props: Props) => {
   const [selectedTable, setSelectedTable] = useState<string>();
 
   const isLoading = useSelector((state: AppState) =>
-    getIsFetchingDatasourceStructure(state, props.datasourceId),
+    getIsFetchingDatasourceStructure(state, datasourceId),
   );
 
   const pluginDatasourceForm = useSelector((state) =>
     getPluginDatasourceComponentFromId(state, pluginId || ""),
   );
 
+  const datasource = useSelector((state) => getDatasource(state, datasourceId));
+
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+
+  const canCreateDatasourceActions = getHasCreateDatasourceActionPermission(
+    isFeatureEnabled,
+    datasource?.userPermissions || [],
+  );
+
+  const canReadDatasource = getHasReadDatasourcePermission(
+    isFeatureEnabled,
+    datasource?.userPermissions || [],
+  );
+
+  const canManageDatasource = getHasManageDatasourcePermission(
+    isFeatureEnabled,
+    datasource?.userPermissions || [],
+  );
+
   useEffect(
     function resetSelectedTable() {
       setSelectedTable(undefined);
     },
-    [props.datasourceId],
+    [datasourceId],
   );
 
   useEffect(
     function fetchDatasourceStructureEffect() {
       function fetchStructure() {
         if (
-          props.datasourceId &&
+          datasourceId &&
           datasourceStructure === undefined &&
           pluginDatasourceForm !==
             DatasourceComponentTypes.RestAPIDatasourceForm
         ) {
           dispatch(
             fetchDatasourceStructure(
-              props.datasourceId,
+              datasourceId,
               true,
               DatasourceStructureContext.QUERY_EDITOR,
             ),
@@ -89,7 +118,7 @@ const Datasource = (props: Props) => {
 
       fetchStructure();
     },
-    [props.datasourceId, datasourceStructure, dispatch, pluginDatasourceForm],
+    [datasourceId, datasourceStructure, dispatch, pluginDatasourceForm],
   );
 
   useEffect(
@@ -98,7 +127,7 @@ const Datasource = (props: Props) => {
         setSelectedTable(datasourceStructure.tables[0].name);
       }
     },
-    [selectedTable, props.datasourceId, isLoading, datasourceStructure],
+    [selectedTable, datasourceId, isLoading, datasourceStructure],
   );
 
   // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
@@ -106,14 +135,14 @@ const Datasource = (props: Props) => {
     const entryPoint = DatasourceEditEntryPoints.QUERY_EDITOR_DATASOURCE_SCHEMA;
 
     AnalyticsUtil.logEvent("EDIT_DATASOURCE_CLICK", {
-      datasourceId: props.datasourceId,
+      datasourceId,
       pluginName: "",
       entryPoint: entryPoint,
     });
 
     const url = datasourcesEditorIdURL({
       baseParentEntityId: parentEntityId,
-      datasourceId: props.datasourceId,
+      datasourceId,
       params: { ...omit(getQueryParams(), "viewMode"), viewMode: false },
       generateEditorPath: true,
     });
@@ -124,7 +153,12 @@ const Datasource = (props: Props) => {
   const getStatusState = () => {
     if (isLoading) return SchemaDisplayStatus.SCHEMA_LOADING;
 
-    if (!datasourceStructure) return SchemaDisplayStatus.NOSCHEMA;
+    /* When a user doesn't have view access on a datasource  */
+    if (!canReadDatasource) return SchemaDisplayStatus.NOACCESS;
+
+    /* When a user doesn't have create new query access but has view access on the datasource  */
+    if (!datasourceStructure || !canCreateDatasourceActions)
+      return SchemaDisplayStatus.NOSCHEMA;
 
     if (datasourceStructure && "error" in datasourceStructure)
       return SchemaDisplayStatus.FAILED;
@@ -144,10 +178,10 @@ const Datasource = (props: Props) => {
     return (
       <Flex flexDirection="column" padding="spaces-3">
         <DatasourceInfo
-          datasourceId={props.datasourceId}
-          datasourceName={props.datasourceName}
+          datasourceId={datasourceId}
+          datasourceName={datasourceName}
           plugin={plugin}
-          showEditButton={!isLoading}
+          showEditButton={!isLoading && canManageDatasource}
         />
         <StatusDisplay
           editDatasource={editDatasource}
@@ -171,8 +205,8 @@ const Datasource = (props: Props) => {
       <Flex h="100%">
         <DatasourceTables
           currentActionId={props.currentActionId}
-          datasourceId={props.datasourceId}
-          datasourceName={props.datasourceName}
+          datasourceId={datasourceId}
+          datasourceName={datasourceName}
           datasourceStructure={datasourceStructure}
           plugin={plugin}
           selectedTable={selectedTable}
@@ -200,4 +234,4 @@ const Datasource = (props: Props) => {
   );
 };
 
-export { Datasource };
+export { DatasourceTab };
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/index.tsx
index 5cf4489ec905..cb6f851d1f78 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/index.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/index.tsx
@@ -1 +1 @@
-export * from "./Datasource";
+export * from "./DatasourceTab";
diff --git a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
index 5562c634d254..a6825dabbd5b 100644
--- a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
+++ b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx
@@ -24,7 +24,7 @@ import {
 } from "PluginActionEditor/store";
 import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
 import useShowSchema from "PluginActionEditor/components/PluginActionResponse/hooks/useShowSchema";
-import { Datasource } from "PluginActionEditor/components/PluginActionResponse/components/DatasourceTab";
+import { DatasourceTab } from "PluginActionEditor/components/PluginActionResponse/components/DatasourceTab";
 import {
   useBlockExecution,
   useHandleRunClick,
@@ -64,10 +64,10 @@ function usePluginActionResponseTabs() {
         key: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
         title: "Datasource",
         panelComponent: (
-          <Datasource
+          <DatasourceTab
             currentActionId={action.id}
-            datasourceId={datasource?.id || ""}
-            datasourceName={datasource?.name || ""}
+            datasourceId={datasource?.id || action.datasource.id || ""}
+            datasourceName={datasource?.name || action.datasource.name || ""}
           />
         ),
       });
@@ -119,10 +119,10 @@ function usePluginActionResponseTabs() {
         key: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
         title: "Datasource",
         panelComponent: (
-          <Datasource
+          <DatasourceTab
             currentActionId={action.id}
-            datasourceId={datasource?.id || ""}
-            datasourceName={datasource?.name || ""}
+            datasourceId={datasource?.id || action.datasource.id || ""}
+            datasourceName={datasource?.name || action.datasource.name || ""}
           />
         ),
       });
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index d284e9e393df..84bea15b4b61 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -394,6 +394,7 @@ export const CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER = () => "Most popular";
 export const CREATE_NEW_DATASOURCE_REST_API = () => "REST API";
 export const SAMPLE_DATASOURCES = () => "Sample datasources";
 export const EDIT_DS_CONFIG = () => "Edit datasource configuration";
+export const NOT_FOUND = () => "Not found";
 
 export const ERROR_EVAL_ERROR_GENERIC = () =>
   `Unexpected error occurred while evaluating the application`;
diff --git a/app/client/src/ce/selectors/appIDESelectors.ts b/app/client/src/ce/selectors/appIDESelectors.ts
index 3d17b4894ef8..79d4fd62558b 100644
--- a/app/client/src/ce/selectors/appIDESelectors.ts
+++ b/app/client/src/ce/selectors/appIDESelectors.ts
@@ -8,7 +8,7 @@ import {
 import { getJSTabs, getQueryTabs } from "selectors/ideSelectors";
 import type { AppState } from "ee/reducers";
 import { identifyEntityFromPath } from "navigation/FocusEntity";
-import { getCurrentPageId } from "selectors/editorSelectors";
+import { getCurrentBasePageId } from "selectors/editorSelectors";
 import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
 
 export type EditorSegmentList = Array<{
@@ -74,10 +74,10 @@ export const selectQuerySegmentEditorTabs = (state: AppState) => {
 
 export const getLastQueryTab = createSelector(
   selectQuerySegmentEditorTabs,
-  getCurrentPageId,
-  (tabs, pageId) => {
+  getCurrentBasePageId,
+  (tabs, basePageId) => {
     if (tabs.length) {
-      const url = getQueryEntityItemUrl(tabs[tabs.length - 1], pageId);
+      const url = getQueryEntityItemUrl(tabs[tabs.length - 1], basePageId);
       const urlWithoutQueryParams = url.split("?")[0];
 
       return identifyEntityFromPath(urlWithoutQueryParams);
diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts
index 03262d1b6489..a020e93ad13a 100644
--- a/app/client/src/ce/selectors/entitiesSelector.ts
+++ b/app/client/src/ce/selectors/entitiesSelector.ts
@@ -1645,7 +1645,9 @@ export const getQuerySegmentItems = createSelector(
           ? "AI Queries"
           : datasourceIdToNameMap[action.config.datasource.id] ?? "AI Queries";
       } else {
-        group = datasourceIdToNameMap[action.config.datasource.id];
+        group =
+          action.config.datasource?.name ??
+          datasourceIdToNameMap[action.config.datasource?.id];
       }
 
       return {
diff --git a/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx b/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx
index f3c86a2d9874..8cd3dcb06c47 100644
--- a/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx
+++ b/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx
@@ -5,6 +5,9 @@ import { hasCreateWorkspacePermission as hasCreateWorkspacePermission_EE } from
 import { hasCreateDatasourcePermission as hasCreateDatasourcePermission_CE } from "ce/utils/permissionHelpers";
 import { hasCreateDatasourcePermission as hasCreateDatasourcePermission_EE } from "ee/utils/permissionHelpers";
 
+import { hasReadDatasourcePermission as hasReadDatasourcePermission_CE } from "ce/utils/permissionHelpers";
+import { hasReadDatasourcePermission as hasReadDatasourcePermission_EE } from "ee/utils/permissionHelpers";
+
 import { hasManageDatasourcePermission as hasManageDatasourcePermission_CE } from "ce/utils/permissionHelpers";
 import { hasManageDatasourcePermission as hasManageDatasourcePermission_EE } from "ee/utils/permissionHelpers";
 
@@ -58,6 +61,14 @@ export const getHasCreateDatasourcePermission = (
   else return hasCreateDatasourcePermission_CE(permissions);
 };
 
+export const getHasReadDatasourcePermission = (
+  isEnabled: boolean,
+  permissions?: string[],
+) => {
+  if (isEnabled) return hasReadDatasourcePermission_EE(permissions);
+  else return hasReadDatasourcePermission_CE(permissions);
+};
+
 export const getHasManageDatasourcePermission = (
   isEnabled: boolean,
   permissions?: string[],
diff --git a/app/client/src/ce/utils/permissionHelpers.tsx b/app/client/src/ce/utils/permissionHelpers.tsx
index 865ce2233f4a..429422765ed0 100644
--- a/app/client/src/ce/utils/permissionHelpers.tsx
+++ b/app/client/src/ce/utils/permissionHelpers.tsx
@@ -19,6 +19,7 @@ export enum PERMISSION_TYPE {
   CREATE_APPLICATION = "create:applications",
   /* Datasource permissions */
   CREATE_DATASOURCES = "create:datasources",
+  READ_DATASOURCES = "read:datasources",
   EXECUTE_DATASOURCES = "execute:datasources",
   CREATE_DATASOURCE_ACTIONS = "create:datasourceActions",
   DELETE_DATASOURCES = "delete:datasources",
@@ -85,6 +86,8 @@ export const hasCreateWorkspacePermission = (_permissions?: string[]) => true;
 
 export const hasCreateDatasourcePermission = (_permissions?: string[]) => true;
 
+export const hasReadDatasourcePermission = (_permissions?: string[]) => true;
+
 export const hasManageDatasourcePermission = (_permissions?: string[]) => true;
 
 export const hasManageWorkspaceDatasourcePermission = (
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
index 17d0a6a958be..65314ae7a727 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/QueryRender.test.tsx
@@ -14,9 +14,6 @@ import { getIDETestState } from "test/factories/AppIDEFactoryUtils";
 import { PageFactory } from "test/factories/PageFactory";
 import { screen, waitFor } from "@testing-library/react";
 import { GoogleSheetFactory } from "test/factories/Actions/GoogleSheetFactory";
-import { PluginActionContextProvider } from "PluginActionEditor";
-import { PluginPackageName, PluginType } from "entities/Action";
-import { DatasourceComponentTypes, UIComponentTypes } from "api/PluginApi";
 
 const FeatureFlags = {
   rollout_side_by_side_enabled: true,
@@ -329,17 +326,6 @@ describe("IDE URL rendering of Queries", () => {
   });
 
   describe("Postgres Routes", () => {
-    const mockPlugin = {
-      id: "plugin_id",
-      name: "Postgres",
-      packageName: PluginPackageName.POSTGRES,
-      type: PluginType.DB,
-      uiComponent: UIComponentTypes.UQIDbEditorForm,
-      datasourceComponent: DatasourceComponentTypes.AutoForm,
-      templates: {},
-      requiresDatasource: true,
-    };
-
     it("Renders Postgres routes in Full Screen", async () => {
       const page = PageFactory.build();
       const anQuery = PostgresFactory.build({
@@ -358,9 +344,7 @@ describe("IDE URL rendering of Queries", () => {
 
       const { getAllByText, getByRole, getByTestId } = render(
         <Route path={BUILDER_PATH}>
-          <PluginActionContextProvider action={anQuery} plugin={mockPlugin}>
-            <IDE />
-          </PluginActionContextProvider>
+          <IDE />
         </Route>,
         {
           url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/queries/${anQuery.baseId}`,
@@ -418,9 +402,7 @@ describe("IDE URL rendering of Queries", () => {
 
       const { getAllByText, getByRole, getByTestId } = render(
         <Route path={BUILDER_PATH}>
-          <PluginActionContextProvider action={anQuery} plugin={mockPlugin}>
-            <IDE />
-          </PluginActionContextProvider>
+          <IDE />
         </Route>,
         {
           url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/queries/${anQuery.baseId}`,
@@ -551,17 +533,6 @@ describe("IDE URL rendering of Queries", () => {
   });
 
   describe("Google Sheets Routes", () => {
-    const mockPlugin = {
-      id: "plugin_id",
-      name: "Google Sheets",
-      packageName: PluginPackageName.GOOGLE_SHEETS,
-      type: PluginType.DB,
-      uiComponent: UIComponentTypes.GraphQLEditorForm,
-      datasourceComponent: DatasourceComponentTypes.RestAPIDatasourceForm,
-      templates: {},
-      requiresDatasource: false,
-    };
-
     it("Renders Google Sheets routes in Full Screen", async () => {
       const page = PageFactory.build();
       const anQuery = GoogleSheetFactory.build({
@@ -581,9 +552,7 @@ describe("IDE URL rendering of Queries", () => {
 
       const { getAllByText, getByRole, getByTestId } = render(
         <Route path={BUILDER_PATH}>
-          <PluginActionContextProvider action={anQuery} plugin={mockPlugin}>
-            <IDE />
-          </PluginActionContextProvider>
+          <IDE />
         </Route>,
         {
           url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/saas/google-sheets-plugin/api/${anQuery.baseId}`,
@@ -634,9 +603,7 @@ describe("IDE URL rendering of Queries", () => {
 
       const { container, getAllByText, getByRole, getByTestId } = render(
         <Route path={BUILDER_PATH}>
-          <PluginActionContextProvider action={anQuery} plugin={mockPlugin}>
-            <IDE />
-          </PluginActionContextProvider>
+          <IDE />
         </Route>,
         {
           url: `/app/applicationSlug/pageSlug-${page.basePageId}/edit/saas/google-sheets-plugin/api/${anQuery.baseId}`,
diff --git a/app/client/src/pages/Editor/IDE/hooks.ts b/app/client/src/pages/Editor/IDE/hooks.ts
index c6cb404b919c..25f724ef5f5c 100644
--- a/app/client/src/pages/Editor/IDE/hooks.ts
+++ b/app/client/src/pages/Editor/IDE/hooks.ts
@@ -27,6 +27,8 @@ import { closeJSActionTab } from "actions/jsActionActions";
 import { closeQueryActionTab } from "actions/pluginActionActions";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
 import { getCurrentEntityInfo } from "../utils";
+import { useEditorType } from "ee/hooks";
+import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
 
 export const useCurrentEditorState = () => {
   const [selectedSegment, setSelectedSegment] = useState<EditorEntityTab>(
@@ -58,7 +60,9 @@ export const useCurrentEditorState = () => {
 export const useSegmentNavigation = (): {
   onSegmentChange: (value: string) => void;
 } => {
-  const basePageId = useSelector(getCurrentBasePageId);
+  const editorType = useEditorType(location.pathname);
+  const { parentEntityId: baseParentEntityId } =
+    useParentEntityInfo(editorType);
 
   /**
    * Callback to handle the segment change
@@ -70,17 +74,17 @@ export const useSegmentNavigation = (): {
   const onSegmentChange = (value: string) => {
     switch (value) {
       case EditorEntityTab.QUERIES:
-        history.push(queryListURL({ basePageId }), {
+        history.push(queryListURL({ baseParentEntityId }), {
           invokedBy: NavigationMethod.SegmentControl,
         });
         break;
       case EditorEntityTab.JS:
-        history.push(jsCollectionListURL({ basePageId }), {
+        history.push(jsCollectionListURL({ baseParentEntityId }), {
           invokedBy: NavigationMethod.SegmentControl,
         });
         break;
       case EditorEntityTab.UI:
-        history.push(widgetListURL({ basePageId }), {
+        history.push(widgetListURL({ baseParentEntityId }), {
           invokedBy: NavigationMethod.SegmentControl,
         });
         break;
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
index f745e5ac49cf..aa59a502dcdc 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
@@ -12,7 +12,7 @@ import {
 } from "ee/constants/messages";
 import DebuggerLogs from "components/editorComponents/Debugger/DebuggerLogs";
 import ErrorLogs from "components/editorComponents/Debugger/Errors";
-import { Datasource } from "PluginActionEditor/components/PluginActionResponse/components/DatasourceTab";
+import { DatasourceTab } from "PluginActionEditor/components/PluginActionResponse/components/DatasourceTab";
 import type { ActionResponse } from "api/ActionAPI";
 import type { SourceEntity } from "entities/AppsmithConsole";
 import type { Action } from "entities/Action";
@@ -219,10 +219,12 @@ function QueryDebuggerTabs({
       key: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
       title: "Datasource",
       panelComponent: (
-        <Datasource
+        <DatasourceTab
           currentActionId={currentActionConfig.id}
           datasourceId={currentActionConfig.datasource.id || ""}
-          datasourceName={datasource?.name || ""}
+          datasourceName={
+            datasource?.name || currentActionConfig.datasource.name || ""
+          }
         />
       ),
     });
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index c4c50492829b..189fe5b80bc4 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -1561,66 +1561,101 @@ function* fetchDatasourceStructureSaga(
     yield take(ReduxActionTypes.FETCH_ENVIRONMENT_SUCCESS);
   }
 
-  const datasource = shouldBeDefined<Datasource>(
-    yield select(getDatasource, action.payload.id),
-    `Datasource not found for id - ${action.payload.id}`,
-  );
-  const plugin: Plugin = yield select(getPlugin, datasource?.pluginId);
   let errorMessage = "";
   let isSuccess = false;
 
   try {
-    const response: ApiResponse = yield DatasourcesApi.fetchDatasourceStructure(
-      action.payload.id,
-      action.payload.ignoreCache,
+    const datasource = shouldBeDefined<Datasource>(
+      yield select(getDatasource, action.payload.id),
+      `Datasource not found for id - ${action.payload.id}`,
     );
-    const isValidResponse: boolean = yield validateResponse(response, false);
+    const plugin: Plugin = yield select(getPlugin, datasource?.pluginId);
 
-    if (isValidResponse) {
-      yield put({
-        type: ReduxActionTypes.FETCH_DATASOURCE_STRUCTURE_SUCCESS,
-        payload: {
-          data: response.data,
-          datasourceId: action.payload.id,
-        },
-      });
+    try {
+      const response: ApiResponse =
+        yield DatasourcesApi.fetchDatasourceStructure(
+          action.payload.id,
+          action.payload.ignoreCache,
+        );
+      const isValidResponse: boolean = yield validateResponse(response, false);
 
-      if (isEmpty(response.data)) {
-        errorMessage = createMessage(DATASOURCE_SCHEMA_NOT_AVAILABLE);
-        AppsmithConsole.warning({
-          text: "Datasource structure could not be retrieved",
-          source: {
-            id: action.payload.id,
-            name: datasource.name,
-            type: ENTITY_TYPE.DATASOURCE,
-          },
-        });
-      } else {
-        isSuccess = true;
-        AppsmithConsole.info({
-          text: "Datasource structure retrieved",
-          source: {
-            id: action.payload.id,
-            name: datasource.name,
-            type: ENTITY_TYPE.DATASOURCE,
+      if (isValidResponse) {
+        yield put({
+          type: ReduxActionTypes.FETCH_DATASOURCE_STRUCTURE_SUCCESS,
+          payload: {
+            data: response.data,
+            datasourceId: action.payload.id,
           },
         });
-      }
 
-      // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (!!(response.data as any)?.error) {
-        isSuccess = false;
+        if (isEmpty(response.data)) {
+          errorMessage = createMessage(DATASOURCE_SCHEMA_NOT_AVAILABLE);
+          AppsmithConsole.warning({
+            text: "Datasource structure could not be retrieved",
+            source: {
+              id: action.payload.id,
+              name: datasource.name,
+              type: ENTITY_TYPE.DATASOURCE,
+            },
+          });
+        } else {
+          isSuccess = true;
+          AppsmithConsole.info({
+            text: "Datasource structure retrieved",
+            source: {
+              id: action.payload.id,
+              name: datasource.name,
+              type: ENTITY_TYPE.DATASOURCE,
+            },
+          });
+        }
+
         // TODO: Fix this the next time the file is edited
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        errorMessage = (response.data as any).error?.message;
+        if (!!(response.data as any)?.error) {
+          isSuccess = false;
+          // TODO: Fix this the next time the file is edited
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          errorMessage = (response.data as any).error?.message;
+        }
       }
+    } catch (error) {
+      // TODO: Fix this the next time the file is edited
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      errorMessage = (error as any)?.message;
+      isSuccess = false;
+      yield put({
+        type: ReduxActionErrorTypes.FETCH_DATASOURCE_STRUCTURE_ERROR,
+        payload: {
+          error,
+          show: false,
+          datasourceId: action.payload.id,
+        },
+      });
+      AppsmithConsole.error({
+        text: "Datasource structure could not be retrieved",
+        source: {
+          id: action.payload.id,
+          name: datasource.name,
+          type: ENTITY_TYPE.DATASOURCE,
+        },
+      });
     }
+
+    const currentEnvDetails: { id: string; name: string } = yield select(
+      getCurrentEnvironmentDetails,
+    );
+
+    AnalyticsUtil.logEvent("DATASOURCE_SCHEMA_FETCH", {
+      datasourceId: datasource?.id,
+      pluginName: plugin?.name,
+      environmentId: currentEnvDetails.id,
+      environmentName: currentEnvDetails.name,
+      errorMessage: errorMessage,
+      isSuccess: isSuccess,
+      source: action.payload.schemaFetchContext,
+    });
   } catch (error) {
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    errorMessage = (error as any)?.message;
-    isSuccess = false;
     yield put({
       type: ReduxActionErrorTypes.FETCH_DATASOURCE_STRUCTURE_ERROR,
       payload: {
@@ -1629,28 +1664,7 @@ function* fetchDatasourceStructureSaga(
         datasourceId: action.payload.id,
       },
     });
-    AppsmithConsole.error({
-      text: "Datasource structure could not be retrieved",
-      source: {
-        id: action.payload.id,
-        name: datasource.name,
-        type: ENTITY_TYPE.DATASOURCE,
-      },
-    });
   }
-  const currentEnvDetails: { id: string; name: string } = yield select(
-    getCurrentEnvironmentDetails,
-  );
-
-  AnalyticsUtil.logEvent("DATASOURCE_SCHEMA_FETCH", {
-    datasourceId: datasource?.id,
-    pluginName: plugin?.name,
-    environmentId: currentEnvDetails.id,
-    environmentName: currentEnvDetails.name,
-    errorMessage: errorMessage,
-    isSuccess: isSuccess,
-    source: action.payload.schemaFetchContext,
-  });
 }
 
 function* addAndFetchDatasourceStructureSaga(