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 4c00cc7c3143..7b639a11a7e7 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
@@ -8,8 +8,8 @@ import { datasourcesEditorIdURL } from "ee/RouteBuilder";
 import { omit } from "lodash";
 import { getQueryParams } from "utils/URLUtils";
 import history from "utils/history";
-import { useEditorType } from "ee/hooks";
-import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 import type { Plugin } from "entities/Plugin";
 
 interface Props {
@@ -25,8 +25,8 @@ const DatasourceInfo = ({
   plugin,
   showEditButton,
 }: Props) => {
-  const editorType = useEditorType(location.pathname);
-  const { parentEntityId } = useParentEntityInfo(editorType);
+  const ideType = getIDETypeByUrl(location.pathname);
+  const { parentEntityId } = useParentEntityInfo(ideType);
 
   // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
   const editDatasource = () => {
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTab.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTab.tsx
index 78964d811697..c31b4668ee70 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTab.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTab.tsx
@@ -23,8 +23,7 @@ import { isEmpty, omit } from "lodash";
 import { getQueryParams } from "utils/URLUtils";
 import { TableColumns } from "./TableColumns";
 import { BOTTOMBAR_HEIGHT } from "./constants";
-import { useEditorType } from "ee/hooks";
-import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
 import DatasourceInfo from "./DatasourceInfo";
 import { getPlugin } from "ee/selectors/entitiesSelector";
 import {
@@ -34,6 +33,7 @@ import {
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 interface Props {
   datasourceId: string;
@@ -58,8 +58,8 @@ const DatasourceTab = (props: Props) => {
 
   const plugin = useSelector((state) => getPlugin(state, pluginId || ""));
 
-  const editorType = useEditorType(location.pathname);
-  const { parentEntityId } = useParentEntityInfo(editorType);
+  const ideType = getIDETypeByUrl(location.pathname);
+  const { parentEntityId } = useParentEntityInfo(ideType);
 
   const [selectedTable, setSelectedTable] = useState<string>();
 
diff --git a/app/client/src/ce/IDE/hooks/useParentEntityInfo.ts b/app/client/src/ce/IDE/hooks/useParentEntityInfo.ts
new file mode 100644
index 000000000000..47a277a4cca8
--- /dev/null
+++ b/app/client/src/ce/IDE/hooks/useParentEntityInfo.ts
@@ -0,0 +1,19 @@
+import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
+import type { IDEType } from "ee/entities/IDE/constants";
+import { useSelector } from "react-redux";
+import {
+  getCurrentApplicationId,
+  getCurrentBasePageId,
+} from "selectors/editorSelectors";
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const useParentEntityInfo = (ideType: IDEType) => {
+  const appId = useSelector(getCurrentApplicationId);
+  const basePageId = useSelector(getCurrentBasePageId);
+
+  return {
+    editorId: appId || "",
+    parentEntityId: basePageId || "",
+    parentEntityType: ActionParentEntityType.PAGE,
+  };
+};
diff --git a/app/client/src/ce/actions/helpers.ts b/app/client/src/ce/actions/helpers.ts
index 5c976888d3e9..f244ff7483d2 100644
--- a/app/client/src/ce/actions/helpers.ts
+++ b/app/client/src/ce/actions/helpers.ts
@@ -10,6 +10,7 @@ import {
   saveActionName,
 } from "actions/pluginActionActions";
 import { saveJSObjectName } from "actions/jsActionActions";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
 
 export const createNewQueryBasedOnParentEntity = (
   entityId: string,
@@ -43,29 +44,29 @@ export const createNewJSCollectionBasedOnParentEntity = (
   return createNewJSCollection(entityId, from);
 };
 
-export const saveActionNameBasedOnParentEntity = (
+export const saveActionNameBasedOnIdeType = (
   id: string,
   name: string,
   // Used in EE
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  parentEntityType: ActionParentEntityTypeInterface = ActionParentEntityType.PAGE,
+  ideType: IDEType = IDE_TYPE.App,
 ) => {
   return saveActionName({ id, name });
 };
 
-export const saveJSObjectNameBasedOnParentEntity = (
+export const saveJSObjectNameBasedOnIdeType = (
   id: string,
   name: string,
   // Used in EE
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  parentEntityType: ActionParentEntityTypeInterface = ActionParentEntityType.PAGE,
+  ideType: IDEType = IDE_TYPE.App,
 ) => {
   return saveJSObjectName({ id, name });
 };
 
-export const createNewApiActionBasedOnEditorType = (
+export const createNewApiActionBasedOnIdeType = (
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  editorType: string,
+  ideType: IDEType,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   editorId: string,
   parentEntityId: string,
diff --git a/app/client/src/ce/entities/IDE/hooks/useCreateActionsPermissions.ts b/app/client/src/ce/entities/IDE/hooks/useCreateActionsPermissions.ts
new file mode 100644
index 000000000000..c984e29bc061
--- /dev/null
+++ b/app/client/src/ce/entities/IDE/hooks/useCreateActionsPermissions.ts
@@ -0,0 +1,20 @@
+import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
+import { useSelector } from "react-redux";
+import { getPagePermissions } from "selectors/editorSelectors";
+import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
+
+export const useCreateActionsPermissions = (ideType: IDEType) => {
+  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
+  const pagePermissions = useSelector(getPagePermissions);
+
+  switch (ideType) {
+    case IDE_TYPE.App: {
+      return getHasCreateActionPermission(isFeatureEnabled, pagePermissions);
+    }
+    default: {
+      return true;
+    }
+  }
+};
diff --git a/app/client/src/ce/hooks/datasourceEditorHooks.tsx b/app/client/src/ce/hooks/datasourceEditorHooks.tsx
index 5dde79d1f35d..db6730c1961d 100644
--- a/app/client/src/ce/hooks/datasourceEditorHooks.tsx
+++ b/app/client/src/ce/hooks/datasourceEditorHooks.tsx
@@ -2,7 +2,6 @@ import {
   GENERATE_NEW_PAGE_BUTTON_TEXT,
   createMessage,
 } from "ee/constants/messages";
-import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import type { AppState } from "ee/reducers";
 import { getPlugin } from "ee/selectors/entitiesSelector";
@@ -18,17 +17,13 @@ import NewActionButton from "pages/Editor/DataSourceEditor/NewActionButton";
 import { useShowPageGenerationOnHeader } from "pages/Editor/DataSourceEditor/hooks";
 import React from "react";
 import { useDispatch, useSelector } from "react-redux";
-import {
-  getCurrentApplicationId,
-  getCurrentBasePageId,
-  getPagePermissions,
-} from "selectors/editorSelectors";
+import { getPagePermissions } from "selectors/editorSelectors";
 import { getIsAnvilEnabledInCurrentApplication } from "layoutSystems/anvil/integrations/selectors";
 import { isEnabledForPreviewData } from "utils/editorContextUtils";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { EditorNames } from "./";
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
 import { openGeneratePageModal } from "pages/Editor/GeneratePage/store/generatePageActions";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
 
 export interface HeaderActionProps {
   datasource: Datasource | ApiDatasourceForm | undefined;
@@ -38,7 +33,7 @@ export interface HeaderActionProps {
 }
 
 export const useHeaderActions = (
-  editorType: string,
+  ideType: IDEType,
   {
     datasource,
     isPluginAuthorized,
@@ -77,7 +72,7 @@ export const useHeaderActions = (
     ? false
     : !!isPluginAllowedToPreviewData;
 
-  if (editorType === EditorNames.APPLICATION) {
+  if (ideType === IDE_TYPE.App) {
     const canCreateDatasourceActions = hasCreateDSActionPermissionInApp({
       isEnabled: isFeatureEnabled,
       dsPermissions: datasource?.userPermissions ?? [],
@@ -141,15 +136,3 @@ export const useHeaderActions = (
 
   return {};
 };
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const useParentEntityInfo = (editorType: string) => {
-  const appId = useSelector(getCurrentApplicationId);
-  const basePageId = useSelector(getCurrentBasePageId);
-
-  return {
-    editorId: appId || "",
-    parentEntityId: basePageId || "",
-    parentEntityType: ActionParentEntityType.PAGE,
-  };
-};
diff --git a/app/client/src/ce/hooks/hooks.test.ts b/app/client/src/ce/hooks/hooks.test.ts
deleted file mode 100644
index 8259537e9dd3..000000000000
--- a/app/client/src/ce/hooks/hooks.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useEditorType, EditorNames } from "./index";
-import {
-  BUILDER_VIEWER_PATH_PREFIX,
-  BUILDER_BASE_PATH_DEPRECATED,
-} from "constants/routes";
-
-describe("useEditorType", () => {
-  it('should return "app" for BUILDER_VIEWER_PATH_PREFIX', () => {
-    const result = useEditorType(BUILDER_VIEWER_PATH_PREFIX);
-
-    expect(result).toBe(EditorNames.APPLICATION);
-  });
-
-  it('should return "app" for BUILDER_BASE_PATH_DEPRECATED', () => {
-    const result = useEditorType(BUILDER_BASE_PATH_DEPRECATED);
-
-    expect(result).toBe(EditorNames.APPLICATION);
-  });
-
-  it('should default to "app" for unmatched paths', () => {
-    const result = useEditorType("/some-random-path");
-
-    expect(result).toBe(EditorNames.APPLICATION);
-  });
-});
diff --git a/app/client/src/ce/hooks/index.ts b/app/client/src/ce/hooks/index.ts
index 07f4b12bcd7c..44bb64e4445e 100644
--- a/app/client/src/ce/hooks/index.ts
+++ b/app/client/src/ce/hooks/index.ts
@@ -1,39 +1,4 @@
-import {
-  BUILDER_BASE_PATH_DEPRECATED,
-  BUILDER_VIEWER_PATH_PREFIX,
-} from "constants/routes";
 import { useEffect, type RefObject } from "react";
-import { matchPath } from "react-router";
-
-export const EditorNames = {
-  APPLICATION: "app",
-};
-
-export interface EditorType {
-  [key: string]: string;
-}
-
-export const editorType: EditorType = {
-  [BUILDER_VIEWER_PATH_PREFIX]: EditorNames.APPLICATION,
-  [BUILDER_BASE_PATH_DEPRECATED]: EditorNames.APPLICATION,
-};
-
-// Utility function to get editor type based on path
-// to be used in non react functions
-export const getEditorType = (path: string) => {
-  const basePath = matchPath(path, {
-    path: [BUILDER_VIEWER_PATH_PREFIX, BUILDER_BASE_PATH_DEPRECATED],
-  });
-
-  return basePath
-    ? editorType[basePath.path]
-    : editorType[BUILDER_VIEWER_PATH_PREFIX];
-};
-
-// custom hook to get editor type based on path
-export const useEditorType = (path: string) => {
-  return getEditorType(path);
-};
 
 export function useOutsideClick<T extends HTMLElement>(
   ref: RefObject<T>,
diff --git a/app/client/src/ce/navigation/FocusSetters.ts b/app/client/src/ce/navigation/FocusSetters.ts
index 85a26812644e..4d5aa3197b08 100644
--- a/app/client/src/ce/navigation/FocusSetters.ts
+++ b/app/client/src/ce/navigation/FocusSetters.ts
@@ -7,7 +7,7 @@ import {
 import { PluginType } from "entities/Plugin";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 import { FocusEntity } from "navigation/FocusEntity";
-import { getQueryEntityItemUrl } from "../pages/Editor/IDE/EditorPane/Query/utils";
+import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl";
 
 export function setSelectedDatasource(id?: string) {
   if (id) {
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx
index cf79cc6e9748..65db9a369bd6 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import ExplorerJSCollectionEntity from "pages/Editor/Explorer/JSActions/JSActionEntity";
-import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 import { Flex } from "@appsmith/ads";
 import type { EntityItem } from "ee/entities/IDE/constants";
 
@@ -8,11 +7,10 @@ export interface JSListItemProps {
   item: EntityItem;
   isActive: boolean;
   parentEntityId: string;
-  parentEntityType: ActionParentEntityTypeInterface;
 }
 
 export const JSListItem = (props: JSListItemProps) => {
-  const { isActive, item, parentEntityId, parentEntityType } = props;
+  const { isActive, item, parentEntityId } = props;
 
   return (
     <Flex data-testid="t--ide-list-item" flexDirection={"column"}>
@@ -21,7 +19,6 @@ export const JSListItem = (props: JSListItemProps) => {
         isActive={isActive}
         key={item.key}
         parentEntityId={parentEntityId}
-        parentEntityType={parentEntityType}
         searchKeyword={""}
         step={1}
       />
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.tsx
index 34ce88dd556a..9f71fb80b129 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.tsx
@@ -12,7 +12,7 @@ import { ADD_PATH } from "ee/constants/routes/appRoutes";
 import history from "utils/history";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
 import { useModuleOptions } from "ee/utils/moduleInstanceHelpers";
-import { getJSUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils";
+import { getJSUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import { EditorViewMode } from "ee/entities/IDE/constants";
 import { setListViewActiveState } from "actions/ideActions";
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.test.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.test.ts
new file mode 100644
index 000000000000..d05e384edd34
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.test.ts
@@ -0,0 +1,21 @@
+import { getJSEntityItemUrl } from "./getJSEntityItemUrl";
+import urlBuilder from "ee/entities/URLRedirect/URLAssembly";
+import { PluginType } from "entities/Plugin";
+
+describe("getJSEntityItemUrl", () => {
+  urlBuilder.setCurrentBasePageId("0123456789abcdef00000000");
+  it("returns a JS url", () => {
+    const url = getJSEntityItemUrl(
+      {
+        title: "TestTitle",
+        key: "abc",
+        type: PluginType.JS,
+      },
+      "0123456789abcdef00000000",
+    );
+
+    expect(url).toEqual(
+      "/app/application/page-0123456789abcdef00000000/edit/jsObjects/abc",
+    );
+  });
+});
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.ts
new file mode 100644
index 000000000000..e394f9db47fd
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.ts
@@ -0,0 +1,12 @@
+import type { EntityItem } from "ee/entities/IDE/constants";
+import { jsCollectionIdURL } from "ee/RouteBuilder";
+
+export const getJSEntityItemUrl = (
+  item: EntityItem,
+  basePageId: string,
+): string => {
+  return jsCollectionIdURL({
+    baseCollectionId: item.key,
+    basePageId,
+  });
+};
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils.test.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.test.ts
similarity index 77%
rename from app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils.test.ts
rename to app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.test.ts
index d12cadbbf429..d71b88d4f4bd 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils.test.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.test.ts
@@ -1,28 +1,9 @@
-import { getJSEntityItemUrl, getJSUrl } from "./utils";
+import { getJSUrl } from "./getJSUrl";
 import urlBuilder from "ee/entities/URLRedirect/URLAssembly";
-import { PluginType } from "entities/Plugin";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 import { FocusEntity } from "navigation/FocusEntity";
 import { EditorState } from "ee/entities/IDE/constants";
 
-describe("getJSEntityItemUrl", () => {
-  urlBuilder.setCurrentBasePageId("0123456789abcdef00000000");
-  it("returns a JS url", () => {
-    const url = getJSEntityItemUrl(
-      {
-        title: "TestTitle",
-        key: "abc",
-        type: PluginType.JS,
-      },
-      "0123456789abcdef00000000",
-    );
-
-    expect(url).toEqual(
-      "/app/application/page-0123456789abcdef00000000/edit/jsObjects/abc",
-    );
-  });
-});
-
 describe("getJSUrl", () => {
   urlBuilder.setCurrentBasePageId("0123456789abcdef00000000");
   it("returns a JS collection url", () => {
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.ts
similarity index 74%
rename from app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils.ts
rename to app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.ts
index efc02a20c386..af7f33f6a406 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.ts
@@ -1,4 +1,3 @@
-import type { EntityItem } from "ee/entities/IDE/constants";
 import {
   jsCollectionAddURL,
   jsCollectionIdURL,
@@ -6,16 +5,6 @@ import {
 } from "ee/RouteBuilder";
 import { FocusEntity, type FocusEntityInfo } from "navigation/FocusEntity";
 
-export const getJSEntityItemUrl = (
-  item: EntityItem,
-  basePageId: string,
-): string => {
-  return jsCollectionIdURL({
-    baseCollectionId: item.key,
-    basePageId,
-  });
-};
-
 export const getJSUrl = (
   item: FocusEntityInfo,
   add: boolean = true,
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx
index 9cbf4f993aa8..90db39393a2a 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/ListItem.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 import ExplorerActionEntity from "pages/Editor/Explorer/Actions/ActionEntity";
 import type { EntityItem } from "ee/entities/IDE/constants";
 
@@ -7,11 +6,10 @@ export interface QueryListItemProps {
   item: EntityItem;
   isActive: boolean;
   parentEntityId: string;
-  parentEntityType: ActionParentEntityTypeInterface;
 }
 
 export const QueryListItem = (props: QueryListItemProps) => {
-  const { isActive, item, parentEntityId, parentEntityType } = props;
+  const { isActive, item, parentEntityId } = props;
 
   return (
     <ExplorerActionEntity
@@ -19,7 +17,6 @@ export const QueryListItem = (props: QueryListItemProps) => {
       isActive={isActive}
       key={item.key}
       parentEntityId={parentEntityId}
-      parentEntityType={parentEntityType}
       searchKeyword={""}
       step={1}
       type={item.type}
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
index 1c850a191c4f..d7aacb7d649a 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
@@ -15,7 +15,7 @@ import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissi
 import type { ActionOperation } from "components/editorComponents/GlobalSearch/utils";
 import { SEARCH_ITEM_TYPES } from "components/editorComponents/GlobalSearch/utils";
 import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages";
-import { getQueryUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
+import { getQueryUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl";
 import {
   ADD_PATH,
   API_EDITOR_ID_PATH,
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.test.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.test.ts
new file mode 100644
index 000000000000..211808cffca0
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.test.ts
@@ -0,0 +1,26 @@
+import { getQueryEntityItemUrl } from "./getQueryEntityItemUrl";
+import { PluginType } from "entities/Plugin";
+
+describe("getQueryEntityItemUrl", () => {
+  it("throws error if plugin type is not a query", () => {
+    const item = {
+      title: "testTitle",
+      type: PluginType.JS,
+      key: "abc",
+    };
+
+    expect(() => getQueryEntityItemUrl(item, "")).toThrow();
+  });
+
+  it("returns url for a query type plugin", () => {
+    const item = {
+      title: "testTitle",
+      type: PluginType.INTERNAL,
+      key: "abc",
+    };
+
+    expect(getQueryEntityItemUrl(item, "0123456789abcdef00000000")).toEqual(
+      "/app/application/page-0123456789abcdef00000000/edit/queries/abc",
+    );
+  });
+});
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.ts
new file mode 100644
index 000000000000..b8b7ae4112de
--- /dev/null
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.ts
@@ -0,0 +1,15 @@
+import type { EntityItem } from "ee/entities/IDE/constants";
+import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
+
+export const getQueryEntityItemUrl = (
+  item: EntityItem,
+  basePageId: string,
+): string => {
+  const config = getActionConfig(item.type);
+
+  if (!config) {
+    throw Error(`Cannot find url of plugin type ${item.type}`);
+  }
+
+  return config.getURL(basePageId, item.key, item.type);
+};
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils.test.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.test.ts
similarity index 81%
rename from app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils.test.ts
rename to app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.test.ts
index f6e557398c62..aa5fee5925da 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils.test.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.test.ts
@@ -1,34 +1,10 @@
-import { getQueryEntityItemUrl, getQueryUrl } from "./utils";
+import { getQueryUrl } from "./getQueryUrl";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 import { FocusEntity } from "navigation/FocusEntity";
 import { EditorState } from "ee/entities/IDE/constants";
-import { PluginPackageName, PluginType } from "entities/Plugin";
+import { PluginPackageName } from "entities/Plugin";
 import urlBuilder from "ee/entities/URLRedirect/URLAssembly";
 
-describe("getQueryEntityItemUrl", () => {
-  it("throws error if plugin type is not a query", () => {
-    const item = {
-      title: "testTitle",
-      type: PluginType.JS,
-      key: "abc",
-    };
-
-    expect(() => getQueryEntityItemUrl(item, "")).toThrow();
-  });
-
-  it("returns url for a query type plugin", () => {
-    const item = {
-      title: "testTitle",
-      type: PluginType.INTERNAL,
-      key: "abc",
-    };
-
-    expect(getQueryEntityItemUrl(item, "0123456789abcdef00000000")).toEqual(
-      "/app/application/page-0123456789abcdef00000000/edit/queries/abc",
-    );
-  });
-});
-
 describe("getQueryUrl", () => {
   urlBuilder.setCurrentBasePageId("0123456789abcdef00000000");
   it("gets the correct SAAS plugin url", () => {
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.ts
similarity index 70%
rename from app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils.ts
rename to app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.ts
index 6a732cee324b..f56cc625940b 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.ts
@@ -1,6 +1,3 @@
-import type { EntityItem } from "ee/entities/IDE/constants";
-import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
-import type { FocusEntityInfo } from "navigation/FocusEntity";
 import {
   apiEditorIdURL,
   queryAddURL,
@@ -8,19 +5,7 @@ import {
   queryListURL,
   saasEditorApiIdURL,
 } from "ee/RouteBuilder";
-
-export const getQueryEntityItemUrl = (
-  item: EntityItem,
-  basePageId: string,
-): string => {
-  const config = getActionConfig(item.type);
-
-  if (!config) {
-    throw Error(`Cannot find url of plugin type ${item.type}`);
-  }
-
-  return config.getURL(basePageId, item.key, item.type);
-};
+import type { FocusEntityInfo } from "navigation/FocusEntity";
 
 export const getQueryUrl = (
   item: FocusEntityInfo,
diff --git a/app/client/src/ce/pages/Editor/gitSync/useReconnectModalData.ts b/app/client/src/ce/pages/Editor/gitSync/useReconnectModalData.ts
index 42e4c97d492b..b8c012ee97d1 100644
--- a/app/client/src/ce/pages/Editor/gitSync/useReconnectModalData.ts
+++ b/app/client/src/ce/pages/Editor/gitSync/useReconnectModalData.ts
@@ -1,10 +1,10 @@
+import { IDE_TYPE } from "ee/entities/IDE/constants";
 import { builderURL } from "ee/RouteBuilder";
 import {
   RECONNECT_MISSING_DATASOURCE_CREDENTIALS_DESCRIPTION,
   SKIP_TO_APPLICATION,
   createMessage,
 } from "ee/constants/messages";
-import { EditorNames } from "ee/hooks";
 import { getApplicationByIdFromWorkspaces } from "ee/selectors/applicationSelectors";
 import { useSelector } from "react-redux";
 
@@ -36,7 +36,7 @@ function useReconnectModalData({ appId, pageId }: UseReconnectModalDataProps) {
     editorURL,
     editorId: appId,
     parentEntityId: pageId,
-    editorType: EditorNames.APPLICATION,
+    ideType: IDE_TYPE.App,
   };
 }
 
diff --git a/app/client/src/ce/selectors/appIDESelectors.ts b/app/client/src/ce/selectors/appIDESelectors.ts
index 79d4fd62558b..16fcca2e5e5f 100644
--- a/app/client/src/ce/selectors/appIDESelectors.ts
+++ b/app/client/src/ce/selectors/appIDESelectors.ts
@@ -9,7 +9,7 @@ import { getJSTabs, getQueryTabs } from "selectors/ideSelectors";
 import type { AppState } from "ee/reducers";
 import { identifyEntityFromPath } from "navigation/FocusEntity";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
-import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
+import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl";
 
 export type EditorSegmentList = Array<{
   group: string | "NA";
diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts
index d81657d5d4a0..10b30bc32b90 100644
--- a/app/client/src/ce/selectors/entitiesSelector.ts
+++ b/app/client/src/ce/selectors/entitiesSelector.ts
@@ -64,6 +64,7 @@ import {
   EditorEntityTab,
   type EntityItem,
   type GenericEntityItem,
+  type IDEType,
 } from "ee/entities/IDE/constants";
 import {
   ActionUrlIcon,
@@ -1701,16 +1702,17 @@ export const getSelectedTableName = (state: AppState) =>
 export const getDatasourceUsageCountForApp = createSelector(
   getActions,
   getDatasources,
-  (state: AppState, editorType: string) => editorType,
-  (actions, datasources, editorType) => {
+  (state: AppState, ideType: IDEType) => ideType,
+  (actions, datasources, ideType) => {
     const actionCount = countBy(actions, "config.datasource.id");
     const actionDsMap: Record<string, string> = {};
 
     datasources.forEach((ds) => {
-      actionDsMap[ds.id] = `No queries in this ${editorType}`;
+      actionDsMap[ds.id] = `No queries in this ${ideType.toLowerCase()}`;
     });
     Object.keys(actionCount).forEach((dsId) => {
-      actionDsMap[dsId] = `${actionCount[dsId]} queries in this ${editorType}`;
+      actionDsMap[dsId] =
+        `${actionCount[dsId]} queries in this ${ideType.toLowerCase()}`;
     });
 
     return actionDsMap;
diff --git a/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx b/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx
index 8cd3dcb06c47..e882d308b893 100644
--- a/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx
+++ b/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx
@@ -43,7 +43,7 @@ import { hasExecuteActionPermission as hasExecuteActionPermission_EE } from "ee/
 
 import { hasAuditLogsReadPermission as hasAuditLogsReadPermission_CE } from "ce/utils/permissionHelpers";
 import { hasAuditLogsReadPermission as hasAuditLogsReadPermission_EE } from "ee/utils/permissionHelpers";
-import { EditorNames } from "ee/hooks";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
 
 export const getHasCreateWorkspacePermission = (
   isEnabled: boolean,
@@ -167,16 +167,16 @@ export const getHasAuditLogsReadPermission = (
 
 export const hasCreateDSActionPermissionInApp = ({
   dsPermissions,
-  editorType,
+  ideType,
   isEnabled,
   pagePermissions,
 }: {
   dsPermissions?: string[];
-  editorType?: string;
+  ideType?: IDEType;
   isEnabled: boolean;
   pagePermissions?: string[];
 }) => {
-  return !editorType || editorType === EditorNames.APPLICATION
+  return !ideType || ideType === IDE_TYPE.App
     ? getHasCreateDatasourceActionPermission(isEnabled, dsPermissions) &&
         getHasCreateActionPermission(isEnabled, pagePermissions)
     : getHasCreateDatasourceActionPermission(isEnabled, dsPermissions);
diff --git a/app/client/src/ce/utils/lintRulesHelpers.ts b/app/client/src/ce/utils/lintRulesHelpers.ts
index fc857cad6b1e..fe0c07471d15 100644
--- a/app/client/src/ce/utils/lintRulesHelpers.ts
+++ b/app/client/src/ce/utils/lintRulesHelpers.ts
@@ -1,5 +1,7 @@
+import type { IDEType } from "ee/entities/IDE/constants";
+
 interface ContextType {
-  editorType: string;
+  ideType: IDEType;
 }
 
 /**
diff --git a/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx b/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx
index b728ad86e495..c42dd6c333a3 100644
--- a/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx
+++ b/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx
@@ -80,7 +80,7 @@ function DropdownWrapper(props: DropdownWrapperProps) {
 
   return (
     <Select
-      data-testId={props.testId}
+      data-testid={props.testId}
       defaultValue={props.isMultiSelect ? selectedOption : selectedOption[0]}
       isDisabled={props.disabled}
       isMultiSelect={props.isMultiSelect}
diff --git a/app/client/src/ee/IDE/hooks/useParentEntityInfo.ts b/app/client/src/ee/IDE/hooks/useParentEntityInfo.ts
new file mode 100644
index 000000000000..b9a1e16341e9
--- /dev/null
+++ b/app/client/src/ee/IDE/hooks/useParentEntityInfo.ts
@@ -0,0 +1 @@
+export * from "ce/IDE/hooks/useParentEntityInfo";
diff --git a/app/client/src/ee/entities/IDE/hooks/useCreateActionsPermissions.ts b/app/client/src/ee/entities/IDE/hooks/useCreateActionsPermissions.ts
new file mode 100644
index 000000000000..87326ae22985
--- /dev/null
+++ b/app/client/src/ee/entities/IDE/hooks/useCreateActionsPermissions.ts
@@ -0,0 +1 @@
+export { useCreateActionsPermissions } from "ce/entities/IDE/hooks/useCreateActionsPermissions";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils.ts b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils.ts
deleted file mode 100644
index 4b6be27891c9..000000000000
--- a/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "ce/pages/Editor/IDE/EditorPane/JS/utils";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.ts b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.ts
new file mode 100644
index 000000000000..eb6c0e73e7d1
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl.ts
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.ts b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.ts
new file mode 100644
index 000000000000..c66a8e2720fa
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl.ts
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/JS/utils/getJSUrl";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils.ts b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils.ts
deleted file mode 100644
index 1270999ec635..000000000000
--- a/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "ce/pages/Editor/IDE/EditorPane/Query/utils";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.ts b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.ts
new file mode 100644
index 000000000000..33b8b6cade89
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl.ts
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl";
diff --git a/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.ts b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.ts
new file mode 100644
index 000000000000..75a6d60c4def
--- /dev/null
+++ b/app/client/src/ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl.ts
@@ -0,0 +1 @@
+export * from "ce/pages/Editor/IDE/EditorPane/Query/utils/getQueryUrl";
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
index a1fdfc81bb78..203905a47936 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
@@ -16,8 +16,8 @@ import {
 } from "./types";
 import { compileSrcDoc } from "./utility";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { useEditorType } from "ee/hooks";
-import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 let connectionTimeout: number;
 
@@ -29,8 +29,8 @@ export function useCustomBuilder(): [CustomWidgetBuilderContextType, boolean] {
     true,
   );
 
-  const editorType = useEditorType(location.pathname);
-  const { parentEntityId } = useParentEntityInfo(editorType);
+  const ideType = getIDETypeByUrl(location.pathname);
+  const { parentEntityId } = useParentEntityInfo(ideType);
 
   const [contextValue, setContextValue] =
     useState<CustomWidgetBuilderContextValueType>(DEFAULT_CONTEXT_VALUE);
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
index 986299016c5d..f6122062b95d 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
@@ -25,9 +25,9 @@ import {
 } from "ee/utils/Environments";
 import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors";
 import type { PluginType } from "entities/Plugin";
-import { useEditorType } from "ee/hooks";
-import { useHistory } from "react-router";
+import { useLocation } from "react-router";
 import { useHeaderActions } from "ee/hooks/datasourceEditorHooks";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 export const ActionWrapper = styled.div`
   display: flex;
@@ -116,8 +116,8 @@ export const DSFormHeader = (props: DSFormHeaderProps) => {
 
   const [confirmDelete, setConfirmDelete] = useState(false);
   const dispatch = useDispatch();
-  const history = useHistory();
-  const editorType = useEditorType(history.location.pathname);
+  const location = useLocation();
+  const ideType = getIDETypeByUrl(location.pathname);
 
   const deleteAction = () => {
     if (isDeleting) return;
@@ -165,7 +165,7 @@ export const DSFormHeader = (props: DSFormHeaderProps) => {
       : true)
   );
 
-  const headerActions = useHeaderActions(editorType, {
+  const headerActions = useHeaderActions(ideType, {
     datasource,
     isPluginAuthorized,
     pluginType,
diff --git a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
index 493449dfe9e9..d6c9fccf8dcf 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
+++ b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
@@ -19,9 +19,9 @@ import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import type { AppState } from "ee/reducers";
 import { getPagePermissions } from "selectors/editorSelectors";
 import { get } from "lodash";
-import { useEditorType } from "ee/hooks";
 import history from "utils/history";
 import { getCurrentApplication } from "ee/selectors/applicationSelectors";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 interface FetchPreviewData {
   datasourceId: string;
@@ -141,7 +141,7 @@ export const useShowPageGenerationOnHeader = (
     getGenerateCRUDEnabledPluginMap,
   );
 
-  const editorType = useEditorType(history.location.pathname);
+  const ideType = getIDETypeByUrl(history.location.pathname);
 
   const canCreatePages = getHasCreatePagePermission(
     isGACEnabled,
@@ -151,7 +151,7 @@ export const useShowPageGenerationOnHeader = (
     isEnabled: isGACEnabled,
     dsPermissions: datasourcePermissions,
     pagePermissions,
-    editorType,
+    ideType,
   });
 
   const canGeneratePage = canCreateDatasourceActions && canCreatePages;
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx
index 64c224ade492..695b7cb3e79d 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx
@@ -20,8 +20,8 @@ import { Virtuoso } from "react-virtuoso";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { hasCreateDSActionPermissionInApp } from "ee/utils/BusinessFeatures/permissionPageHelpers";
-import { useEditorType } from "ee/hooks";
 import history from "utils/history";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 interface DatasourceStructureItemProps {
   dbStructure: DatasourceTable;
@@ -66,13 +66,13 @@ const DatasourceStructureItem = memo((props: DatasourceStructureItemProps) => {
   const datasourcePermissions = datasource?.userPermissions || [];
   const pagePermissions = useSelector(getPagePermissions);
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-  const editorType = useEditorType(history.location.pathname);
+  const ideType = getIDETypeByUrl(history.location.pathname);
 
   const canCreateDatasourceActions = hasCreateDSActionPermissionInApp({
     isEnabled: isFeatureEnabled,
     dsPermissions: datasourcePermissions,
     pagePermissions,
-    editorType,
+    ideType,
   });
 
   const onSelect = () => {
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
index 33ccf5c49c2f..0b1932841548 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
@@ -47,11 +47,11 @@ import {
   TableWrapper,
   ViewModeSchemaContainer,
 } from "./SchemaViewModeCSS";
-import { useEditorType } from "ee/hooks";
 import history from "utils/history";
 import { getIsGeneratingTemplatePage } from "selectors/pageListSelectors";
 import { setDatasourcePreviewSelectedTableName } from "actions/datasourceActions";
 import { getIsAnvilEnabledInCurrentApplication } from "layoutSystems/anvil/integrations/selectors";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 interface Props {
   datasource: Datasource;
@@ -82,7 +82,7 @@ const DatasourceViewModeSchema = (props: Props) => {
     FEATURE_FLAG.release_drag_drop_building_blocks_enabled,
   );
 
-  const editorType = useEditorType(history.location.pathname);
+  const ideType = getIDETypeByUrl(history.location.pathname);
 
   const canCreatePages = getHasCreatePagePermission(
     isFeatureEnabled,
@@ -93,7 +93,7 @@ const DatasourceViewModeSchema = (props: Props) => {
     isEnabled: isFeatureEnabled,
     dsPermissions: datasourcePermissions,
     pagePermissions,
-    editorType,
+    ideType,
   });
 
   const applicationId: string = useSelector(getCurrentApplicationId);
diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
index 41c89159a1df..8da55ec485f5 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
@@ -48,10 +48,10 @@ import Entity from "../Explorer/Entity";
 import DatasourceField from "./DatasourceField";
 import { setEntityCollapsibleState } from "actions/editorContextActions";
 import ItemLoadingIndicator from "./ItemLoadingIndicator";
-import { useEditorType } from "ee/hooks";
 import history from "utils/history";
 import { getIsGeneratingTemplatePage } from "selectors/pageListSelectors";
 import { getIsAnvilEnabledInCurrentApplication } from "layoutSystems/anvil/integrations/selectors";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 interface Props {
   datasourceId: string;
@@ -360,7 +360,7 @@ function GoogleSheetSchema(props: Props) {
     FEATURE_FLAG.release_drag_drop_building_blocks_enabled,
   );
 
-  const editorType = useEditorType(history.location.pathname);
+  const ideType = getIDETypeByUrl(history.location.pathname);
 
   const canCreatePages = getHasCreatePagePermission(
     isFeatureEnabled,
@@ -371,7 +371,7 @@ function GoogleSheetSchema(props: Props) {
     isEnabled: isFeatureEnabled,
     dsPermissions: datasourcePermissions,
     pagePermissions,
-    editorType,
+    ideType,
   });
 
   const refreshSpreadSheetButton = (option: DropdownOption) => (
diff --git a/app/client/src/pages/Editor/DatasourceInfo/HideGeneratePageButton.test.tsx b/app/client/src/pages/Editor/DatasourceInfo/HideGeneratePageButton.test.tsx
index fbba7b99954a..f1e0b944f08f 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/HideGeneratePageButton.test.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/HideGeneratePageButton.test.tsx
@@ -117,7 +117,8 @@ describe("DatasourceViewModeSchema Component", () => {
     const mockHistoryPush = jest.fn();
     const mockHistoryReplace = jest.fn();
     const mockHistoryLocation = {
-      pathname: "/",
+      pathname:
+        "/app/untitled-application-1/page1-678a356f18346f618bc2c80a/edit/datasource/users-ds-id",
       search: "",
       hash: "",
       state: {},
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
index 5837ae9ae387..3e7910e14011 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
@@ -21,17 +21,9 @@ import {
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { saveActionNameBasedOnParentEntity } from "ee/actions/helpers";
-import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
+import { saveActionNameBasedOnIdeType } from "ee/actions/helpers";
 import { convertToBaseParentEntityIdSelector } from "selectors/pageListSelectors";
-
-const getUpdateActionNameReduxAction = (
-  id: string,
-  name: string,
-  parentEntityType: ActionParentEntityTypeInterface,
-) => {
-  return saveActionNameBasedOnParentEntity(id, name, parentEntityType);
-};
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 interface ExplorerActionEntityProps {
   step: number;
@@ -40,7 +32,6 @@ interface ExplorerActionEntityProps {
   type: PluginType;
   isActive: boolean;
   parentEntityId: string;
-  parentEntityType: ActionParentEntityTypeInterface;
 }
 
 export const ExplorerActionEntity = memo((props: ExplorerActionEntityProps) => {
@@ -56,6 +47,7 @@ export const ExplorerActionEntity = memo((props: ExplorerActionEntityProps) => {
   const baseParentEntityId = useSelector((state) =>
     convertToBaseParentEntityIdSelector(state, props.parentEntityId),
   );
+  const ideType = getIDETypeByUrl(location.pathname);
 
   const config = getActionConfig(props.type);
   const url = config?.getURL(
@@ -122,7 +114,7 @@ export const ExplorerActionEntity = memo((props: ExplorerActionEntityProps) => {
       searchKeyword={props.searchKeyword}
       step={props.step}
       updateEntityName={(id, name) =>
-        getUpdateActionNameReduxAction(id, name, props.parentEntityType)
+        saveActionNameBasedOnIdeType(id, name, ideType)
       }
     />
   );
diff --git a/app/client/src/pages/Editor/Explorer/Files/index.tsx b/app/client/src/pages/Editor/Explorer/Files/index.tsx
index 9f4aa303c066..daca88a00059 100644
--- a/app/client/src/pages/Editor/Explorer/Files/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/index.tsx
@@ -122,7 +122,6 @@ function Files() {
               isActive={entity.id === activeActionBaseId}
               key={entity.id}
               parentEntityId={parentEntityId}
-              parentEntityType={parentEntityType}
               searchKeyword={""}
               step={2}
             />
@@ -134,7 +133,6 @@ function Files() {
               isActive={entity.id === activeActionBaseId}
               key={entity.id}
               parentEntityId={parentEntityId}
-              parentEntityType={parentEntityType}
               searchKeyword={""}
               step={2}
               type={type}
diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
index 117c9b71b211..682d77d89d52 100644
--- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
@@ -16,9 +16,9 @@ import {
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { saveJSObjectNameBasedOnParentEntity } from "ee/actions/helpers";
-import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
+import { saveJSObjectNameBasedOnIdeType } from "ee/actions/helpers";
 import { convertToBaseParentEntityIdSelector } from "selectors/pageListSelectors";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 interface ExplorerJSCollectionEntityProps {
   step: number;
@@ -26,27 +26,20 @@ interface ExplorerJSCollectionEntityProps {
   baseCollectionId: string;
   isActive: boolean;
   parentEntityId: string;
-  parentEntityType: ActionParentEntityTypeInterface;
 }
 
-const getUpdateJSObjectName = (
-  id: string,
-  name: string,
-  parentEntityType: ActionParentEntityTypeInterface,
-) => {
-  return saveJSObjectNameBasedOnParentEntity(id, name, parentEntityType);
-};
-
 export const ExplorerJSCollectionEntity = memo(
   (props: ExplorerJSCollectionEntityProps) => {
     const jsAction = useSelector((state: AppState) =>
       getJsCollectionByBaseId(state, props.baseCollectionId),
     ) as JSCollection;
     const location = useLocation();
-    const { parentEntityId, parentEntityType } = props;
+    const { parentEntityId } = props;
     const baseParentEntityId = useSelector((state) =>
       convertToBaseParentEntityIdSelector(state, parentEntityId),
     );
+    const ideType = getIDETypeByUrl(location.pathname);
+
     const navigateToUrl = jsCollectionIdURL({
       baseParentEntityId,
       baseCollectionId: jsAction.baseId,
@@ -107,7 +100,7 @@ export const ExplorerJSCollectionEntity = memo(
         searchKeyword={props.searchKeyword}
         step={props.step}
         updateEntityName={(id, name) =>
-          getUpdateJSObjectName(id, name, parentEntityType)
+          saveJSObjectNameBasedOnIdeType(id, name, ideType)
         }
       />
     );
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
index 824cc6cc8eb3..f1df474f1654 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
@@ -70,57 +70,55 @@ const ListJSObjects = () => {
           showAddButton={canCreateActions}
         />
       ) : null}
-      <FilesContextProvider
-        canCreateActions={canCreateActions}
-        editorId={applicationId}
-        parentEntityId={pageId}
-        parentEntityType={ActionParentEntityType.PAGE}
+
+      <Flex
+        data-testid="t--ide-list"
+        flexDirection="column"
+        gap="spaces-4"
+        overflowY="auto"
       >
-        <Flex
-          data-testid="t--ide-list"
-          flexDirection="column"
-          gap="spaces-4"
-          overflowY="auto"
-        >
-          {filteredItemGroups.map(({ group, items }) => {
-            return (
-              <Flex flexDirection={"column"} key={group}>
-                {group !== "NA" ? (
-                  <Flex py="spaces-1">
-                    <Text
-                      className="overflow-hidden overflow-ellipsis whitespace-nowrap"
-                      kind="body-s"
-                    >
-                      {group}
-                    </Text>
-                  </Flex>
-                ) : null}
-                <>
-                  {items.map((item) => {
-                    return (
-                      <JSListItem
-                        isActive={item.key === activeActionBaseId}
-                        item={item}
-                        key={item.key}
-                        parentEntityId={pageId}
-                        parentEntityType={ActionParentEntityType.PAGE}
-                      />
-                    );
-                  })}
-                </>
-              </Flex>
-            );
-          })}
-          {filteredItemGroups.length === 0 && searchTerm !== "" ? (
-            <NoSearchResults
-              text={createMessage(
-                EDITOR_PANE_TEXTS.empty_search_result,
-                createMessage(EDITOR_PANE_TEXTS.search_objects.jsObject),
-              )}
-            />
-          ) : null}
-        </Flex>
-      </FilesContextProvider>
+        {filteredItemGroups.map(({ group, items }) => {
+          return (
+            <Flex flexDirection={"column"} key={group}>
+              {group !== "NA" ? (
+                <Flex py="spaces-1">
+                  <Text
+                    className="overflow-hidden overflow-ellipsis whitespace-nowrap"
+                    kind="body-s"
+                  >
+                    {group}
+                  </Text>
+                </Flex>
+              ) : null}
+              <FilesContextProvider
+                canCreateActions={canCreateActions}
+                editorId={applicationId}
+                parentEntityId={pageId}
+                parentEntityType={ActionParentEntityType.PAGE}
+              >
+                {items.map((item) => {
+                  return (
+                    <JSListItem
+                      isActive={item.key === activeActionBaseId}
+                      item={item}
+                      key={item.key}
+                      parentEntityId={pageId}
+                    />
+                  );
+                })}
+              </FilesContextProvider>
+            </Flex>
+          );
+        })}
+        {filteredItemGroups.length === 0 && searchTerm !== "" ? (
+          <NoSearchResults
+            text={createMessage(
+              EDITOR_PANE_TEXTS.empty_search_result,
+              createMessage(EDITOR_PANE_TEXTS.search_objects.jsObject),
+            )}
+          />
+        ) : null}
+      </Flex>
     </JSContainer>
   );
 };
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
index d5f66c9e4d54..ef5dfccff8e1 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
@@ -87,7 +87,6 @@ const ListQuery = () => {
                       item={file}
                       key={file.key}
                       parentEntityId={pageId}
-                      parentEntityType={ActionParentEntityType.PAGE}
                     />
                   );
                 })}
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts b/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts
index 9b06326a3fe7..ba9ce7d61210 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/constants.ts
@@ -9,8 +9,8 @@ import {
   getJSSegmentItems,
   getQuerySegmentItems,
 } from "ee/selectors/entitiesSelector";
-import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils";
-import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
+import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl";
+import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl";
 
 export const TabSelectors: Record<
   EditorEntityTab,
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.test.tsx b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.test.tsx
index fba4513791f0..42a994c05c73 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.test.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.test.tsx
@@ -41,7 +41,7 @@ describe("DataSidePane", () => {
     }) as AppState;
 
     render(<DataSidePane />, {
-      url: "app/untitled-application-1/page1/edit/datasource/users-ds-id",
+      url: "/app/untitled-application-1/page1-678a356f18346f618bc2c80a/edit/datasource/users-ds-id",
       initialState: state,
     });
 
@@ -80,7 +80,7 @@ describe("DataSidePane", () => {
     };
 
     render(<DataSidePane dsUsageSelector={usageSelector} />, {
-      url: "app/untitled-application-1/page1/edit/datasource/users-ds-id",
+      url: "/app/untitled-application-1/page1-2/edit/datasource/users-ds-id",
       initialState: state,
     });
 
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx
index 2219569a637e..d0a65be5da8a 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx
@@ -21,7 +21,6 @@ import {
   DATASOURCE_LIST_BLANK_DESCRIPTION,
 } from "ee/constants/messages";
 import PaneHeader from "./PaneHeader";
-import { useEditorType } from "ee/hooks";
 import { INTEGRATION_TABS } from "constants/routes";
 import type { AppState } from "ee/reducers";
 import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors";
@@ -31,6 +30,7 @@ import { getHasCreateDatasourcePermission } from "ee/utils/BusinessFeatures/perm
 import { EmptyState } from "@appsmith/ads";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 const PaneBody = styled.div`
   padding: var(--ads-v2-spaces-3) 0;
@@ -51,7 +51,6 @@ interface DataSidePaneProps {
 
 const DataSidePane = (props: DataSidePaneProps) => {
   const { dsUsageSelector = getDatasourceUsageCountForApp } = props;
-  const editorType = useEditorType(history.location.pathname);
   const basePageId = useSelector(getCurrentBasePageId) as string;
   const [currentSelectedDatasource, setCurrentSelectedDatasource] = useState<
     string | undefined
@@ -60,13 +59,13 @@ const DataSidePane = (props: DataSidePaneProps) => {
   const groupedDatasources = useSelector(getDatasourcesGroupedByPluginCategory);
   const plugins = useSelector(getPlugins);
   const groupedPlugins = keyBy(plugins, "id");
-  const dsUsageMap = useSelector((state) => dsUsageSelector(state, editorType));
+  const location = useLocation();
+  const ideType = getIDETypeByUrl(location.pathname);
+  const dsUsageMap = useSelector((state) => dsUsageSelector(state, ideType));
   const goToDatasource = useCallback((id: string) => {
     history.push(datasourcesEditorIdURL({ datasourceId: id }));
   }, []);
 
-  const location = useLocation();
-
   useEffect(() => {
     setCurrentSelectedDatasource(getSelectedDatasourceId(location.pathname));
   }, [location]);
diff --git a/app/client/src/pages/Editor/IDE/hooks.ts b/app/client/src/pages/Editor/IDE/hooks.ts
index ccfe8c31e57c..6cf34caf2a27 100644
--- a/app/client/src/pages/Editor/IDE/hooks.ts
+++ b/app/client/src/pages/Editor/IDE/hooks.ts
@@ -27,11 +27,11 @@ import { closeQueryActionTab } from "actions/pluginActionActions";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
 import { getCurrentEntityInfo } from "../utils";
 import { useGitCurrentBranch } from "../gitSync/hooks/modHooks";
-import { useEditorType } from "ee/hooks";
-import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
 import { useBoolean } from "usehooks-ts";
 import { isWidgetActionConnectionPresent } from "selectors/onboardingSelectors";
 import localStorage, { LOCAL_STORAGE_KEYS } from "utils/localStorage";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 export const useCurrentEditorState = () => {
   const [selectedSegment, setSelectedSegment] = useState<EditorEntityTab>(
@@ -63,9 +63,8 @@ export const useCurrentEditorState = () => {
 export const useSegmentNavigation = (): {
   onSegmentChange: (value: string) => void;
 } => {
-  const editorType = useEditorType(location.pathname);
-  const { parentEntityId: baseParentEntityId } =
-    useParentEntityInfo(editorType);
+  const ideType = getIDETypeByUrl(location.pathname);
+  const { parentEntityId: baseParentEntityId } = useParentEntityInfo(ideType);
 
   /**
    * Callback to handle the segment change
diff --git a/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx b/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx
index 17912c39fdfa..3cf053abc581 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx
@@ -20,9 +20,8 @@ import {
 import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
 import { getAssetUrl, isAirgapped } from "ee/utils/airgapHelpers";
 import { Spinner } from "@appsmith/ads";
-import { useEditorType } from "ee/hooks";
-import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
-import { createNewApiActionBasedOnEditorType } from "ee/actions/helpers";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
+import { createNewApiActionBasedOnIdeType } from "ee/actions/helpers";
 import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 import {
   DatasourceContainer,
@@ -48,6 +47,8 @@ import {
   type PremiumIntegration,
 } from "./PremiumDatasources/Constants";
 import { getDatasourcesLoadingState } from "selectors/datasourceSelectors";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
+import type { IDEType } from "ee/entities/IDE/constants";
 
 interface CreateAPIOrSaasPluginsProps {
   location: {
@@ -62,8 +63,8 @@ interface CreateAPIOrSaasPluginsProps {
   plugins: Plugin[];
   createDatasourceFromForm: typeof createDatasourceFromForm;
   createTempDatasourceFromForm: typeof createTempDatasourceFromForm;
-  createNewApiActionBasedOnEditorType: (
-    editorType: string,
+  createNewApiActionBasedOnIdeType: (
+    ideType: IDEType,
     editorId: string,
     parentEntityId: string,
     parentEntityType: ActionParentEntityTypeInterface,
@@ -87,9 +88,9 @@ export const API_ACTION = {
 function APIOrSaasPlugins(props: CreateAPIOrSaasPluginsProps) {
   const { authApiPlugin, isCreating, isOnboardingScreen, pageId, plugins } =
     props;
-  const editorType = useEditorType(location.pathname);
+  const ideType = getIDETypeByUrl(location.pathname);
   const { editorId, parentEntityId, parentEntityType } =
-    useParentEntityInfo(editorType);
+    useParentEntityInfo(ideType);
   const generateCRUDSupportedPlugin: GenerateCRUDEnabledPluginMap = useSelector(
     getGenerateCRUDEnabledPluginMap,
   );
@@ -114,8 +115,8 @@ function APIOrSaasPlugins(props: CreateAPIOrSaasPluginsProps) {
     AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
       source,
     });
-    props.createNewApiActionBasedOnEditorType(
-      editorType,
+    props.createNewApiActionBasedOnIdeType(
+      ideType,
       editorId,
       // Set parentEntityId as (parentEntityId or if it is onboarding screen then set it as pageId) else empty string
       parentEntityId || (isOnboardingScreen && pageId) || "",
@@ -347,7 +348,7 @@ const mapStateToProps = (
 const mapDispatchToProps = {
   createDatasourceFromForm,
   createTempDatasourceFromForm,
-  createNewApiActionBasedOnEditorType,
+  createNewApiActionBasedOnIdeType,
 };
 
 export default connect(
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx b/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx
index 042c1ce28137..d3fc12b0ca57 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx
@@ -27,7 +27,7 @@ import {
   CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER,
   CREATE_NEW_DATASOURCE_DATABASE_HEADER,
 } from "ee/constants/messages";
-import { createNewApiActionBasedOnEditorType } from "ee/actions/helpers";
+import { createNewApiActionBasedOnIdeType } from "ee/actions/helpers";
 import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 import history from "utils/history";
 import {
@@ -38,8 +38,7 @@ import {
 } from "./IntegrationStyledComponents";
 import DatasourceItem from "./DatasourceItem";
 import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
-import { useEditorType } from "ee/hooks";
-import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo";
 import scrollIntoView from "scroll-into-view-if-needed";
 import { pluginSearchSelector } from "./CreateNewDatasourceHeader";
 import type { CreateDatasourceConfig } from "api/DatasourcesApi";
@@ -51,6 +50,8 @@ import {
   PluginPackageName,
   PluginType,
 } from "entities/Plugin";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
+import type { IDEType } from "ee/entities/IDE/constants";
 
 // This function remove the given key from queryParams and return string
 const removeQueryParams = (paramKeysToRemove: Array<string>) => {
@@ -73,7 +74,7 @@ const removeQueryParams = (paramKeysToRemove: Array<string>) => {
 };
 
 interface DBOrMostPopularPluginsProps {
-  editorType: string;
+  ideType: IDEType;
   editorId: string;
   parentEntityId: string;
   parentEntityType: ActionParentEntityTypeInterface;
@@ -90,8 +91,8 @@ interface ReduxDispatchProps {
   initializeForm: (data: Record<string, unknown>) => void;
   createDatasource: (data: CreateDatasourceConfig & Datasource) => void;
   createTempDatasource: typeof createTempDatasourceFromForm;
-  createNewApiActionBasedOnEditorType: (
-    editorType: string,
+  createNewApiActionBasedOnIdeType: (
+    ideType: IDEType,
     editorId: string,
     parentEntityId: string,
     parentEntityType: ActionParentEntityTypeInterface,
@@ -185,14 +186,13 @@ class DBOrMostPopularPlugins extends React.Component<Props> {
   };
 
   handleOnClick = () => {
-    const { editorId, editorType, parentEntityId, parentEntityType } =
-      this.props;
+    const { editorId, ideType, parentEntityId, parentEntityType } = this.props;
 
     AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
       source: API_ACTION.CREATE_NEW_API,
     });
-    this.props.createNewApiActionBasedOnEditorType(
-      editorType,
+    this.props.createNewApiActionBasedOnIdeType(
+      ideType,
       editorId,
       parentEntityId,
       parentEntityType,
@@ -254,9 +254,9 @@ class DBOrMostPopularPlugins extends React.Component<Props> {
 }
 
 function CreateDBOrMostPopularPlugins(props: CreateDBOrMostPopularPluginsType) {
-  const editorType = useEditorType(location.pathname);
+  const ideType = getIDETypeByUrl(location.pathname);
   const { editorId, parentEntityId, parentEntityType } =
-    useParentEntityInfo(editorType);
+    useParentEntityInfo(ideType);
   const newDatasourceRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -284,7 +284,7 @@ function CreateDBOrMostPopularPlugins(props: CreateDBOrMostPopularPluginsType) {
         <DBOrMostPopularPlugins
           {...props}
           editorId={editorId}
-          editorType={editorType}
+          ideType={ideType}
           isCreating={props.isCreating}
           location={location}
           parentEntityId={
@@ -345,16 +345,16 @@ const mapDispatchToProps = (dispatch: Dispatch<AnyAction>) => {
       dispatch(createDatasourceFromForm(data)),
     createTempDatasource: (data: { pluginId: string; type: PluginType }) =>
       dispatch(createTempDatasourceFromForm(data)),
-    createNewApiActionBasedOnEditorType: (
-      editorType: string,
+    createNewApiActionBasedOnIdeType: (
+      ideType: IDEType,
       editorId: string,
       parentEntityId: string,
       parentEntityType: ActionParentEntityTypeInterface,
       apiType: string,
     ) =>
       dispatch(
-        createNewApiActionBasedOnEditorType(
-          editorType,
+        createNewApiActionBasedOnIdeType(
+          ideType,
           editorId,
           parentEntityId,
           parentEntityType,
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
index 3c35e2d37d79..197401484c7a 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
@@ -58,9 +58,9 @@ import {
   getHasManageDatasourcePermission,
   hasCreateDSActionPermissionInApp,
 } from "ee/utils/BusinessFeatures/permissionPageHelpers";
-import { useEditorType } from "ee/hooks";
 import { getIsAnvilEnabledInCurrentApplication } from "layoutSystems/anvil/integrations/selectors";
 import { openGeneratePageModal } from "../GeneratePage/store/generatePageActions";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 const Wrapper = styled.div`
   padding: 15px;
@@ -179,7 +179,7 @@ function DatasourceCard(props: DatasourceCardProps) {
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
   const isAnvilEnabled = useSelector(getIsAnvilEnabledInCurrentApplication);
 
-  const editorType = useEditorType(history.location.pathname);
+  const ideType = getIDETypeByUrl(history.location.pathname);
 
   const canCreatePages = getHasCreatePagePermission(
     isFeatureEnabled,
@@ -190,7 +190,7 @@ function DatasourceCard(props: DatasourceCardProps) {
     isEnabled: isFeatureEnabled,
     dsPermissions: datasourcePermissions,
     pagePermissions,
-    editorType,
+    ideType,
   });
 
   const canEditDatasource = getHasManageDatasourcePermission(
diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
index c9318a0f1f62..64508daae4db 100644
--- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
@@ -324,8 +324,8 @@ function ReconnectDatasourceModal() {
    */
   const {
     editorId,
-    editorType,
     editorURL,
+    ideType,
     missingDsCredentialsDescription, // pageId or moduleId
     parentEntityId, // appId or packageId from query params
     skipMessage,
@@ -354,7 +354,7 @@ function ReconnectDatasourceModal() {
         workspaceId: orgId,
         datasourceName: dsName,
         pluginName: plugins[datasource?.pluginId || ""]?.name,
-        editorType,
+        ideType,
       });
     } else if (queryDatasourceId) {
       dispatch(loadFilePickerAction());
diff --git a/app/client/src/plugins/Linting/constants.ts b/app/client/src/plugins/Linting/constants.ts
index 40f0ab2d5c7b..63acf26cfbd6 100644
--- a/app/client/src/plugins/Linting/constants.ts
+++ b/app/client/src/plugins/Linting/constants.ts
@@ -3,6 +3,7 @@ import type { LintOptions } from "jshint";
 import isEntityFunction from "./utils/isEntityFunction";
 import { noFloatingPromisesLintRule } from "./customRules/no-floating-promises";
 import { getLintRulesBasedOnContext } from "ee/utils/lintRulesHelpers";
+import type { IDEType } from "ee/entities/IDE/constants";
 
 export enum LINTER_TYPE {
   "JSHINT" = "JSHint",
@@ -12,7 +13,7 @@ export enum LINTER_TYPE {
 export const lintOptions = (
   globalData: Record<string, boolean | "readonly" | "writable">,
   asyncFunctions: string[],
-  editorType: string,
+  ideType: IDEType,
   linterType: LINTER_TYPE = LINTER_TYPE.JSHINT,
 ) => {
   if (linterType === LINTER_TYPE.JSHINT) {
@@ -42,7 +43,7 @@ export const lintOptions = (
       loopfunc: true,
     } as LintOptions;
   } else {
-    const extraRules = getLintRulesBasedOnContext({ editorType });
+    const extraRules = getLintRulesBasedOnContext({ ideType });
 
     return {
       languageOptions: {
diff --git a/app/client/src/plugins/Linting/tests/generateLintingGlobalData.test.ts b/app/client/src/plugins/Linting/tests/generateLintingGlobalData.test.ts
index efa9e1f6bc64..3f1290cb44a3 100644
--- a/app/client/src/plugins/Linting/tests/generateLintingGlobalData.test.ts
+++ b/app/client/src/plugins/Linting/tests/generateLintingGlobalData.test.ts
@@ -7,7 +7,6 @@ jest.mock("ee/hooks", () => {
 
   return {
     ...actualModule, // Spread the original module exports
-    getEditorType: jest.fn(() => "TestEditorType"), // Override `getEditorType`
   };
 });
 
@@ -52,8 +51,6 @@ describe("generateLintingGlobalData", () => {
       "JSObject1.myFun2",
       "JSObject1.test",
     ]);
-
-    expect(result.editorType).toEqual("TestEditorType");
   });
 
   it("should handle an empty input and return default values", () => {
diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
index a66476af4c34..bfbc61d13f02 100644
--- a/app/client/src/plugins/Linting/utils/getLintingErrors.ts
+++ b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -44,8 +44,9 @@ import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { Linter } from "eslint-linter-browserify";
 import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
-import { EditorNames, getEditorType } from "ee/hooks";
 import type { AppsmithEntity } from "ee/entities/DataTree/types";
+import { IDE_TYPE, type IDEType } from "ee/entities/IDE/constants";
+import { getIDETypeByUrl } from "ee/entities/IDE/utils";
 
 const EvaluationScriptPositions: Record<string, Position> = {};
 
@@ -80,7 +81,7 @@ export function generateLintingGlobalData(
   linterType = LINTER_TYPE.JSHINT,
 ) {
   const asyncFunctions: string[] = [];
-  let editorType = EditorNames.APPLICATION;
+  let ideType: IDEType = IDE_TYPE.App;
   let globalData: Record<string, boolean | "readonly" | "writable"> = {};
 
   if (linterType === LINTER_TYPE.JSHINT) {
@@ -139,7 +140,7 @@ export function generateLintingGlobalData(
         } else if (dataValueEntityType === ENTITY_TYPE.APPSMITH) {
           const appsmithEntity: AppsmithEntity = dataValue;
 
-          editorType = getEditorType(appsmithEntity.URL.pathname);
+          ideType = getIDETypeByUrl(appsmithEntity.URL.pathname);
         }
       }
     }
@@ -156,7 +157,7 @@ export function generateLintingGlobalData(
     );
   }
 
-  return { globalData, asyncFunctions, editorType };
+  return { globalData, asyncFunctions, ideType };
 }
 
 function sanitizeESLintErrors(
@@ -371,13 +372,13 @@ export default function getLintingErrors({
   const scriptPos = getEvaluationScriptPosition(scriptType);
   const {
     asyncFunctions,
-    editorType,
     globalData: lintingGlobalData,
+    ideType,
   } = generateLintingGlobalData(data, linterType);
   const lintingOptions = lintOptions(
     lintingGlobalData,
     asyncFunctions,
-    editorType,
+    ideType,
     linterType,
   );
 
diff --git a/app/client/src/sagas/IDESaga.tsx b/app/client/src/sagas/IDESaga.tsx
index 539b42af8ab7..e6adeafa8e3d 100644
--- a/app/client/src/sagas/IDESaga.tsx
+++ b/app/client/src/sagas/IDESaga.tsx
@@ -15,8 +15,8 @@ import {
   queryListURL,
 } from "ee/RouteBuilder";
 import type { EntityItem } from "ee/entities/IDE/constants";
-import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
-import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils";
+import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils/getQueryEntityItemUrl";
+import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl";
 import log from "loglevel";
 import type { ReduxAction } from "actions/ReduxActionTypes";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
diff --git a/app/client/src/selectors/jsPaneSelectors.ts b/app/client/src/selectors/jsPaneSelectors.ts
index 2ed21844c3fe..cc5416609bc0 100644
--- a/app/client/src/selectors/jsPaneSelectors.ts
+++ b/app/client/src/selectors/jsPaneSelectors.ts
@@ -1,5 +1,5 @@
 import type { AppState } from "ee/reducers";
-import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils";
+import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils/getJSEntityItemUrl";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 import { identifyEntityFromPath } from "navigation/FocusEntity";
 import { selectJSSegmentEditorTabs } from "ee/selectors/appIDESelectors";