Skip to content

Commit cd605b5

Browse files
committed
Rename to 'InputHandle' and 'OutputHandle'
1 parent 0dea688 commit cd605b5

File tree

7 files changed

+48
-43
lines changed

7 files changed

+48
-43
lines changed

src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/Handles.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const InputHandle = ({
3434
onLabelClick,
3535
onHandleSelectionChange,
3636
}: InputHandleProps) => {
37-
const { getTaskInputNodeId } = useNodeManager();
37+
const { getInputHandleNodeId } = useNodeManager();
3838
const { taskId, nodeId, state, name } = useTaskNode();
3939

4040
const fromHandle = useConnection((connection) => connection.fromHandle?.id);
@@ -47,7 +47,7 @@ export const InputHandle = ({
4747
const [selected, setSelected] = useState(false);
4848
const [active, setActive] = useState(false);
4949

50-
const handleId = getTaskInputNodeId(taskId, input.name);
50+
const handleId = getInputHandleNodeId(taskId, input.name);
5151

5252
const missing = invalid ? "bg-red-700!" : "bg-gray-500!";
5353
const hasValue = value !== undefined && value !== null;
@@ -230,7 +230,7 @@ export const OutputHandle = ({
230230
onLabelClick,
231231
onHandleSelectionChange,
232232
}: OutputHandleProps) => {
233-
const { getTaskOutputNodeId } = useNodeManager();
233+
const { getOutputHandleNodeId } = useNodeManager();
234234
const { taskId, nodeId, state, name } = useTaskNode();
235235

236236
const fromHandle = useConnection((connection) => connection.fromHandle?.id);
@@ -243,7 +243,7 @@ export const OutputHandle = ({
243243
const [selected, setSelected] = useState(false);
244244
const [active, setActive] = useState(false);
245245

246-
const handleId = getTaskOutputNodeId(taskId, output.name);
246+
const handleId = getOutputHandleNodeId(taskId, output.name);
247247
const hasValue = value !== undefined && value !== "" && value !== null;
248248

249249
const handleHandleClick = useCallback(

src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeInputs.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function TaskNodeInputs({
2727
expanded,
2828
onBackgroundClick,
2929
}: TaskNodeInputsProps) {
30-
const { getTaskInputNodeId } = useNodeManager();
30+
const { getInputHandleNodeId } = useNodeManager();
3131
const { taskId, inputs, taskSpec, state, select } = useTaskNode();
3232
const { graphSpec } = useComponentSpec();
3333
const {
@@ -146,7 +146,7 @@ export function TaskNodeInputs({
146146
}
147147

148148
const input = inputs.find(
149-
(i) => getTaskInputNodeId(taskId, i.name) === fromHandle?.id,
149+
(i) => getInputHandleNodeId(taskId, i.name) === fromHandle?.id,
150150
);
151151

152152
if (!input) return;

src/components/shared/ReactFlow/FlowCanvas/TaskNode/TaskNodeCard/TaskNodeOutputs.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function TaskNodeOutputs({
2323
expanded,
2424
onBackgroundClick,
2525
}: TaskNodeOutputsProps) {
26-
const { getTaskOutputNodeId } = useNodeManager();
26+
const { getOutputHandleNodeId } = useNodeManager();
2727
const { taskId, nodeId, outputs, state, select } = useTaskNode();
2828
const {
2929
highlightSearchFilter,
@@ -41,7 +41,7 @@ export function TaskNodeOutputs({
4141
edges.some(
4242
(edge) =>
4343
edge.source === nodeId &&
44-
edge.sourceHandle === getTaskOutputNodeId(taskId, output.name),
44+
edge.sourceHandle === getOutputHandleNodeId(taskId, output.name),
4545
),
4646
);
4747

@@ -139,7 +139,7 @@ export function TaskNodeOutputs({
139139
}
140140

141141
const output = outputs.find(
142-
(o) => getTaskOutputNodeId(taskId, o.name) === fromHandle?.id,
142+
(o) => getOutputHandleNodeId(taskId, o.name) === fromHandle?.id,
143143
);
144144

145145
if (!output) return;

src/components/shared/ReactFlow/FlowCanvas/utils/addAndConnectNode.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ export function addAndConnectNode({
6464
fromHandleName = fromHandleInfo?.handleName;
6565
fromHandleType = nodeManager.getNodeType(fromHandle.id);
6666
} else if (fromNodeType === "input") {
67-
fromHandleType = "taskOutput";
67+
fromHandleType = "outputHandle";
6868
fromHandleName = inputIdToInputName(fromTaskId);
6969
} else if (fromNodeType === "output") {
70-
fromHandleType = "taskInput";
70+
fromHandleType = "inputHandle";
7171
fromHandleName = outputIdToOutputName(fromTaskId);
7272
} else {
7373
return componentSpec;
@@ -79,13 +79,13 @@ export function addAndConnectNode({
7979

8080
if (
8181
!fromHandleType ||
82-
(fromHandleType !== "taskInput" && fromHandleType !== "taskOutput")
82+
(fromHandleType !== "inputHandle" && fromHandleType !== "outputHandle")
8383
) {
8484
return componentSpec;
8585
}
8686

8787
const adjustedPosition =
88-
fromHandleType === "taskInput"
88+
fromHandleType === "inputHandle"
8989
? { ...position, x: position.x - DEFAULT_NODE_DIMENSIONS.w }
9090
: position;
9191

@@ -126,19 +126,19 @@ export function addAndConnectNode({
126126
}
127127

128128
let connectionType: TypeSpecType | undefined;
129-
if (fromHandleType === "taskInput") {
129+
if (fromHandleType === "inputHandle") {
130130
connectionType = fromComponentSpec?.inputs?.find(
131131
(io) => io.name === fromHandleName,
132132
)?.type;
133-
} else if (fromHandleType === "taskOutput") {
133+
} else if (fromHandleType === "outputHandle") {
134134
connectionType = fromComponentSpec?.outputs?.find(
135135
(io) => io.name === fromHandleName,
136136
)?.type;
137137
}
138138

139139
// Find the first matching handle on the new node
140140
const toHandleType =
141-
fromHandleType === "taskInput" ? "taskOutput" : "taskInput";
141+
fromHandleType === "inputHandle" ? "outputHandle" : "inputHandle";
142142

143143
const inputHandleName = componentRef.spec?.inputs?.find(
144144
(io) => io.type === connectionType,
@@ -149,13 +149,13 @@ export function addAndConnectNode({
149149
)?.name;
150150

151151
const toHandleName =
152-
toHandleType === "taskInput" ? inputHandleName : outputHandleName;
152+
toHandleType === "inputHandle" ? inputHandleName : outputHandleName;
153153

154154
if (!toHandleName) {
155155
return newComponentSpec;
156156
}
157157

158-
const targetHandleId = nodeManager.getTaskHandleNodeId(
158+
const targetHandleId = nodeManager.getHandleNodeId(
159159
newTaskId,
160160
toHandleName,
161161
toHandleType,
@@ -167,7 +167,7 @@ export function addAndConnectNode({
167167
const fromHandleId = fromHandle.id;
168168

169169
const isReversedConnection =
170-
fromHandleType === "taskInput" && toHandleType === "taskOutput";
170+
fromHandleType === "inputHandle" && toHandleType === "outputHandle";
171171

172172
const connection: Connection = isReversedConnection
173173
? // Drawing from an input handle to a new output handle

src/hooks/useComponentSpecToEdges.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ const createTaskOutputEdge = (
112112
const sourceNodeId = nodeManager.getNodeId(taskOutput.taskId, "task");
113113
const targetNodeId = nodeManager.getNodeId(taskId, "task");
114114

115-
const sourceHandleNodeId = nodeManager.getTaskHandleNodeId(
115+
const sourceHandleNodeId = nodeManager.getHandleNodeId(
116116
taskOutput.taskId,
117117
taskOutput.outputName,
118-
"taskOutput",
118+
"outputHandle",
119119
);
120120

121-
const targetHandleNodeId = nodeManager.getTaskHandleNodeId(
121+
const targetHandleNodeId = nodeManager.getHandleNodeId(
122122
taskId,
123123
inputName,
124-
"taskInput",
124+
"inputHandle",
125125
);
126126

127127
return {
@@ -145,10 +145,10 @@ const createGraphInputEdge = (
145145
const sourceNodeId = nodeManager.getNodeId(inputId, "input");
146146
const targetNodeId = nodeManager.getNodeId(taskId, "task");
147147

148-
const targetHandleNodeId = nodeManager.getTaskHandleNodeId(
148+
const targetHandleNodeId = nodeManager.getHandleNodeId(
149149
taskId,
150150
inputName,
151-
"taskInput",
151+
"inputHandle",
152152
);
153153

154154
return {
@@ -174,10 +174,10 @@ const createOutputEdgesFromGraphSpec = (
174174
const targetOutputId = outputNameToOutputId(outputName);
175175
const targetNodeId = nodeManager.getNodeId(targetOutputId, "output");
176176

177-
const sourceHandleNodeId = nodeManager.getTaskHandleNodeId(
177+
const sourceHandleNodeId = nodeManager.getHandleNodeId(
178178
taskOutput.taskId,
179179
taskOutput.outputName,
180-
"taskOutput",
180+
"outputHandle",
181181
);
182182

183183
const edge: Edge = {

src/hooks/useNodeManager.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ export const useNodeManager = () => {
2828
[nodeManager],
2929
);
3030

31-
const getTaskInputNodeId = useCallback(
31+
const getInputHandleNodeId = useCallback(
3232
(taskId: string, inputName: string): string => {
33-
return nodeManager.getTaskHandleNodeId(taskId, inputName, "taskInput");
33+
return nodeManager.getHandleNodeId(taskId, inputName, "inputHandle");
3434
},
3535
[nodeManager],
3636
);
3737

38-
const getTaskOutputNodeId = useCallback(
38+
const getOutputHandleNodeId = useCallback(
3939
(taskId: string, outputName: string): string => {
40-
return nodeManager.getTaskHandleNodeId(taskId, outputName, "taskOutput");
40+
return nodeManager.getHandleNodeId(taskId, outputName, "outputHandle");
4141
},
4242
[nodeManager],
4343
);
@@ -101,8 +101,8 @@ export const useNodeManager = () => {
101101
getInputNodeId,
102102
getOutputNodeId,
103103
getTaskNodeId,
104-
getTaskInputNodeId,
105-
getTaskOutputNodeId,
104+
getInputHandleNodeId,
105+
getOutputHandleNodeId,
106106
getHandleInfo,
107107

108108
// Direct access to NodeManager for advanced use cases
@@ -117,8 +117,8 @@ export const useNodeManager = () => {
117117
getInputNodeId,
118118
getOutputNodeId,
119119
getTaskNodeId,
120-
getTaskInputNodeId,
121-
getTaskOutputNodeId,
120+
getInputHandleNodeId,
121+
getOutputHandleNodeId,
122122
getHandleInfo,
123123
nodeManager,
124124
],

src/nodeManager.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@ import {
55
isGraphImplementation,
66
} from "./utils/componentSpec";
77

8-
export type NodeType = "task" | "input" | "output" | "taskInput" | "taskOutput";
8+
export type NodeType =
9+
| "task"
10+
| "input"
11+
| "output"
12+
| "inputHandle"
13+
| "outputHandle";
914

1015
interface NodeMapping {
1116
nodeId: string;
1217
taskId: string;
1318
nodeType: NodeType;
1419
createdAt: number;
15-
// For TaskInput & TaskOutput:
20+
// For InputHandle & OutputHandle:
1621
parentTaskId?: string;
1722
handleName?: string;
1823
}
@@ -38,7 +43,7 @@ export class NodeManager {
3843
return this.taskToNodeMap.get(nodeType)!;
3944
}
4045

41-
private getTaskHandleMapForTask(taskId: string): Map<string, string> {
46+
private getHandleMapForTask(taskId: string): Map<string, string> {
4247
if (!this.taskHandleMap.has(taskId)) {
4348
this.taskHandleMap.set(taskId, new Map<string, string>());
4449
}
@@ -68,12 +73,12 @@ export class NodeManager {
6873
return nodeId;
6974
}
7075

71-
getTaskHandleNodeId(
76+
getHandleNodeId(
7277
taskId: string,
7378
handleName: string,
74-
handleType: "taskInput" | "taskOutput",
79+
handleType: "inputHandle" | "outputHandle",
7580
): string {
76-
const taskHandleMap = this.getTaskHandleMapForTask(taskId);
81+
const taskHandleMap = this.getHandleMapForTask(taskId);
7782
const handleKey = `${handleType}:${handleName}`;
7883
const existing = taskHandleMap.get(handleKey);
7984

@@ -233,11 +238,11 @@ export class NodeManager {
233238
const taskHandleSet = currentTaskHandles.get(taskId)!;
234239

235240
inputs.forEach((input) => {
236-
taskHandleSet.add(`taskInput:${input.name}`);
241+
taskHandleSet.add(`inputHandle:${input.name}`);
237242
});
238243

239244
outputs.forEach((output) => {
240-
taskHandleSet.add(`taskOutput:${output.name}`);
245+
taskHandleSet.add(`outputHandle:${output.name}`);
241246
});
242247
});
243248
}

0 commit comments

Comments
 (0)