refactor: Separate types from implementations to reduce cyclic dependencies

- Move types to dedicated type files
- Update imports to reference new type locations
- Reduce cyclic dependencies to address memory issues

Testing: No functional changes

Co-Authored-By: arpit@appsmith.com <arpit@appsmith.com>

Author: devin-ai-integration[bot]

app/client/src/actions/controlActions.tsx

@@ -3,8 +3,18 @@ import type {
   ReduxActionType,
 } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import type { UpdateWidgetsPayload } from "reducers/entityReducers/canvasWidgetsReducer";
+import type { UpdateWidgetsPayload } from "reducers/types/canvasWidgets.types";
 import type { DynamicPath } from "utils/DynamicBindingUtils";
+import type {
+  BatchPropertyUpdatePayload,
+  UpdateWidgetPropertyRequestPayload,
+  UpdateWidgetPropertyPayload,
+  UpdateCanvasLayoutPayload,
+  SetWidgetDynamicPropertyPayload,
+  BatchUpdateDynamicPropertyUpdates,
+  BatchUpdateWidgetDynamicPropertyPayload,
+  DeleteWidgetPropertyPayload,
+} from "./types/controlActions.types";
 
 export const updateWidgetPropertyRequest = (
   widgetId: string,
@@ -23,12 +33,7 @@ export const updateWidgetPropertyRequest = (
   };
 };
 
-export interface BatchPropertyUpdatePayload {
-  modify?: Record<string, unknown>; //Key value pairs of paths and values to update
-  remove?: string[]; //Array of paths to delete
-  triggerPaths?: string[]; // Array of paths in the modify and remove list which are trigger paths
-  postUpdateAction?: ReduxActionType; // Array of action types we need to dispatch after property updates.
-}
+
 
 export const batchUpdateWidgetProperty = (
   widgetId: string,
@@ -111,50 +116,3 @@ export const updateMultipleMetaWidgetPropertiesAction = (
     payload: { widgetsToUpdate, shouldEval },
   };
 };
-
-export interface UpdateWidgetPropertyRequestPayload {
-  widgetId: string;
-  propertyPath: string;
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  propertyValue: any;
-}
-
-export interface UpdateWidgetPropertyPayload {
-  widgetId: string;
-  updates: BatchPropertyUpdatePayload;
-  dynamicUpdates?: {
-    dynamicBindingPathList?: DynamicPath[];
-    dynamicTriggerPathList?: DynamicPath[];
-    dynamicPropertyPathList?: DynamicPath[];
-  };
-  shouldReplay?: boolean;
-}
-
-export interface UpdateCanvasLayoutPayload {
-  width: number;
-  height: number;
-}
-
-export interface SetWidgetDynamicPropertyPayload {
-  widgetId: string;
-  propertyPath: string;
-  isDynamic: boolean;
-  shouldRejectDynamicBindingPathList?: boolean;
-  skipValidation?: boolean;
-}
-
-export type BatchUpdateDynamicPropertyUpdates = Omit<
-  SetWidgetDynamicPropertyPayload,
-  "widgetId"
->;
-
-export interface BatchUpdateWidgetDynamicPropertyPayload {
-  widgetId: string;
-  updates: BatchUpdateDynamicPropertyUpdates[];
-}
-
-export interface DeleteWidgetPropertyPayload {
-  widgetId: string;
-  propertyPaths: string[];
-}

app/client/src/actions/pageActions.tsx

@@ -9,19 +9,15 @@ import {
   ReduxActionTypes,
   WidgetReduxActionTypes,
 } from "ee/constants/ReduxActionConstants";
-import type { DynamicPath } from "utils/DynamicBindingUtils";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { WidgetOperation, WidgetProps } from "widgets/BaseWidget";
 import type {
-  FetchPageResponse,
-  PageLayout,
   SavePageResponse,
-  UpdatePageRequest,
   UpdatePageResponse,
+  FetchPageResponse,
+  PageLayout,
 } from "api/PageApi";
 import type { UrlDataState } from "reducers/entityReducers/appReducer";
