Skip to content
This repository was archived by the owner on Jun 23, 2026. It is now read-only.

Fix flow blueprint layout #117

Merged
cybermaggedon merged 3 commits into from
Jan 15, 2026
Merged

Fix flow blueprint layout #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc6ec87
A fix, maybe
cybermaggedon Jan 15, 2026
8327ed2
Revert some "fixes" which aren't needed
cybermaggedon Jan 15, 2026
17257c9
Pull in newer trustgraph/react-state
cybermaggedon Jan 15, 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
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@tanstack/react-table": "^8.21.3",
"@trustgraph/client": "^1.2.1",
"@trustgraph/react-provider": "^1.2.0",
"@trustgraph/react-state": "^1.2.0",
"@trustgraph/react-state": "^1.2.1",
"@types/dagre": "^0.7.53",
"compute-cosine-similarity": "^1.1.0",
"dagre": "^0.8.5",
Expand Down
46 changes: 23 additions & 23 deletions src/components/flow-blueprints/FlowBlueprintEditorView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ const nodeTypes = {
interface: InterfaceNode,
};

interface FlowBlueprints {
interface FlowBlueprint {
blueprint?: Record<string, unknown>;
flow?: Record<string, unknown>;
}
Expand All @@ -311,7 +311,7 @@ const generateNodesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Node[] =
const nodes: Node[] = [];

// Add blueprint processors
Object.keys(flowBlueprints.blueprint || {}).forEach((processorName) => {
Object.keys(flowBlueprint.blueprint || {}).forEach((processorName) => {
// Strip template suffix to get base processor name for service map lookup
const baseProcessorName = processorName.replace(/:\{[^}]+\}$/, "");

Expand Down Expand Up @@ -343,7 +343,7 @@ const generateNodesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Node[] =
});

// Add flow processors
Object.keys(flowBlueprints.flow || {}).forEach((processorName) => {
Object.keys(flowBlueprint.flow || {}).forEach((processorName) => {
// Strip template suffix to get base processor name for service map lookup
const baseProcessorName = processorName.replace(/:\{[^}]+\}$/, "");

Expand Down Expand Up @@ -375,7 +375,7 @@ const generateNodesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Node[] =
});

// Add interface nodes
Object.entries(flowBlueprints.interfaces || {}).forEach(
Object.entries(flowBlueprint.interfaces || {}).forEach(
([interfaceName, interfaceQueues]) => {
// Look up interface definition in service map
const interfaceDefinition = serviceMap.interfaces?.[interfaceName];
Expand Down Expand Up @@ -469,24 +469,24 @@ const generateEdgesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Edge[] =
}>
>();

// Collect all processors and their connections from service map + flow blueprint queues
// Collect all processors and their connections from service map + flow class queues
const allProcessors = [
...Object.keys(flowBlueprints.blueprint || {}).map((name) => ({
...Object.keys(flowBlueprint.blueprint || {}).map((name) => ({
name,
type: "blueprint",
baseProcessorName: name.replace(/:\{[^}]+\}$/, ""),
flowBlueprintsConnections: flowBlueprint.blueprint[name],
flowBlueprintConnections: flowBlueprint.blueprint[name],
})),
...Object.keys(flowBlueprints.flow || {}).map((name) => ({
...Object.keys(flowBlueprint.flow || {}).map((name) => ({
name,
type: "flow",
baseProcessorName: name.replace(/:\{[^}]+\}$/, ""),
flowBlueprintsConnections: flowBlueprint.flow[name],
flowBlueprintConnections: flowBlueprint.flow[name],
})),
];

allProcessors.forEach(
({ name, type, baseProcessorName, flowBlueprintsConnections }) => {
({ name, type, baseProcessorName, flowBlueprintConnections }) => {
const processorInfo = serviceMap.processors[baseProcessorName];
if (!processorInfo?.connections) return;

Expand All @@ -505,21 +505,21 @@ const generateEdgesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Edge[] =
// For providers: look for request and response
if (connection.role === "provides") {
queues = {
request: flowBlueprintsConnections.request,
response: flowBlueprintsConnections.response,
request: flowBlueprintConnections.request,
response: flowBlueprintConnections.response,
};
} else if (connection.role === "consumes") {
queues = {
request: flowBlueprintsConnections[`${connection.name}-request`],
response: flowBlueprintsConnections[`${connection.name}-response`],
request: flowBlueprintConnections[`${connection.name}-request`],
response: flowBlueprintConnections[`${connection.name}-response`],
};
}
} else if (connectionKind === "flow") {
// For flow: single queue value at connection.name
queues = { value: flowBlueprintsConnections[connection.name] };
queues = { value: flowBlueprintConnections[connection.name] };
} else if (connectionKind === "passive") {
// For passive: both consumer and provider use single queue value
queues = { value: flowBlueprintsConnections[connection.name] };
queues = { value: flowBlueprintConnections[connection.name] };
}

// Only add if we found valid queues
Expand Down Expand Up @@ -609,7 +609,7 @@ const generateEdgesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Edge[] =

// Connect interfaces to their implementing processors

Object.entries(flowBlueprints.interfaces || {}).forEach(
Object.entries(flowBlueprint.interfaces || {}).forEach(
([interfaceName, interfaceQueues]) => {
const interfaceDefinition = serviceMap.interfaces?.[interfaceName];
const interfaceKind = interfaceDefinition?.kind;
Expand All @@ -620,7 +620,7 @@ const generateEdgesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Edge[] =

// Find processors that match this interface's queue pattern
allProcessors.forEach(
({ name, type, baseProcessorName, flowBlueprintsConnections }) => {
({ name, type, baseProcessorName, flowBlueprintConnections }) => {
const processorId = `${type}-${name}`;
const processorInfo = serviceMap.processors[baseProcessorName];
if (!processorInfo?.connections) return;
Expand All @@ -639,8 +639,8 @@ const generateEdgesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Edge[] =

// Check if this processor provides this service
if (
flowBlueprintsConnections.request === interfaceRequest &&
flowBlueprintsConnections.response === interfaceResponse
flowBlueprintConnections.request === interfaceRequest &&
flowBlueprintConnections.response === interfaceResponse
) {
// Find the service connection that provides
matchingConnection = processorInfo.connections.find(
Expand All @@ -657,7 +657,7 @@ const generateEdgesFromFlowBlueprints = (flowBlueprint: FlowBlueprint): Edge[] =
// Check only provider connections for matching queue
processorInfo.connections.forEach((connection) => {
if (connection.role === "provides") {
const connectionQueue = flowBlueprintsConnections[connection.name];
const connectionQueue = flowBlueprintConnections[connection.name];
if (connectionQueue === interfaceQueue) {
matchingConnection = connection;
isMatch = true;
Expand Down Expand Up @@ -740,7 +740,7 @@ export const FlowBlueprintEditorView: React.FC<FlowBlueprintEditorViewProps> = (
[setEdges],
);

if (!flowBlueprints) {
if (!flowBlueprint) {
return (
<Box p={6}>
<HStack spacing={4} mb={4}>
Expand Down Expand Up @@ -790,7 +790,7 @@ export const FlowBlueprintEditorView: React.FC<FlowBlueprintEditorViewProps> = (
</HStack>

<VStack spacing={2} align="start" w="100%">
<Heading size="lg">{flowBlueprints.name}</Heading>
<Heading size="lg">{flowBlueprint?.name}</Heading>
</VStack>

<Separator />
Expand Down