diff --git a/app/client/src/sagas/getNextEntityAfterRemove.test.ts b/app/client/src/IDE/utils/getNextEntityAfterRemove.test.ts
similarity index 94%
rename from app/client/src/sagas/getNextEntityAfterRemove.test.ts
rename to app/client/src/IDE/utils/getNextEntityAfterRemove.test.ts
index 77ad93bfd417..ec9120b5ff09 100644
--- a/app/client/src/sagas/getNextEntityAfterRemove.test.ts
+++ b/app/client/src/IDE/utils/getNextEntityAfterRemove.test.ts
@@ -1,7 +1,10 @@
 import { EditorState } from "IDE/enums";
 import { PluginType } from "entities/Plugin";
 import * as FocusEntityObj from "navigation/FocusEntity";
-import { RedirectAction, getNextEntityAfterRemove } from "./IDESaga";
+import {
+  RedirectAction,
+  getNextEntityAfterRemove,
+} from "./getNextEntityAfterRemove";
 import { FocusEntity } from "navigation/FocusEntity";
 import type { EntityItem } from "ee/IDE/Interfaces/EntityItem";
 
diff --git a/app/client/src/IDE/utils/getNextEntityAfterRemove.ts b/app/client/src/IDE/utils/getNextEntityAfterRemove.ts
new file mode 100644
index 000000000000..2843b7d0ff11
--- /dev/null
+++ b/app/client/src/IDE/utils/getNextEntityAfterRemove.ts
@@ -0,0 +1,66 @@
+import type { EntityItem } from "ee/IDE/Interfaces/EntityItem";
+import { identifyEntityFromPath } from "navigation/FocusEntity";
+
+/**
+ * Adds custom redirect logic to redirect after an item is deleted
+ * 1. Do not navigate if the deleted item is not selected
+ * 2. If it was the only item, navigate to the list url, to show the blank state
+ * 3. If there are other items, navigate to an item close to the current one
+ * **/
+
+export enum RedirectAction {
+  NA = "NA", // No action is needed
+  LIST = "LIST", // Navigate to a creation URL
+  ITEM = "ITEM", // Navigate to this item
+}
+
+interface RedirectActionDescription<T> {
+  action: RedirectAction;
+  payload?: T;
+}
+
+export function getNextEntityAfterRemove<T extends EntityItem>(
+  removedId: string,
+  tabs: T[],
+): RedirectActionDescription<T> {
+  const currentSelectedEntity = identifyEntityFromPath(
+    window.location.pathname,
+  );
+  const isSelectedActionRemoved = currentSelectedEntity.id === removedId;
+
+  // If removed item is not currently selected, don't redirect
+  if (!isSelectedActionRemoved) {
+    return {
+      action: RedirectAction.NA,
+    };
+  }
+
+  const indexOfTab = tabs.findIndex((item) => item.key === removedId);
+
+  switch (indexOfTab) {
+    case -1:
+      // If no other action is remaining, navigate to the creation url
+      return {
+        action: RedirectAction.LIST,
+      };
+    case 0:
+      // if the removed item is first item, then if tabs present, tabs + 1
+      // else otherItems[0] -> TODO: consider changing this logic after discussion with
+      // design team. May be new listing UI for side by side
+      if (tabs.length > 1) {
+        return {
+          action: RedirectAction.ITEM,
+          payload: tabs[1],
+        };
+      } else {
+        return {
+          action: RedirectAction.LIST,
+        };
+      }
+    default:
+      return {
+        action: RedirectAction.ITEM,
+        payload: tabs[indexOfTab - 1],
+      };
+  }
+}
diff --git a/app/client/src/IDE/utils/getUpdatedTabs.ts b/app/client/src/IDE/utils/getUpdatedTabs.ts
new file mode 100644
index 000000000000..e2f201ec2145
--- /dev/null
+++ b/app/client/src/IDE/utils/getUpdatedTabs.ts
@@ -0,0 +1,7 @@
+export function getUpdatedTabs(newId: string, currentTabs: string[]) {
+  if (currentTabs.includes(newId)) return currentTabs;
+
+  const newTabs = [...currentTabs, newId];
+
+  return newTabs;
+}
diff --git a/app/client/src/IDE/utils/groupAndSortEntitySegmentList.ts b/app/client/src/IDE/utils/groupAndSortEntitySegmentList.ts
index 0c661cc82f25..9fa3cb40d5dc 100644
--- a/app/client/src/IDE/utils/groupAndSortEntitySegmentList.ts
+++ b/app/client/src/IDE/utils/groupAndSortEntitySegmentList.ts
@@ -1,14 +1,14 @@
-import { groupBy, sortBy } from "lodash";
 import type { EntityItem } from "ee/IDE/Interfaces/EntityItem";
+import { groupBy, sortBy } from "lodash";
 
