From ee196210f23a0831d89a4c39c0eb651063926c8d Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Fri, 4 Aug 2023 14:52:44 -0300 Subject: [PATCH] fix(tabsContext.tsx): add missing import statement for updateEdgesHandleIds function fix(tabsContext.tsx): update processFlowEdges function to call updateEdgesHandleIds and update the edges in the flow data refactor(reactflowUtils.ts): update updateEdgesHandleIds function to return the updated edges instead of using setEdges function --- src/frontend/src/contexts/tabsContext.tsx | 5 ++++- src/frontend/src/types/utils/reactflowUtils.ts | 1 - src/frontend/src/utils/reactflowUtils.ts | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 33e334e97..48416e8cb 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -27,6 +27,7 @@ import { import { TabsContextType, TabsState } from "../types/tabs"; import { addVersionToDuplicates, + updateEdgesHandleIds, updateIds, updateTemplate, } from "../utils/reactflowUtils"; @@ -149,8 +150,10 @@ export function TabsProvider({ children }: { children: ReactNode }) { }); } - function processFlowEdges(flow) { + function processFlowEdges(flow: FlowType) { if (!flow.data || !flow.data.edges) return; + const newEdges = updateEdgesHandleIds(flow.data); + flow.data.edges = newEdges; flow.data.edges.forEach((edge) => { edge.className = ""; edge.style = { stroke: "#555" }; diff --git a/src/frontend/src/types/utils/reactflowUtils.ts b/src/frontend/src/types/utils/reactflowUtils.ts index d7207ac62..40a3f2868 100644 --- a/src/frontend/src/types/utils/reactflowUtils.ts +++ b/src/frontend/src/types/utils/reactflowUtils.ts @@ -12,5 +12,4 @@ export type cleanEdgesType = { export type updateEdgesHandleIdsType = { nodes: NodeType[]; edges: Edge[]; - setEdges: (edges: Edge[]) => void; }; diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index 1f797cf67..7658584f2 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -235,8 +235,7 @@ export function addVersionToDuplicates(flow: FlowType, flows: FlowType[]) { export function updateEdgesHandleIds({ edges, nodes, - setEdges, -}: updateEdgesHandleIdsType) { +}: updateEdgesHandleIdsType): Edge[] { let newEdges = _.cloneDeep(edges); newEdges.forEach((edge) => { const sourceNodeId = edge.source; @@ -268,7 +267,7 @@ export function updateEdgesHandleIds({ edge.sourceHandle = JSON.stringify(newSource); edge.targetHandle = JSON.stringify(newTarget); }); - setEdges(newEdges); + return newEdges; } export function getConnectedNodes(