Skip to content

Enhance flow handling by integrating forwards dynamically#587

Closed
stijnpotters1 wants to merge 11 commits into
masterfrom
fix/dynamic-forwards
Closed

Enhance flow handling by integrating forwards dynamically#587
stijnpotters1 wants to merge 11 commits into
masterfrom
fix/dynamic-forwards

Conversation

@stijnpotters1

@stijnpotters1 stijnpotters1 commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Now i have made logic to make different colors for each handle type.
The thing is that we could reuse the colour logic of #536 here as well. But this needs to be merged first
image
image

@stijnpotters1 stijnpotters1 self-assigned this Jun 30, 2026
@stijnpotters1 stijnpotters1 linked an issue Jun 30, 2026 that may be closed by this pull request
Comment thread src/main/frontend/app/routes/studio/canvas/nodetypes/components/handle.tsx Outdated
Comment thread src/main/frontend/app/utils/frankdoc-utils.ts Outdated
Comment thread src/main/frontend/app/utils/frankdoc-utils.ts Outdated
@philipsens

Copy link
Copy Markdown
Member

The border is a bit weird. Can you fix that?
image

@stijnpotters1 stijnpotters1 force-pushed the fix/dynamic-forwards branch from 7271630 to db33c3a Compare July 6, 2026 13:06
@stijnpotters1 stijnpotters1 requested a review from Matthbo July 6, 2026 15:29
@Matthbo

Matthbo commented Jul 7, 2026

Copy link
Copy Markdown
Member

I prefer if you didn't force-push when a PR is already in review, this makes it much more difficult to review

@sonarqubecloud

sonarqubecloud Bot commented Jul 7, 2026

Copy link
Copy Markdown

Comment on lines +46 to +62
private String repairParentChains(String frankDocJson) {
try {
JsonNode root = objectMapper.readTree(frankDocJson);
JsonNode elements = root.path("elements");

Map<String, List<String>> childrenByParent = groupChildrenByParent(elements);
childrenByParent.values().forEach(siblings ->
findSuccessDeclaringAbstract(elements, siblings)
.ifPresent(successBase -> repointSiblingsToBase(elements, siblings, successBase))
);

return objectMapper.writeValueAsString(root);
} catch (Exception e) {
log.warn("Failed to repair FrankDoc parent chains, returning raw JSON", e);
return frankDocJson;
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this imply an issue with the frankdoc element hierarchy?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fixed in the latest @frankframework/doc-library-core version
So this hopefully isn't needed


const isRouter = element.labels?.EIP === 'Router'
if (isRouter) {
const { success: _omit, ...withoutSuccess } = merged

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does _omit mean here?
Also I I think I commented on this before but success should be inherited from FixedForwardPipe.
Issue frankframework/frank-doc#466 of the frank-doc needs to be fixed and this code updated to accurately have the success forward on the correct elements

@philipsens

Copy link
Copy Markdown
Member

I've looked trough the code, and apart from the color generation the code seems a bit redundant. I'll close this, so all usefull parts can be implemented in a new PR.

@philipsens philipsens closed this Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Gather the right forwards from the FrankDoc.json

3 participants