Skip to content

fix: prevent log loading from scrolling ancestor elements in task Logs tab #64896

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

Closed
Pyasma wants to merge 2 commits into from
+7 −10
Closed

fix: prevent log loading from scrolling ancestor elements in task Logs tab #64896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53880db
removing scroll into view to scroll to Bottom
Pyasma Apr 7, 2026
d5b388c
testpush
Pyasma Apr 8, 2026
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
9 changes: 3 additions & 6 deletions airflow/www/static/js/dag/details/taskInstance/Logs/LogBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@ const LogBlock = ({
const [autoScroll, setAutoScroll] = useState(true);

const logBoxRef = useRef<HTMLPreElement>(null);
const codeBlockBottomDiv = useRef<HTMLDivElement>(null);
const offsetTop = useOffsetTop(logBoxRef);

const scrollToBottom = () => {
codeBlockBottomDiv.current?.scrollIntoView({
block: "nearest",
inline: "nearest",
});
if (logBoxRef.current) {
logBoxRef.current.scrollTop = logBoxRef.current.scrollHeight;
}
};

useEffect(() => {
Expand Down Expand Up @@ -122,7 +120,6 @@ const LogBlock = ({
>
{/* eslint-disable-next-line react/no-danger */}
<div dangerouslySetInnerHTML={{ __html: parsedLogs }} />
<div ref={codeBlockBottomDiv} />
</Code>
);
};
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/static/js/utils/useOffsetTop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { debounce } from "lodash";
import React, { useEffect, useState } from "react";

// For an html element, keep it within view height by calculating the top offset and footer height
const useOffsetTop = (contentRef: React.RefObject<HTMLElement>) => {
const useOffsetTop = (contentRef: React.RefObject<HTMLElement | null>) => {
const [top, setTop] = useState(0);

useEffect(() => {
Expand Down
6 changes: 3 additions & 3 deletions tests/providers/fab/auth_manager/cli_commands/test_user_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@ def test_cli_add_user_role(self, create_user_test4):
user_command.users_manage_role(args, remove=False)
assert 'User "test4" added to role "Op"' in stdout.getvalue()

assert _does_user_belong_to_role(appbuilder=self.appbuilder, email=TEST_USER1_EMAIL, rolename="Op"), (
"User should have been added to role 'Op'"
)
assert _does_user_belong_to_role(
appbuilder=self.appbuilder, email=TEST_USER1_EMAIL, rolename="Op"
), "User should have been added to role 'Op'"

def test_cli_remove_user_role(self, create_user_test4):
assert _does_user_belong_to_role(
Expand Down
Loading