Skip to content
Merged
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
22 changes: 10 additions & 12 deletions airflow-core/src/airflow/ui/src/hooks/navigation/useNavigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { useLocation, useNavigate, useParams } from "react-router-dom";

import type { GridRunsResponse } from "openapi/requests";
import type { GridTask } from "src/layouts/Details/Grid/utils";
import { getTaskInstanceAdditionalPath } from "src/utils/links";
import { buildTaskInstanceUrl } from "src/utils/links";

import type {
NavigationDirection,
Expand Down Expand Up @@ -72,24 +72,22 @@ const buildPath = (params: {
}): string => {
const { dagId, mapIndex = "-1", mode, pathname, run, task } = params;
const groupPath = task.isGroup ? "group/" : "";
const additionalPath = getTaskInstanceAdditionalPath(pathname);

switch (mode) {
case "run":
return `/dags/${dagId}/runs/${run.run_id}`;
case "task":
return `/dags/${dagId}/tasks/${groupPath}${task.id}`;
case "TI":
if (task.is_mapped ?? false) {
if (mapIndex !== "-1") {
// For mapped tasks with specific map index, we need to construct the path manually
return `/dags/${dagId}/runs/${run.run_id}/tasks/${groupPath}${task.id}/mapped/${mapIndex}${additionalPath}`;
}

return `/dags/${dagId}/runs/${run.run_id}/tasks/${groupPath}${task.id}/mapped${additionalPath}`;
}

return `/dags/${dagId}/runs/${run.run_id}/tasks/${groupPath}${task.id}${additionalPath}`;
return buildTaskInstanceUrl({
currentPathname: pathname,
dagId,
isGroup: task.isGroup,
isMapped: task.is_mapped ?? false,
mapIndex,
runId: run.run_id,
taskId: task.id,
});
default:
return `/dags/${dagId}`;
}
Expand Down
15 changes: 13 additions & 2 deletions airflow-core/src/airflow/ui/src/utils/links.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,18 @@ describe("buildTaskInstanceUrl", () => {
}),
).toBe("/dags/my_dag/runs/run_123/tasks/mapped_task/mapped");

// Complex: group + mapped + sub-routes
// Groups should never preserve tabs (only have "Task Instances" tab)
expect(
buildTaskInstanceUrl({
currentPathname: "/dags/old/runs/old/tasks/old_task/rendered_templates",
dagId: "new_dag",
isGroup: true,
runId: "new_run",
taskId: "new_group",
}),
).toBe("/dags/new_dag/runs/new_run/tasks/group/new_group");

// Groups should never preserve tabs even for mapped groups
expect(
buildTaskInstanceUrl({
currentPathname: "/dags/old/runs/old/tasks/group/old_group/events",
Expand All @@ -243,6 +254,6 @@ describe("buildTaskInstanceUrl", () => {
runId: "new_run",
taskId: "new_group",
}),
).toBe("/dags/new_dag/runs/new_run/tasks/group/new_group/mapped/3/events");
).toBe("/dags/new_dag/runs/new_run/tasks/group/new_group/mapped/3");
});
});
3 changes: 2 additions & 1 deletion airflow-core/src/airflow/ui/src/utils/links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ export const buildTaskInstanceUrl = (params: {
}): string => {
const { currentPathname, dagId, isGroup = false, isMapped = false, mapIndex, runId, taskId } = params;
const groupPath = isGroup ? "group/" : "";
const additionalPath = getTaskInstanceAdditionalPath(currentPathname);
// Task groups only have "Task Instances" tab, so never preserve tabs for groups
const additionalPath = isGroup ? "" : getTaskInstanceAdditionalPath(currentPathname);

let basePath = `/dags/${dagId}/runs/${runId}/tasks/${groupPath}${taskId}`;

Expand Down