Skip to content

The open alternative to Salesforce, designed for AI.

Keep workflow nodes centered when renamed (#24334)

Raaaaafi9f4f83e95ba2
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
index bf1d4798bc8..14e3ebe6fde 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
@@ -45,6 +45,8 @@ import {
type EdgeChange,
type FitViewOptions,
type NodeChange,
+ type NodeDimensionChange,
+ type NodeOrigin,
type NodeProps,
type OnBeforeDelete,
type OnConnectStartParams,
@@ -63,6 +65,7 @@ import React, {
useState,
} from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { WORKFLOW_DIAGRAM_DEFAULT_NODE_DIMENSIONS } from 'twenty-shared/workflow';
import { Tag, type TagColor } from 'twenty-ui/data-display';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledResetReactflowStyles = styled.div`
@@ -100,6 +103,10 @@ const defaultFitViewOptions = {
maxZoom: 1,
} satisfies FitViewOptions;
+const CENTERED_NODE_ORIGIN = [0.5, 0.5] satisfies NodeOrigin;
+
+const CREATED_NODE_TOP_EDGE_DISTANCE_BELOW_CONNECTION_DROP = 50;
+
export const WorkflowDiagramCanvasBase = ({
nodeTypes,
edgeTypes,
@@ -212,6 +219,9 @@ export const WorkflowDiagramCanvasBase = ({
startPosition: { x: number; y: number };
} | null>(null);
+ const [emptyNodeMeasuredDimensions, setEmptyNodeMeasuredDimensions] =
+ useState<{ width: number; height: number } | undefined>(undefined);
+
const { nodes, edges } = useMemo(() => {
if (!isDefined(workflowDiagram)) {
return { nodes: [], edges: [] };
@@ -227,6 +237,7 @@ export const WorkflowDiagramCanvasBase = ({
const emptyNode = {
...WORKFLOW_DIAGRAM_EMPTY_NODE_DEFINITION,
position: workflowInsertStepIds.position,
+ measured: emptyNodeMeasuredDimensions,
data: {
...WORKFLOW_DIAGRAM_EMPTY_NODE_DEFINITION.data,
position: workflowInsertStepIds.position,
@@ -255,7 +266,7 @@ export const WorkflowDiagramCanvasBase = ({
}
return { nodes, edges };
- }, [workflowDiagram, workflowInsertStepIds]);
+ }, [workflowDiagram, workflowInsertStepIds, emptyNodeMeasuredDimensions]);
const isSidePanelOpened = useAtomStateValue(isSidePanelOpenedState);
const { commandMenuContextApi } = useContext(CommandMenuContext);
@@ -330,7 +341,7 @@ export const WorkflowDiagramCanvasBase = ({
const flowBounds = reactflow.getNodesBounds(nodes);
const centeredXPosition =
- adjustedContainerWidth / 2 - flowBounds.width / 2;
+ adjustedContainerWidth / 2 - flowBounds.width / 2 - flowBounds.x;
reactflow.setViewport(
{
@@ -381,6 +392,16 @@ export const WorkflowDiagramCanvasBase = ({
(changes: NodeChange<WorkflowDiagramNode>[]) => {
const existingWorkflowDiagram = store.get(workflowDiagramCallbackState);
+ const measuredEmptyNodeDimensions = changes.findLast(
+ (change): change is NodeDimensionChange =>
+ change.type === 'dimensions' &&
+ change.id === WORKFLOW_DIAGRAM_EMPTY_NODE_DEFINITION.id,
+ )?.dimensions;
+
+ if (isDefined(measuredEmptyNodeDimensions)) {
+ setEmptyNodeMeasuredDimensions(measuredEmptyNodeDimensions);
+ }
+
const filteredChanges = changes.filter(
(change) =>
!(
@@ -569,16 +590,16 @@ export const WorkflowDiagramCanvasBase = ({
return;
}
- const DEFAULT_NODE_WIDTH = 200;
- const adjustedPosition = {
- x: flowPosition.x - DEFAULT_NODE_WIDTH / 2,
- y: flowPosition.y + 50,
- };
-
startNodeCreation({
parentStepId: startInfo.nodeId,
nextStepId: undefined,
- position: adjustedPosition,
+ position: {
+ x: flowPosition.x,
+ y:
+ flowPosition.y +
+ CREATED_NODE_TOP_EDGE_DISTANCE_BELOW_CONNECTION_DROP +
+ WORKFLOW_DIAGRAM_DEFAULT_NODE_DIMENSIONS.height / 2,
+ },
connectionOptions: getConnectionOptionsForSourceHandle({
sourceHandleId: startInfo.handleId,
}),
@@ -594,6 +615,7 @@ export const WorkflowDiagramCanvasBase = ({
minZoom={defaultFitViewOptions.minZoom}
maxZoom={defaultFitViewOptions.maxZoom}
defaultViewport={{ x: 0, y: 150, zoom: defaultFitViewOptions.maxZoom }}
+ nodeOrigin={CENTERED_NODE_ORIGIN}
nodeTypes={nodeTypes}
// @ts-expect-error We override Reactflow types for sourceHandle and targetHandle to be required
edgeTypes={edgeTypes}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts
index 3f52cd7ba27..947907efd55 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts
@@ -17,7 +17,7 @@ export const getOrganizedDiagram = (
});
const positionByNodeId = new Map(
- positions.map((position) => [position.id, position.position]),
+ positions.map((position) => [position.id, position.centerPosition]),
);
return {
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
index 1b77d4980ec..371b9c3ad97 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
@@ -1,5 +1,6 @@
import { FieldActorSource } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { IF_ELSE_BRANCH_POSITION_OFFSETS } from 'twenty-shared/workflow';
import { type EntityManager } from 'typeorm';
import { v5 } from 'uuid';
@@ -476,7 +477,7 @@ export const prefillWorkflows = async (
type: 'CODE',
valid: false,
position: {
- x: 227.25,
+ x: 0,
y: 130,
},
settings: {
@@ -512,7 +513,7 @@ export const prefillWorkflows = async (
type: 'FILTER',
valid: false,
position: {
- x: 249.25,
+ x: 0,
y: 260,
},
settings: {
@@ -556,7 +557,7 @@ export const prefillWorkflows = async (
type: 'CODE',
valid: false,
position: {
- x: 219.75,
+ x: 0,
y: 390,
},
settings: {
@@ -600,7 +601,7 @@ export const prefillWorkflows = async (
type: 'FIND_RECORDS',
valid: false,
position: {
- x: 247.75,
+ x: 0,
y: 520,
},
settings: {
@@ -648,7 +649,7 @@ export const prefillWorkflows = async (
type: 'CODE',
valid: false,
position: {
- x: 247.75,
+ x: 0,
y: 650,
},
settings: {
@@ -691,7 +692,7 @@ export const prefillWorkflows = async (
type: 'IF_ELSE',
valid: false,
position: {
- x: 216.25,
+ x: 0,
y: 780,
},
settings: {
@@ -745,7 +746,7 @@ export const prefillWorkflows = async (
type: 'UPDATE_RECORD',
valid: false,
position: {
- x: 0,
+ x: IF_ELSE_BRANCH_POSITION_OFFSETS.IF.x,
y: 910,
},
settings: {
@@ -775,7 +776,7 @@ export const prefillWorkflows = async (
type: 'CREATE_RECORD',
valid: false,
position: {
- x: 440,
+ x: IF_ELSE_BRANCH_POSITION_OFFSETS.ELSE.x,
y: 910,
},
settings: {
@@ -809,7 +810,7 @@ export const prefillWorkflows = async (
type: 'UPDATE_RECORD',
valid: false,
position: {
- x: 420.5,
+ x: IF_ELSE_BRANCH_POSITION_OFFSETS.ELSE.x,
y: 1040,
},
settings: {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.workspace-service.ts
index cd538d71b17..c90d7619640 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.workspace-service.ts
@@ -464,7 +464,9 @@ export class WorkflowVersionWorkspaceService {
targets.map((target) => ({ source, target })),
);
- const positions = computeWorkflowLayout({ nodes, edges });
+ const positions = computeWorkflowLayout({ nodes, edges }).map(
+ ({ id, centerPosition }) => ({ id, position: centerPosition }),
+ );
await this.updateWorkflowVersionPositions({
workflowVersionId,
diff --git a/packages/twenty-shared/src/workflow/layout/utils/__tests__/compute-workflow-layout.util.test.ts b/packages/twenty-shared/src/workflow/layout/utils/__tests__/compute-workflow-layout.util.test.ts
index 5b1801cb587..e9bec2b1fb9 100644
--- a/packages/twenty-shared/src/workflow/layout/utils/__tests__/compute-workflow-layout.util.test.ts
+++ b/packages/twenty-shared/src/workflow/layout/utils/__tests__/compute-workflow-layout.util.test.ts
@@ -5,9 +5,13 @@ import {
type WorkflowLayoutNode,
} from '@/workflow/layout/utils/compute-workflow-layout.util';
-const buildNode = (id: string): WorkflowLayoutNode => ({
+const buildNode = (
+ id: string,
+ dimensions: Partial<Omit<WorkflowLayoutNode, 'id'>> = {},
+): WorkflowLayoutNode => ({
id,
...WORKFLOW_DIAGRAM_DEFAULT_NODE_DIMENSIONS,
+ ...dimensions,
});
const doNodesOverlap = (
@@ -37,6 +41,20 @@ describe('computeWorkflowLayout', () => {
]);
});
+ it('should position a node on its center rather than its top left corner', () => {
+ const { width, height } = WORKFLOW_DIAGRAM_DEFAULT_NODE_DIMENSIONS;
+
+ const positions = computeWorkflowLayout({
+ nodes: [buildNode('trigger')],
+ edges: [],
+ });
+
+ expect(positions[0].centerPosition).toEqual({
+ x: width / 2,
+ y: height / 2,
+ });
+ });
+
it('should stack a linear chain vertically without overlap (rankdir TB)', () => {
const nodes = [buildNode('trigger'), buildNode('a'), buildNode('b')];
const edges: WorkflowLayoutEdge[] = [
@@ -47,7 +65,7 @@ describe('computeWorkflowLayout', () => {
const positionById = new Map(
computeWorkflowLayout({ nodes, edges }).map((position) => [
position.id,
- position.position,
+ position.centerPosition,
]),
);
@@ -75,7 +93,7 @@ describe('computeWorkflowLayout', () => {
const positionById = new Map(
computeWorkflowLayout({ nodes, edges }).map((position) => [
position.id,
- position.position,
+ position.centerPosition,
]),
);
@@ -86,6 +104,33 @@ describe('computeWorkflowLayout', () => {
expect(doNodesOverlap(branchA, branchB)).toBe(false);
});
+ it('should spread if-else branches symmetrically around their parent whatever their width', () => {
+ const nodes = [
+ buildNode('trigger'),
+ buildNode('ifElse'),
+ buildNode('branchA', { width: 44 }),
+ buildNode('branchB', { width: 240 }),
+ ];
+ const edges: WorkflowLayoutEdge[] = [
+ { source: 'trigger', target: 'ifElse' },
+ { source: 'ifElse', target: 'branchA' },
+ { source: 'ifElse', target: 'branchB' },
+ ];
+
+ const positionById = new Map(
+ computeWorkflowLayout({ nodes, edges }).map((position) => [
+ position.id,
+ position.centerPosition,
+ ]),
+ );
+
+ const ifElse = positionById.get('ifElse')!;
+ const branchA = positionById.get('branchA')!;
+ const branchB = positionById.get('branchB')!;
+
+ expect(branchA.x + branchB.x).toEqual(ifElse.x * 2);
+ });
+
it('should ignore edges pointing to unknown nodes', () => {
const nodes = [buildNode('trigger'), buildNode('a')];
const edges: WorkflowLayoutEdge[] = [
diff --git a/packages/twenty-shared/src/workflow/layout/utils/compute-workflow-layout.util.ts b/packages/twenty-shared/src/workflow/layout/utils/compute-workflow-layout.util.ts
index 5e5a1708e4d..7b98a8b6840 100644
--- a/packages/twenty-shared/src/workflow/layout/utils/compute-workflow-layout.util.ts
+++ b/packages/twenty-shared/src/workflow/layout/utils/compute-workflow-layout.util.ts
@@ -15,7 +15,7 @@ export type WorkflowLayoutEdge = {
export type WorkflowLayoutPosition = {
id: string;
- position: { x: number; y: number };
+ centerPosition: { x: number; y: number };
};
export type WorkflowLayoutOptions = {
@@ -61,9 +61,9 @@ export const computeWorkflowLayout = ({
return nodes.map((node) => {
const layoutedNode = graph.node(node.id);
- const x = layoutedNode.x - layoutedNode.width / 2;
- const y = layoutedNode.y - layoutedNode.height / 2;
-
- return { id: node.id, position: { x, y } };
+ return {
+ id: node.id,
+ centerPosition: { x: layoutedNode.x, y: layoutedNode.y },
+ };
});
};