Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const InputHandle = ({
onLabelClick,
onHandleSelectionChange,
}: InputHandleProps) => {
const { getTaskInputNodeId } = useNodeManager();
const { getInputHandleNodeId } = useNodeManager();
const { taskId, nodeId, state, name } = useTaskNode();

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

const handleId = getTaskInputNodeId(taskId, input.name);
const handleId = getInputHandleNodeId(taskId, input.name);

const missing = invalid ? "bg-red-700!" : "bg-gray-500!";
const hasValue = value !== undefined && value !== null;
Expand Down Expand Up @@ -230,7 +230,7 @@ export const OutputHandle = ({
onLabelClick,
onHandleSelectionChange,
}: OutputHandleProps) => {
const { getTaskOutputNodeId } = useNodeManager();
const { getOutputHandleNodeId } = useNodeManager();
const { taskId, nodeId, state, name } = useTaskNode();

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

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

const handleHandleClick = useCallback(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function TaskNodeInputs({
expanded,
onBackgroundClick,
}: TaskNodeInputsProps) {
const { getTaskInputNodeId } = useNodeManager();
const { getInputHandleNodeId } = useNodeManager();
const { taskId, inputs, taskSpec, state, select } = useTaskNode();
const { graphSpec } = useComponentSpec();
const {
Expand Down Expand Up @@ -146,7 +146,7 @@ export function TaskNodeInputs({
}

const input = inputs.find(
(i) => getTaskInputNodeId(taskId, i.name) === fromHandle?.id,
(i) => getInputHandleNodeId(taskId, i.name) === fromHandle?.id,
);

if (!input) return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function TaskNodeOutputs({
expanded,
onBackgroundClick,
}: TaskNodeOutputsProps) {
const { getTaskOutputNodeId } = useNodeManager();
const { getOutputHandleNodeId } = useNodeManager();
const { taskId, nodeId, outputs, state, select } = useTaskNode();
const {
highlightSearchFilter,
Expand All @@ -41,7 +41,7 @@ export function TaskNodeOutputs({
edges.some(
(edge) =>
edge.source === nodeId &&
edge.sourceHandle === getTaskOutputNodeId(taskId, output.name),
edge.sourceHandle === getOutputHandleNodeId(taskId, output.name),
),
);

Expand Down Expand Up @@ -139,7 +139,7 @@ export function TaskNodeOutputs({
}

const output = outputs.find(
(o) => getTaskOutputNodeId(taskId, o.name) === fromHandle?.id,
(o) => getOutputHandleNodeId(taskId, o.name) === fromHandle?.id,
);

if (!output) return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ export function addAndConnectNode({
fromHandleName = fromHandleInfo?.handleName;
fromHandleType = nodeManager.getNodeType(fromHandle.id);
} else if (fromNodeType === "input") {
fromHandleType = "taskOutput";
fromHandleType = "outputHandle";
fromHandleName = inputIdToInputName(fromTaskId);
} else if (fromNodeType === "output") {
fromHandleType = "taskInput";
fromHandleType = "inputHandle";
fromHandleName = outputIdToOutputName(fromTaskId);
} else {
return componentSpec;
Expand All @@ -79,13 +79,13 @@ export function addAndConnectNode({

if (
!fromHandleType ||
(fromHandleType !== "taskInput" && fromHandleType !== "taskOutput")
(fromHandleType !== "inputHandle" && fromHandleType !== "outputHandle")
) {
return componentSpec;
}

const adjustedPosition =
fromHandleType === "taskInput"
fromHandleType === "inputHandle"
? { ...position, x: position.x - DEFAULT_NODE_DIMENSIONS.w }
: position;

Expand Down Expand Up @@ -126,19 +126,19 @@ export function addAndConnectNode({
}

let connectionType: TypeSpecType | undefined;
if (fromHandleType === "taskInput") {
if (fromHandleType === "inputHandle") {
connectionType = fromComponentSpec?.inputs?.find(
(io) => io.name === fromHandleName,
)?.type;
} else if (fromHandleType === "taskOutput") {
} else if (fromHandleType === "outputHandle") {
connectionType = fromComponentSpec?.outputs?.find(
(io) => io.name === fromHandleName,
)?.type;
}

// Find the first matching handle on the new node
const toHandleType =
fromHandleType === "taskInput" ? "taskOutput" : "taskInput";
fromHandleType === "inputHandle" ? "outputHandle" : "inputHandle";

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

const toHandleName =
toHandleType === "taskInput" ? inputHandleName : outputHandleName;
toHandleType === "inputHandle" ? inputHandleName : outputHandleName;

if (!toHandleName) {
return newComponentSpec;
}

const targetHandleId = nodeManager.getTaskHandleNodeId(
const targetHandleId = nodeManager.getHandleNodeId(
newTaskId,
toHandleName,
toHandleType,
Expand All @@ -167,7 +167,7 @@ export function addAndConnectNode({
const fromHandleId = fromHandle.id;

const isReversedConnection =
fromHandleType === "taskInput" && toHandleType === "taskOutput";
fromHandleType === "inputHandle" && toHandleType === "outputHandle";

const connection: Connection = isReversedConnection
? // Drawing from an input handle to a new output handle
Expand Down
16 changes: 8 additions & 8 deletions src/hooks/useComponentSpecToEdges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ const createTaskOutputEdge = (
const sourceNodeId = nodeManager.getNodeId(taskOutput.taskId, "task");
const targetNodeId = nodeManager.getNodeId(taskId, "task");

const sourceHandleNodeId = nodeManager.getTaskHandleNodeId(
const sourceHandleNodeId = nodeManager.getHandleNodeId(
taskOutput.taskId,
taskOutput.outputName,
"taskOutput",
"outputHandle",
);

const targetHandleNodeId = nodeManager.getTaskHandleNodeId(
const targetHandleNodeId = nodeManager.getHandleNodeId(
taskId,
inputName,
"taskInput",
"inputHandle",
);

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

const targetHandleNodeId = nodeManager.getTaskHandleNodeId(
const targetHandleNodeId = nodeManager.getHandleNodeId(
taskId,
inputName,
"taskInput",
"inputHandle",
);

return {
Expand All @@ -174,10 +174,10 @@ const createOutputEdgesFromGraphSpec = (
const targetOutputId = outputNameToOutputId(outputName);
const targetNodeId = nodeManager.getNodeId(targetOutputId, "output");

const sourceHandleNodeId = nodeManager.getTaskHandleNodeId(
const sourceHandleNodeId = nodeManager.getHandleNodeId(
taskOutput.taskId,
taskOutput.outputName,
"taskOutput",
"outputHandle",
);

const edge: Edge = {
Expand Down