-import type { APP_MODE } from "entities/App";
-import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import type { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 import type { Replayable } from "entities/Replay/ReplayEntity/ReplayEditor";
 import * as Sentry from "@sentry/react";
@@ -30,26 +26,42 @@ import type {
   LayoutOnLoadActionErrors,
   PageAction,
 } from "../constants/AppsmithActionConstants/ActionConstants";
-import { ReplayOperation } from "entities/Replay/ReplayEntity/ReplayOperations";
-import type { PACKAGE_PULL_STATUS } from "ee/constants/ModuleConstants";
+import type { APP_MODE } from "entities/App";
 import type { ApiResponse } from "api/ApiResponses";
+import type { DynamicPath } from "utils/DynamicBindingUtils";
+import type { CanvasWidgetsReduxState } from "reducers/types/canvasWidgets.types";
+import { ReplayOperation } from "entities/Replay/ReplayEntity/ReplayOperations";
+import type {
+  FetchPageListPayload,
+  UpdateLayoutOptions,
+  FetchPageActionPayload,
+  UpdateCurrentPagePayload,
+  UpdateCanvasPayload,
+  CreatePageActionPayload,
+  ClonePageActionPayload,
+  SetupPageActionPayload,
+  FetchPublishedPageActionPayload,
+  FetchPublishedPageResourcesPayload,
+  UpdatePageErrorPayload,
+  WidgetAddChild,
+  WidgetRemoveChild,
+  WidgetDelete,
+  MultipleWidgetDeletePayload,
+  WidgetResize,
+  ModalWidgetResize,
+  WidgetAddChildren,
+  WidgetUpdateProperty,
+  ReduxActionWithExtraParams,
+  GenerateCRUDSuccess,
+  GenerateTemplatePageActionPayload,
+  DeletePageActionPayload,
+  SetDefaultPageActionPayload,
+  SetPageOrderActionPayload,
+  SetupPublishedPageActionPayload,
+  ClonePageSuccessPayload,
+} from "./types/pageActions.types";
 
-export interface FetchPageListPayload {
-  applicationId: string;
-  mode: APP_MODE;
-}
-
-export interface updateLayoutOptions {
-  isRetry?: boolean;
-  shouldReplay?: boolean;
-  updatedWidgetIds?: string[];
-}
 
-export interface FetchPageActionPayload {
-  id: string;
-  isFirstLoad?: boolean;
-  pageWithMigratedDsl?: FetchPageResponse;
-}
 
 export const fetchPageAction = (
   pageId: string,
@@ -67,17 +79,6 @@ export const fetchPageAction = (
 };
 
 // fetch a published page
-export interface FetchPublishedPageActionPayload {
-  pageId: string;
-  bustCache?: boolean;
-  pageWithMigratedDsl?: FetchPageResponse;
-}
-
-export interface FetchPublishedPageResourcesPayload {
-  pageId: string;
-  basePageId: string;
-}
-
 export const fetchPublishedPageAction = (
   pageId: string,
   bustCache = false,
@@ -119,12 +120,6 @@ export const fetchAllPageEntityCompletion = (
   payload: undefined,
 });
 
-export interface UpdateCurrentPagePayload {
-  id: string;
-  slug?: string;
-  permissions?: string[];
-}
-
 export const updateCurrentPage = (
   id: string,
   slug?: string,
@@ -134,19 +129,6 @@ export const updateCurrentPage = (
   payload: { id, slug, permissions },
 });
 
-export interface UpdateCanvasPayload {
-  pageWidgetId: string;
-  widgets: { [widgetId: string]: WidgetProps };
-  currentLayoutId: string;
-  currentPageId: string;
-  currentPageName: string;
-  currentApplicationId: string;
-  dsl: Partial<DSLWidget>;
-  pageActions: PageAction[][];
-  updatedWidgetIds?: string[];
-  layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
-}
-
 export const initCanvasLayout = (
   payload: UpdateCanvasPayload,
 ): ReduxAction<UpdateCanvasPayload> => {
@@ -182,7 +164,7 @@ export const deletePageSuccess = () => {
 
 export const updateAndSaveLayout = (
   widgets: CanvasWidgetsReduxState,
-  options: updateLayoutOptions = {},
+  options: UpdateLayoutOptions = {},
 ) => {
   const { isRetry, shouldReplay, updatedWidgetIds } = options;
 
@@ -199,12 +181,6 @@ export const saveLayout = (isRetry?: boolean) => {
   };
 };
 
-export interface CreatePageActionPayload {
-  applicationId: string;
-  name: string;
-  layouts: Partial<PageLayout>[];
-}
-
 export const createPageAction = (
   applicationId: string,
   pageName: string,
@@ -250,11 +226,6 @@ export const createNewPageFromEntities = (
 };
 
 // cloning a page
-export interface ClonePageActionPayload {
-  id: string;
-  blockNavigation?: boolean;
-}
-
 export const clonePageInit = (
   pageId: string,
   blockNavigation?: boolean,
@@ -268,16 +239,6 @@ export const clonePageInit = (
   };
 };
 
-export interface ClonePageSuccessPayload {
-  pageName: string;
-  description?: string;
-  pageId: string;
-  basePageId: string;
-  layoutId: string;
-  isDefault: boolean;
-  slug: string;
-}
-
 export const clonePageSuccess = ({
   basePageId,
   layoutId,
@@ -351,92 +312,7 @@ export const updatePageError = (payload: UpdatePageErrorPayload) => {
   };
 };
 
-export interface UpdatePageErrorPayload {
-  request: UpdatePageRequest;
-  error: unknown;
-}
-
-export interface WidgetAddChild {
-  widgetId: string;
-  widgetName?: string;
-  type: WidgetType;
-  leftColumn: number;
-  topRow: number;
-  columns: number;
-  rows: number;
-  parentRowSpace: number;
-  parentColumnSpace: number;
-  newWidgetId: string;
-  tabId: string;
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  props?: Record<string, any>;
-  dynamicBindingPathList?: DynamicPath[];
-}
-
-export interface WidgetRemoveChild {
-  widgetId: string;
-  childWidgetId: string;
-}
-
-export interface WidgetDelete {
-  widgetId?: string;
-  parentId?: string;
-  disallowUndo?: boolean;
-  isShortcut?: boolean;
-}
-
-export interface MultipleWidgetDeletePayload {
-  widgetIds: string[];
-  disallowUndo?: boolean;
-  isShortcut?: boolean;
-}
 
-export interface WidgetResize {
-  widgetId: string;
-  parentId: string;
-  leftColumn?: number;
-  rightColumn?: number;
-  topRow?: number;
-  bottomRow?: number;
-  mobileLeftColumn?: number;
-  mobileRightColumn?: number;
-  mobileTopRow?: number;
-  mobileBottomRow?: number;
-  snapColumnSpace: number;
-  snapRowSpace: number;
-}
-
-export interface ModalWidgetResize {
-  height: number;
-  width: number;
-  widgetId: string;
-  canvasWidgetId: string;
-}
-
-export interface WidgetAddChildren {
-  widgetId: string;
-  children: Array<{
-    type: WidgetType;
-    widgetId: string;
-    parentId: string;
-    parentRowSpace: number;
-    parentColumnSpace: number;
-    leftColumn: number;
-    rightColumn: number;
-    topRow: number;
-    bottomRow: number;
-    isLoading: boolean;
-  }>;
-}
-
-export interface WidgetUpdateProperty {
-  widgetId: string;
-  propertyPath: string;
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  propertyValue: any;
-}
 
 export const updateWidget = (
   operation: WidgetOperation,
@@ -482,26 +358,7 @@ export const updateAppStore = (
   };
 };
 
-export interface ReduxActionWithExtraParams<T> extends ReduxAction<T> {
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  extraParams: Record<any, any>;
-}
 
-export interface GenerateCRUDSuccess {
-  page: {
-    // TODO: Fix this the next time the file is edited
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    layouts: Array<any>;
-    id: string;
-    baseId: string;
-    name: string;
-    isDefault?: boolean;
-    slug: string;
-    description?: string;
-  };
-  isNewPage: boolean;
-}
 
 export const generateTemplateSuccess = (payload: GenerateCRUDSuccess) => {
   return {
@@ -516,18 +373,7 @@ export const generateTemplateError = () => {
   };
 };
 
-export interface GenerateTemplatePageActionPayload {
-  pageId: string;
-  tableName: string;
-  datasourceId: string;
-  applicationId: string;
-  columns?: string[];
-  searchColumn?: string;
-  mode?: string;
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  pluginSpecificParams?: Record<any, any>;
-}
+
 
 export const generateTemplateToUpdatePage = ({
   applicationId,
@@ -587,10 +433,6 @@ export function redoAction() {
 
 // delete a page
 
-export interface DeletePageActionPayload {
-  id: string;
-}
-
 export const deletePageAction = (
   pageId: string,
 ): ReduxAction<DeletePageActionPayload> => {
@@ -602,11 +444,6 @@ export const deletePageAction = (
   };
 };
 
-export interface SetDefaultPageActionPayload {
-  id: string;
-  applicationId: string;
-}
-
 export const setPageAsDefault = (
   pageId: string,
   applicationId: string,
@@ -620,12 +457,6 @@ export const setPageAsDefault = (
   };
 };
 
-export interface SetPageOrderActionPayload {
-  pageId: string;
-  order: number;
-  applicationId: string;
-}
-
 export const setPageOrder = (
   applicationId: string,
   pageId: string,
@@ -655,13 +486,6 @@ export const fetchPageDSLs = (payload?: any) => ({
   type: ReduxActionTypes.POPULATE_PAGEDSLS_INIT,
   payload,
 });
-export interface SetupPageActionPayload {
-  id: string;
-  isFirstLoad?: boolean;
-  pageWithMigratedDsl?: FetchPageResponse;
-  packagePullStatus?: ApiResponse<PACKAGE_PULL_STATUS>;
-}
-
 export const setupPageAction = ({
   id,
   isFirstLoad = false,
@@ -677,12 +501,6 @@ export const setupPageAction = ({
   },
 });
 
-export interface SetupPublishedPageActionPayload {
-  pageId: string;
-  bustCache: boolean;
-  pageWithMigratedDsl?: FetchPageResponse;
-}
-
 export const setupPublishedPage = (
   pageId: string,
   bustCache = false,

app/client/src/actions/types/controlActions.types.ts

@@ -0,0 +1,57 @@
+import type {
+  ReduxAction,
+  ReduxActionType,
+} from "ee/constants/ReduxActionConstants";
+import type { DynamicPath } from "utils/DynamicBindingUtils";
+
+export interface BatchPropertyUpdatePayload {
+  modify?: Record<string, unknown>; //Key value pairs of paths and values to update
+  remove?: string[]; //Array of paths to delete
+  triggerPaths?: string[]; // Array of paths in the modify and remove list which are trigger paths
+  postUpdateAction?: ReduxActionType; // Array of action types we need to dispatch after property updates.
+}
+
+export interface UpdateWidgetPropertyRequestPayload {
+  widgetId: string;
+  propertyPath: string;
+  propertyValue: any;
+}
+
+export interface UpdateWidgetPropertyPayload {
+  widgetId: string;
+  updates: BatchPropertyUpdatePayload;
+  dynamicUpdates?: {
+    dynamicBindingPathList?: DynamicPath[];
+    dynamicTriggerPathList?: DynamicPath[];
+    dynamicPropertyPathList?: DynamicPath[];
+  };
+  shouldReplay?: boolean;
+}
+
+export interface UpdateCanvasLayoutPayload {
+  width: number;
+  height: number;
+}
+
+export interface SetWidgetDynamicPropertyPayload {
+  widgetId: string;
+  propertyPath: string;
+  isDynamic: boolean;
+  shouldRejectDynamicBindingPathList?: boolean;
+  skipValidation?: boolean;
+}
+
+export type BatchUpdateDynamicPropertyUpdates = Omit<
+  SetWidgetDynamicPropertyPayload,
+  "widgetId"
+>;
+
+export interface BatchUpdateWidgetDynamicPropertyPayload {
+  widgetId: string;
+  updates: BatchUpdateDynamicPropertyUpdates[];
+}
+
+export interface DeleteWidgetPropertyPayload {
+  widgetId: string;
+  propertyPaths: string[];
+}

app/client/src/actions/types/pageActions.types.ts

@@ -0,0 +1,225 @@
+import type { APP_MODE } from "entities/App";
+import type { PageLayout, FetchPageResponse, UpdatePageRequest } from "api/PageApi";
+import type { CanvasWidgetsReduxState } from "reducers/types/canvasWidgets.types";
+import type { DSLWidget } from "WidgetProvider/constants";
+import type { PageAction, LayoutOnLoadActionErrors } from "constants/AppsmithActionConstants/ActionConstants";
+import type { ApiResponse } from "api/ApiResponses";
+import type { PACKAGE_PULL_STATUS } from "ee/constants/ModuleConstants";
+import type { WidgetProps } from "widgets/BaseWidget";
+import type { WidgetType } from "constants/WidgetConstants";
+import type { DynamicPath } from "utils/DynamicBindingUtils";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+
+export interface FetchPageListPayload {
+  applicationId: string;
+  mode: APP_MODE;
+}
+
+export interface UpdateLayoutOptions {
+  isRetry?: boolean;
+  shouldReplay?: boolean;
+  updatedWidgetIds?: string[];
+}
+
+export interface FetchPageActionPayload {
+  id: string;
+  isFirstLoad?: boolean;
+  pageWithMigratedDsl?: FetchPageResponse;
+}
+
+export interface UpdateCurrentPagePayload {
+  id: string;
+  slug?: string;
+  permissions?: string[];
+}
+
+export interface UpdateCanvasPayload {
+  pageWidgetId: string;
+  widgets: { [widgetId: string]: WidgetProps };
+  currentLayoutId: string;
+  currentPageId: string;
+  currentPageName: string;
+  currentApplicationId: string;
+  dsl: Partial<DSLWidget>;
+  pageActions: PageAction[][];
+  updatedWidgetIds?: string[];
+  layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
+}
+
+export interface CreatePageActionPayload {
+  applicationId: string;
+  name: string;
+  layouts: Partial<PageLayout>[];
+}
+
+export interface ClonePageActionPayload {
+  id: string;
+  blockNavigation?: boolean;
+}
+
+export interface ClonePageSuccessPayload {
+  pageName: string;
+  description?: string;
+  pageId: string;
+  basePageId: string;
+  layoutId: string;
+  isDefault: boolean;
+  slug: string;
+}
+
+export interface SetupPageActionPayload {
+  id: string;
+  isFirstLoad?: boolean;
+  pageWithMigratedDsl?: FetchPageResponse;
+  packagePullStatus?: ApiResponse<PACKAGE_PULL_STATUS>;
+}
+
+export interface FetchPublishedPageActionPayload {
+  pageId: string;
+  bustCache?: boolean;
+  pageWithMigratedDsl?: FetchPageResponse;
+}
+
+export interface FetchPublishedPageResourcesPayload {
+  pageId: string;
+  basePageId: string;
+}
+
+export interface UpdatePageErrorPayload {
+  request: UpdatePageRequest;
+  error: unknown;
+}
+
+export interface WidgetAddChild {
+  widgetId: string;
+  widgetName?: string;
+  type: WidgetType;
+  leftColumn: number;
+  topRow: number;
+  columns: number;
+  rows: number;
+  parentRowSpace: number;
+  parentColumnSpace: number;
+  newWidgetId: string;
+  tabId: string;
+  props?: Record<string, unknown>;
+  dynamicBindingPathList?: DynamicPath[];
+}
+
+export interface WidgetRemoveChild {
+  widgetId: string;
+  childWidgetId: string;
+}
+
+export interface WidgetDelete {
+  widgetId?: string;
+  parentId?: string;
+  disallowUndo?: boolean;
+  isShortcut?: boolean;
+}
+
+export interface MultipleWidgetDeletePayload {
+  widgetIds: string[];
+  disallowUndo?: boolean;
+  isShortcut?: boolean;
+}
+
+export interface WidgetResize {
+  widgetId: string;
+  parentId: string;
+  leftColumn?: number;
+  rightColumn?: number;
+  topRow?: number;
+  bottomRow?: number;
+  mobileLeftColumn?: number;
+  mobileRightColumn?: number;
+  mobileTopRow?: number;
+  mobileBottomRow?: number;
+  snapColumnSpace: number;
+  snapRowSpace: number;
+}
+
+export interface ModalWidgetResize {
+  height: number;
+  width: number;
+  widgetId: string;
+  canvasWidgetId: string;
+}
+
+export interface WidgetAddChildren {
+  widgetId: string;
+  children: Array<{
+    type: WidgetType;
+    widgetId: string;
+    parentId: string;
+    parentRowSpace: number;
+    parentColumnSpace: number;
+    leftColumn: number;
+    rightColumn: number;
+    topRow: number;
+    bottomRow: number;
+    isLoading: boolean;
+  }>;
+}
+
+export interface WidgetUpdateProperty {
+  widgetId: string;
+  propertyPath: string;
+  propertyValue: unknown;
+}
+
+export interface ReduxActionWithExtraParams<T> extends ReduxAction<T> {
+  extraParams: Record<string, unknown>;
+}
+
+export interface GenerateCRUDSuccess {
+  page: {
+    layouts: Array<Partial<PageLayout>>;
+    id: string;
+    baseId: string;
+    name: string;
+    isDefault?: boolean;
+    slug: string;
+    description?: string;
+  };
+  isNewPage: boolean;
+}
+
+export interface GenerateTemplatePageActionPayload {
+  pageId: string;
+  tableName: string;
+  datasourceId: string;
+  applicationId: string;
+  columns?: string[];
+  searchColumn?: string;
+  mode?: string;
+  pluginSpecificParams?: Record<string, unknown>;
+}
+
+export interface DeletePageActionPayload {
+  id: string;
+}
+
+export interface SetDefaultPageActionPayload {
+  id: string;
+  applicationId: string;
+}
+
+export interface SetPageOrderActionPayload {
+  pageId: string;
+  order: number;
+  applicationId: string;
+}
+
+export interface SetupPageActionPayload {
+  id: string;
+  isFirstLoad?: boolean;
+  pageWithMigratedDsl?: FetchPageResponse;
+  packagePullStatus?: ApiResponse<PACKAGE_PULL_STATUS>;
+}
+
+export interface SetupPublishedPageActionPayload {
+  pageId: string;
+  bustCache: boolean;
+  pageWithMigratedDsl?: FetchPageResponse;
+}

app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts

@@ -10,29 +10,19 @@ import {
   getCanvasWidgetHeightsToUpdate,
 } from "utils/WidgetSizeUtils";
 import { klona } from "klona";
-import type { UpdateCanvasPayload } from "actions/pageActions";
-import type { SetWidgetDynamicPropertyPayload } from "../../actions/controlActions";
+import type { UpdateCanvasPayload } from "actions/types/pageActions.types";
+import type { SetWidgetDynamicPropertyPayload } from "actions/types/controlActions.types";
 
 /* This type is an object whose keys are widgetIds and values are arrays with property paths
 and property values
 For example:
 { "xyz123": [{ propertyPath: "bottomRow", propertyValue: 20 }] }
 */
-export type UpdateWidgetsPayload = Record<
-  string,
-  Array<{
-    propertyPath: string;
-    propertyValue: unknown;
-  }>
->;
+import type { UpdateWidgetsPayload, FlattenedWidgetProps, CanvasWidgetsReduxState } from "../types/canvasWidgets.types";
 
 export const initialState: CanvasWidgetsReduxState = {};
 
-export type FlattenedWidgetProps<orType = never> =
-  | (WidgetProps & {
-      children?: string[];
-    })
-  | orType;
+
 
 /**
  *
@@ -61,7 +51,7 @@ const canvasWidgetsReducer = createImmerReducer(initialState, {
   ) => {
     const { widgets } = action.payload;
 
-    for (const [widgetId, widgetProps] of Object.entries(widgets)) {
+    for (const [widgetId, widgetProps] of Object.entries(widgets) as [string, WidgetProps][]) {
       if (widgetProps.type === "CANVAS_WIDGET") {
         const bottomRow = getCanvasBottomRow(widgetId, widgets);
 
@@ -168,8 +158,6 @@ const canvasWidgetsReducer = createImmerReducer(initialState, {
   },
 });
 
-export interface CanvasWidgetsReduxState {
-  [widgetId: string]: FlattenedWidgetProps;
-}
+
 
 export default canvasWidgetsReducer;

app/client/src/reducers/types/canvasWidgets.types.ts

@@ -0,0 +1,19 @@
+import type { WidgetProps } from "../../widgets/BaseWidget";
+
+export type UpdateWidgetsPayload = Record<
+  string,
+  Array<{
+    propertyPath: string;
+    propertyValue: unknown;
+  }>
+>;
+
+export type FlattenedWidgetProps<orType = never> =
+  | (WidgetProps & {
+      children?: string[];
+    })
+  | orType;
+
+export interface CanvasWidgetsReduxState {
+  [widgetId: string]: FlattenedWidgetProps;
+}

app/client/src/sagas/InitSagas.ts

@@ -15,6 +15,7 @@ import {
 import type {
   ReduxAction,
   ReduxActionWithoutPayload,
+  ReduxActionType,
 } from "ee/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { resetApplicationWidgets, resetPageList } from "actions/pageActions";
@@ -92,51 +93,18 @@ import type { ApplicationPayload } from "entities/Application";
 import type { Page } from "entities/Page";
 import type { PACKAGE_PULL_STATUS } from "ee/constants/ModuleConstants";
 
+import type {
+  ReduxURLChangeAction,
+  DeployConsolidatedApi,
+  EditConsolidatedApi,
+  InitConsolidatedApi,
+} from "./types/InitSagas.types";
+
 export const URL_CHANGE_ACTIONS = [
   ReduxActionTypes.CURRENT_APPLICATION_NAME_UPDATE,
   ReduxActionTypes.UPDATE_PAGE_SUCCESS,
   ReduxActionTypes.UPDATE_APPLICATION_SUCCESS,
-];
-
-export interface ReduxURLChangeAction {
-  type: typeof URL_CHANGE_ACTIONS;
-  payload: ApplicationPagePayload | ApplicationPayload | Page;
-}
-export interface DeployConsolidatedApi {
-  productAlert: ApiResponse<ProductAlert>;
-  tenantConfig: ApiResponse;
-  featureFlags: ApiResponse<FeatureFlags>;
-  userProfile: ApiResponse;
-  pages: FetchApplicationResponse;
-  publishedActions: ApiResponse<ActionViewMode[]>;
-  publishedActionCollections: ApiResponse<JSCollection[]>;
-  customJSLibraries: ApiResponse;
-  pageWithMigratedDsl: FetchPageResponse;
-  currentTheme: ApiResponse<AppTheme[]>;
-  themes: ApiResponse<AppTheme>;
-}
-export interface EditConsolidatedApi {
-  productAlert: ApiResponse<ProductAlert>;
-  tenantConfig: ApiResponse;
-  featureFlags: ApiResponse<FeatureFlags>;
-  userProfile: ApiResponse;
-  pages: FetchApplicationResponse;
-  publishedActions: ApiResponse<ActionViewMode[]>;
-  publishedActionCollections: ApiResponse<JSCollection[]>;
-  customJSLibraries: ApiResponse;
-  pageWithMigratedDsl: FetchPageResponse;
-  currentTheme: ApiResponse<AppTheme[]>;
-  themes: ApiResponse<AppTheme>;
-  datasources: ApiResponse<Datasource[]>;
-  pagesWithMigratedDsl: ApiResponse<FetchPageResponseData[]>;
-  plugins: ApiResponse<Plugin[]>;
-  mockDatasources: ApiResponse;
-  pluginFormConfigs: ApiResponse<PluginFormPayload>[];
-  unpublishedActions: ApiResponse<Action[]>;
-  unpublishedActionCollections: ApiResponse<JSCollection[]>;
-  packagePullStatus: ApiResponse<PACKAGE_PULL_STATUS>;
-}
-export type InitConsolidatedApi = DeployConsolidatedApi | EditConsolidatedApi;
+] as ReduxActionType[];
 export function* failFastApiCalls(
   triggerActions: Array<ReduxAction<unknown> | ReduxActionWithoutPayload>,
   successActions: string[],

app/client/src/sagas/WidgetBlueprintSagas.ts

@@ -3,7 +3,7 @@ import {
   BlueprintOperationActionTypes,
   type WidgetBlueprint,
 } from "WidgetProvider/constants";
-import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
+import type { FlattenedWidgetProps } from "../reducers/types/canvasWidgets.types";
 import type { WidgetProps } from "widgets/BaseWidget";
 import { generateReactKey } from "utils/generators";
 import { call, select } from "redux-saga/effects";
@@ -59,28 +59,17 @@ export function* buildWidgetBlueprint(
   return widgetProps;
 }
 
-export interface UpdatePropertyArgs {
-  widgetId: string;
-  propertyName: string;
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  propertyValue: any;
-}
-export type BlueprintOperationAddActionFn = (
-  widget: WidgetProps & { children?: WidgetProps[] },
-) => Generator;
-export type BlueprintOperationModifyPropsFn = (
-  widget: WidgetProps & { children?: WidgetProps[] },
-  widgets: { [widgetId: string]: FlattenedWidgetProps },
-  parent?: WidgetProps,
-  layoutSystemType?: LayoutSystemTypes,
-  addActionResult?: ActionData,
-) => UpdatePropertyArgs[] | undefined;
-
-export interface ChildOperationFnResponse {
-  widgets: Record<string, FlattenedWidgetProps>;
-  message?: string;
-}
+import type {
+  UpdatePropertyArgs,
+  BlueprintOperationAddActionFn,
+  BlueprintOperationModifyPropsFn,
+  ChildOperationFnResponse,
+  BlueprintOperationActionPayload,
+} from "./types/WidgetBlueprintSagas.types";
+
+
+
+
 
 export type BlueprintOperationChildOperationsFn = (
   widgets: { [widgetId: string]: FlattenedWidgetProps },
@@ -109,11 +98,7 @@ export type BlueprintOperationType = keyof typeof BlueprintOperationTypes;
 export type BlueprintOperationActionType =
   keyof typeof BlueprintOperationActionTypes;
 
-export interface BlueprintOperationActionPayload {
-  pluginPackageName: PluginPackageName;
-  actionConfig: Action;
-  datasourceName?: string;
-}
+
 
 export interface BlueprintOperation {
   type: BlueprintOperationType;

app/client/src/sagas/types/InitSagas.types.ts

@@ -0,0 +1,65 @@
+import type { ApplicationPagePayload, FetchApplicationResponse } from "../../ee/api/ApplicationApi";
+import type { ApplicationPayload } from "../../entities/Application";
+import type { Page } from "../../entities/Page";
+import type { ApiResponse } from "../../api/ApiResponses";
+import type { ProductAlert } from "../../reducers/uiReducers/usersReducer";
+import type { FeatureFlags } from "../../ee/entities/FeatureFlag";
+import type { Action, ActionViewMode } from "../../entities/Action";
+import type { JSCollection } from "../../entities/JSCollection";
+import type { FetchPageResponse, FetchPageResponseData } from "../../api/PageApi";
+import type { AppTheme } from "../../entities/AppTheming";
+import type { Datasource } from "../../entities/Datasource";
+import type { Plugin, PluginFormPayload } from "../../api/PluginApi";
+import type { PACKAGE_PULL_STATUS } from "../../ee/constants/ModuleConstants";
+import { ReduxActionTypes } from "../../ee/constants/ReduxActionConstants";
+
+// Types are already exported with their declarations
+
+const URL_CHANGE_ACTIONS = [
+  ReduxActionTypes.CURRENT_APPLICATION_NAME_UPDATE,
+  ReduxActionTypes.UPDATE_PAGE_SUCCESS,
+  ReduxActionTypes.UPDATE_APPLICATION_SUCCESS,
+] as const;
+
+export interface ReduxURLChangeAction {
+  type: typeof URL_CHANGE_ACTIONS;
+  payload: ApplicationPagePayload | ApplicationPayload | Page;
+}
+
+export interface DeployConsolidatedApi {
+  productAlert: ApiResponse<ProductAlert>;
+  tenantConfig: ApiResponse;
+  featureFlags: ApiResponse<FeatureFlags>;
+  userProfile: ApiResponse;
+  pages: FetchApplicationResponse;
+  publishedActions: ApiResponse<ActionViewMode[]>;
+  publishedActionCollections: ApiResponse<JSCollection[]>;
+  customJSLibraries: ApiResponse;
+  pageWithMigratedDsl: FetchPageResponse;
+  currentTheme: ApiResponse<AppTheme[]>;
+  themes: ApiResponse<AppTheme>;
+}
+
+export interface EditConsolidatedApi {
+  productAlert: ApiResponse<ProductAlert>;
+  tenantConfig: ApiResponse;
+  featureFlags: ApiResponse<FeatureFlags>;
+  userProfile: ApiResponse;
+  pages: FetchApplicationResponse;
+  publishedActions: ApiResponse<ActionViewMode[]>;
+  publishedActionCollections: ApiResponse<JSCollection[]>;
+  customJSLibraries: ApiResponse;
+  pageWithMigratedDsl: FetchPageResponse;
+  currentTheme: ApiResponse<AppTheme[]>;
+  themes: ApiResponse<AppTheme>;
+  datasources: ApiResponse<Datasource[]>;
+  pagesWithMigratedDsl: ApiResponse<FetchPageResponseData[]>;
+  plugins: ApiResponse<Plugin[]>;
+  mockDatasources: ApiResponse;
+  pluginFormConfigs: ApiResponse<PluginFormPayload>[];
+  unpublishedActions: ApiResponse<Action[]>;
+  unpublishedActionCollections: ApiResponse<JSCollection[]>;
+  packagePullStatus: ApiResponse<PACKAGE_PULL_STATUS>;
+}
+
+export type InitConsolidatedApi = DeployConsolidatedApi | EditConsolidatedApi;

app/client/src/sagas/types/WidgetBlueprintSagas.types.ts

@@ -0,0 +1,34 @@
+import type { WidgetProps } from "../../widgets/BaseWidget";
+import type { FlattenedWidgetProps } from "../../reducers/types/canvasWidgets.types";
+import type { LayoutSystemTypes } from "../../layoutSystems/types";
+import type { ActionData } from "../../ee/reducers/entityReducers/actionsReducer";
+import type { Action, PluginPackageName } from "../../entities/Action";
+
+export interface UpdatePropertyArgs {
+  widgetId: string;
+  propertyName: string;
+  propertyValue: any;
+}
+
+export type BlueprintOperationAddActionFn = (
+  widget: WidgetProps & { children?: WidgetProps[] },
+) => Generator;
+
+export type BlueprintOperationModifyPropsFn = (
+  widget: WidgetProps & { children?: WidgetProps[] },
+  widgets: { [widgetId: string]: FlattenedWidgetProps },
+  parent?: WidgetProps,
+  layoutSystemType?: LayoutSystemTypes,
+  addActionResult?: ActionData,
+) => UpdatePropertyArgs[] | undefined;
+
+export interface ChildOperationFnResponse {
+  widgets: Record<string, FlattenedWidgetProps>;
+  message?: string;
+}
+
+export interface BlueprintOperationActionPayload {
+  pluginPackageName: PluginPackageName;
+  actionConfig: Action;
+  datasourceName?: string;
+}