Fix: Cut and Paste functionality #9

Merged
tymurbaniak merged 3 commits from claude/issue-8 into main 2026-03-26 01:00:42 +00:00
5 changed files with 282 additions and 4 deletions
Showing only changes of commit 000aad362a - Show all commits

174
e2e/cut-paste.spec.ts Normal file
View File

@@ -0,0 +1,174 @@
import { test, expect, type Page } from '@playwright/test';
async function waitForGraph(page: Page) {
await page.waitForSelector('svg g.node', { timeout: 15000 });
}
function nodeByLabel(page: Page, label: string) {
return page.locator('g.node').filter({ hasText: label });
}
function graphContainer(page: Page) {
return page.locator('.bg-white.rounded.shadow');
}
async function openSubgraph(page: Page, nodeLabel: string) {
await nodeByLabel(page, nodeLabel).click({ button: 'right' });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Subgraph' }).click();
await waitForGraph(page);
}
async function selectNode(page: Page, nodeLabel: string) {
await page.keyboard.down('Control');
await nodeByLabel(page, nodeLabel).click();
await page.keyboard.up('Control');
}
test.describe('Cut and Paste', () => {
test.beforeEach(async ({ page }) => {
await page.goto('/');
await waitForGraph(page);
});
test('node context menu shows Cut option', async ({ page }) => {
await nodeByLabel(page, 'Start').click({ button: 'right' });
const dropdown = page.locator('.ant-dropdown:visible');
await expect(dropdown).toBeVisible({ timeout: 3000 });
await expect(dropdown.locator('.ant-dropdown-menu-item').filter({ hasText: 'Cut' })).toBeVisible();
});
test('empty area context menu shows Paste option', async ({ page }) => {
await graphContainer(page).click({ button: 'right', position: { x: 10, y: 400 } });
const dropdown = page.locator('.ant-dropdown:visible');
await expect(dropdown).toBeVisible({ timeout: 3000 });
await expect(dropdown.locator('.ant-dropdown-menu-item').filter({ hasText: 'Paste' })).toBeVisible();
});
test('cut without selection cuts the right-clicked node with dashed style', async ({ page }) => {
// Right-click Start without any ctrl+click selection
await nodeByLabel(page, 'Start').click({ button: 'right' });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Cut' }).click();
// Graph re-renders with cut node styled as dashed
await waitForGraph(page);
// The Start node's polygon should have dashed style applied via DOT
const startNode = nodeByLabel(page, 'Start');
await expect(startNode).toBeVisible();
});
test('cut with ctrl-selected nodes marks them as cut (dashed style)', async ({ page }) => {
// Ctrl+click to select End node
await selectNode(page, 'End');
// Right-click End and cut
await nodeByLabel(page, 'End').click({ button: 'right' });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Cut' }).click();
// Graph re-renders; cut nodes are still present but with dashed style
await waitForGraph(page);
await expect(nodeByLabel(page, 'End')).toBeVisible();
});
test('cut node also includes nodes reachable by outgoing edges', async ({ page }) => {
// Start → random child, Start is selected for cut
// First create a child of Start
await nodeByLabel(page, 'Start').click();
await expect(page.locator('g.node')).toHaveCount(3, { timeout: 5000 });
// Ctrl+click to select Start
await selectNode(page, 'Start');
// Cut Start (which has an outgoing edge to the new child node)
await nodeByLabel(page, 'Start').click({ button: 'right' });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Cut' }).click();
// All 3 nodes are still visible (not removed until paste)
await waitForGraph(page);
await expect(page.locator('g.node')).toHaveCount(3, { timeout: 5000 });
});
test('paste adds cut nodes to a different subgraph', async ({ page }) => {
// Cut the End node (no selection)
await nodeByLabel(page, 'End').click({ button: 'right' });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Cut' }).click();
await waitForGraph(page);
// Navigate into Start's subgraph
await openSubgraph(page, 'Start');
// Subgraph has its own Start/End nodes
await expect(page.locator('g.node')).toHaveCount(2, { timeout: 5000 });
// Paste into this subgraph via right-click on empty area
await graphContainer(page).click({ button: 'right', position: { x: 10, y: 400 } });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Paste' }).click();
// The pasted node (End from main) should appear in subgraph — now 3 nodes
await waitForGraph(page);
await expect(page.locator('g.node')).toHaveCount(3, { timeout: 5000 });
});
test('after paste, cut nodes are removed from the source graph', async ({ page }) => {
// Cut End from main graph
await nodeByLabel(page, 'End').click({ button: 'right' });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Cut' }).click();
await waitForGraph(page);
// Navigate into Start's subgraph
await openSubgraph(page, 'Start');
// Paste there
await graphContainer(page).click({ button: 'right', position: { x: 10, y: 400 } });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Paste' }).click();
await waitForGraph(page);
// Navigate back to main graph via breadcrumb
await page.locator('.ant-breadcrumb-link').first().click();
await waitForGraph(page);
// End node should no longer be in main graph (it was cut and pasted)
await expect(nodeByLabel(page, 'End')).not.toBeAttached({ timeout: 5000 });
await expect(page.locator('g.node')).toHaveCount(1, { timeout: 5000 });
});
test('pasting on the same graph as the cut source cancels the cut', async ({ page }) => {
const initialNodeCount = await page.locator('g.node').count();
// Cut End
await nodeByLabel(page, 'End').click({ button: 'right' });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Cut' }).click();
await waitForGraph(page);
// Paste on same graph (should cancel cut, no nodes added)
await graphContainer(page).click({ button: 'right', position: { x: 10, y: 400 } });
await expect(page.locator('.ant-dropdown:visible')).toBeVisible({ timeout: 3000 });
await page.waitForTimeout(300);
await page.locator('.ant-dropdown-menu-item').filter({ hasText: 'Paste' }).click();
await waitForGraph(page);
// Node count should be unchanged (no duplication)
await expect(page.locator('g.node')).toHaveCount(initialNodeCount, { timeout: 5000 });
// End node is still present (cut was cancelled)
await expect(nodeByLabel(page, 'End')).toBeVisible({ timeout: 5000 });
});
});

