This is an automated email from the ASF dual-hosted git repository.

choo121600 pushed a commit to branch v3-4-test
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/v3-4-test by this push:
     new 60236c1f3a2 [v3-4-test] Refresh Dag cards after Dag run changes 
(#76274) (#77215)
60236c1f3a2 is described below

commit 60236c1f3a222334615219f33b76076d9b132d96
Author: Brent Bovenzi <[email protected]>
AuthorDate: Tue Nov 17 23:30:39 2026 -0500

    [v3-4-test] Refresh Dag cards after Dag run changes (#76274) (#77215)
    
    * Refresh Dag cards after deleting Dag runs (#75931)
    
    (cherry picked from commit cd1ed360b9a3ad86d3d0885f515cf32fff8f5146)
    
    * UI: Refresh Dag cards after Dag run changes (#76274)
    
    (cherry picked from commit 8df64a7dd3c1d450844644285986b302d7f65936)
    
    ---------
    
    Co-authored-by: Anzin Mohammed <[email protected]>
    Co-authored-by: Yuseok Jo <[email protected]>
---
 .../ui/src/queries/dagListQueryKeys.test.tsx       | 134 +++++++++++++++++++++
 .../airflow/ui/src/queries/gridViewQueryKeys.ts    |  10 ++
 .../airflow/ui/src/queries/useBulkClearDagRuns.ts  |   3 +-
 .../airflow/ui/src/queries/useBulkDeleteDagRuns.ts |   3 +-
 .../airflow/ui/src/queries/useBulkPatchDagRun.ts   |   5 +-
 .../src/airflow/ui/src/queries/useClearRun.ts      |   3 +-
 .../ui/src/queries/useClearTaskInstances.ts        |   3 +-
 .../ui/src/queries/useCreateBackfill.test.tsx      |   9 +-
 .../airflow/ui/src/queries/useCreateBackfill.ts    |   6 +-
 .../ui/src/queries/useDeleteDagRun.test.tsx        |  82 +++++++++++++
 .../src/airflow/ui/src/queries/useDeleteDagRun.ts  |   3 +-
 .../src/airflow/ui/src/queries/usePatchDagRun.ts   |   3 +-
 .../src/queries/useRecentTaskStateCounts.test.tsx  |  20 +++
 .../ui/src/queries/useRecentTaskStateCounts.tsx    |   9 +-
 .../src/airflow/ui/src/queries/useTrigger.ts       |  15 +--
 15 files changed, 279 insertions(+), 29 deletions(-)

diff --git a/airflow-core/src/airflow/ui/src/queries/dagListQueryKeys.test.tsx 
b/airflow-core/src/airflow/ui/src/queries/dagListQueryKeys.test.tsx
new file mode 100644
index 00000000000..b91eeff3738
--- /dev/null
+++ b/airflow-core/src/airflow/ui/src/queries/dagListQueryKeys.test.tsx
@@ -0,0 +1,134 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { QueryClient } from "@tanstack/react-query";
+import { renderHook } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type * as OpenapiQueries from "openapi/queries";
+
+import { Wrapper } from "src/utils/Wrapper";
+
+import { useBulkClearDagRuns } from "./useBulkClearDagRuns";
+import { useBulkPatchDagRun } from "./useBulkPatchDagRun";
+import { useClearDagRun } from "./useClearRun";
+import { useClearTaskInstances } from "./useClearTaskInstances";
+import { useCreateBackfill } from "./useCreateBackfill";
+import { usePatchDagRun } from "./usePatchDagRun";
+import { useTrigger } from "./useTrigger";
+
+vi.mock("openapi/queries", async (importOriginal) => {
+  const actual = await importOriginal<typeof OpenapiQueries>();
+
+  return {
+    ...actual,
+    useBackfillServiceCreateBackfill: vi.fn(),
+    useDagRunServiceBulkDagRuns: vi.fn(),
+    useDagRunServiceClearDagRun: vi.fn(),
+    useDagRunServiceClearDagRuns: vi.fn(),
+    useDagRunServicePatchDagRun: vi.fn(),
+    useDagRunServiceTriggerDagRun: vi.fn(),
+    useTaskInstanceServicePostClearTaskInstances: vi.fn(),
+  };
+});
+
+const queries = await import("openapi/queries");
+
+type OnSuccess = (...args: Array<unknown>) => Promise<void>;
+
+const getOnSuccess = (generatedHook: unknown) =>
+  vi.mocked(generatedHook as (options: { onSuccess: OnSuccess }) => 
unknown).mock.calls.at(-1)?.[0].onSuccess;
+
+const dagRun = { dag_id: "dag", dag_run_id: "run" };
+
+describe.each([
+  {
+    args: [dagRun, { dagId: "dag", requestBody: { logical_date: null } }],
+    generatedHook: queries.useDagRunServiceTriggerDagRun,
+    operation: "triggering a Dag",
+    useMutation: () => useTrigger({ dagId: "dag", onSuccessConfirm: vi.fn() }),
+  },
+  {
+    args: [{ dag_id: "dag" }, { requestBody: { drain_dag: false } }],
+    generatedHook: queries.useBackfillServiceCreateBackfill,
+    operation: "creating a backfill",
+    useMutation: () => useCreateBackfill({ onSuccessConfirm: vi.fn() }),
+  },
+  {
+    args: [],
+    generatedHook: queries.useDagRunServicePatchDagRun,
+    operation: "marking a run",
+    useMutation: () => usePatchDagRun({ dagId: "dag", dagRunId: "run" }),
+  },
+  {
+    args: [{ update: { errors: [], success: ["dag.run"] } }],
+    generatedHook: queries.useDagRunServiceBulkDagRuns,
+    operation: "marking runs in bulk",
+    useMutation: () => useBulkPatchDagRun({ deselectKeys: vi.fn(), 
onSuccessConfirm: vi.fn() }),
+  },
+  {
+    args: [],
+    generatedHook: queries.useDagRunServiceClearDagRun,
+    operation: "clearing a run",
+    useMutation: () => useClearDagRun({ dagId: "dag", dagRunId: "run", 
onSuccessConfirm: vi.fn() }),
+  },
+  {
+    args: [{ dag_runs: [dagRun], total_entries: 1 }],
+    generatedHook: queries.useDagRunServiceClearDagRuns,
+    operation: "clearing runs in bulk",
+    useMutation: () => useBulkClearDagRuns({ deselectKeys: vi.fn(), 
onSuccessConfirm: vi.fn() }),
+  },
+  {
+    args: [
+      { task_instances: [], total_entries: 0 },
+      { dagId: "dag", requestBody: { dag_run_id: "run" } },
+    ],
+    generatedHook: queries.useTaskInstanceServicePostClearTaskInstances,
+    operation: "clearing task instances",
+    useMutation: () => useClearTaskInstances({ dagRunId: "run", 
onSuccessConfirm: vi.fn() }),
+  },
+])("Dag cards after $operation", ({ args, generatedHook, useMutation }) => {
+  beforeEach(() => {
+    vi.mocked(generatedHook as () => unknown).mockReturnValue({
+      isPending: false,
+      mutate: vi.fn(),
+      reset: vi.fn(),
+    });
+  });
+  afterEach(() => vi.restoreAllMocks());
+
+  it("invalidates the Dag list and its run and task state counts", async () => 
{
+    const invalidateSpy = vi.spyOn(QueryClient.prototype, 
"invalidateQueries").mockResolvedValue();
+
+    renderHook(
+      () => {
+        useMutation();
+      },
+      { wrapper: Wrapper },
+    );
+    await getOnSuccess(generatedHook)?.(...args);
+
+    expect(invalidateSpy).toHaveBeenCalledWith({ queryKey: 
[queries.useDagServiceGetDagsUiKey] });
+    expect(invalidateSpy).toHaveBeenCalledWith({
+      queryKey: [queries.useDagServiceGetDagRunStateCountsUiKey],
+    });
+    expect(invalidateSpy).toHaveBeenCalledWith({
+      queryKey: [queries.useDagServiceGetRecentTaskInstanceStateCountsUiKey],
+    });
+  });
+});
diff --git a/airflow-core/src/airflow/ui/src/queries/gridViewQueryKeys.ts 
b/airflow-core/src/airflow/ui/src/queries/gridViewQueryKeys.ts
index b975ef9c0d5..21b2bd2b844 100644
--- a/airflow-core/src/airflow/ui/src/queries/gridViewQueryKeys.ts
+++ b/airflow-core/src/airflow/ui/src/queries/gridViewQueryKeys.ts
@@ -19,7 +19,10 @@
 import {
   UseDagRunServiceGetDagRunsKeyFn,
   UseDagServiceGetDagDetailsKeyFn,
+  useDagServiceGetDagRunStateCountsUiKey,
+  useDagServiceGetDagsUiKey,
   UseDagServiceGetLatestRunInfoKeyFn,
+  useDagServiceGetRecentTaskInstanceStateCountsUiKey,
   UseGridServiceGetDagStructureKeyFn,
   UseGridServiceGetGridRunsKeyFn,
   UseGridServiceGetLoopHistoryKeyFn,
@@ -43,6 +46,13 @@ export const gridQueryKeys = (dagId: string) =>
     UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId: "~" }, [{ 
dagId, dagRunId: "~" }]),
   ] as const;
 
+/** Prefix keys for the Dag cards on the Dags list, which a change to a Dag 
run leaves stale. */
+export const dagListQueryKeys = [
+  [useDagServiceGetDagsUiKey],
+  [useDagServiceGetDagRunStateCountsUiKey],
+  [useDagServiceGetRecentTaskInstanceStateCountsUiKey],
+] as const;
+
 /** Prefix keys for per-attempt TI caches that become stale after any 
mutation. */
 export const tiPerAttemptQueryKeys = [
   [useTaskInstanceServiceGetLogKey],
diff --git a/airflow-core/src/airflow/ui/src/queries/useBulkClearDagRuns.ts 
b/airflow-core/src/airflow/ui/src/queries/useBulkClearDagRuns.ts
index 0bf20879641..03a29635fff 100644
--- a/airflow-core/src/airflow/ui/src/queries/useBulkClearDagRuns.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useBulkClearDagRuns.ts
@@ -32,7 +32,7 @@ import type { ClearDagRunsResponse, DAGRunResponse } from 
"openapi/requests/type
 
 import { toaster } from "src/system-components";
 
-import { gridQueryKeys, tiPerAttemptQueryKeys } from "./gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys, tiPerAttemptQueryKeys } from 
"./gridViewQueryKeys";
 import { useBulkClearDagRunsDryRunKey } from "./useBulkClearDagRunsDryRun";
 import { useClearDagRunDryRunKey } from "./useClearDagRunDryRun";
 
@@ -62,6 +62,7 @@ export const useBulkClearDagRuns = ({ deselectKeys, 
onSuccessConfirm }: Props) =
       [useTaskInstanceServiceGetMappedTaskInstanceKey],
       [useBulkClearDagRunsDryRunKey],
       ...tiPerAttemptQueryKeys,
+      ...dagListQueryKeys,
       ...[...dagIds].flatMap((dagId) => [...gridQueryKeys(dagId), 
[useClearDagRunDryRunKey, dagId]]),
       ...clearedRuns.flatMap((dagRun) => [
         UseDagRunServiceGetDagRunKeyFn({ dagId: dagRun.dag_id, dagRunId: 
dagRun.dag_run_id }),
diff --git a/airflow-core/src/airflow/ui/src/queries/useBulkDeleteDagRuns.ts 
b/airflow-core/src/airflow/ui/src/queries/useBulkDeleteDagRuns.ts
index 428b77d5113..12da451d6b6 100644
--- a/airflow-core/src/airflow/ui/src/queries/useBulkDeleteDagRuns.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useBulkDeleteDagRuns.ts
@@ -30,7 +30,7 @@ import type { BulkBody_BulkDAGRunBody_, BulkResponse } from 
"openapi/requests/ty
 
 import { toaster } from "src/system-components";
 
-import { gridQueryKeys, tiPerAttemptQueryKeys } from "./gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys, tiPerAttemptQueryKeys } from 
"./gridViewQueryKeys";
 
 type Props = {
   readonly deselectKeys: (keys: Array<string>) => void;
@@ -47,6 +47,7 @@ export const useBulkDeleteDagRuns = ({ deselectKeys, 
onSuccessConfirm }: Props)
       queryClient.invalidateQueries({ queryKey: 
[useDagRunServiceGetDagRunsKey] }),
       queryClient.invalidateQueries({ queryKey: 
[useTaskInstanceServiceGetTaskInstancesKey] }),
       ...tiPerAttemptQueryKeys.map((key) => queryClient.invalidateQueries({ 
queryKey: key })),
+      ...dagListQueryKeys.map((key) => queryClient.invalidateQueries({ 
queryKey: key })),
       ...[...affectedDagIds.current].flatMap((dagId) =>
         gridQueryKeys(dagId).map((key) => queryClient.invalidateQueries({ 
queryKey: key })),
       ),
diff --git a/airflow-core/src/airflow/ui/src/queries/useBulkPatchDagRun.ts 
b/airflow-core/src/airflow/ui/src/queries/useBulkPatchDagRun.ts
index d884aef7211..e5200ec7c7c 100644
--- a/airflow-core/src/airflow/ui/src/queries/useBulkPatchDagRun.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useBulkPatchDagRun.ts
@@ -34,7 +34,7 @@ import type { BulkBody_BulkDAGRunBody_, BulkResponse } from 
"openapi/requests/ty
 
 import { toaster } from "src/system-components";
 
-import { gridQueryKeys, tiPerAttemptQueryKeys } from "./gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys, tiPerAttemptQueryKeys } from 
"./gridViewQueryKeys";
 import { useClearDagRunDryRunKey } from "./useClearDagRunDryRun";
 
 type Props = {
@@ -50,7 +50,7 @@ export const useBulkPatchDagRun = ({ deselectKeys, 
onSuccessConfirm }: Props) =>
   const onSuccess = async (responseData: BulkResponse) => {
     // Marking runs changes run + task instance states, so invalidate the same 
surfaces the
     // single-run mark (usePatchDagRun) does: run/TI lists, run + 
single/mapped TI details, gantt,
-    // grid, and the clear dry-run preview.
+    // grid, the Dags list cards and the clear dry-run preview.
     await Promise.all([
       queryClient.invalidateQueries({ queryKey: 
[useDagRunServiceGetDagRunsKey] }),
       queryClient.invalidateQueries({ queryKey: [useDagRunServiceGetDagRunKey] 
}),
@@ -59,6 +59,7 @@ export const useBulkPatchDagRun = ({ deselectKeys, 
onSuccessConfirm }: Props) =>
       queryClient.invalidateQueries({ queryKey: 
[useTaskInstanceServiceGetMappedTaskInstanceKey] }),
       queryClient.invalidateQueries({ queryKey: 
[useGanttServiceGetGanttDataKey] }),
       ...tiPerAttemptQueryKeys.map((key) => queryClient.invalidateQueries({ 
queryKey: key })),
+      ...dagListQueryKeys.map((key) => queryClient.invalidateQueries({ 
queryKey: key })),
       ...[...affectedDagIds.current].flatMap((dagId) => [
         ...gridQueryKeys(dagId).map((key) => queryClient.invalidateQueries({ 
queryKey: key })),
         queryClient.invalidateQueries({ queryKey: [useClearDagRunDryRunKey, 
dagId] }),
diff --git a/airflow-core/src/airflow/ui/src/queries/useClearRun.ts 
b/airflow-core/src/airflow/ui/src/queries/useClearRun.ts
index 4cc5478d017..2ec29fc0421 100644
--- a/airflow-core/src/airflow/ui/src/queries/useClearRun.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useClearRun.ts
@@ -29,7 +29,7 @@ import {
 
 import { createErrorToaster } from "src/utils";
 
-import { gridQueryKeys, tiPerAttemptQueryKeys } from "./gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys, tiPerAttemptQueryKeys } from 
"./gridViewQueryKeys";
 import { useClearDagRunDryRunKey } from "./useClearDagRunDryRun";
 
 export const useClearDagRun = ({
@@ -63,6 +63,7 @@ export const useClearDagRun = ({
       [useClearDagRunDryRunKey, dagId],
       UseGanttServiceGetGanttDataKeyFn({ dagId, runId: dagRunId }),
       ...tiPerAttemptQueryKeys,
+      ...dagListQueryKeys,
     ];
 
     await Promise.all([
diff --git a/airflow-core/src/airflow/ui/src/queries/useClearTaskInstances.ts 
b/airflow-core/src/airflow/ui/src/queries/useClearTaskInstances.ts
index 5dfc76dd10e..b4e3e74050b 100644
--- a/airflow-core/src/airflow/ui/src/queries/useClearTaskInstances.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useClearTaskInstances.ts
@@ -33,7 +33,7 @@ import type { ClearTaskInstancesBody, 
TaskInstanceCollectionResponse } from "ope
 
 import { toaster } from "src/system-components";
 
-import { gridQueryKeys, tiPerAttemptQueryKeys } from "./gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys, tiPerAttemptQueryKeys } from 
"./gridViewQueryKeys";
 import { useClearTaskInstancesDryRunKey } from "./useClearTaskInstancesDryRun";
 import { usePatchTaskInstanceDryRunKey } from "./usePatchTaskInstanceDryRun";
 
@@ -103,6 +103,7 @@ export const useClearTaskInstances = ({
       [usePatchTaskInstanceDryRunKey, dagId, runId],
       UseGanttServiceGetGanttDataKeyFn({ dagId, runId }),
       ...tiPerAttemptQueryKeys,
+      ...dagListQueryKeys,
     ];
 
     await Promise.all([
diff --git a/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.test.tsx 
b/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.test.tsx
index 9a7122d19c5..2abc9a8019d 100644
--- a/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.test.tsx
+++ b/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.test.tsx
@@ -33,12 +33,8 @@ vi.mock("openapi/queries", async (importOriginal) => {
   return { ...actual, useBackfillServiceCreateBackfill: vi.fn() };
 });
 
-const {
-  useBackfillServiceCreateBackfill,
-  UseDagServiceGetDagDetailsKeyFn,
-  UseDagServiceGetDagKeyFn,
-  useDagServiceGetDagsUiKey,
-} = await import("openapi/queries");
+const { useBackfillServiceCreateBackfill, UseDagServiceGetDagDetailsKeyFn, 
UseDagServiceGetDagKeyFn } =
+  await import("openapi/queries");
 
 const DAG_ID = "paused_dag";
 const mutate = vi.fn();
@@ -87,7 +83,6 @@ describe("useCreateBackfill", () => {
     for (const queryKey of [
       UseDagServiceGetDagKeyFn({ dagId: DAG_ID }, [{ dagId: DAG_ID }]),
       UseDagServiceGetDagDetailsKeyFn({ dagId: DAG_ID }, [{ dagId: DAG_ID }]),
-      [useDagServiceGetDagsUiKey],
     ]) {
       if (drainDag) {
         expect(invalidateSpy).toHaveBeenCalledWith({ queryKey });
diff --git a/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.ts 
b/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.ts
index d03b105ef3f..35cebf3224c 100644
--- a/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useCreateBackfill.ts
@@ -26,12 +26,13 @@ import {
   UseDagServiceGetDagKeyFn,
   useBackfillServiceCreateBackfill,
   useBackfillServiceListBackfillsUiKey,
-  useDagServiceGetDagsUiKey,
 } from "openapi/queries";
 import type { BackfillResponse, CreateBackfillData } from 
"openapi/requests/types.gen";
 
 import { toaster } from "src/system-components";
 
+import { dagListQueryKeys } from "src/queries/gridViewQueryKeys";
+
 export const useCreateBackfill = ({ onSuccessConfirm }: { onSuccessConfirm: () 
=> void }) => {
   const [dateValidationError, setDateValidationError] = 
useState<unknown>(undefined);
   const queryClient = useQueryClient();
@@ -43,12 +44,11 @@ export const useCreateBackfill = ({ onSuccessConfirm }: { 
onSuccessConfirm: () =
       ? [
           UseDagServiceGetDagKeyFn({ dagId }, [{ dagId }]),
           UseDagServiceGetDagDetailsKeyFn({ dagId }, [{ dagId }]),
-          [useDagServiceGetDagsUiKey],
         ]
       : [];
 
     await Promise.all(
-      [[useBackfillServiceListBackfillsUiKey], ...drainKeys].map((queryKey) =>
+      [[useBackfillServiceListBackfillsUiKey], ...dagListQueryKeys, 
...drainKeys].map((queryKey) =>
         queryClient.invalidateQueries({ queryKey }),
       ),
     );
diff --git a/airflow-core/src/airflow/ui/src/queries/useDeleteDagRun.test.tsx 
b/airflow-core/src/airflow/ui/src/queries/useDeleteDagRun.test.tsx
new file mode 100644
index 00000000000..70aec8a5c9c
--- /dev/null
+++ b/airflow-core/src/airflow/ui/src/queries/useDeleteDagRun.test.tsx
@@ -0,0 +1,82 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import type { PropsWithChildren } from "react";
+
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { act, renderHook, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import {
+  UseDagServiceGetDagRunStateCountsUiKeyFn,
+  UseDagServiceGetDagsUiKeyFn,
+  UseDagServiceGetRecentTaskInstanceStateCountsUiKeyFn,
+} from "openapi/queries";
+import { DagRunService } from "openapi/requests";
+
+import { useBulkDeleteDagRuns } from "./useBulkDeleteDagRuns";
+import { useDeleteDagRun } from "./useDeleteDagRun";
+
+const useDeleteSingleRun = (onSuccessConfirm: VoidFunction) => {
+  const { mutate } = useDeleteDagRun({ dagId: "dag", dagRunId: "run", 
onSuccessConfirm });
+
+  return () => mutate({ dagId: "dag", dagRunId: "run" });
+};
+
+const useDeleteMultipleRuns = (onSuccessConfirm: VoidFunction) => {
+  const { bulkAction } = useBulkDeleteDagRuns({ deselectKeys: vi.fn(), 
onSuccessConfirm });
+
+  return () =>
+    bulkAction({ actions: [{ action: "delete", entities: [{ dag_id: "dag", 
dag_run_id: "run" }] }] });
+};
+
+describe.each([
+  { operation: "single-run deletion", useDelete: useDeleteSingleRun },
+  { operation: "bulk-run deletion", useDelete: useDeleteMultipleRuns },
+])("Dag card cache after $operation", ({ useDelete }) => {
+  beforeEach(() => {
+    vi.spyOn(DagRunService, "deleteDagRun").mockResolvedValue(undefined);
+    vi.spyOn(DagRunService, "bulkDagRuns").mockResolvedValue({
+      delete: { errors: [], success: ["dag.run"] },
+    });
+  });
+  afterEach(() => vi.restoreAllMocks());
+
+  it.each([
+    { name: "Dag list", queryKey: UseDagServiceGetDagsUiKeyFn({ limit: 50 }) },
+    { name: "run-state counts", queryKey: 
UseDagServiceGetDagRunStateCountsUiKeyFn({ dagIds: ["dag"] }) },
+    {
+      name: "recent task-state counts",
+      queryKey: UseDagServiceGetRecentTaskInstanceStateCountsUiKeyFn({ 
dagRunIds: [1] }),
+    },
+  ])("invalidates the cached $name before navigating back", async ({ queryKey 
}) => {
+    const queryClient = new QueryClient({ defaultOptions: { queries: { 
staleTime: Infinity } } });
+
+    queryClient.setQueryData(queryKey, { cached: true });
+    const wrapper = ({ children }: PropsWithChildren) => (
+      <QueryClientProvider 
client={queryClient}>{children}</QueryClientProvider>
+    );
+    const onSuccessConfirm = vi.fn();
+    const { result } = renderHook(() => useDelete(onSuccessConfirm), { wrapper 
});
+
+    act(() => result.current());
+    await waitFor(() => expect(onSuccessConfirm).toHaveBeenCalled());
+    expect(queryClient.getQueryState(queryKey)?.isInvalidated).toBe(true);
+    queryClient.clear();
+  });
+});
diff --git a/airflow-core/src/airflow/ui/src/queries/useDeleteDagRun.ts 
b/airflow-core/src/airflow/ui/src/queries/useDeleteDagRun.ts
index 3f442a474e8..43fdaa2d661 100644
--- a/airflow-core/src/airflow/ui/src/queries/useDeleteDagRun.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useDeleteDagRun.ts
@@ -31,7 +31,7 @@ import {
 
 import { toaster } from "src/system-components";
 
-import { gridQueryKeys, tiPerAttemptQueryKeys } from 
"src/queries/gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys, tiPerAttemptQueryKeys } from 
"src/queries/gridViewQueryKeys";
 import { createErrorToaster } from "src/utils";
 
 type DeleteDagRunParams = {
@@ -59,6 +59,7 @@ export const useDeleteDagRun = ({ dagId, dagRunId, 
onSuccessConfirm }: DeleteDag
     const queryKeys = [
       UseDagRunServiceGetDagRunKeyFn({ dagId, dagRunId }),
       [useDagRunServiceGetDagRunsKey],
+      ...dagListQueryKeys,
       [useTaskInstanceServiceGetTaskInstancesKey],
       [useTaskInstanceServiceGetHitlDetailsKey],
       UseGanttServiceGetGanttDataKeyFn({ dagId, runId: dagRunId }),
diff --git a/airflow-core/src/airflow/ui/src/queries/usePatchDagRun.ts 
b/airflow-core/src/airflow/ui/src/queries/usePatchDagRun.ts
index 1db0f18c446..1faaacea810 100644
--- a/airflow-core/src/airflow/ui/src/queries/usePatchDagRun.ts
+++ b/airflow-core/src/airflow/ui/src/queries/usePatchDagRun.ts
@@ -31,7 +31,7 @@ import {
 
 import { createErrorToaster } from "src/utils";
 
-import { gridQueryKeys, tiPerAttemptQueryKeys } from "./gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys, tiPerAttemptQueryKeys } from 
"./gridViewQueryKeys";
 import { useClearDagRunDryRunKey } from "./useClearDagRunDryRun";
 
 export const usePatchDagRun = ({
@@ -67,6 +67,7 @@ export const usePatchDagRun = ({
       [useClearDagRunDryRunKey, dagId],
       UseGanttServiceGetGanttDataKeyFn({ dagId, runId: dagRunId }),
       ...tiPerAttemptQueryKeys,
+      ...dagListQueryKeys,
     ];
 
     await Promise.all([
diff --git 
a/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.test.tsx 
b/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.test.tsx
index 2bd2eaf235b..92d3c258ce3 100644
--- a/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.test.tsx
+++ b/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.test.tsx
@@ -43,6 +43,26 @@ const makeDag = (overrides: 
Partial<DAGWithLatestDagRunsResponse>) =>
   }) as DAGWithLatestDagRunsResponse;
 
 describe("useRecentTaskStateCounts", () => {
+  it.each([false, true])("discards deleted-run counts when another Dag has 
runs: %s", (hasOtherDag) => {
+    const cachedResponse = {
+      data: { dags: [{ dag_id: "my_dag", run_ids: ["run"], state_counts: { 
success: 60 } }] },
+      isLoading: false,
+    } as ReturnType<typeof useDagServiceGetRecentTaskInstanceStateCountsUi>;
+
+    vi.mocked(useDagServiceGetRecentTaskInstanceStateCountsUi)
+      .mockReturnValueOnce(cachedResponse)
+      .mockReturnValueOnce(cachedResponse);
+    const { rerender, result } = renderHook(({ dags }) => 
useRecentTaskStateCounts(dags), {
+      initialProps: { dags: [makeDag({})] },
+    });
+
+    expect(result.current.entriesByDag.my_dag?.state_counts).toEqual({ 
success: 60 });
+    rerender({
+      dags: [makeDag({ latest_dag_runs: [] }), ...(hasOtherDag ? [makeDag({ 
dag_id: "other_dag" })] : [])],
+    });
+    expect(result.current.entriesByDag).toEqual({});
+  });
+
   it.each([
     { expected: 3000, has_unfinished_runs: true, is_paused: false },
     { expected: false, has_unfinished_runs: false, is_paused: false },
diff --git 
a/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.tsx 
b/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.tsx
index a814e67c0d1..999fed3f8ee 100644
--- a/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.tsx
+++ b/airflow-core/src/airflow/ui/src/queries/useRecentTaskStateCounts.tsx
@@ -47,6 +47,9 @@ export const useRecentTaskStateCounts = (
     .map((dag) => dag.latest_dag_runs[0]?.id)
     .filter((id): id is number => id !== undefined)
     .sort((left, right) => left - right);
+  const dagIdsWithRuns = new Set(
+    (dags ?? []).filter((dag) => dag.latest_dag_runs.length > 0).map((dag) => 
dag.dag_id),
+  );
 
   const { data, isLoading } = 
useDagServiceGetRecentTaskInstanceStateCountsUi({ dagRunIds }, undefined, {
     enabled: show && dagRunIds.length > 0,
@@ -55,7 +58,11 @@ export const useRecentTaskStateCounts = (
   });
 
   return {
-    entriesByDag: Object.fromEntries((data?.dags ?? []).map((entry) => 
[entry.dag_id, entry])),
+    entriesByDag: Object.fromEntries(
+      (data?.dags ?? [])
+        .filter((entry) => dagIdsWithRuns.has(entry.dag_id))
+        .map((entry) => [entry.dag_id, entry]),
+    ),
     isLoading,
     show,
   };
diff --git a/airflow-core/src/airflow/ui/src/queries/useTrigger.ts 
b/airflow-core/src/airflow/ui/src/queries/useTrigger.ts
index eccb38608fd..a653ad3b30e 100644
--- a/airflow-core/src/airflow/ui/src/queries/useTrigger.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useTrigger.ts
@@ -20,11 +20,7 @@ import { useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import { useLocation, useNavigate, useParams } from "react-router-dom";
 
-import {
-  UseDagServiceGetDagKeyFn,
-  useDagRunServiceTriggerDagRun,
-  useDagServiceGetDagsUiKey,
-} from "openapi/queries";
+import { UseDagServiceGetDagKeyFn, useDagRunServiceTriggerDagRun } from 
"openapi/queries";
 import type { TriggerDagRunData, TriggerDagRunResponse } from 
"openapi/requests/types.gen";
 
 import { toaster } from "src/system-components";
@@ -32,7 +28,7 @@ import { toaster } from "src/system-components";
 import type { DagRunTriggerParams } from "src/components/TriggerDag/types";
 
 import { SearchParamsKeys } from "src/constants/searchParams";
-import { gridQueryKeys } from "src/queries/gridViewQueryKeys";
+import { dagListQueryKeys, gridQueryKeys } from 
"src/queries/gridViewQueryKeys";
 import { createErrorToaster, toNullablePartitionKey } from "src/utils";
 
 export const useTrigger = ({ dagId, onSuccessConfirm }: { dagId: string; 
onSuccessConfirm: () => void }) => {
@@ -47,12 +43,11 @@ export const useTrigger = ({ dagId, onSuccessConfirm }: { 
dagId: string; onSucce
       ? [UseDagServiceGetDagKeyFn({ dagId }, [{ dagId }])]
       : [];
 
-    await Promise.all([
-      queryClient.invalidateQueries({ queryKey: [useDagServiceGetDagsUiKey] }),
-      ...[...gridQueryKeys(dagId), ...drainKeys].map((key) =>
+    await Promise.all(
+      [...dagListQueryKeys, ...gridQueryKeys(dagId), ...drainKeys].map((key) =>
         queryClient.invalidateQueries({ queryKey: key }),
       ),
-    ]);
+    );
 
     toaster.create({
       description: translate("triggerDag.toaster.success.description"),

Reply via email to