mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-10 08:07:03 +00:00
* feat: add flow group nodes core infrastructure Add group data model (start_id/end_id boundary pairs), GroupEditor for CRUD operations, groupDetectionUtils for membership computation and validation, GroupedModulesProxy for reactive sync, and compound layout support. Update openflow.openapi.yaml with group schema. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add group UI components and rendering Add GroupOverlay with bounding box and z-ordering, GroupHeader with StepCountTab and ellipsis menu, GroupNodeCard, GroupNoteArea for inline markdown notes, CollapsedGroupNode/CollapsedSubflowNode for collapsed rendering, GroupEndNode/GroupHeadNode boundary markers, and group actions in NodeContextMenu and SelectionBoundingBox. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: integrate groups into flow graph, builder, and existing components Wire group support into FlowGraphV2 (overlays, collapsed rendering, group-aware layout), graphBuilder (GroupedModule tree, container collapse/expand, group boundary nodes), BaseEdge (drop targets for group operations), ModuleNode (collapsed container rendering), and flow map components (schema item grouping). Remove SubflowBound in favor of CollapsedSubflowNode. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove banned $bindable(default) pattern and dead ternary Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: decouple collapse state from grouped module tree Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: pass groups prop to FlowGraphV2 and use GroupDisplayState via graphContext Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: remove group membership system, compute nesting depth from visual bounds Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: simplify GroupOverlay bounds, remove unused headerY and showNotes prop Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: populate innerNodeIds for expanded subflow overlay Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: remove expanded subflow overlay feature for separate PR Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: flatten groups in getContainerModules to prevent crash on collapsed containers Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add drag-to-move support for group nodes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: derive group boundaries from expanded membership to prevent splitting existing groups Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: catch group validation errors and display as flow graph alert Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test: add unit tests for group validation in buildGroupedModules Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: reject virtual nodes (Input, Result, Trigger) from groups Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test: add virtual node rejection tests for buildGroupedModules Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: exclude preprocessor and failure module from groups Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: disable Create group button when preprocessor is selected Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: reject selection entirely when it contains excluded nodes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: remove unnecessary excludeIds from buildGroupedModules Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove debug console.log from FlowGraphV2 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use cross-browser CSS grid trick for group summary input auto-sizing Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: hide group boundary edges and reformat GroupNoteArea Hide edges between group header and first node, and between last node and group-end, keeping them in the DOM but visually hidden. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: stop FlowGraphV2 from reading groups via groupEditorContext Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: show module previews with status, selection, and suspend popover in collapsed groups Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: extract collapsible implicit containers to separate branch Remove collapse/expand functionality for implicit containers (forloops, while loops, branches) from this branch. Backed up as collapsible-implicit-containers-backup for later rebase. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: use original reactive modules for graph node data instead of proxy snapshots Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: prevent node loss when moving into forloop inside a group Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: replace GroupedModule proxy with structure-only FlowStructureNode tree Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use "group-" prefix for group IDs instead of "note-" Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: update group boundaries when renaming a module ID When a module at a group boundary (start_id or end_id) is renamed, the group definitions now get updated before the reactive rebuild, preventing stale references that would break the flow structure. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: update graph layout when removing a group note Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add opaque background behind test run button to prevent see-through Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: detect and reject duplicate group IDs Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: simplify group creation validation with early marker normalization Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use $state.raw in MiniFlowGraph to avoid xyflow performance warning Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address code review feedback - Revert backend traverse_modules change (not part of this feature) - Use Map for node lookup in GroupOverlay (O(1) vs O(n) per group) - Extract computeNodeExtraSpace to nodeExtraSpace.ts for testability Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address PR review feedback - Compute group depths from structure tree O(n) instead of O(n²) bounds comparison - Remove unnecessary $derived(groups) in GroupOverlay - Remove unused collapsed field from container types in OpenAPI spec - Use NODE.width constant in GroupNodeCard instead of hardcoded 275px - Add comment explaining intentional stale preservation in rebuild() Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: preserve flow groups during dependency job re-serialization Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: resolve Svelte state_referenced_locally warnings in GroupHeader and FlowGraphV2 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: show subflow groups when expanding a subflow in the graph - Store both modules and groups when expanding a subflow - Pass groups to buildStructureTree so group nodes render - Include subflow groups in overlay rendering and collapse tracking - Clone modules for prefix rewriting to avoid state_unsafe_mutation - Register expanded subflow modules in moduleMap before prefix rewriting - Disable group editing in expanded subflows and read-only views Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: restore accidentally removed code from main - Restore subflowBound selection handling in selectionUtils - Restore comments in SelectionBoundingBox - Restore deletable={false} in FirstStepInputs Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: remove redundant adjacency check from MoveManager The disableMoveIds check already prevents all invalid drop targets, making the adjacencySourceId/adjacencyTargetId fields unnecessary. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: regenerate auto-generated files after OpenAPI schema change Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: regenerate cli skills after main merge Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: include groups in view_graph localStorage state Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: centralize canCreateGroup and replace group note with group creation - Add canCreateGroup StateStore to GroupEditorContext, computed in FlowGraphV2 - Replace "Create group note" with "Create group" in FlowSelectionPanel - Remove "Add note" from selection bounding box dropdown - Remove unused NodeContextMenu component - Wire createGroup through FlowModuleSchemaMap → FlowGraphV2 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: reject groups spanning parallel branches and surface ill-formed group errors Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: regenerate auto-generated files after main merge Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: ensure modules appears before groups in YAML export Svelte 5's $state proxy registers groups as a tracked property before it's explicitly set, causing it to appear before modules in Object.keys iteration. Reorder the value object at export time for readable YAML. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address second round of PR review feedback - Add comment explaining duplicateMultiple bypasses structure tree - Add warning log for inverted ranges in computeGroupModuleIds - Use NODE.width constant in CollapsedGroupNode instead of hardcoded 275px - Simplify redundant condition in getGroupsEmptiedBy Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: remove stored group ID, derive ephemeral key from start_id:end_id Groups no longer store an `id` field. Instead, a `groupKey(g)` helper derives an ephemeral key from `${start_id}:${end_id}` at read time. This simplifies the schema while preserving all runtime functionality. When boundaries shift (module deletion), runtime state (collapse, note heights) is remapped to the new key via GroupDisplayState.remapGroupKey. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add note button, save/cancel hints, and rename collapsed_by_default to autocollapse Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: propagate selection from collapsed group badges to external listeners Pass eventHandlers to GroupModuleIcons so clicking a module badge calls both selectionManager.selectId (visual highlight) and eventHandlers.select (side panel propagation via onSelect). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: regenerate auto-generated files after main merge Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: hide In/Out popovers and actions during click-to-move Replace isDragging with isMoving derived that covers both drag-move and click-move states, disabling popovers, delete button, and test run button during any move operation. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
155 lines
4.3 KiB
Svelte
155 lines
4.3 KiB
Svelte
<script lang="ts">
|
|
import { ViewportPortal, type Node } from '@xyflow/svelte'
|
|
import { calculateNodesBoundsWithOffset } from './util'
|
|
import { Move, Copy, Trash2, EllipsisVertical, Group } from 'lucide-svelte'
|
|
import { Button } from '../common'
|
|
import DropdownV2 from '../DropdownV2.svelte'
|
|
import { getGroupEditorContext } from './groupEditor.svelte'
|
|
import { getGraphContext } from './graphContext'
|
|
import MoveHandleButton from './MoveHandleButton.svelte'
|
|
import { tick } from 'svelte'
|
|
import { isMac, type Item } from '$lib/utils'
|
|
|
|
interface Props {
|
|
selectedNodes: string[]
|
|
allNodes: (Node & { type: string })[]
|
|
onDeleteSelected?: () => void
|
|
onDuplicateSelected?: () => void
|
|
onMoveSelected?: () => void
|
|
onCancelMove?: () => void
|
|
canMoveSelected?: boolean
|
|
isMoving?: boolean
|
|
resolvedModuleIds?: string[]
|
|
}
|
|
|
|
let {
|
|
selectedNodes,
|
|
allNodes,
|
|
onDeleteSelected,
|
|
onDuplicateSelected,
|
|
onMoveSelected,
|
|
onCancelMove,
|
|
canMoveSelected = false,
|
|
isMoving = false,
|
|
resolvedModuleIds = []
|
|
}: Props = $props()
|
|
|
|
let resolvedCount = $derived(resolvedModuleIds.length)
|
|
|
|
// Get GroupEditor context for group creation
|
|
const groupEditorContext = getGroupEditorContext()
|
|
// Get Graph context for clearFlowSelection function and moveManager
|
|
const graphContext = getGraphContext()
|
|
const moveManager = graphContext?.moveManager
|
|
|
|
let canCreateGroup = $derived(groupEditorContext?.canCreateGroup.val ?? false)
|
|
|
|
function handleAddGroup() {
|
|
if (selectedNodes.length > 0 && groupEditorContext?.groupEditor && graphContext) {
|
|
const flowNodes = graphContext.getFlowNodes?.() ?? []
|
|
groupEditorContext.groupEditor.createGroup(selectedNodes, flowNodes)
|
|
|
|
tick().then(() => {
|
|
graphContext?.clearFlowSelection?.()
|
|
graphContext?.selectionManager.clearSelection()
|
|
})
|
|
}
|
|
}
|
|
|
|
let menuItems: Item[] = $derived([
|
|
{
|
|
displayName: 'Move',
|
|
icon: Move,
|
|
action: () => onMoveSelected?.(),
|
|
disabled: !canMoveSelected
|
|
},
|
|
{
|
|
displayName: 'Duplicate',
|
|
icon: Copy,
|
|
action: () => onDuplicateSelected?.()
|
|
},
|
|
{
|
|
displayName: `Delete (${resolvedCount})`,
|
|
icon: Trash2,
|
|
type: 'delete',
|
|
shortcut: isMac() ? '⌫' : 'Del',
|
|
action: () => onDeleteSelected?.()
|
|
},
|
|
...(groupEditorContext?.groupEditor
|
|
? [
|
|
{
|
|
displayName: 'Create group',
|
|
icon: Group,
|
|
action: handleAddGroup,
|
|
disabled: !canCreateGroup
|
|
}
|
|
]
|
|
: [])
|
|
])
|
|
|
|
let bounds = $derived.by(() => {
|
|
if (selectedNodes.length === 0) {
|
|
return null
|
|
}
|
|
|
|
// Calculate flow coordinates bounds, accounting for CSS offset and expanded subflows
|
|
const { minX, minY, maxX, maxY } = calculateNodesBoundsWithOffset(selectedNodes, allNodes)
|
|
|
|
// Add padding in flow coordinates
|
|
const padding = 4
|
|
|
|
// Return flow coordinates directly - ViewportPortal handles transformation
|
|
return {
|
|
x: minX - padding,
|
|
y: minY - padding,
|
|
width: maxX - minX + 2 * padding,
|
|
height: maxY - minY + 2 * padding
|
|
}
|
|
})
|
|
</script>
|
|
|
|
{#if bounds && selectedNodes.length > 1}
|
|
{@const currentBounds = bounds!}
|
|
<ViewportPortal target="front">
|
|
<div
|
|
class={'absolute cursor-pointer bg-surface-selected/40 rounded-md pointer-events-none'}
|
|
style:transform="translate({currentBounds.x}px, {currentBounds.y}px)"
|
|
style:width="{currentBounds.width}px"
|
|
style:height="{currentBounds.height}px"
|
|
style:z-index="10"
|
|
>
|
|
<div
|
|
class="absolute -top-4 -right-1 z-20 flex gap-2 items-center"
|
|
style="pointer-events: auto;"
|
|
>
|
|
{#if isMoving}
|
|
<Button variant="accent" onClick={() => onCancelMove?.()} size="xs" destructive
|
|
>Cancel move</Button
|
|
>
|
|
{:else if resolvedCount > 0}
|
|
{#if canMoveSelected && moveManager && resolvedModuleIds.length > 0}
|
|
<div class="">
|
|
<MoveHandleButton
|
|
{moveManager}
|
|
moduleId={resolvedModuleIds[0]}
|
|
selectedIds={resolvedModuleIds}
|
|
onClickMove={() => onMoveSelected?.()}
|
|
/>
|
|
</div>
|
|
{/if}
|
|
<DropdownV2 items={menuItems} size="sm" placement="right-start">
|
|
{#snippet buttonReplacement()}
|
|
<button
|
|
class="center-center p-1 rounded-md shadow-md bg-surface text-secondary hover:bg-surface-tertiary"
|
|
title="Actions"
|
|
>
|
|
<EllipsisVertical size={12} />
|
|
</button>
|
|
{/snippet}
|
|
</DropdownV2>
|
|
{/if}
|
|
</div>
|
|
</div>
|
|
</ViewportPortal>
|
|
{/if}
|