A modern platform for visual, flexible, and extensible graph-based investigations. For cybersecurity analysts and investigators.
feat(app): add alt+drag edge creation between nodes
dextmorgn97ef7e469540
diff --git a/flowsint-app/src/components/sketches/graph/components/graph-main.tsx b/flowsint-app/src/components/sketches/graph/components/graph-main.tsxindex fb1558e5..9061e7e2 100644--- a/flowsint-app/src/components/sketches/graph/components/graph-main.tsx+++ b/flowsint-app/src/components/sketches/graph/components/graph-main.tsx@@ -1,13 +1,13 @@import { useGraphStore } from '@/stores/graph-store'-import React, { useRef, useCallback, SetStateAction, Dispatch } from 'react'+import React, { useRef, useCallback, useMemo, SetStateAction, Dispatch } from 'react'import GraphViewer from '../index'-// import WebGLGraphViewer from './webgl'import NodeContextMenu from '../context-menu/node-context-menu'import BackgroundContextMenu from '../context-menu/background-context-menu'import EdgeContextMenu from '../context-menu/edge-context-menu'import { PathPanel } from '../actions/path-finder'import { useParams } from '@tanstack/react-router'import { type GraphNode, GraphEdge } from '@/types'+import { useLinkCreation } from '../hooks/use-link-creation'type BaseContextMenuProps = {rawTop: number@@ -51,6 +51,16 @@ const GraphMain = () => {const [edgeMenu, setEdgeMenu] = React.useState<EdgeContextMenuProps | null>(null)const [background, setBackgroundMenu] = React.useState<BackgroundContextMenuProps | null>(null)+ const {+ linkCreation,+ shiftHeld,+ startLinking,+ completeLinking,+ cancelLinkCreation,+ submitNewEdge,+ dismissNewEdge+ } = useLinkCreation(sketchId)+const handleNodeClick = useCallback((node: any, event: MouseEvent) => {const isMultiSelect = event.ctrlKey || event.shiftKey@@ -65,6 +75,10 @@ const GraphMain = () => {)const handleBackgroundClick = useCallback(() => {+ if (linkCreation.mode !== 'idle') {+ cancelLinkCreation()+ return+ }setCurrentNodeId(null)clearSelectedNodes()clearSelectedEdges()@@ -72,7 +86,14 @@ const GraphMain = () => {setNodeMenu(null)setEdgeMenu(null)setBackgroundMenu(null)- }, [setCurrentNodeId, clearSelectedNodes, clearSelectedEdges, setCurrentEdgeId])+ }, [+ linkCreation.mode,+ cancelLinkCreation,+ setCurrentNodeId,+ clearSelectedNodes,+ clearSelectedEdges,+ setCurrentEdgeId+ ])const onNodeContextMenu = useCallback((node: any, event: MouseEvent) => {@@ -82,7 +103,6 @@ const GraphMain = () => {const relativeX = event.clientX - pane.leftconst relativeY = event.clientY - pane.top- // If multiple selected nodes → background menuif (selectedNodes.length > 0) {setBackgroundMenu({nodes: selectedNodes,@@ -96,7 +116,6 @@ const GraphMain = () => {setNodeMenu(null)return}- // Otherwise normal menusetNodeMenu({node,rawTop: relativeY,@@ -118,7 +137,6 @@ const GraphMain = () => {const relativeX = event.clientX - pane.leftconst relativeY = event.clientY - pane.top- // If multiple edges are selected, show multi-select menuif (selectedEdges.length > 0) {setEdgeMenu({edges: selectedEdges,@@ -130,7 +148,6 @@ const GraphMain = () => {onClick: handleBackgroundClick})} else {- // Otherwise show single edge menusetEdgeMenu({edge,rawTop: relativeY,@@ -164,19 +181,46 @@ const GraphMain = () => {})}, [])+ // On link creation complete: create edge in store, then open edge context menu+ const handleCompleteLinking = useCallback(+ (targetNode: GraphNode, screenX: number, screenY: number) => {+ const newEdge = completeLinking(targetNode)+ if (!newEdge || !containerRef.current) return++ const pane = containerRef.current.getBoundingClientRect()++ setEdgeMenu({+ edge: newEdge,+ rawTop: screenY,+ rawLeft: screenX,+ wrapperWidth: pane.width,+ wrapperHeight: pane.height,+ setMenu: setEdgeMenu,+ onClick: handleBackgroundClick,+ onSubmitNew: submitNewEdge,+ onDismissNew: dismissNewEdge+ })+ },+ [completeLinking, handleBackgroundClick, submitNewEdge, dismissNewEdge]+ )++ const linkCreationProp = useMemo(+ () => ({+ shiftHeld,+ sourceNode: linkCreation.sourceNode,+ onStartLinking: startLinking,+ onCompleteLinking: handleCompleteLinking,+ onCancel: cancelLinkCreation+ }),+ [shiftHeld, linkCreation.sourceNode, startLinking, handleCompleteLinking, cancelLinkCreation]+ )+const handleGraphRef = useCallback((ref: any) => {graphRef.current = ref}, [])+return (<div ref={containerRef} className="relative h-full w-full bg-background">- {/* <WebGLGraphViewer- sketchId={sketchId as string}- nodes={filteredNodes}- edges={filteredEdges}- onNodeClick={handleNodeClick}- onNodeRightClick={onNodeContextMenu}- onBackgroundClick={handleBackgroundClick}- /> */}<GraphViewernodes={filteredNodes}edges={filteredEdges}@@ -188,8 +232,10 @@ const GraphMain = () => {showLabels={true}showIcons={true}onGraphRef={handleGraphRef}+ enableNodeDrag={!shiftHeld}allowLassosketchId={sketchId}+ linkCreation={linkCreationProp}/><PathPanel />{nodeMenu && selectedNodes.length === 0 && <NodeContextMenu {...nodeMenu} />}diff --git a/flowsint-app/src/components/sketches/graph/components/link-creation-overlay.tsx b/flowsint-app/src/components/sketches/graph/components/link-creation-overlay.tsxnew file mode 100644index 00000000..2eeb0c4b--- /dev/null+++ b/flowsint-app/src/components/sketches/graph/components/link-creation-overlay.tsx@@ -0,0 +1,181 @@+import { useCallback, useRef, type PointerEvent } from 'react'+import { type GraphNode } from '@/types'++function getRelativeCoordinates(+ e: PointerEvent,+ canvas: HTMLCanvasElement | null+): [number, number] {+ const rect = canvas?.getBoundingClientRect()+ if (!rect) return [0, 0]+ return [e.clientX - rect.left, e.clientY - rect.top]+}++interface LinkCreationCanvasProps {+ nodes: any[]+ graph2ScreenCoords: (node: any) => { x: number; y: number }+ width: number+ height: number+ onStartLinking: (node: GraphNode) => void+ onCompleteLinking: (node: GraphNode, screenX: number, screenY: number) => void+ onCancel: () => void+ sourceNode: GraphNode | null+}++const NODE_HIT_RADIUS_PX = 20++export function LinkCreationCanvas({+ nodes,+ graph2ScreenCoords,+ width,+ height,+ onStartLinking,+ onCompleteLinking,+ onCancel,+ sourceNode+}: LinkCreationCanvasProps) {+ const canvasRef = useRef<HTMLCanvasElement>(null)+ const ctxRef = useRef<CanvasRenderingContext2D | null>(null)+ const sourceScreenRef = useRef<[number, number] | null>(null)+ const hoveredNodeRef = useRef<GraphNode | null>(null)++ const nodeScreenPosRef = useRef<Map<string, { x: number; y: number }>>(new Map())++ const findNodeAtScreenCoords = useCallback(+ (sx: number, sy: number, excludeId?: string): GraphNode | null => {+ let closest: GraphNode | null = null+ let closestDist = NODE_HIT_RADIUS_PX++ for (const node of nodes) {+ if (node.id === excludeId) continue+ const pos = nodeScreenPosRef.current.get(node.id)+ if (!pos) continue+ const dx = pos.x - sx+ const dy = pos.y - sy+ const dist = Math.sqrt(dx * dx + dy * dy)+ if (dist < closestDist) {+ closestDist = dist+ closest = node+ }+ }+ return closest+ },+ [nodes]+ )++ const drawLine = useCallback(+ (+ ctx: CanvasRenderingContext2D,+ fromX: number,+ fromY: number,+ toX: number,+ toY: number,+ hovered: boolean+ ) => {+ ctx.clearRect(0, 0, width, height)++ ctx.beginPath()+ ctx.moveTo(fromX, fromY)+ ctx.lineTo(toX, toY)+ ctx.strokeStyle = hovered ? 'rgba(59, 130, 246, 0.8)' : 'rgba(59, 130, 246, 0.5)'+ ctx.lineWidth = hovered ? 2.5 : 2+ ctx.setLineDash(hovered ? [] : [8, 4])+ ctx.stroke()+ ctx.setLineDash([])++ const angle = Math.atan2(toY - fromY, toX - fromX)+ const arrowLen = 10+ ctx.beginPath()+ ctx.moveTo(toX, toY)+ ctx.lineTo(toX - arrowLen * Math.cos(angle - 0.4), toY - arrowLen * Math.sin(angle - 0.4))+ ctx.lineTo(toX - arrowLen * Math.cos(angle + 0.4), toY - arrowLen * Math.sin(angle + 0.4))+ ctx.closePath()+ ctx.fillStyle = hovered ? 'rgba(59, 130, 246, 0.8)' : 'rgba(59, 130, 246, 0.5)'+ ctx.fill()++ if (hovered) {+ ctx.beginPath()+ ctx.arc(toX, toY, 14, 0, Math.PI * 2)+ ctx.fillStyle = 'rgba(59, 130, 246, 0.15)'+ ctx.fill()+ ctx.strokeStyle = 'rgba(59, 130, 246, 0.5)'+ ctx.lineWidth = 1.5+ ctx.stroke()+ }+ },+ [width, height]+ )++ function handlePointerDown(e: PointerEvent) {+ const canvas = canvasRef.current+ if (!canvas) return++ nodeScreenPosRef.current.clear()+ for (const node of nodes) {+ const pos = graph2ScreenCoords(node)+ nodeScreenPosRef.current.set(node.id, pos)+ }++ const [sx, sy] = getRelativeCoordinates(e, canvas)+ const hitNode = findNodeAtScreenCoords(sx, sy)++ if (!hitNode) return++ canvas.setPointerCapture(e.pointerId)++ const pos = nodeScreenPosRef.current.get(hitNode.id)+ sourceScreenRef.current = pos ? [pos.x, pos.y] : [sx, sy]+ hoveredNodeRef.current = null++ const ctx = canvas.getContext('2d')+ if (ctx) ctxRef.current = ctx++ onStartLinking(hitNode)+ }++ function handlePointerMove(e: PointerEvent) {+ if (e.buttons !== 1 || !sourceScreenRef.current) return++ const canvas = canvasRef.current+ const ctx = ctxRef.current+ if (!canvas || !ctx) return++ const [sx, sy] = getRelativeCoordinates(e, canvas)+ const hovered = findNodeAtScreenCoords(sx, sy, sourceNode?.id)+ hoveredNodeRef.current = hovered++ const hoveredPos = hovered ? nodeScreenPosRef.current.get(hovered.id) : null+ const endX = hoveredPos ? hoveredPos.x : sx+ const endY = hoveredPos ? hoveredPos.y : sy++ drawLine(ctx, sourceScreenRef.current[0], sourceScreenRef.current[1], endX, endY, !!hovered)+ }++ function handlePointerUp(e: PointerEvent) {+ canvasRef.current?.releasePointerCapture(e.pointerId)+ ctxRef.current?.clearRect(0, 0, width, height)++ const hovered = hoveredNodeRef.current+ const [sx, sy] = getRelativeCoordinates(e, canvasRef.current)+ sourceScreenRef.current = null+ hoveredNodeRef.current = null++ if (hovered) {+ onCompleteLinking(hovered, sx, sy)+ } else {+ onCancel()+ }+ }++ return (+ <canvas+ ref={canvasRef}+ width={width}+ height={height}+ className="tool-overlay"+ style={{ cursor: 'crosshair' }}+ onPointerDown={handlePointerDown}+ onPointerMove={handlePointerMove}+ onPointerUp={handlePointerUp}+ />+ )+}diff --git a/flowsint-app/src/components/sketches/graph/context-menu/edge-context-menu.tsx b/flowsint-app/src/components/sketches/graph/context-menu/edge-context-menu.tsxindex d8c376c8..cc0b2146 100644--- a/flowsint-app/src/components/sketches/graph/context-menu/edge-context-menu.tsx+++ b/flowsint-app/src/components/sketches/graph/context-menu/edge-context-menu.tsx@@ -23,6 +23,9 @@ interface EdgeContextMenuProps {wrapperWidth: numberwrapperHeight: numbersetMenu: (menu: any | null) => void+ // For newly created edges: save to DB on submit, remove from store on dismiss+ onSubmitNew?: (edgeId: string, label: string) => void+ onDismissNew?: (edgeId: string) => void[key: string]: any}@@ -36,6 +39,8 @@ export default function EdgeContextMenu({wrapperWidth,wrapperHeight,setMenu,+ onSubmitNew,+ onDismissNew,...props}: EdgeContextMenuProps) {const { id: sketchId } = useParams({ strict: false })@@ -54,9 +59,21 @@ export default function EdgeContextMenu({e.stopPropagation()}, [])+ const savedRef = useRef(false)+const handleBlur = useCallback(async () => {if (!edge || !labelRef.current?.value || !sketchId) returnconst newLabel = labelRef.current.value.trim()++ // New edge: always save on blur (triggered by Enter)+ if (onSubmitNew) {+ savedRef.current = true+ updateEdge(edge.id, { label: newLabel })+ setMenu(null)+ onSubmitNew(edge.id, newLabel)+ return+ }+if (newLabel !== edge.label) {const previousLabel = edge.label@@ -80,7 +97,7 @@ export default function EdgeContextMenu({toast.error('Failed to update relationship.')}}- }, [edge, updateEdge, sketchId, setMenu])+ }, [edge, updateEdge, sketchId, setMenu, onSubmitNew])const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {if (e.key === 'Enter') {@@ -119,6 +136,17 @@ export default function EdgeContextMenu({[edgeIds, sketchId, setMenu, removeEdges, clearSelectedEdges, isMultiSelect, confirm])+ // Wrap setMenu to handle dismissing new edges (Escape / click outside)+ const wrappedSetMenu = useCallback(+ (menu: any | null) => {+ if (menu === null && onDismissNew && edge && !savedRef.current) {+ onDismissNew(edge.id)+ }+ setMenu(menu)+ },+ [setMenu, onDismissNew, edge]+ )+return (<BaseContextMenutop={top}@@ -127,7 +155,7 @@ export default function EdgeContextMenu({bottom={bottom}wrapperWidth={wrapperWidth}wrapperHeight={wrapperHeight}- setMenu={setMenu}+ setMenu={wrappedSetMenu}{...props}><div className="px-3 py-1 flex items-center justify-between shrink-0">@@ -141,7 +169,10 @@ export default function EdgeContextMenu({className="h-7"defaultValue={edge?.label ?? '??'}onChange={handleInputChange}- onFocus={(e) => e.stopPropagation()}+ onFocus={(e) => {+ e.stopPropagation()+ if (onSubmitNew) e.currentTarget.select()+ }}onBlur={handleBlur}onKeyDown={handleKeyDown}autoFocusdiff --git a/flowsint-app/src/components/sketches/graph/hooks/use-link-creation.ts b/flowsint-app/src/components/sketches/graph/hooks/use-link-creation.tsnew file mode 100644index 00000000..a1d90390--- /dev/null+++ b/flowsint-app/src/components/sketches/graph/hooks/use-link-creation.ts@@ -0,0 +1,110 @@+import { useCallback, useRef, useState } from 'react'+import { useGraphStore } from '@/stores/graph-store'+import { sketchService } from '@/api/sketch-service'+import { toast } from 'sonner'+import { type GraphNode, type GraphEdge } from '@/types'+import { useKeyboard } from '@/hooks/use-keyboard'++type LinkCreationMode = 'idle' | 'linking'++interface LinkCreationState {+ mode: LinkCreationMode+ sourceNode: GraphNode | null+}++const INITIAL_STATE: LinkCreationState = {+ mode: 'idle',+ sourceNode: null+}++export const useLinkCreation = (sketchId?: string) => {+ const [state, setState] = useState<LinkCreationState>(INITIAL_STATE)+ const stateRef = useRef(state)+ stateRef.current = state++ const [shiftHeld, setShiftHeld] = useState(false)++ const addEdge = useGraphStore((s) => s.addEdge)+ const removeEdges = useGraphStore((s) => s.removeEdges)++ useKeyboard(+ 'Alt',+ useCallback(() => setShiftHeld(true), []),+ useCallback(() => {+ setShiftHeld(false)+ if (stateRef.current.mode === 'linking') {+ setState(INITIAL_STATE)+ }+ }, [])+ )++ const cancel = useCallback(() => {+ setState(INITIAL_STATE)+ }, [])++ const startLinking = useCallback((node: GraphNode) => {+ setState({ mode: 'linking', sourceNode: node })+ }, [])++ // Creates the edge in store only (not persisted yet) and returns it+ const completeLinking = useCallback(+ (targetNode: GraphNode): GraphEdge | null => {+ const current = stateRef.current+ if (!current.sourceNode || targetNode.id === current.sourceNode.id) {+ setState(INITIAL_STATE)+ return null+ }++ const newEdge = addEdge({+ label: 'IS_RELATED_TO',+ type: 'one-way',+ source: current.sourceNode.id,+ target: targetNode.id+ })++ setState(INITIAL_STATE)+ return newEdge+ },+ [addEdge]+ )++ // Called by edge context menu on Enter/submit — persist to API+ const submitNewEdge = useCallback(+ (edgeId: string, label: string) => {+ if (!sketchId) return+ const edge = useGraphStore.getState().edgesMapping.get(edgeId)+ if (!edge) return++ const edgeData = {+ label,+ type: 'one-way',+ source: edge.source,+ target: edge.target+ }+ toast.promise(sketchService.addEdge(sketchId, JSON.stringify(edgeData)), {+ loading: 'Creating relation...',+ success: 'Relation added.',+ error: 'Failed to create relation.'+ })+ },+ [sketchId]+ )++ // Called when edge context menu is dismissed without saving — remove from store+ const dismissNewEdge = useCallback(+ (edgeId: string) => {+ removeEdges([edgeId])+ },+ [removeEdges]+ )++ return {+ linkCreation: state,+ shiftHeld,+ startLinking,+ completeLinking,+ cancelLinkCreation: cancel,+ submitNewEdge,+ dismissNewEdge+ }+}diff --git a/flowsint-app/src/components/sketches/graph/index.tsx b/flowsint-app/src/components/sketches/graph/index.tsxindex 80d57dca..d8a58e31 100644--- a/flowsint-app/src/components/sketches/graph/index.tsx+++ b/flowsint-app/src/components/sketches/graph/index.tsx@@ -30,6 +30,7 @@ import { GraphEmptyState } from './components/graph-empty-state'import { GraphTooltip } from './components/graph-tooltip'import { GraphLoadingOverlay } from './components/graph-loading-overlay'import { GraphSelectorOverlay } from './components/graph-selector-overlay'+import { LinkCreationCanvas } from './components/link-creation-overlay'import MinimapCanvas from './components/minimap'import { Background } from './background'import { BackgroundVariant } from './background/background-types'@@ -56,7 +57,9 @@ const GraphViewer: React.FC<GraphViewerProps> = ({allowForces = false,autoZoomOnNode = true,showMinimalControls = false,- showMinimap+ showMinimap,+ enableNodeDrag: enableNodeDragProp = true,+ linkCreation: linkCreationProp}) => {const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })const graphRef = useRef<any>(null)@@ -534,7 +537,7 @@ const GraphViewer: React.FC<GraphViewerProps> = ({dagLevelDistance={forceSettings.dagLevelDistance.value}backgroundColor={backgroundColor}linkCanvasObject={renderLinkCallback}- enableNodeDrag={true}+ enableNodeDrag={enableNodeDragProp}autoPauseRedraw={true}onNodeHover={handleNodeHoverWithTooltip}onLinkHover={handleLinkHover}@@ -548,6 +551,18 @@ const GraphViewer: React.FC<GraphViewerProps> = ({containerSize={containerSize}/>)}+ {linkCreationProp?.shiftHeld && (+ <LinkCreationCanvas+ nodes={graphData.nodes}+ graph2ScreenCoords={graph2ScreenCoords}+ width={containerSize.width}+ height={containerSize.height}+ onStartLinking={linkCreationProp.onStartLinking}+ onCompleteLinking={linkCreationProp.onCompleteLinking}+ onCancel={linkCreationProp.onCancel}+ sourceNode={linkCreationProp.sourceNode}+ />+ )}{(showMinimap ?? showMinimapSetting) && graphData.nodes.length > 0 && (<MinimapCanvasnodes={graphData.nodes}diff --git a/flowsint-app/src/components/sketches/graph/utils/types.ts b/flowsint-app/src/components/sketches/graph/utils/types.tsindex cde32434..934be142 100644--- a/flowsint-app/src/components/sketches/graph/utils/types.ts+++ b/flowsint-app/src/components/sketches/graph/utils/types.ts@@ -21,6 +21,14 @@ export interface GraphViewerProps {autoZoomOnNode?: booleanshowMinimalControls?: booleanshowMinimap?: boolean+ enableNodeDrag?: boolean+ linkCreation?: {+ shiftHeld: boolean+ sourceNode: GraphNode | null+ onStartLinking: (node: GraphNode) => void+ onCompleteLinking: (node: GraphNode, screenX: number, screenY: number) => void+ onCancel: () => void+ }}export interface TooltipData {