Skip to content

[v3-1-test] fix: use useAssetServiceGetDagAssetQueuedEvents to get the correct number of ADRQs (#62868) #62902

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
Lee-W merged 1 commit into from
Mar 5, 2026
Merged

[v3-1-test] fix: use useAssetServiceGetDagAssetQueuedEvents to get the correct number of ADRQs (#62868) #62902

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
44 changes: 37 additions & 7 deletions airflow-core/src/airflow/ui/src/pages/DagsList/AssetSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { useTranslation } from "react-i18next";
import { FiDatabase } from "react-icons/fi";
import { Link as RouterLink } from "react-router-dom";

import { useAssetServiceNextRunAssets } from "openapi/queries";
import { useAssetServiceGetDagAssetQueuedEvents, useAssetServiceNextRunAssets } from "openapi/queries";
import { AssetExpression, type ExpressionType } from "src/components/AssetExpression";
import type { NextRunEvent } from "src/components/AssetExpression/types";
import { TruncatedText } from "src/components/TruncatedText";
Expand All @@ -36,18 +36,48 @@ type Props = {
};

export const AssetSchedule = ({ assetExpression, dagId, latestRunAfter, timetableSummary }: Props) => {
const { t: translate } = useTranslation("dags");
const { data: nextRun, isLoading } = useAssetServiceNextRunAssets({ dagId });
const { t: translate } = useTranslation(["dags", "common"]);

const { data: nextRun, isLoading: isNextRunLoading } = useAssetServiceNextRunAssets({ dagId });
const {
data: queuedEventsData,
error: queuedEventsError,
isLoading: isQueuedEventsLoading,
} = useAssetServiceGetDagAssetQueuedEvents({ dagId }, undefined);

const nextRunEvents = (nextRun?.events ?? []) as Array<NextRunEvent>;
const queuedEventsErrorStatus =
typeof queuedEventsError === "object" && queuedEventsError !== null && "status" in queuedEventsError
? (queuedEventsError as { status?: number }).status
: undefined;
const hasQueuedEventsError = Boolean(queuedEventsError) && queuedEventsErrorStatus !== 404;
const queuedAssetEvents = new Map<number, string>();

if (!hasQueuedEventsError) {
for (const event of queuedEventsData?.queued_events ?? []) {
// Keep a single event timestamp per asset, using the latest one when duplicates exist.
const existingEventDate = queuedAssetEvents.get(event.asset_id);

const pendingEvents = nextRunEvents.filter((ev) => {
if (ev.lastUpdate !== null && latestRunAfter !== undefined) {
return dayjs(ev.lastUpdate).isAfter(latestRunAfter);
if (existingEventDate === undefined || dayjs(event.created_at).isAfter(existingEventDate)) {
queuedAssetEvents.set(event.asset_id, event.created_at);
}
}
}

const pendingEvents = nextRunEvents.flatMap((event) => {
if (hasQueuedEventsError) {
if (event.lastUpdate === null) {
return [];
}

return latestRunAfter !== undefined && dayjs(event.lastUpdate).isAfter(latestRunAfter) ? [event] : [];
}

const queuedAt = queuedAssetEvents.get(event.id);

return false;
return queuedAt === undefined ? [] : [{ ...event, lastUpdate: event.lastUpdate ?? queuedAt }];
});
const isLoading = isNextRunLoading || isQueuedEventsLoading;

if (!nextRunEvents.length) {
return (
Expand Down