From 0fa51db7c56289cab5afaa6d42669e0cd9043470 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Tue, 22 Aug 2023 11:06:24 -0300 Subject: [PATCH] fix bug on import new flow --- src/frontend/src/contexts/tabsContext.tsx | 5 +---- src/frontend/src/utils/reactflowUtils.ts | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 799b1388b..405a76a1e 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -214,9 +214,7 @@ export function TabsProvider({ children }: { children: ReactNode }) { let sourceHandleObject: sourceHandleType = scapeJSONParse( edge.sourceHandle! ); - sourceHandleObject.baseClasses = sourceHandleObject.baseClasses.concat( - template["base_classes"] - ); + sourceHandleObject.baseClasses = template["base_classes"]; edge.sourceHandle = scapedJSONStringfy(sourceHandleObject); } }); @@ -513,7 +511,6 @@ export function TabsProvider({ children }: { children: ReactNode }) { const extractDataFromFlow = (flow: FlowType) => { let data = flow?.data ? flow.data : null; const description = flow?.description ? flow.description : ""; - if (data) { processFlowEdges(flow); processFlowNodes(flow); diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index ef58d0a3f..590e925f6 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -71,7 +71,6 @@ export function isValidConnection( ) { const targetHandleObject: targetHandleType = scapeJSONParse(targetHandle!); const sourceHandleObject: sourceHandleType = scapeJSONParse(sourceHandle!); - console.log(sourceHandleObject, targetHandleObject); if ( targetHandleObject.inputTypes?.some( (n) => n === sourceHandleObject.dataType @@ -283,9 +282,9 @@ export function updateEdgesHandleIds({ } if (source && sourceNode) { newSource = { - dataType: sourceNode.data.type, id: sourceNode.data.id, baseClasses: sourceNode.data.node!.base_classes, + dataType: sourceNode.data.type, }; } edge.sourceHandle = scapedJSONStringfy(newSource!); @@ -334,7 +333,8 @@ export function scapedJSONStringfy(json: object): string { return customStringify(json).replace(/"/g, "œ"); } export function scapeJSONParse(json: string): any { - return JSON.parse(json.replace(/œ/g, '"')); + let parsed = json.replace(/œ/g, '"'); + return JSON.parse(parsed); } // this function receives an array of edges and return true if any of the handles are not a json string