RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(agent): allow deleting edges inside iteration on canvas (#16925)
天海蒼灆9214b9c34887
diff --git a/web/src/pages/agent/canvas/edge/index.tsx b/web/src/pages/agent/canvas/edge/index.tsxindex 6385ada2ae..36f3030ba8 100644--- a/web/src/pages/agent/canvas/edge/index.tsx+++ b/web/src/pages/agent/canvas/edge/index.tsx@@ -5,13 +5,13 @@ import {EdgeProps,getBezierPath,} from '@xyflow/react';-import { memo } from 'react';+import { memo, useMemo } from 'react';import useGraphStore from '../../store';import { useFetchAgent } from '@/hooks/use-agent-request';import { cn } from '@/lib/utils';import { isEmpty } from 'lodash';-import { useMemo } from 'react';+import { PointerEvent as ReactPointerEvent } from 'react';import { NodeHandleId, Operator } from '../../constant';function InnerButtonEdge({@@ -59,7 +59,10 @@ function InnerButtonEdge({: {};}, [isTargetPlaceholder]);- const onEdgeClick = () => {+ const onEdgeClick = (event: ReactPointerEvent<HTMLButtonElement>) => {+ // pointerdown: React Flow may swallow click inside group nodes.+ event.stopPropagation();+ event.preventDefault();deleteEdgeById(id);};@@ -82,15 +85,21 @@ function InnerButtonEdge({return {};}, [flowDetail?.dsl?.path, source, target]);- const visible = useMemo(() => {+ const showDelete = useMemo(() => {return (- data?.isHovered &&+ (selected || data?.isHovered) &&sourceHandleId !== NodeHandleId.Tool &&- sourceHandleId !== NodeHandleId.AgentBottom && // The connection between the agent node and the tool node does not need to display the delete button+ sourceHandleId !== NodeHandleId.AgentBottom &&!target.startsWith(Operator.Tool) &&!isTargetPlaceholder);- }, [data?.isHovered, isTargetPlaceholder, sourceHandleId, target]);+ }, [+ data?.isHovered,+ isTargetPlaceholder,+ selected,+ sourceHandleId,+ target,+ ]);const activeMarkerEnd =selected || !isEmpty(showHighlight) || isTargetPlaceholder@@ -111,32 +120,28 @@ function InnerButtonEdge({className={cn('text-text-disabled')}/>- <EdgeLabelRenderer>- <div- style={{- position: 'absolute',- transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,- fontSize: 12,- // everything inside EdgeLabelRenderer has no pointer events by default- // if you have an interactive element, set pointer-events: all- pointerEvents: 'all',- zIndex: 1001, // https://github.com/xyflow/xyflow/discussions/3498- }}- className="nodrag nopan"- >- <button- className={cn(- 'size-3.5 border border-state-error text-state-error rounded-full leading-none bg-bg-canvas outline outline-bg-canvas',- 'invisible',- { visible },- )}- type="button"- onClick={onEdgeClick}+ {showDelete ? (+ <EdgeLabelRenderer>+ <div+ style={{+ position: 'absolute',+ transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,+ fontSize: 12,+ pointerEvents: 'auto',+ zIndex: 1002,+ }}+ className="nodrag nopan">- ×- </button>- </div>- </EdgeLabelRenderer>+ <button+ className="size-5 border border-state-error text-state-error rounded-full leading-none bg-bg-canvas outline outline-bg-canvas"+ type="button"+ onPointerDown={onEdgeClick}+ >+ ×+ </button>+ </div>+ </EdgeLabelRenderer>+ ) : null}</>);}diff --git a/web/src/pages/agent/canvas/index.module.less b/web/src/pages/agent/canvas/index.module.lessindex 5c37ff8b0e..d8c0e9dd38 100644--- a/web/src/pages/agent/canvas/index.module.less+++ b/web/src/pages/agent/canvas/index.module.less@@ -1,14 +1,27 @@.canvasWrapper {position: relative;height: calc(100% - 64px);- :global(.react-flow__node-iterationNode) {++ // Edge delete buttons must sit above iteration/loop group nodes.+ :global(.react-flow__edgelabel-renderer) {+ z-index: 1002;+ }++ :global(.react-flow__node-iterationNode),+ :global(.react-flow__node-loopNode) {.commonNode();border-radius: 0 0 10px 10px;padding: 0;border: 0;background-color: transparent;+ pointer-events: none;++ :global(.react-flow__node) {+ pointer-events: auto;+ }}- :global(.react-flow__node-iterationNode.selectable.selected) {+ :global(.react-flow__node-iterationNode.selectable.selected),+ :global(.react-flow__node-loopNode.selectable.selected) {box-shadow: none;}}diff --git a/web/src/pages/agent/canvas/node/handle.tsx b/web/src/pages/agent/canvas/node/handle.tsxindex 00f3aad12d..38bcb0b7ee 100644--- a/web/src/pages/agent/canvas/node/handle.tsx+++ b/web/src/pages/agent/canvas/node/handle.tsx@@ -87,12 +87,13 @@ export function CommonHandle({export function LeftEndHandle({isConnectable,+ className,...props}: Omit<HandleProps, 'type' | 'position'>) {return (<HandleisConnectable={isConnectable}- className="!bg-accent-primary !size-2"+ className={cn('!bg-accent-primary !size-2', className)}id={NodeHandleId.End}type="target"position={Position.Left}diff --git a/web/src/pages/agent/canvas/node/iteration-node.tsx b/web/src/pages/agent/canvas/node/iteration-node.tsxindex 46fe6bfbba..8cae265a44 100644--- a/web/src/pages/agent/canvas/node/iteration-node.tsx+++ b/web/src/pages/agent/canvas/node/iteration-node.tsx@@ -29,23 +29,28 @@ export function InnerIterationNode({},)}>- <NodeResizeControl style={controlStyle} minWidth={100} minHeight={50}>+ <NodeResizeControl+ style={{ ...controlStyle, pointerEvents: 'auto' }}+ minWidth={100}+ minHeight={50}+ ><ResizeIcon /></NodeResizeControl>- <LeftEndHandle></LeftEndHandle>+ <LeftEndHandle className="!pointer-events-auto"></LeftEndHandle><CommonHandleid={NodeHandleId.Start}type="source"position={Position.Right}isConnectable={isConnectable}nodeId={id}+ className="!pointer-events-auto"></CommonHandle><NodeHeaderid={id}name={data.name}label={data.label}wrapperClassName={cn(- 'bg-background-header-bar p-2 rounded-t-[10px] absolute w-full top-[-38px] left-[-0.3px] border-x border-t border-border-button',+ 'pointer-events-auto bg-background-header-bar p-2 rounded-t-[10px] absolute w-full top-[-38px] left-[-0.3px] border-x border-t border-border-button',{['border-x border-t border-accent-primary']: selected,},diff --git a/web/src/pages/agent/hooks/use-before-delete.test.tsx b/web/src/pages/agent/hooks/use-before-delete.test.tsxindex 114d5f85f7..1ba8d0b2b7 100644--- a/web/src/pages/agent/hooks/use-before-delete.test.tsx+++ b/web/src/pages/agent/hooks/use-before-delete.test.tsx@@ -119,6 +119,83 @@ describe('useBeforeDelete', () => {expect(startDeletion?.nodes).toEqual([]);});+ it('allows deleting a selected edge inside iteration without deleting nodes', async () => {+ const nodes = [+ createNode('iteration:0', Operator.Iteration, { type: 'group' }),+ createNode('iterationStart:0', Operator.IterationStart, {+ parentId: 'iteration:0',+ type: 'iterationStartNode',+ }),+ createNode('message:0', Operator.Message, { parentId: 'iteration:0' }),+ createNode('message:1', Operator.Message, { parentId: 'iteration:0' }),+ ];+ const selectedEdge = createEdge('e1', 'message:0', 'message:1');+ const edges = [+ createEdge('e0', 'iterationStart:0', 'message:0'),+ selectedEdge,+ ];++ useGraphStore.setState({ nodes, edges });++ const { result } = renderHook(() => useBeforeDelete());+ let deletion;+ await act(async () => {+ deletion = await result.current.handleBeforeDelete({+ nodes: [],+ edges: [selectedEdge],+ });+ });++ expect(deletion?.nodes).toEqual([]);+ expect(deletion?.edges.map((edge) => edge.id)).toEqual(['e1']);+ });++ it('does not delete edges of protected nodes when those nodes are rejected', async () => {+ const beginNode = createNode('begin', Operator.Begin);+ const messageNode = createNode('message:0', Operator.Message);+ const edge = createEdge('e1', 'begin', 'message:0');++ useGraphStore.setState({+ nodes: [beginNode, messageNode],+ edges: [edge],+ });++ const { result } = renderHook(() => useBeforeDelete());+ let deletion;+ await act(async () => {+ deletion = await result.current.handleBeforeDelete({+ nodes: [beginNode as any],+ edges: [edge],+ });+ });++ expect(deletion?.nodes).toEqual([]);+ expect(deletion?.edges).toEqual([]);+ });++ it('deletes edges of a protected node when the other end is deleted', async () => {+ const beginNode = createNode('begin', Operator.Begin);+ const messageNode = createNode('message:0', Operator.Message);+ const edge = createEdge('e1', 'begin', 'message:0');++ useGraphStore.setState({+ nodes: [beginNode, messageNode],+ edges: [edge],+ });++ const { result } = renderHook(() => useBeforeDelete());+ let deletion;+ await act(async () => {+ deletion = await result.current.handleBeforeDelete({+ nodes: [beginNode as any, messageNode as any],+ edges: [edge],+ });+ });++ expect(deletion?.nodes.map((node) => node.id)).toEqual(['message:0']);+ expect(deletion?.edges.map((edge) => edge.id)).toEqual(['e1']);+ });+it('preserves agent downstream cleanup', async () => {const nodes = [createNode('agent:0', Operator.Agent),diff --git a/web/src/pages/agent/hooks/use-before-delete.tsx b/web/src/pages/agent/hooks/use-before-delete.tsxindex 15f76675bf..8b8adccc49 100644--- a/web/src/pages/agent/hooks/use-before-delete.tsx+++ b/web/src/pages/agent/hooks/use-before-delete.tsx@@ -1,5 +1,5 @@import { RAGFlowNodeType } from '@/interfaces/database/agent';-import { Node, OnBeforeDelete } from '@xyflow/react';+import { Edge, Node, OnBeforeDelete } from '@xyflow/react';import { Operator } from '../constant';import useGraphStore, { collectDeletionNodeIds } from '../store';import { deleteAllDownstreamAgentsAndTool } from '../utils/delete-node';@@ -53,7 +53,7 @@ export function useBeforeDelete() {if (nodes.some(agentPredicate)) {nodes.filter(agentPredicate).forEach((node) => {const { downstreamAgentAndToolNodeIds } =- deleteAllDownstreamAgentsAndTool(node.id, edges);+ deleteAllDownstreamAgentsAndTool(node.id, graphEdges);downstreamAgentAndToolNodeIds.forEach((nodeId) => {const currentNode = getNode(nodeId);@@ -61,21 +61,39 @@ export function useBeforeDelete() {toBeDeletedNodes.push(currentNode);}});- }, []);+ });}const toBeDeletedNodeIdSet = new Set(toBeDeletedNodes.map((node) => node.id),);- const toBeDeletedEdges = graphEdges.filter(- (edge) =>- toBeDeletedNodeIdSet.has(edge.source) ||- toBeDeletedNodeIdSet.has(edge.target),+ const discardedNodeIds = new Set(+ nodes+ .filter((node) => !toBeDeletedNodeIdSet.has(node.id))+ .map((node) => node.id),);+ const allowEdge = (edge: Edge) =>+ !discardedNodeIds.has(edge.source) && !discardedNodeIds.has(edge.target);++ const edgeById = new Map<string, Edge>();+ for (const edge of edges) {+ if (allowEdge(edge)) {+ edgeById.set(edge.id, edge);+ }+ }+ for (const edge of graphEdges) {+ if (+ toBeDeletedNodeIdSet.has(edge.source) ||+ toBeDeletedNodeIdSet.has(edge.target)+ ) {+ edgeById.set(edge.id, edge);+ }+ }+return {nodes: toBeDeletedNodes,- edges: toBeDeletedEdges,+ edges: [...edgeById.values()],};};