Skip to content

Not all nodes are removed when first sub flow node #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicosammito merged 2 commits into from
Apr 25, 2026
Merged

Not all nodes are removed when first sub flow node #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff12212
feat: improve color assignment by handling undefined node IDs
nicosammito Apr 25, 2026
97c4d01
feat: refactor removeParameterNode and clean up getLinkedNodesById me…
nicosammito Apr 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packages/ce/src/flow/hooks/Flow.nodes.hook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const useFlowNodes = (flowId: Flow["id"], namespaceId?: Namespace["id"],
parentNodeId: nodeId,
nodeId: nodeId,
flowId: flowId,
color: hashToColor(value.id!),
color: hashToColor(value?.id ?? ""),
},
});
}
Expand Down
28 changes: 7 additions & 21 deletions src/packages/ce/src/flow/services/Flow.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ export class FlowService extends ReactiveArrayService<FlowView, FlowDependencies
return this.values(dependencies).find(value => value.id === id);
}

protected removeParameterNode(flow: FlowView, parameter: NodeParameter): void {
if (parameter?.value?.__typename === "NodeFunctionIdWrapper") {
const parameterNode = flow?.nodes?.nodes?.find(n => n?.id === (parameter.value as NodeFunction)?.id)
protected removeParameterNode(flow: FlowView, node: NodeParameter): void {
if (node?.value?.__typename === "NodeFunctionIdWrapper") {
const parameterNode = flow?.nodes?.nodes?.find(n => n?.id === (node.value as NodeFunction)?.id)
if (parameterNode) {
flow!.nodes!.nodes = flow!.nodes!.nodes!.filter(n => n?.id !== (parameter.value as NodeFunction)?.id)
flow!.nodes!.nodes = flow!.nodes!.nodes!.filter(n => n?.id !== (node.value as NodeFunction)?.id)
let nextNodeId = parameterNode.nextNodeId
while (nextNodeId) {
const nextNode = flow!.nodes!.nodes!.find(n => n?.id === nextNodeId)
Expand All @@ -119,22 +119,6 @@ export class FlowService extends ReactiveArrayService<FlowView, FlowDependencies
}
}

getLinkedNodesById(flowId: FlowView['id'], nodeId: NodeFunction['id']): NodeFunction[] {
const parentNode = this.getNodeById(flowId, nodeId)
//const nextNodes = parentNode ? this.getLinkedNodesById(flowId, parentNode.nextNodeId) : []
const parameterNodes: NodeFunction[] = []
parentNode?.parameters?.nodes?.forEach(p => {
if (p?.value?.__typename === "NodeFunctionIdWrapper") {
const parameterNode = this.getNodeById(flowId, (p.value as NodeFunctionIdWrapper)?.id!!)
if (parameterNode) {
parameterNodes.push(parameterNode)
//parameterNodes.push(...(parameterNode ? this.getLinkedNodesById(flowId, parameterNode.nextNodeId) : []))
}
}
})
return [...(parentNode ? [parentNode] : []), ...parameterNodes]
}

getNodeById(flowId: FlowView['id'], nodeId: NodeFunction['id']): NodeFunction | undefined {
return this.getById(flowId)?.nodes?.nodes?.find(node => node?.id === nodeId)!!
}
Expand Down Expand Up @@ -224,7 +208,9 @@ export class FlowService extends ReactiveArrayService<FlowView, FlowDependencies

if (parentNode) {
const parameter = parentNode.parameters?.nodes?.find(p => p?.value?.__typename === "NodeFunctionIdWrapper" && (p.value as NodeFunction)?.id === nodeId)
if (parameter) {
if (parameter && parameter.value?.__typename === "NodeFunctionIdWrapper" && node.nextNodeId) {
parameter.value.id = node.nextNodeId
} else if (parameter) {
parameter.value = undefined
}
}
Expand Down