Skip to content

[26.0] Parse input collections as well in markdown editor #21913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahmedhamidawan merged 2 commits into from
Feb 24, 2026
Merged

[26.0] Parse input collections as well in markdown editor #21913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
251038f
[26.0] Parse input collections in markdown editor as well
ahmedhamidawan Feb 24, 2026
0593029
add test for hdca input routing in parseInvocation
claude Feb 24, 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
2 changes: 1 addition & 1 deletion client/src/components/Markdown/Editor/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface DatasetLabel {

export interface Invocation {
history_id: string;
inputs: Record<string, { label?: string; id?: string }>;
inputs: Record<string, { label?: string; id?: string; src?: string }>;
outputs: Record<string, { id?: string }>;
output_collections: Record<string, { id?: string }>;
steps: { workflow_step_label?: string; job_id?: string; implicit_collection_jobs_id?: string }[];
Expand Down
16 changes: 16 additions & 0 deletions client/src/components/Markdown/Utilities/parseInvocation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ const INVOCATION = {
label: "input_3",
id: "input_id_3",
},
{
label: "input_collection_1",
id: "input_collection_id_1",
src: "hdca",
},
],
outputs: {
output_1: {
Expand Down Expand Up @@ -83,6 +88,17 @@ describe("parseInvocation.ts", () => {
}).implicit_collection_jobs_id,
).toBe("implicit_id_2");
expect(parseInvocation(INVOCATION, STORED_WORKFLOW_ID, "", {}).invocation.id).toBe("invocation_id_1");
// collection inputs (src=hdca) route to history_dataset_collection_id, not history_dataset_id
expect(
parseInvocation(INVOCATION, STORED_WORKFLOW_ID, "history_dataset_as_image", {
input: "input_collection_1",
}).history_dataset_collection_id,
).toBe("input_collection_id_1");
expect(
parseInvocation(INVOCATION, STORED_WORKFLOW_ID, "history_dataset_as_image", {
input: "input_collection_1",
}).history_dataset_id,
).toBeUndefined();
});
});
});
16 changes: 15 additions & 1 deletion client/src/components/Markdown/Utilities/parseInvocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ interface ParsedAttributes {
export function parseInput(invocation: Invocation, name: string | undefined) {
if (name && invocation.inputs) {
const inputs = Object.values(invocation.inputs);
const input = inputs.find((i) => i.label && i.label === name);
const input = inputs.find((i) => i.label && i.label === name && i.src !== "hdca");
return input?.id;
}
}

export function parseInputCollection(invocation: Invocation, name: string | undefined) {
if (name && invocation.inputs) {
const inputs = Object.values(invocation.inputs);
const input = inputs.find((i) => i.label && i.label === name && i.src === "hdca");
return input?.id;
}
}
Expand Down Expand Up @@ -59,6 +67,7 @@ export function parseInvocation(
): ParsedAttributes {
const result: ParsedAttributes = { ...attributes, invocation };
const inputId = parseInput(invocation, result.input);
const inputCollectionId = parseInputCollection(invocation, result.input);
const outputId = parseOutput(invocation, result.output);
const outputCollectionId = parseOutputCollection(invocation, result.output);
const step = parseStep(invocation, result.step);
Expand All @@ -67,6 +76,11 @@ export function parseInvocation(
result.history_id = invocation.history_id;
} else if (["workflow_display", "workflow_image", "workflow_license"].includes(name)) {
result.workflow_id = workflowId;
} else if (inputCollectionId && "history_dataset_id" === requiredObject) {
// asked for a history_dataset_id but the input is a collection
result.history_dataset_collection_id = inputCollectionId;
} else if (inputCollectionId && "history_dataset_collection_id" === requiredObject) {
result.history_dataset_collection_id = inputCollectionId;
} else if (inputId && "history_dataset_id" === requiredObject) {
result.history_dataset_id = inputId;
} else if (inputId && "history_dataset_collection_id" === requiredObject) {
Expand Down
Loading