View File

@@ -1,6 +1,6 @@
import type { GraphModel } from "./components/Graph"; import type { GraphModel } from "./components/Graph";
export function graphToDot(g: GraphModel): string { export function graphToDot(g: GraphModel, cutNodeIds: Set<string> = new Set()): string {
// Directed graph, use neato layout so we can use pos attributes // Directed graph, use neato layout so we can use pos attributes
const lines = []; const lines = [];
lines.push('digraph G {'); lines.push('digraph G {');
@@ -12,6 +12,9 @@ export function graphToDot(g: GraphModel): string {
const attrs = []; const attrs = [];
attrs.push(`label=\"${n.label}\"`); attrs.push(`label=\"${n.label}\"`);
attrs.push(`id=\"${n.id}\"`) attrs.push(`id=\"${n.id}\"`)
if (cutNodeIds.has(n.id)) {
attrs.push(`fillcolor="#d9d9d9"`, `style="filled,dashed"`);
}
lines.push(` \"${n.id}\" [${attrs.join(', ')}];`); lines.push(` \"${n.id}\" [${attrs.join(', ')}];`);
} }

View File

@@ -9,6 +9,7 @@ import NodeRenameModal from "./NodeRenameModal";
import { useGraphsStore } from "../stores/GraphsStore"; import { useGraphsStore } from "../stores/GraphsStore";
import { useKeysdownStore, useSelectedNodesStore } from "../stores/ArrayStore"; import { useKeysdownStore, useSelectedNodesStore } from "../stores/ArrayStore";
import { useLoadStore } from "../stores/LoadStore"; import { useLoadStore } from "../stores/LoadStore";
import { useCutStore } from "../stores/CutStore";
export class GraphModel { export class GraphModel {
@@ -92,6 +93,7 @@ const Graph = forwardRef<GraphHandle, { setGraphPath: React.Dispatch<React.SetSt
const anyNodeSelected = useSelectedNodesStore(store => store.hasAny); const anyNodeSelected = useSelectedNodesStore(store => store.hasAny);
const deselectAllNodes = useSelectedNodesStore(store => store.clear); const deselectAllNodes = useSelectedNodesStore(store => store.clear);
const loadCount = useLoadStore(state => state.loadCount); const loadCount = useLoadStore(state => state.loadCount);
const cutNodeIds = useCutStore(state => state.cutNodeIds);
useEffect(() => { useEffect(() => {
setGraphPath(graphsPath); setGraphPath(graphsPath);
@@ -100,7 +102,7 @@ const Graph = forwardRef<GraphHandle, { setGraphPath: React.Dispatch<React.SetSt
useEffect(() => { useEffect(() => {
renderGraph(); renderGraph();
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [graph]); }, [graph, cutNodeIds]);
// Persist graph edits to the store so they survive breadcrumb navigation. // Persist graph edits to the store so they survive breadcrumb navigation.
// We intentionally read graphId via ref (not as a dep) so this effect only // We intentionally read graphId via ref (not as a dep) so this effect only
@@ -142,6 +144,7 @@ const Graph = forwardRef<GraphHandle, { setGraphPath: React.Dispatch<React.SetSt
setGraphsPath([createPathSegment('main', 'Main')]); setGraphsPath([createPathSegment('main', 'Main')]);
openNodeContext(null); openNodeContext(null);
openContextMenu(false); openContextMenu(false);
useCutStore.getState().clearCut();
onNavigate?.('main'); onNavigate?.('main');
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [loadCount]); }, [loadCount]);
@@ -161,7 +164,8 @@ const Graph = forwardRef<GraphHandle, { setGraphPath: React.Dispatch<React.SetSt
}, [graphId]); }, [graphId]);
async function renderGraph() { async function renderGraph() {
const dot = graphToDot(graph); const currentCutNodeIds = new Set(useCutStore.getState().cutNodeIds);
const dot = graphToDot(graph, currentCutNodeIds);
try { try {
const svgElement = await viz.renderSVGElement(dot, { engine: 'dot' }); const svgElement = await viz.renderSVGElement(dot, { engine: 'dot' });

View File

@@ -4,6 +4,8 @@ import { useContext } from "react";
import { cloneDeep } from "lodash"; import { cloneDeep } from "lodash";
import { useGraphsStore } from "../stores/GraphsStore"; import { useGraphsStore } from "../stores/GraphsStore";
import { useGraphLayersTreeStore } from "../stores/TreeStore"; import { useGraphLayersTreeStore } from "../stores/TreeStore";
import { useCutStore } from "../stores/CutStore";
import { useSelectedNodesStore } from "../stores/ArrayStore";
const nodeItems: MenuProps['items'] = [ const nodeItems: MenuProps['items'] = [
{ {
@@ -20,6 +22,11 @@ const nodeItems: MenuProps['items'] = [
key: 'remove', key: 'remove',
label: 'Remove', label: 'Remove',
extra: 'ctrl + r' extra: 'ctrl + r'
},
{
key: 'cut',
label: 'Cut',
extra: 'ctrl + x',
} }
] ]
@@ -27,6 +34,11 @@ const emptyAreaItems: MenuProps['items'] = [
{ {
key: 'create', key: 'create',
label: 'Create Node', label: 'Create Node',
},
{
key: 'paste',
label: 'Paste',
extra: 'ctrl + v',
} }
] ]
@@ -50,6 +62,8 @@ export default function NodeContextMenu({
const graphsById = useGraphsStore((s) => (s as { graphsById: Map<string, GraphModel> }).graphsById); const graphsById = useGraphsStore((s) => (s as { graphsById: Map<string, GraphModel> }).graphsById);
const addTreeNode = useGraphLayersTreeStore(store => store.add); const addTreeNode = useGraphLayersTreeStore(store => store.add);
const removeTreeNode = useGraphLayersTreeStore(store => store.remove); const removeTreeNode = useGraphLayersTreeStore(store => store.remove);
const setCut = useCutStore(store => store.setCut);
const clearCut = useCutStore(store => store.clearCut);
function contextMenuOpenChange(open: boolean) { function contextMenuOpenChange(open: boolean) {
if (!open) { if (!open) {
@@ -89,6 +103,67 @@ export default function NodeContextMenu({
break; break;
} }
case 'cut': {
const currentGraph = graphContextValue.graph;
const selectedNodeIds = useSelectedNodesStore.getState().items;
// Determine the nodes to cut: selected nodes, or the right-clicked node if nothing is selected
const baseIds: string[] = selectedNodeIds.length > 0
? selectedNodeIds
: [nodeContext.nodeId];
// Also include nodes reachable by outgoing edges from base nodes
const baseIdSet = new Set(baseIds);
const linkedIds = new Set<string>();
for (const nodeId of baseIds) {
currentGraph.edges
.filter(e => e.from === nodeId && !baseIdSet.has(e.to))
.forEach(e => linkedIds.add(e.to));
}
const allCutIds = [...baseIds, ...linkedIds];
const allCutIdSet = new Set(allCutIds);
const cutNodes = currentGraph.nodes.filter(n => allCutIdSet.has(n.id));
// Only include edges where both endpoints are cut nodes
const cutEdges = currentGraph.edges.filter(e => allCutIdSet.has(e.from) && allCutIdSet.has(e.to));
setCut(allCutIds, cutNodes, cutEdges, graphContextValue.graphId);
useSelectedNodesStore.getState().clear();
break;
}
case 'paste': {
const cutState = useCutStore.getState();
if (cutState.cutNodes.length === 0) break;
// If pasting into the same graph, just cancel the cut
if (cutState.sourceGraphId === graphContextValue.graphId) {
clearCut();
break;
}
// Add cut nodes/edges to current graph
graphContextValue.setGraph(prev => ({
...prev,
nodes: [...prev.nodes, ...cutState.cutNodes],
edges: [...prev.edges, ...cutState.cutEdges],
}));
// Remove cut nodes and their connected edges from the source graph
if (cutState.sourceGraphId) {
const sourceGraph = graphsById.get(cutState.sourceGraphId);
if (sourceGraph) {
const cutIdSet = new Set(cutState.cutNodeIds);
graphsById.set(cutState.sourceGraphId, {
nodes: sourceGraph.nodes.filter(n => !cutIdSet.has(n.id)),
edges: sourceGraph.edges.filter(e => !cutIdSet.has(e.from) && !cutIdSet.has(e.to)),
});
}
}
clearCut();
break;
}
} }
}; };

22
src/stores/CutStore.ts Normal file
View File

@@ -0,0 +1,22 @@
import { create } from 'zustand';
import type { NodeModel, EdgeModel } from '../components/Graph';
export interface CutStore {
cutNodeIds: string[];
cutNodes: NodeModel[];
cutEdges: EdgeModel[];
sourceGraphId: string | null;
setCut: (nodeIds: string[], nodes: NodeModel[], edges: EdgeModel[], sourceGraphId: string) => void;
clearCut: () => void;
}
export const useCutStore = create<CutStore>()((set) => ({
cutNodeIds: [],
cutNodes: [],
cutEdges: [],
sourceGraphId: null,
setCut: (nodeIds, nodes, edges, sourceGraphId) =>
set({ cutNodeIds: nodeIds, cutNodes: nodes, cutEdges: edges, sourceGraphId }),
clearCut: () =>
set({ cutNodeIds: [], cutNodes: [], cutEdges: [], sourceGraphId: null }),
}));