Skip to content

Fix collapsed grid width and match selected row between grid/gantt #37205

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
jedcunningham merged 1 commit into from
Feb 7, 2024
Merged

Fix collapsed grid width and match selected row between grid/gantt #37205

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
2 changes: 1 addition & 1 deletion airflow/www/static/js/dag/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import keyboardShortcutIdentifier from "./keyboardShortcutIdentifier";

const detailsPanelKey = "hideDetailsPanel";
const minPanelWidth = 300;
const collapsedWidth = "28px";
const collapsedWidth = "32px";

const gridWidthKey = "grid-width";
const saveWidth = debounce(
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/static/js/dag/details/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const Header = () => {
const isMappedTaskDetails = runId && taskId && mapIndex !== undefined;

return (
<Breadcrumb separator={<Text color="gray.300">/</Text>}>
<Breadcrumb ml={3} separator={<Text color="gray.300">/</Text>}>
<BreadcrumbItem isCurrentPage={isDagDetails} mt={4}>
<BreadcrumbLink
onClick={clearSelection}
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/static/js/dag/details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ const Details = ({
: group?.instances.find((ti) => ti.runId === runId);

return (
<Flex flexDirection="column" pl={3} height="100%">
<Flex flexDirection="column" height="100%">
<Flex
alignItems="center"
justifyContent="space-between"
Expand Down
12 changes: 11 additions & 1 deletion airflow/www/static/js/dag/grid/dagRuns/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,21 @@ const DagRuns = ({
</Flex>
</Th>
)}
<Th align="right" verticalAlign="bottom">
<Th
align="right"
verticalAlign="bottom"
borderRightWidth="16px"
borderRightColor="white"
>
<Flex
justifyContent="flex-end"
borderBottomWidth={3}
position="relative"
borderRightWidth="16px"
borderRightColor="white"
marginRight="-16px"
borderTopWidth="50px"
borderTopColor="white"
>
{runs.map((run: RunWithDuration, index) => (
<DagRunBar
Expand Down
3 changes: 1 addition & 2 deletions airflow/www/static/js/dag/grid/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,10 @@ const Grid = ({
ref={gridScrollRef}
overflow="auto"
position="relative"
pr={4}
mt={8}
overscrollBehavior="auto"
>
<Table pr="10px" borderRightWidth="14px" borderColor="transparent">
<Table borderRightWidth="16px" borderColor="transparent">
<Thead>
<DagRuns
groups={groups}
Expand Down
2 changes: 2 additions & 0 deletions airflow/www/static/js/dag/grid/renderTaskRows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ const Row = (props: RowProps) => {
bg={isSelected ? "blue.100" : "inherit"}
borderBottomWidth={1}
borderBottomColor={isGroup && isOpen ? "gray.400" : "gray.200"}
borderRightWidth="16px"
borderRightColor={isSelected ? "blue.100" : "transparent"}
role="group"
_hover={!isSelected ? { bg: hoverBlue } : undefined}
transition="background-color 0.2s"
Expand Down