diff --git a/airflow-core/src/airflow/ui/package.json b/airflow-core/src/airflow/ui/package.json
index 812419bdda522..f37db48d9dc0f 100644
--- a/airflow-core/src/airflow/ui/package.json
+++ b/airflow-core/src/airflow/ui/package.json
@@ -22,6 +22,7 @@
"@emotion/react": "^11.14.0",
"@tanstack/react-query": "^5.75.1",
"@tanstack/react-table": "^8.21.3",
+ "@tanstack/react-virtual": "^3.13.8",
"@types/debounce-promise": "^3.1.9",
"@uiw/codemirror-themes-all": "^4.23.12",
"@uiw/react-codemirror": "^4.23.12",
diff --git a/airflow-core/src/airflow/ui/pnpm-lock.yaml b/airflow-core/src/airflow/ui/pnpm-lock.yaml
index 7b8af620e5455..0c0c1b55bf9c8 100644
--- a/airflow-core/src/airflow/ui/pnpm-lock.yaml
+++ b/airflow-core/src/airflow/ui/pnpm-lock.yaml
@@ -26,6 +26,9 @@ importers:
'@tanstack/react-table':
specifier: ^8.21.3
version: 8.21.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ '@tanstack/react-virtual':
+ specifier: ^3.13.8
+ version: 3.13.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@types/debounce-promise':
specifier: ^3.1.9
version: 3.1.9
@@ -995,10 +998,19 @@ packages:
react: '>=16.8'
react-dom: '>=16.8'
+ '@tanstack/react-virtual@3.13.8':
+ resolution: {integrity: sha512-meS2AanUg50f3FBSNoAdBSRAh8uS0ue01qm7zrw65KGJtiXB9QXfybqZwkh4uFpRv2iX/eu5tjcH5wqUpwYLPg==}
+ peerDependencies:
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+ react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
'@tanstack/table-core@8.21.3':
resolution: {integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==}
engines: {node: '>=12'}
+ '@tanstack/virtual-core@3.13.8':
+ resolution: {integrity: sha512-BT6w89Hqy7YKaWewYzmecXQzcJh6HTBbKYJIIkMaNU49DZ06LoTV3z32DWWEdUsgW6n1xTmwTLs4GtWrZC261w==}
+
'@testing-library/dom@10.4.0':
resolution: {integrity: sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==}
engines: {node: '>=18'}
@@ -5279,8 +5291,16 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1(react@18.3.1)
+ '@tanstack/react-virtual@3.13.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+ dependencies:
+ '@tanstack/virtual-core': 3.13.8
+ react: 18.3.1
+ react-dom: 18.3.1(react@18.3.1)
+
'@tanstack/table-core@8.21.3': {}
+ '@tanstack/virtual-core@3.13.8': {}
+
'@testing-library/dom@10.4.0':
dependencies:
'@babel/code-frame': 7.27.1
diff --git a/airflow-core/src/airflow/ui/src/pages/Dag/Overview/TaskLogPreview.tsx b/airflow-core/src/airflow/ui/src/pages/Dag/Overview/TaskLogPreview.tsx
index 979f6bcfddff7..a4b82e1680369 100644
--- a/airflow-core/src/airflow/ui/src/pages/Dag/Overview/TaskLogPreview.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/Dag/Overview/TaskLogPreview.tsx
@@ -67,7 +67,7 @@ export const TaskLogPreview = ({
error={error}
isLoading={isLoading}
logError={error}
- parsedLogs={data.parsedLogs}
+ parsedLogs={data.parsedLogs ?? []}
wrap={wrap}
/>
diff --git a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.test.tsx b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.test.tsx
index e39b98cbaf99a..af613d9dc61d3 100644
--- a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.test.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.test.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import "@testing-library/jest-dom";
-import { render, screen, waitFor } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { setupServer, type SetupServerApi } from "msw/node";
import { afterEach, describe, it, expect, beforeAll, afterAll } from "vitest";
@@ -25,10 +25,17 @@ import { handlers } from "src/mocks/handlers";
import { AppWrapper } from "src/utils/AppWrapper";
let server: SetupServerApi;
+const ITEM_HEIGHT = 20;
beforeAll(() => {
server = setupServer(...handlers);
server.listen({ onUnhandledRequest: "bypass" });
+ Object.defineProperty(HTMLElement.prototype, "offsetHeight", {
+ value: ITEM_HEIGHT,
+ });
+ Object.defineProperty(HTMLElement.prototype, "offsetWidth", {
+ value: 800,
+ });
});
afterEach(() => server.resetHandlers());
@@ -39,14 +46,18 @@ describe("Task log grouping", () => {
render(
,
);
+ await waitFor(() => expect(screen.queryByTestId("virtualized-list")).toBeInTheDocument());
+ await waitFor(() => expect(screen.queryByTestId("virtualized-item-0")).toBeInTheDocument());
+ await waitFor(() => expect(screen.queryByTestId("virtualized-item-10")).toBeInTheDocument());
- await waitFor(() => expect(screen.queryByTestId("summary-Pre task execution logs")).toBeInTheDocument(), {
- timeout: 10_000,
- });
+ fireEvent.scroll(screen.getByTestId("virtualized-list"), { target: { scrollTop: ITEM_HEIGHT * 6 } });
+ await waitFor(() => expect(screen.queryByTestId("virtualized-item-16")).toBeInTheDocument());
+
+ await waitFor(() => expect(screen.queryByTestId("summary-Pre task execution logs")).toBeInTheDocument());
await waitFor(() => expect(screen.getByTestId("summary-Pre task execution logs")).toBeVisible());
await waitFor(() => expect(screen.queryByText(/Task instance is in running state/iu)).not.toBeVisible());
await waitFor(() => screen.getByTestId("summary-Pre task execution logs").click());
await waitFor(() => expect(screen.queryByText(/Task instance is in running state/iu)).toBeVisible());
- });
+ }, 10_000);
});
diff --git a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx
index c7214ed8bea8c..25fce170dd063 100644
--- a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx
@@ -92,7 +92,7 @@ export const Logs = () => {
const showExternalLogRedirect = Boolean(useConfig("show_external_log_redirect"));
return (
-
+
{
error={error}
isLoading={isLoading || isLoadingLogs}
logError={logError}
- parsedLogs={data.parsedLogs}
+ parsedLogs={data.parsedLogs ?? []}
wrap={wrap}
/>
@@ -139,12 +139,12 @@ export const Logs = () => {
-
+
diff --git a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/TaskLogContent.tsx b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/TaskLogContent.tsx
index db62882ad08ad..e2c5109ab414c 100644
--- a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/TaskLogContent.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/TaskLogContent.tsx
@@ -17,8 +17,8 @@
* under the License.
*/
import { Box, Code, VStack, useToken } from "@chakra-ui/react";
-import type { ReactNode } from "react";
-import { useLayoutEffect } from "react";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { useLayoutEffect, useRef } from "react";
import { ErrorAlert } from "src/components/ErrorAlert";
import { ProgressBar } from "src/components/ui";
@@ -27,12 +27,19 @@ type Props = {
readonly error: unknown;
readonly isLoading: boolean;
readonly logError: unknown;
- readonly parsedLogs: ReactNode;
+ readonly parsedLogs: Array;
readonly wrap: boolean;
};
export const TaskLogContent = ({ error, isLoading, logError, parsedLogs, wrap }: Props) => {
const [bgLine] = useToken("colors", ["blue.emphasized"]);
+ const parentRef = useRef(null);
+ const rowVirtualizer = useVirtualizer({
+ count: parsedLogs.length,
+ estimateSize: () => 20,
+ getScrollElement: () => parentRef.current,
+ overscan: 10,
+ });
useLayoutEffect(() => {
if (location.hash) {
@@ -53,7 +60,7 @@ export const TaskLogContent = ({ error, isLoading, logError, parsedLogs, wrap }:
}, [isLoading, bgLine]);
return (
-
+
-
- {parsedLogs}
+
+ {rowVirtualizer.getVirtualItems().map((virtualRow) => (
+
+ {parsedLogs[virtualRow.index] ?? undefined}
+
+ ))}
diff --git a/airflow-core/src/airflow/ui/src/queries/useLogs.tsx b/airflow-core/src/airflow/ui/src/queries/useLogs.tsx
index 3007deee70d9a..01b476f93c957 100644
--- a/airflow-core/src/airflow/ui/src/queries/useLogs.tsx
+++ b/airflow-core/src/airflow/ui/src/queries/useLogs.tsx
@@ -28,6 +28,7 @@ import { isStatePending, useAutoRefresh } from "src/utils";
import { getTaskInstanceLink } from "src/utils/links";
type Props = {
+ accept?: "*/*" | "application/json" | "application/x-ndjson";
dagId: string;
logLevelFilters?: Array;
sourceFilters?: Array;
@@ -120,13 +121,14 @@ const parseLogs = ({ data, logLevelFilters, sourceFilters, taskInstance, tryNumb
};
export const useLogs = (
- { dagId, logLevelFilters, sourceFilters, taskInstance, tryNumber = 1 }: Props,
+ { accept = "application/json", dagId, logLevelFilters, sourceFilters, taskInstance, tryNumber = 1 }: Props,
options?: Omit, "queryFn" | "queryKey">,
) => {
const refetchInterval = useAutoRefresh({ dagId });
const { data, ...rest } = useTaskInstanceServiceGetLog(
{
+ accept,
dagId,
dagRunId: taskInstance?.dag_run_id ?? "",
mapIndex: taskInstance?.map_index ?? -1,