-export type EditorSegmentList = Array<{
+export type EditorSegmentList<T> = Array<{
   group: string | "NA";
-  items: EntityItem[];
+  items: T[];
 }>;
 
-export const groupAndSortEntitySegmentList = (
-  items: EntityItem[],
-): EditorSegmentList => {
+export const groupAndSortEntitySegmentList = <T extends EntityItem>(
+  items: T[],
+): EditorSegmentList<T> => {
   const groups = groupBy(items, (item) => {
     if (item.group) return item.group;
 
diff --git a/app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts b/app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts
index e1ee5994c5f6..08cc042793cd 100644
--- a/app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts
+++ b/app/client/src/ce/PluginActionEditor/hooks/useBlockExecution.ts
@@ -21,7 +21,7 @@ const useBlockExecution = () => {
   // this gets the url of the current action's datasource
   const actionDatasourceUrl =
     action.datasource.datasourceConfiguration?.url || "";
-  const actionDatasourceUrlPath = action.actionConfiguration.path || "";
+  const actionDatasourceUrlPath = action.actionConfiguration?.path || "";
   // this gets the name of the current action's datasource
   const actionDatasourceName = action.datasource.name || "";
 
diff --git a/app/client/src/sagas/IDESaga.tsx b/app/client/src/sagas/IDESaga.tsx
index 0f312ad3c977..42cf5866b480 100644
--- a/app/client/src/sagas/IDESaga.tsx
+++ b/app/client/src/sagas/IDESaga.tsx
@@ -1,5 +1,5 @@
 import type { FocusEntityInfo } from "navigation/FocusEntity";
-import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
+import { FocusEntity } from "navigation/FocusEntity";
 import { all, call, put, select, takeEvery } from "redux-saga/effects";
 import { getJSTabs, getQueryTabs } from "selectors/ideSelectors";
 import {
@@ -27,6 +27,11 @@ import {
   selectQuerySegmentEditorTabs,
 } from "ee/selectors/appIDESelectors";
 import { getCurrentBasePageId } from "selectors/editorSelectors";
+import {
+  getNextEntityAfterRemove,
+  RedirectAction,
+} from "IDE/utils/getNextEntityAfterRemove";
+import { getUpdatedTabs } from "IDE/utils/getUpdatedTabs";
 
 export function* updateIDETabsOnRouteChangeSaga(entityInfo: FocusEntityInfo) {
   const { entity, id, params } = entityInfo;
@@ -54,14 +59,6 @@ export function* updateIDETabsOnRouteChangeSaga(entityInfo: FocusEntityInfo) {
   }
 }
 
-function* getUpdatedTabs(newId: string, currentTabs: string[]) {
-  if (currentTabs.includes(newId)) return currentTabs;
-
-  const newTabs = [...currentTabs, newId];
-
-  return newTabs;
-}
-
 export function* handleJSEntityRedirect(deletedId: string) {
   const basePageId: string = yield select(getCurrentBasePageId);
   const jsTabs: EntityItem[] = yield select(selectJSSegmentEditorTabs);
@@ -108,70 +105,6 @@ export function* handleQueryEntityRedirect(deletedId: string) {
   }
 }
 
-/**
- * Adds custom redirect logic to redirect after an item is deleted
- * 1. Do not navigate if the deleted item is not selected
- * 2. If it was the only item, navigate to the list url, to show the blank state
- * 3. If there are other items, navigate to an item close to the current one
- * **/
-
-export enum RedirectAction {
-  NA = "NA", // No action is needed
-  LIST = "LIST", // Navigate to a creation URL
-  ITEM = "ITEM", // Navigate to this item
-}
-
-interface RedirectActionDescription {
-  action: RedirectAction;
-  payload?: EntityItem;
-}
-
-export function getNextEntityAfterRemove(
-  removedId: string,
-  tabs: EntityItem[],
-): RedirectActionDescription {
-  const currentSelectedEntity = identifyEntityFromPath(
-    window.location.pathname,
-  );
-  const isSelectedActionRemoved = currentSelectedEntity.id === removedId;
-
-  // If removed item is not currently selected, don't redirect
-  if (!isSelectedActionRemoved) {
-    return {
-      action: RedirectAction.NA,
-    };
-  }
-
-  const indexOfTab = tabs.findIndex((item) => item.key === removedId);
-
-  switch (indexOfTab) {
-    case -1:
-      // If no other action is remaining, navigate to the creation url
-      return {
-        action: RedirectAction.LIST,
-      };
-    case 0:
-      // if the removed item is first item, then if tabs present, tabs + 1
-      // else otherItems[0] -> TODO: consider changing this logic after discussion with
-      // design team. May be new listing UI for side by side
-      if (tabs.length > 1) {
-        return {
-          action: RedirectAction.ITEM,
-          payload: tabs[1],
-        };
-      } else {
-        return {
-          action: RedirectAction.LIST,
-        };
-      }
-    default:
-      return {
-        action: RedirectAction.ITEM,
-        payload: tabs[indexOfTab - 1],
-      };
-  }
-}
-
 function* storeIDEViewChangeSaga(
   action: ReduxAction<{ view: EditorViewMode }>,
 ) {