Skip to content

[v3-3-test] UI: Avoid 404 links for tasks outside run dates (#71762) #72732

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
pierrejeambrun merged 1 commit into from
Sep 9, 2026
Merged

[v3-3-test] UI: Avoid 404 links for tasks outside run dates (#71762) #72732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions airflow-core/src/airflow/ui/src/components/Graph/TaskLink.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,23 @@ describe("TaskLink", () => {
"/dags/test_dag/runs/test_run/tasks/one_try?log_level=error",
);
});

it("links to the task overview when the run has no task instance", () => {
render(
<MemoryRouter initialEntries={["/dags/test_dag/runs/test_run/tasks/other_task"]}>
<Routes>
<Route
element={<TaskLink hasTaskInstance={false} id="missing_task" label="missing_task" />}
path="/dags/:dagId/runs/:runId/tasks/:taskId"
/>
</Routes>
</MemoryRouter>,
{ wrapper: BaseWrapper },
);

expect(screen.getByRole("link", { name: "missing_task" })).toHaveAttribute(
"href",
"/dags/test_dag/tasks/missing_task",
);
});
});
66 changes: 36 additions & 30 deletions airflow-core/src/airflow/ui/src/components/Graph/TaskLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,44 +25,50 @@ import { taskNodeSeparator } from "src/utils/assetGraph";

type Props = {
readonly dagId?: string;
readonly hasTaskInstance?: boolean;
readonly id: string;
} & TaskNameProps;

export const TaskLink = forwardRef<HTMLAnchorElement, Props>(({ id, isGroup, isMapped, ...rest }, ref) => {
const { dagId: urlDagId = "", groupId, runId, taskId: urlTaskId } = useParams();
const [searchParams] = useSearchParams();
export const TaskLink = forwardRef<HTMLAnchorElement, Props>(
({ hasTaskInstance = true, id, isGroup, isMapped, ...rest }, ref) => {
const { dagId: urlDagId = "", groupId, runId, taskId: urlTaskId } = useParams();
const [searchParams] = useSearchParams();

// Extract dagId and taskId from composite ID
const parseCompositeId = (compositeId: string) => {
const match = new RegExp(`^task:(?<dagId>.*?)${taskNodeSeparator}(?<taskId>.+)$`, "u").exec(compositeId);
// Extract dagId and taskId from composite ID
const parseCompositeId = (compositeId: string) => {
const match = new RegExp(`^task:(?<dagId>.*?)${taskNodeSeparator}(?<taskId>.+)$`, "u").exec(
compositeId,
);

if (match) {
return { dagId: match[1], taskId: match[2] };
}
if (match) {
return { dagId: match[1], taskId: match[2] };
}

return { dagId: undefined, taskId: undefined };
};
return { dagId: undefined, taskId: undefined };
};

const { dagId: extractedDagId, taskId: extractedTaskId } = parseCompositeId(id);
const dagId = extractedDagId ?? urlDagId;
const taskId = extractedTaskId ?? id;
const { dagId: extractedDagId, taskId: extractedTaskId } = parseCompositeId(id);
const dagId = extractedDagId ?? urlDagId;
const taskId = extractedTaskId ?? id;

const basePath = `/dags/${dagId}${runId === undefined ? "" : `/runs/${runId}`}`;
const taskPath = isGroup
? groupId === taskId
? ""
: `/tasks/group/${taskId}`
: urlTaskId === taskId
? ""
: `/tasks/${taskId}${isMapped && urlTaskId !== taskId && runId !== undefined ? "/mapped" : ""}`;
const includeRun = runId !== undefined && hasTaskInstance;
const basePath = `/dags/${dagId}${includeRun ? `/runs/${runId}` : ""}`;
const taskPath = isGroup
? includeRun && groupId === taskId
? ""
: `/tasks/group/${taskId}`
: includeRun && urlTaskId === taskId
? ""
: `/tasks/${taskId}${isMapped && urlTaskId !== taskId && includeRun ? "/mapped" : ""}`;

const targetSearchParams = new URLSearchParams(searchParams);
const targetSearchParams = new URLSearchParams(searchParams);

targetSearchParams.delete(SearchParamsKeys.TRY_NUMBER);
targetSearchParams.delete(SearchParamsKeys.TRY_NUMBER);

return (
<RouterLink ref={ref} to={{ pathname: basePath + taskPath, search: targetSearchParams.toString() }}>
<TaskName isGroup={isGroup} isMapped={isMapped} {...rest} />
</RouterLink>
);
});
return (
<RouterLink ref={ref} to={{ pathname: basePath + taskPath, search: targetSearchParams.toString() }}>
<TaskName isGroup={isGroup} isMapped={isMapped} {...rest} />
</RouterLink>
);
},
);
4 changes: 4 additions & 0 deletions airflow-core/src/airflow/ui/src/components/Graph/TaskNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ export const TaskNode = ({
const thisChildCount = Object.entries(taskInstance?.child_states ?? {})
.map(([_state, count]) => count)
.reduce((sum, val) => sum + val, 0);
const hasTaskInstance = isGroup
? true
: taskInstance?.dag_version_number !== null && taskInstance?.dag_version_number !== undefined;

return (
<NodeWrapper>
Expand Down Expand Up @@ -117,6 +120,7 @@ export const TaskNode = ({
<LinkOverlay asChild>
<TaskLink
childCount={thisChildCount}
hasTaskInstance={hasTaskInstance}
id={id}
isGroup={isGroup}
isMapped={isMapped}
Expand Down
19 changes: 11 additions & 8 deletions airflow-core/src/airflow/ui/src/layouts/Details/Grid/GridTI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,17 @@ export const GridTI = ({

const [searchParams] = useSearchParams();

const taskUrl = buildTaskInstanceUrl({
currentPathname: location.pathname,
dagId,
isGroup,
isMapped: Boolean(isMapped),
runId,
taskId,
});
const hasTaskInstance = instance.dag_version_number !== null && instance.dag_version_number !== undefined;
const taskUrl = hasTaskInstance
? buildTaskInstanceUrl({
currentPathname: location.pathname,
dagId,
isGroup,
isMapped: Boolean(isMapped),
runId,
taskId,
})
: `/dags/${dagId}/tasks/${isGroup ? "group/" : ""}${taskId}`;

// Remove try_number query param when navigating to reset to the
// latest try of the task instance and avoid issues with invalid try numbers:
Expand Down
Loading