Skip to content

Refactor HITL details fetching to use exact dagId and taskId #54319

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
Aug 12, 2025
Merged

Refactor HITL details fetching to use exact dagId and taskId #54319

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
6 changes: 3 additions & 3 deletions airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,22 @@ export const Dag = () => {

const { data: hitlData } = useHumanInTheLoopServiceGetHitlDetails(
{
dagIdPattern: dagId,
dagId,
},
undefined,
{
enabled: Boolean(dagId),
},
);

const hasHitlTasks = (hitlData?.total_entries ?? 0) > 0;
const hasHitlTaskInstances = (hitlData?.total_entries ?? 0) > 0;

const displayTabs = tabs.filter((tab) => {
if (dag?.timetable_summary === null && tab.value === "backfills") {
return false;
}

if (tab.value === "required_actions" && !hasHitlTasks) {
if (tab.value === "required_actions" && !hasHitlTaskInstances) {
return false;
}

Expand Down
20 changes: 6 additions & 14 deletions airflow-core/src/airflow/ui/src/pages/HITLTaskInstances/HITLTaskInstances.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,11 @@ export const HITLTaskInstances = () => {

const { data, error, isLoading } = useHumanInTheLoopServiceGetHitlDetails(
{
dagIdPattern: dagId,
dagId,
dagRunId: runId,
responseReceived: Boolean(responseReceived) ? responseReceived === "true" : undefined,
taskId: Boolean(groupId) ? undefined : taskId,
taskIdPattern: groupId,
},
undefined,
{
Expand All @@ -144,21 +146,11 @@ export const HITLTaskInstances = () => {
},
);

const filteredData = data?.hitl_details.filter((hitl) => {
if (taskId !== undefined) {
return hitl.task_instance.task_id === taskId;
} else if (groupId !== undefined) {
return hitl.task_instance.task_id.includes(groupId);
}

return true;
});

return (
<Box>
{!Boolean(dagId) && !Boolean(runId) && !Boolean(taskId) ? (
<Heading size="md">
{filteredData?.length} {translate("requiredAction", { count: filteredData?.length })}
{data?.total_entries} {translate("requiredAction", { count: data?.total_entries })}
</Heading>
) : undefined}
<DataTable
Expand All @@ -168,13 +160,13 @@ export const HITLTaskInstances = () => {
taskId: Boolean(groupId) ? undefined : taskId,
translate,
})}
data={filteredData ?? []}
data={data?.hitl_details ?? []}
errorMessage={<ErrorAlert error={error} />}
initialState={tableURLState}
isLoading={isLoading}
modelName={translate("requiredAction_other")}
onStateChange={setTableURLState}
total={filteredData?.length}
total={data?.total_entries}
/>
</Box>
);
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/ui/src/pages/Run/Run.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const Run = () => {

const { data: hitlData } = useHumanInTheLoopServiceGetHitlDetails(
{
dagIdPattern: dagId,
dagId,
dagRunId: runId,
},
undefined,
Expand Down
16 changes: 5 additions & 11 deletions airflow-core/src/airflow/ui/src/pages/Task/Task.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,29 +59,23 @@ export const Task = () => {

const groupTask = getGroupTask(dagStructure, groupId);

// Check if this task has any HITL details
const { data: hitlData } = useHumanInTheLoopServiceGetHitlDetails(
{
dagIdPattern: dagId,
dagId,
dagRunId: runId,
taskId: Boolean(groupId) ? undefined : taskId,
taskIdPattern: groupId,
},
undefined,
{
enabled: Boolean(dagId && (groupId !== undefined || taskId !== undefined)),
},
);

const hasHitlForTask =
(hitlData?.hitl_details.filter((hitl) => hitl.task_instance.task_id === taskId).length ?? 0) > 0;
const hasHitlForTask = (hitlData?.total_entries ?? 0) > 0;

const displayTabs = (groupId === undefined ? tabs : tabs.filter((tab) => tab.value !== "events")).filter(
(tab) => {
if (tab.value === "required_actions" && !hasHitlForTask) {
return false;
}

return true;
},
(tab) => tab.value !== "required_actions" || hasHitlForTask,
);

return (
Expand Down
7 changes: 3 additions & 4 deletions airflow-core/src/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ export const TaskInstance = () => {

const { data: hitlDetails } = useHumanInTheLoopServiceGetHitlDetails(
{
dagIdPattern: dagId,
dagId,
dagRunId: runId,
taskId,
},
undefined,
{
Expand All @@ -91,9 +92,7 @@ export const TaskInstance = () => {
},
);

const hasHitlForTask = Boolean(
hitlDetails?.hitl_details.find((hitl) => hitl.task_instance.task_id === taskId),
);
const hasHitlForTask = (hitlDetails?.total_entries ?? 0) > 0;

const taskInstanceSummary = gridTISummaries?.task_instances.find((ti) => ti.task_id === taskId);
const taskCount = useMemo(
Expand Down
Loading