diff --git a/frontend/src/lib/components/Tooltip.svelte b/frontend/src/lib/components/Tooltip.svelte index afb51171c..ea2cdc00a 100644 --- a/frontend/src/lib/components/Tooltip.svelte +++ b/frontend/src/lib/components/Tooltip.svelte @@ -59,7 +59,15 @@ } }); const action = trigger(node); + function handleEscape(event) { + if (event.key !== 'Escape' || !get(open)) return; + open.set(false); + event.preventDefault(); + event.stopPropagation(); + } + node.addEventListener('keydown', handleEscape, true); return () => { + node.removeEventListener('keydown', handleEscape, true); action?.destroy?.(); unsubscribe(); for (const name of ['data-melt-tooltip-trigger', 'data-state']) node.removeAttribute(name); diff --git a/frontend/src/lib/features/actions/ActionFlowEditor.svelte b/frontend/src/lib/features/actions/ActionFlowEditor.svelte index 29d0fb53b..6e8a0b5ec 100644 --- a/frontend/src/lib/features/actions/ActionFlowEditor.svelte +++ b/frontend/src/lib/features/actions/ActionFlowEditor.svelte @@ -1,23 +1,12 @@ + {#if !reconnecting}
{labelText}
{/if} +
diff --git a/frontend/src/lib/features/actions/nodes/ConditionNode.svelte b/frontend/src/lib/features/actions/nodes/ConditionNode.svelte deleted file mode 100644 index 75eac1e06..000000000 --- a/frontend/src/lib/features/actions/nodes/ConditionNode.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - - diff --git a/frontend/src/lib/features/actions/nodes/ContainerRunNode.svelte b/frontend/src/lib/features/actions/nodes/ContainerRunNode.svelte deleted file mode 100644 index e07ba091c..000000000 --- a/frontend/src/lib/features/actions/nodes/ContainerRunNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/lib/features/actions/nodes/CreateAssetNode.svelte b/frontend/src/lib/features/actions/nodes/CreateAssetNode.svelte deleted file mode 100644 index 72966d46f..000000000 --- a/frontend/src/lib/features/actions/nodes/CreateAssetNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/lib/features/actions/nodes/CreateItemNode.svelte b/frontend/src/lib/features/actions/nodes/CreateItemNode.svelte deleted file mode 100644 index 26a91ac6a..000000000 --- a/frontend/src/lib/features/actions/nodes/CreateItemNode.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - - - {#snippet body()} - {#if data.config?.title} -
{data.config.title}
- {:else} -
Configure item creation
- {/if} - {/snippet} -
- - diff --git a/frontend/src/lib/features/actions/nodes/CreateMilestoneNode.svelte b/frontend/src/lib/features/actions/nodes/CreateMilestoneNode.svelte deleted file mode 100644 index a9b32a83e..000000000 --- a/frontend/src/lib/features/actions/nodes/CreateMilestoneNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/lib/features/actions/nodes/ExecuteScriptNode.svelte b/frontend/src/lib/features/actions/nodes/ExecuteScriptNode.svelte deleted file mode 100644 index e691022b9..000000000 --- a/frontend/src/lib/features/actions/nodes/ExecuteScriptNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/frontend/src/lib/features/actions/nodes/HTTPRequestNode.svelte b/frontend/src/lib/features/actions/nodes/HTTPRequestNode.svelte deleted file mode 100644 index ffcdc01da..000000000 --- a/frontend/src/lib/features/actions/nodes/HTTPRequestNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/lib/features/actions/nodes/InsertCannedResponseNode.svelte b/frontend/src/lib/features/actions/nodes/InsertCannedResponseNode.svelte deleted file mode 100644 index d25d0f739..000000000 --- a/frontend/src/lib/features/actions/nodes/InsertCannedResponseNode.svelte +++ /dev/null @@ -1,40 +0,0 @@ - - - - {#snippet body()} - {#if data.config?.canned_response_id} -
- {t('actions.config.cannedResponse')}: - #{data.config.canned_response_id} -
- {:else} -
{t('actions.config.selectCannedResponse')}
- {/if} - {/snippet} -
- - diff --git a/frontend/src/lib/features/actions/nodes/NotifyCustomerNode.svelte b/frontend/src/lib/features/actions/nodes/NotifyCustomerNode.svelte deleted file mode 100644 index 7ff3dddd3..000000000 --- a/frontend/src/lib/features/actions/nodes/NotifyCustomerNode.svelte +++ /dev/null @@ -1,26 +0,0 @@ - - - - {#snippet body()} - {#if data.config?.message} -
{data.config.message.substring(0, 40)}...
- {:else} -
{t('actions.config.enterMessage')}
- {/if} - {/snippet} -
- - diff --git a/frontend/src/lib/features/actions/nodes/NotifyUserNode.svelte b/frontend/src/lib/features/actions/nodes/NotifyUserNode.svelte deleted file mode 100644 index 0b736d20b..000000000 --- a/frontend/src/lib/features/actions/nodes/NotifyUserNode.svelte +++ /dev/null @@ -1,64 +0,0 @@ - - - - {#snippet body()} - {#if data.config?.recipient_type} -
- {t('actions.config.to')}: - {getRecipientLabel(data.config.recipient_type)}{#if data.config.recipient_type === 'specific' && specificCount > 0} ({specificCount}){/if} -
- {#if data.config.message} -
{data.config.message.substring(0, 40)}...
- {/if} - {:else} -
{t('actions.config.selectRecipient')}
- {/if} - {/snippet} -
- - diff --git a/frontend/src/lib/features/actions/nodes/RelatedItemsNode.svelte b/frontend/src/lib/features/actions/nodes/RelatedItemsNode.svelte deleted file mode 100644 index 066c8df13..000000000 --- a/frontend/src/lib/features/actions/nodes/RelatedItemsNode.svelte +++ /dev/null @@ -1,69 +0,0 @@ - - - - {#snippet body()} - - {/snippet} - - - diff --git a/frontend/src/lib/features/actions/nodes/RoundRobinAssignNode.svelte b/frontend/src/lib/features/actions/nodes/RoundRobinAssignNode.svelte deleted file mode 100644 index b3f088dfb..000000000 --- a/frontend/src/lib/features/actions/nodes/RoundRobinAssignNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/lib/features/actions/nodes/SetFieldNode.svelte b/frontend/src/lib/features/actions/nodes/SetFieldNode.svelte deleted file mode 100644 index 42a1142d0..000000000 --- a/frontend/src/lib/features/actions/nodes/SetFieldNode.svelte +++ /dev/null @@ -1,53 +0,0 @@ - - - - {#snippet body()} - {#if data.config?.field_name} -
- {data.config.field_display_name || data.config.field_name} - → - {data.config.value_display_name || data.config.value || '...'} -
- {:else} -
{t('actions.config.selectField')}
- {/if} - {/snippet} -
- - diff --git a/frontend/src/lib/features/actions/nodes/SetStatusNode.svelte b/frontend/src/lib/features/actions/nodes/SetStatusNode.svelte deleted file mode 100644 index 50d8d4778..000000000 --- a/frontend/src/lib/features/actions/nodes/SetStatusNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/lib/features/actions/nodes/TransitionItemNode.svelte b/frontend/src/lib/features/actions/nodes/TransitionItemNode.svelte deleted file mode 100644 index 706a8ad92..000000000 --- a/frontend/src/lib/features/actions/nodes/TransitionItemNode.svelte +++ /dev/null @@ -1,58 +0,0 @@ - - - - {#snippet body()} - {#if target.mode === 'explicit'} - {#if status} - - {:else} -
Select a target status
- {/if} - {:else if target.mode === 'category_name'} -
-
To category: {target.category_name || '(unset)'}
-
Resolved per item's own workflow
-
- {:else} -
-
Mirror trigger's terminal category
-
Picks the matching terminal in the current item's workflow
-
- {/if} - {/snippet} -
- - diff --git a/frontend/src/lib/features/actions/nodes/TriggerNode.svelte b/frontend/src/lib/features/actions/nodes/TriggerNode.svelte deleted file mode 100644 index c800c8b92..000000000 --- a/frontend/src/lib/features/actions/nodes/TriggerNode.svelte +++ /dev/null @@ -1,78 +0,0 @@ - - - diff --git a/frontend/src/lib/features/actions/nodes/UpdateAssetNode.svelte b/frontend/src/lib/features/actions/nodes/UpdateAssetNode.svelte deleted file mode 100644 index 1b1fb55b7..000000000 --- a/frontend/src/lib/features/actions/nodes/UpdateAssetNode.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/lib/features/actions/shared/ActionCanvasNode.svelte b/frontend/src/lib/features/actions/shared/ActionCanvasNode.svelte new file mode 100644 index 000000000..6cf71f496 --- /dev/null +++ b/frontend/src/lib/features/actions/shared/ActionCanvasNode.svelte @@ -0,0 +1,111 @@ + + +
+ {#if presentation.layout === 'step' || presentation.layout === 'condition'} + + {/if} +
+ + {presentation.label} +
+
+ {#each preview.rows as row (row.key)} +
+
{row.label}:
+
+ + + {row.value} + +
+
+ {/each} +
+ {#if presentation.layout === 'condition'} +
+ {t('actions.condition.true')} + {t('actions.condition.false')} +
+ + + {:else if presentation.layout === 'step' || presentation.layout === 'trigger'} + + {/if} +
+ + diff --git a/frontend/src/lib/features/actions/shared/BaseActionFlowEditor.svelte b/frontend/src/lib/features/actions/shared/BaseActionFlowEditor.svelte index 9a50b4a1c..83c8cc6ed 100644 --- a/frontend/src/lib/features/actions/shared/BaseActionFlowEditor.svelte +++ b/frontend/src/lib/features/actions/shared/BaseActionFlowEditor.svelte @@ -15,11 +15,14 @@ import Button from '../../../components/Button.svelte'; import ActionEdge from '../edges/ActionEdge.svelte'; import { errorToast } from '../../../stores/toasts.svelte.js'; + import ActionCanvasNode from './ActionCanvasNode.svelte'; + import { actionNodeDefinitions } from './actionNodeDefinitions.js'; + import { provideActionEditorContext } from './actionEditorContext.js'; let { action, flowStore, - nodeTypes, + getEditorData = () => ({}), nodePalette = [], triggerTypes = [], sidebarTitle = 'Actions', @@ -46,7 +49,6 @@ minimapNodeStrokeWidth = undefined, minimapNodeBorderRadius = undefined, minimapMaskColor = undefined, - initArgs = [], onSave, onCancel, triggerConfig, @@ -55,6 +57,11 @@ sidebarTop = null, } = $props(); + provideActionEditorContext({ + get flowStore() { return flowStore; }, + getEditorData: () => getEditorData(), + }); + let nodes = $state([]); let edges = $state([]); let selectedNodeId = $state(null); @@ -76,16 +83,11 @@ let lastInitializedActionKey = $state(null); - function comparableNodeData(data = {}) { - const { flowStore: _flowStore, ...rest } = data || {}; - return rest; - } - function storeNodesVersion(storeNodes) { return JSON.stringify(storeNodes.map((n) => ({ id: n.id, type: n.type, - data: comparableNodeData(n.data), + data: n.data, }))); } @@ -135,7 +137,7 @@ if (currentKey === lastInitializedActionKey) return; lastInitializedActionKey = currentKey; - flowStore.init(action, ...initArgs); + flowStore.init(action); nodes = cloneNodes(flowStore.nodes); edges = cloneEdges(flowStore.edges); selectedNodeId = flowStore.selectedNodeId; @@ -169,6 +171,11 @@ selectedNodeId ? nodes.find(n => n.id === selectedNodeId) : null ); + let nodeTypes = $derived(Object.fromEntries( + [...new Set([...Object.keys(actionNodeDefinitions), ...nodes.map((node) => node.type)])] + .map((type) => [type, ActionCanvasNode]), + )); + /** @type {any} */ const edgeTypes = { action: ActionEdge }; @@ -238,10 +245,8 @@ if (node) flowStore.selectNode(node.id); } - // Approximate default node footprint used to center the drop: nodes are - // around 180x80 px at zoom=1. Offsetting by half keeps the new node roughly - // centered on the viewport rather than anchored at its top-left. - const NODE_CENTER_OFFSET = { x: 90, y: 40 }; + // Center new cards in the current viewport. + const NODE_CENTER_OFFSET = { x: 140, y: 40 }; function viewportCenterInFlowCoords() { if (!flowContainer) return null; @@ -403,6 +408,7 @@