feat(editor): Add remove node and connections functionality to canvas v2

packages/editor-ui/src/__tests__/mocks.ts

@@ -93,11 +93,11 @@ export function createTestWorkflow(options: {
 	} as IWorkflowDb;
 }
 
-export function createTestNode(
-	node: Partial<INode> & { name: INode['name']; type: INode['type'] },
-): INode {
+export function createTestNode(node: Partial<INode> = {}): INode {
 	return {
 		id: uuid(),
+		name: 'Node',
+		type: 'n8n-nodes-base.test',
 		typeVersion: 1,
 		position: [0, 0] as [number, number],
 		parameters: {},

packages/editor-ui/src/components/canvas/Canvas.vue

@@ -14,6 +14,8 @@ const $style = useCssModule();
 const emit = defineEmits<{
 	'update:modelValue': [elements: CanvasElement[]];
 	'update:node:position': [id: string, position: { x: number; y: number }];
+	'delete:node': [id: string];
+	'delete:connection': [connection: Connection];
 	'create:connection': [connection: Connection];
 }>();
 
@@ -38,6 +40,14 @@ function onNodeDragStop(e: NodeDragEvent) {
 	});
 }
 
+function onDeleteNode(id: string) {
+	emit('delete:node', id);
+}
+
+function onDeleteConnection(connection: Connection) {
+	emit('delete:connection', connection);
+}
+
 function onConnect(...args: unknown[]) {
 	emit('create:connection', args[0] as Connection);
 }
@@ -58,11 +68,11 @@ function onConnect(...args: unknown[]) {
 		@connect="onConnect"
 	>
 		<template #node-canvas-node="canvasNodeProps">
-			<CanvasNode v-bind="canvasNodeProps" />
+			<CanvasNode v-bind="canvasNodeProps" @delete="onDeleteNode" />
 		</template>
 
 		<template #edge-canvas-edge="canvasEdgeProps">
-			<CanvasEdge v-bind="canvasEdgeProps" />
+			<CanvasEdge v-bind="canvasEdgeProps" @delete="onDeleteConnection" />
 		</template>
 
 		<Background data-test-id="canvas-background" pattern-color="#aaa" :gap="16" />

packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue

@@ -1,15 +1,30 @@
 <script lang="ts" setup>
-import type { EdgeProps } from '@vue-flow/core';
-import { BaseEdge, getBezierPath } from '@vue-flow/core';
-import { computed } from 'vue';
+/* eslint-disable vue/no-multiple-template-root */
+import type { Connection, EdgeProps } from '@vue-flow/core';
+import { BaseEdge, EdgeLabelRenderer, getBezierPath } from '@vue-flow/core';
+import { computed, onMounted, onUnmounted, toRef, useCssModule } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+
+const emit = defineEmits<{
+	delete: [connection: Connection];
+}>();
 
 const props = defineProps<EdgeProps>();
 
+const i18n = useI18n();
+const $style = useCssModule();
+
+const selected = toRef(props, 'selected');
+
 const edgeStyle = computed(() => ({
 	strokeWidth: 2,
 	...props.style,
 }));
 
+const edgeLabelStyle = computed(() => ({
+	transform: `translate(-50%, -50%) translate(${path.value[1]}px,${path.value[2]}px)`,
+}));
+
 const path = computed(() =>
 	getBezierPath({
 		sourceX: props.sourceX,
@@ -20,6 +35,35 @@ const path = computed(() =>
 		targetPosition: props.targetPosition,
 	}),
 );
+
+const connection = computed<Connection>(() => ({
+	source: props.source,
+	target: props.target,
+	sourceHandle: props.sourceHandleId,
+	targetHandle: props.targetHandleId,
+}));
+
+onMounted(() => {
+	document.addEventListener('keydown', onKeyDown);
+});
+
+onUnmounted(() => {
+	document.removeEventListener('keydown', onKeyDown);
+});
+
+function onDelete() {
+	emit('delete', connection.value);
+}
+
+function onKeyDown(e: KeyboardEvent) {
+	if (!selected.value) {
+		return;
+	}
+
+	if (e.key === 'Delete') {
+		onDelete();
+	}
+}
 </script>
 
 <template>
@@ -36,5 +80,25 @@ const path = computed(() =>
 		:label-bg-style="{ fill: 'red' }"
 		:label-bg-padding="[2, 4]"
 		:label-bg-border-radius="2"
+		tabindex="2"
 	/>
+	<EdgeLabelRenderer>
+		<div :class="[$style.edgeToolbar, 'nodrag', 'nopan']" :style="edgeLabelStyle">
+			<N8nIconButton
+				data-test-id="delete-connection-button"
+				type="tertiary"
+				size="small"
+				icon="trash"
+				:title="i18n.baseText('node.delete')"
+				@click="onDelete"
+			/>
+		</div>
+	</EdgeLabelRenderer>
 </template>
+
+<style lang="scss" module>
+.edgeToolbar {
+	pointer-events: all;
+	position: absolute;
+}
+</style>

packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue

@@ -15,6 +15,10 @@ import { useNodeConnections } from '@/composables/useNodeConnections';
 import { CanvasNodeKey } from '@/constants';
 import type { NodeProps } from '@vue-flow/core';
 
+const emit = defineEmits<{
+	delete: [id: string];
+}>();
+
 const props = defineProps<NodeProps<CanvasElementData>>();
 
 const inputs = computed(() => props.data.inputs);
@@ -89,10 +93,24 @@ provide(CanvasNodeKey, {
 	selected,
 	nodeType,
 });
+
+function onDelete() {
+	emit('delete', props.id);
+}
+
+function onKeyDown(e: KeyboardEvent) {
+	if (!selected.value) {
+		return;
+	}
+
+	if (e.key === 'Delete') {
+		onDelete();
+	}
+}
 </script>
 
 <template>
-	<div :class="$style.canvasNode" data-test-id="canvas-node">
+	<div :class="$style.canvasNode" data-test-id="canvas-node" tabindex="1" @keydown="onKeyDown">
 		<template v-for="source in outputsWithPosition" :key="`${source.type}/${source.index}`">
 			<HandleRenderer
 				mode="output"
@@ -121,6 +139,7 @@ provide(CanvasNodeKey, {
 			v-if="nodeType"
 			data-test-id="canvas-node-toolbar"
 			:class="$style.canvasNodeToolbar"
+			@delete="onDelete"
 		/>
 
 		<CanvasNodeRenderer v-if="nodeType">

packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue

@@ -1,12 +1,16 @@
 <script setup lang="ts">
 import { computed, inject, useCssModule } from 'vue';
 import { CanvasNodeKey } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+
+const emit = defineEmits(['delete']);
+const $style = useCssModule();
 
 const node = inject(CanvasNodeKey);
 
-const data = computed(() => node?.data.value);
+const i18n = useI18n();
 
-const $style = useCssModule();
+const data = computed(() => node?.data.value);
 
 // @TODO
 const workflowRunning = false;
@@ -20,8 +24,9 @@ function executeNode() {}
 // @TODO
 function toggleDisableNode() {}
 
-// @TODO
-function deleteNode() {}
+function deleteNode() {
+	emit('delete');
+}
 
 // @TODO
 function openContextMenu(_e: MouseEvent, _type: string) {}
@@ -38,7 +43,7 @@ function openContextMenu(_e: MouseEvent, _type: string) {}
 				size="small"
 				icon="play"
 				:disabled="workflowRunning"
-				:title="$locale.baseText('node.testStep')"
+				:title="i18n.baseText('node.testStep')"
 				@click="executeNode"
 			/>
 			<N8nIconButton
@@ -56,7 +61,7 @@ function openContextMenu(_e: MouseEvent, _type: string) {}
 				size="small"
 				text
 				icon="trash"
-				:title="$locale.baseText('node.delete')"
+				:title="i18n.baseText('node.delete')"
 				@click="deleteNode"
 			/>
 			<N8nIconButton