Skip to content

[v3-1-test] Fix clear task instance dialog tasks states (#59363) #59580

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
Dec 18, 2025
+27 −4
Merged

[v3-1-test] Fix clear task instance dialog tasks states (#59363) #59580

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
11 changes: 10 additions & 1 deletion airflow-core/src/airflow/ui/src/components/Clear/Run/ClearRunDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ import { useTranslation } from "react-i18next";
import { CgRedo } from "react-icons/cg";

import { useDagServiceGetDagDetails } from "openapi/queries";
import type { DAGRunResponse } from "openapi/requests/types.gen";
import type { DAGRunResponse, TaskInstanceResponse } from "openapi/requests/types.gen";
import { ActionAccordion } from "src/components/ActionAccordion";
import { Button, Dialog, Checkbox } from "src/components/ui";
import SegmentedControl from "src/components/ui/SegmentedControl";
import { useClearDagRunDryRun } from "src/queries/useClearDagRunDryRun";
import { useClearDagRun } from "src/queries/useClearRun";
import { usePatchDagRun } from "src/queries/usePatchDagRun";
import { isStatePending, useAutoRefresh } from "src/utils";

type Props = {
readonly dagRun: DAGRunResponse;
Expand All @@ -51,9 +52,17 @@ const ClearRunDialog = ({ dagRun, onClose, open }: Props) => {
dagId,
});

const refetchInterval = useAutoRefresh({ dagId });

const { data: affectedTasks = { task_instances: [], total_entries: 0 } } = useClearDagRunDryRun({
dagId,
dagRunId,
options: {
refetchInterval: (query) =>
query.state.data?.task_instances.some((ti: TaskInstanceResponse) => isStatePending(ti.state))
? refetchInterval
: false,
},
requestBody: { only_failed: onlyFailed, run_on_latest_version: runOnLatestVersion },
});

Expand Down
11 changes: 9 additions & 2 deletions ...ow-core/src/airflow/ui/src/components/Clear/TaskInstance/ClearGroupTaskInstanceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ import { CgRedo } from "react-icons/cg";
import { useParams } from "react-router-dom";

import { useDagServiceGetDagDetails, useTaskInstanceServiceGetTaskInstances } from "openapi/queries";
import type { LightGridTaskInstanceSummary } from "openapi/requests/types.gen";
import type { LightGridTaskInstanceSummary, TaskInstanceResponse } from "openapi/requests/types.gen";
import { ActionAccordion } from "src/components/ActionAccordion";
import { Button, Dialog, Checkbox } from "src/components/ui";
import SegmentedControl from "src/components/ui/SegmentedControl";
import { useClearTaskInstances } from "src/queries/useClearTaskInstances";
import { useClearTaskInstancesDryRun } from "src/queries/useClearTaskInstancesDryRun";
import { isStatePending, useAutoRefresh } from "src/utils";

type Props = {
readonly onClose: () => void;
Expand All @@ -47,7 +48,7 @@ export const ClearGroupTaskInstanceDialog = ({ onClose, open, taskInstance }: Pr
onSuccessConfirm: onClose,
});

const [selectedOptions, setSelectedOptions] = useState<Array<string>>([]);
const [selectedOptions, setSelectedOptions] = useState<Array<string>>(["downstream"]);

const onlyFailed = selectedOptions.includes("onlyFailed");
const past = selectedOptions.includes("past");
Expand Down Expand Up @@ -76,10 +77,16 @@ export const ClearGroupTaskInstanceDialog = ({ onClose, open, taskInstance }: Pr

const groupTaskIds = groupTaskInstances?.task_instances.map((ti) => ti.task_id) ?? [];

const refetchInterval = useAutoRefresh({ dagId });

const { data } = useClearTaskInstancesDryRun({
dagId,
options: {
enabled: open && groupTaskIds.length > 0,
refetchInterval: (query) =>
query.state.data?.task_instances.some((ti: TaskInstanceResponse) => isStatePending(ti.state))
? refetchInterval
: false,
refetchOnMount: "always",
},
requestBody: {
Expand Down
9 changes: 8 additions & 1 deletion airflow-core/src/airflow/ui/src/components/Clear/TaskInstance/ClearTaskInstanceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import SegmentedControl from "src/components/ui/SegmentedControl";
import { useClearTaskInstances } from "src/queries/useClearTaskInstances";
import { useClearTaskInstancesDryRun } from "src/queries/useClearTaskInstancesDryRun";
import { usePatchTaskInstance } from "src/queries/usePatchTaskInstance";
import { isStatePending, useAutoRefresh } from "src/utils";

type Props = {
readonly onClose: () => void;
Expand All @@ -51,7 +52,7 @@ const ClearTaskInstanceDialog = ({ onClose, open, taskInstance }: Props) => {
onSuccessConfirm: onClose,
});

const [selectedOptions, setSelectedOptions] = useState<Array<string>>([]);
const [selectedOptions, setSelectedOptions] = useState<Array<string>>(["downstream"]);

const onlyFailed = selectedOptions.includes("onlyFailed");
const past = selectedOptions.includes("past");
Expand All @@ -73,10 +74,16 @@ const ClearTaskInstanceDialog = ({ onClose, open, taskInstance }: Props) => {
dagId,
});

const refetchInterval = useAutoRefresh({ dagId });

const { data } = useClearTaskInstancesDryRun({
dagId,
options: {
enabled: open,
refetchInterval: (query) =>
query.state.data?.task_instances.some((ti: TaskInstanceResponse) => isStatePending(ti.state))
? refetchInterval
: false,
refetchOnMount: "always",
},
requestBody: {
Expand Down
Loading