removed circular depedency

appsmithorg · Jan 22, 2025 · 2b46cd0 · 2b46cd0
1 parent 1b27128
commit 2b46cd0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/app/client/src/workers/Evaluation/handlers/evalTree.ts b/app/client/src/workers/Evaluation/handlers/evalTree.ts
@@ -34,7 +34,7 @@ import {
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import type { MetaWidgetsReduxState } from "reducers/entityReducers/metaWidgetsReducer";
 import type { Attributes } from "instrumentation/types";
-import { updateActionsToEvalTree } from "./updateActionData";
+import { updateActionsToEvalTree } from "./updateActionsToEvalTree";
 
 // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

diff --git a/app/client/src/workers/Evaluation/handlers/updateActionData.ts b/app/client/src/workers/Evaluation/handlers/updateActionData.ts
@@ -1,10 +1,8 @@
 import { dataTreeEvaluator } from "./evalTree";
 import type { EvalWorkerSyncRequest } from "../types";
-import set from "lodash/set";
 import { evalTreeWithChanges } from "../evalTreeWithChanges";
-import DataStore from "../dataStore";
 import { EVAL_WORKER_SYNC_ACTION } from "ee/workers/Evaluation/evalWorkerActions";
-import type { DataTree } from "entities/DataTree/dataTreeTypes";
+import { updateActionsToEvalTree } from "./updateActionsToEvalTree";
 
 export interface UpdateActionProps {
   entityName: string;
@@ -43,29 +41,3 @@ export function handleActionsDataUpdate(actionsToUpdate: UpdateActionProps[]) {
     webworkerTelemetry: {},
   });
 }
-
-export function updateActionsToEvalTree(
-  evalTree: DataTree,
-  actionsToUpdate?: UpdateActionProps[],
-) {
-  if (!actionsToUpdate) return;
-
-  for (const actionToUpdate of actionsToUpdate) {
-    const { dataPath, dataPathRef, entityName } = actionToUpdate;
-    let { data } = actionToUpdate;
-
-    if (dataPathRef) {
-      data = DataStore.getActionData(dataPathRef);
-      DataStore.deleteActionData(dataPathRef);
-    }
-
-    // update the evaltree
-    set(evalTree, `${entityName}.[${dataPath}]`, data);
-    // Update context
-    set(self, `${entityName}.[${dataPath}]`, data);
-    // Update the datastore
-    const path = `${entityName}.${dataPath}`;
-
-    DataStore.setActionData(path, data);
-  }
-}
diff --git a/app/client/src/workers/Evaluation/handlers/updateActionsToEvalTree.ts b/app/client/src/workers/Evaluation/handlers/updateActionsToEvalTree.ts
@@ -0,0 +1,30 @@
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
+import { set } from "lodash";
+import DataStore from "../dataStore";
+import type { UpdateActionProps } from "./updateActionData";
+
+export function updateActionsToEvalTree(
+  evalTree: DataTree,
+  actionsToUpdate?: UpdateActionProps[],
+) {
+  if (!actionsToUpdate) return;
+
+  for (const actionToUpdate of actionsToUpdate) {
+    const { dataPath, dataPathRef, entityName } = actionToUpdate;
+    let { data } = actionToUpdate;
+
+    if (dataPathRef) {
+      data = DataStore.getActionData(dataPathRef);
+      DataStore.deleteActionData(dataPathRef);
+    }
+
+    // update the evaltree
+    set(evalTree, `${entityName}.[${dataPath}]`, data);
+    // Update context
+    set(self, `${entityName}.[${dataPath}]`, data);
+    // Update the datastore
+    const path = `${entityName}.${dataPath}`;
+
+    DataStore.setActionData(path, data);
+  }
+}
diff --git a/app/client/src/workers/Evaluation/types.ts b/app/client/src/workers/Evaluation/types.ts
@@ -52,7 +52,7 @@ export interface EvalTreeRequestData {
   widgetsMeta: Record<string, any>;
   shouldRespondWithLogs?: boolean;
   affectedJSObjects: AffectedJSObjects;
-  actionDataPayloadConsolidated?: UpdateActionProps;
+  actionDataPayloadConsolidated?: UpdateActionProps[];
 }
 
 export interface EvalTreeResponseData {