diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py index e3090a09f..a47604b9a 100644 --- a/src/backend/langflow/services/auth/utils.py +++ b/src/backend/langflow/services/auth/utils.py @@ -144,7 +144,7 @@ async def get_current_user_for_websocket( return await api_key_security(api_key, query_param, db) else: return None - + def get_current_active_user(current_user: Annotated[User, Depends(get_current_user)]): if not current_user.is_active: diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx index 959685500..1c737417d 100644 --- a/src/frontend/src/modals/codeAreaModal/index.tsx +++ b/src/frontend/src/modals/codeAreaModal/index.tsx @@ -156,7 +156,7 @@ export default function CodeAreaModal({ readOnly={readonly} value={code} mode="python" - setOptions={{ fontFamily: "monospace"}} + setOptions={{ fontFamily: "monospace" }} height={height ?? "100%"} highlightActiveLine={true} showPrintMargin={false} diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index ec07193b8..13f6c3360 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -110,7 +110,15 @@ export default function NodeToolbarComponent({ break; case "ungroup": takeSnapshot(); - expandGroupNode(data.id, updateFlowPosition(position, data.node?.flow!), data.node!.template, nodes, edges, setNodes, setEdges); + expandGroupNode( + data.id, + updateFlowPosition(position, data.node?.flow!), + data.node!.template, + nodes, + edges, + setNodes, + setEdges + ); break; case "override": setShowOverrideModal(true); diff --git a/src/frontend/src/stores/flowsManagerStore.ts b/src/frontend/src/stores/flowsManagerStore.ts index 90d818ef9..4d6440d1f 100644 --- a/src/frontend/src/stores/flowsManagerStore.ts +++ b/src/frontend/src/stores/flowsManagerStore.ts @@ -1,4 +1,5 @@ import { AxiosError } from "axios"; +import { cloneDeep } from "lodash"; import { Edge, Node, Viewport, XYPosition } from "reactflow"; import { create } from "zustand"; import { @@ -24,7 +25,6 @@ import useAlertStore from "./alertStore"; import { useDarkStore } from "./darkStore"; import useFlowStore from "./flowStore"; import { useTypesStore } from "./typesStore"; -import { cloneDeep } from "lodash"; let saveTimeoutId: NodeJS.Timeout | null = null; @@ -330,7 +330,10 @@ const useFlowsManagerStore = create((set, get) => ({ const currentFlowId = get().currentFlowId; // push the current graph to the past state const flowStore = useFlowStore.getState(); - const newState = {nodes: cloneDeep(flowStore.nodes), edges: cloneDeep(flowStore.edges)}; + const newState = { + nodes: cloneDeep(flowStore.nodes), + edges: cloneDeep(flowStore.edges), + }; const pastLength = past[currentFlowId]?.length ?? 0; if ( pastLength > 0 && diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index 208cae435..aa9d708c6 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -651,13 +651,19 @@ export function updateFlowPosition(NewPosition: XYPosition, flow: FlowType) { x: NewPosition.x - middlePoint.x, y: NewPosition.y - middlePoint.y, }; - return {...flow, data: {...flow.data!, nodes: flow.data!.nodes.map((node) => ({ - ...node, - position: { - x: node.position.x + deltaPosition.x, - y: node.position.y + deltaPosition.y, + return { + ...flow, + data: { + ...flow.data!, + nodes: flow.data!.nodes.map((node) => ({ + ...node, + position: { + x: node.position.x + deltaPosition.x, + y: node.position.y + deltaPosition.y, + }, + })), }, - }))}}; + }; } export function concatFlows( @@ -939,7 +945,7 @@ export function expandGroupNode( nodes: Node[], edges: Edge[], setNodes: (update: Node[] | ((oldState: Node[]) => Node[])) => void, - setEdges: (update: Edge[] | ((oldState: Edge[]) => Edge[])) => void, + setEdges: (update: Edge[] | ((oldState: Edge[]) => Edge[])) => void ) { const idsMap = updateIds(flow!.data!); updateProxyIdsOnTemplate(template, idsMap); @@ -1024,14 +1030,9 @@ export function expandGroupNode( } }); - const filteredNodes = [ - ...nodes.filter((n) => n.id !== id), - ...gNodes, - ]; + const filteredNodes = [...nodes.filter((n) => n.id !== id), ...gNodes]; const filteredEdges = [ - ...edges.filter( - (e) => e.target !== id && e.source !== id - ), + ...edges.filter((e) => e.target !== id && e.source !== id), ...gEdges, ...updatedEdges, ]; @@ -1067,7 +1068,7 @@ export function createFlowComponent( edges: [], nodes: [ { - data: {...nodeData, node: {...nodeData.node, official: false}}, + data: { ...nodeData, node: { ...nodeData.node, official: false } }, id: nodeData.id, position: { x: 0, y: 0 }, type: "genericNode",