diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte index e0a1d2222b..f3b593177e 100644 --- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte +++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte @@ -289,6 +289,8 @@ } }} on:insert={async ({ detail }) => { + console.log('insert', detail) + if (shouldRunTutorial('forloop', detail.detail, 1)) { flowTutorials?.runTutorialById('forloop', detail.index) } else if (shouldRunTutorial('branchone', detail.detail, 2)) { @@ -338,6 +340,8 @@ } }} on:move={async ({ detail }) => { + console.log('move', detail, $moving) + if (!$moving || $moving.module.id !== detail.module.id) { if (detail.module && detail.modules) { $moving = { module: detail.module, modules: detail.modules } diff --git a/frontend/src/lib/components/flows/map/MapItem.svelte b/frontend/src/lib/components/flows/map/MapItem.svelte index 34c545f6d5..53f449c8bb 100644 --- a/frontend/src/lib/components/flows/map/MapItem.svelte +++ b/frontend/src/lib/components/flows/map/MapItem.svelte @@ -3,36 +3,23 @@ import LanguageIcon from '$lib/components/common/languageIcons/LanguageIcon.svelte' import IconedResourceType from '$lib/components/IconedResourceType.svelte' import type { FlowModule } from '$lib/gen' - import { - Building, - ClipboardCopy, - GitBranchPlus, - Repeat, - Square, - ArrowDown, - GitBranch - } from 'lucide-svelte' + import { Building, Repeat, Square, ArrowDown, GitBranch } from 'lucide-svelte' import { createEventDispatcher, getContext } from 'svelte' import type { Writable } from 'svelte/store' import FlowModuleSchemaItem from './FlowModuleSchemaItem.svelte' - import InsertModuleButton from './InsertModuleButton.svelte' import { prettyLanguage } from '$lib/common' import { msToSec } from '$lib/utils' import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte' import FlowJobsMenu from './FlowJobsMenu.svelte' export let mod: FlowModule - export let trigger: boolean export let insertable: boolean - export let insertableEnd = false export let annotation: string | undefined = undefined - export let branchable: boolean = false export let bgColor: string = '' export let modules: FlowModule[] export let moving: string | undefined = undefined export let duration_ms: number | undefined = undefined - export let disableAi: boolean = false - export let wrapperId: string | undefined = undefined + export let retries: number | undefined = undefined export let flowJobs: | { flowJobs: string[]; selected: number; flowJobsSuccess: (boolean | undefined)[] } @@ -69,30 +56,9 @@ function onDelete(event: CustomEvent) { dispatch('delete', event) } - let openMenu: boolean | undefined = undefined - let openMenu2: boolean | undefined = undefined {#if mod} -
- {#if moving} - - {/if} -
{#if moving == mod.id}
@@ -226,55 +192,4 @@ {/if}
- {#if insertable && insertableEnd} -
- {#if moving} - - {:else} - { - dispatch('insert', { modules, index: idx + 1, detail: 'script', script: e.detail }) - }} - on:new={(e) => { - dispatch('insert', { modules, index: idx + 1, detail: e.detail }) - }} - index={idx + 1} - {modules} - /> - {/if} -
- {/if} - - {#if insertable && branchable} -
- -
- {/if} {/if} diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte index a77dfb1ab3..99f7f702a0 100644 --- a/frontend/src/lib/components/flows/map/VirtualItem.svelte +++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte @@ -3,7 +3,7 @@ import { Badge } from '$lib/components/common' import type { FlowModule } from '$lib/gen' import { classNames } from '$lib/utils' - import { ClipboardCopy, ExternalLink, Wand2, X } from 'lucide-svelte' + import { ExternalLink, Wand2, X } from 'lucide-svelte' import { createEventDispatcher, getContext } from 'svelte' import type { FlowCopilotContext } from '$lib/components/copilot/flow' import { copilotInfo } from '$lib/stores' @@ -12,17 +12,14 @@ export let label: string export let modules: FlowModule[] | undefined - export let index: number export let insertable: boolean export let bgColor: string = '' export let selected: boolean export let selectable: boolean export let deleteBranch: { module: FlowModule; index: number } | undefined = undefined export let id: string | undefined = undefined - export let moving: string | undefined = undefined export let center = true export let disableAi: boolean = false - export let wrapperNode: FlowModule | undefined = undefined export let borderColor: string | undefined = undefined export let hideId: boolean = false @@ -36,7 +33,6 @@ select: string deleteBranch: { module: FlowModule; index: number } }>() - let openMenu = false let triggerOpenMenu = false let openNoCopilot = false @@ -102,34 +98,6 @@ -{#if modules && (label != 'Input' || modules.length == 0)} -
- {#if moving} - - {/if} -
-{/if} - {#if insertable && modules && label == 'Input'} {#if !disableAi}
([]) @@ -220,13 +221,12 @@ {edges} {edgeTypes} {nodeTypes} - minZoom={1} + minZoom={0.5} connectionLineType={ConnectionLineType.SmoothStep} defaultEdgeOptions={{ type: 'smoothstep' }} fitView {proOptions} nodesDraggable={false} - preventScrolling={!scroll} on:nodeclick={(e) => handleNodeClick(e)} on:delete={(e) => { console.log('delete', e.detail) diff --git a/frontend/src/lib/components/graph/graphBuilder.ts b/frontend/src/lib/components/graph/graphBuilder.ts index 0915ddd5f3..9d5d65cb9f 100644 --- a/frontend/src/lib/components/graph/graphBuilder.ts +++ b/frontend/src/lib/components/graph/graphBuilder.ts @@ -20,7 +20,8 @@ export default function graphBuilder( eventHandlers: GraphEventHandlers, success: boolean | undefined, useDataflow: boolean | undefined, - selectedId: string | undefined + selectedId: string | undefined, + moving: string | undefined ): { nodes: Node[] edges: Edge[] @@ -42,6 +43,7 @@ export default function graphBuilder( modules: modules, parentIds: [], eventHandlers: eventHandlers, + moving: moving, ...extra }, position: { x: -1, y: -1 }, @@ -72,7 +74,8 @@ export default function graphBuilder( modules, sourceId, targetId, - offset + offset, + moving } }) } diff --git a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte index d6a6079017..85ac36e51c 100644 --- a/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte +++ b/frontend/src/lib/components/graph/renderers/edges/BaseEdge.svelte @@ -2,6 +2,7 @@ import InsertModuleButton from '$lib/components/flows/map/InsertModuleButton.svelte' import type { FlowModule } from '$lib/gen/models/FlowModule' import { getBezierPath, BaseEdge, type Position, EdgeLabelRenderer } from '@xyflow/svelte' + import { ClipboardCopy } from 'lucide-svelte' import { getContext } from 'svelte' import type { Writable } from 'svelte/store' @@ -16,6 +17,7 @@ export let data: { insertable: boolean modules: FlowModule[] + moving: string | undefined } $: [edgePath, labelX, labelY] = getBezierPath({ @@ -43,7 +45,7 @@ - {#if data?.insertable && !$useDataflow} + {#if data?.insertable && !$useDataflow && !data?.moving}
{/if} + + {#if data?.moving} +
+ {#if data.moving} + + {/if} +
+ {/if} diff --git a/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte b/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte index 5e826c9bf1..dde67e3e5d 100644 --- a/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte +++ b/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte @@ -1,7 +1,6 @@