Skip to content

Don't render child rows for closed groups #24637

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
bbovenzi merged 1 commit into from
Jun 28, 2022
Merged

Don't render child rows for closed groups #24637

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: 20 additions & 24 deletions airflow/www/static/js/grid/renderTaskRows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
Td,
Box,
Flex,
Collapse,
useTheme,
} from '@chakra-ui/react';

Expand Down Expand Up @@ -140,13 +139,14 @@ const Row = (props: RowProps) => {
[isGroup, isOpen, task.label, openGroupIds, onToggleGroups],
);

const isFullyOpen = level === openParentCount;
// check if the group's parents are all open, if not, return null
if (level !== openParentCount) return null;

return (
<>
<Tr
bg={isSelected ? 'blue.100' : 'inherit'}
borderBottomWidth={isFullyOpen ? 1 : 0}
borderBottomWidth={1}
borderBottomColor={isGroup && isOpen ? 'gray.400' : 'gray.200'}
role="group"
_hover={!isSelected ? { bg: hoverBlue } : undefined}
Expand All @@ -164,16 +164,14 @@ const Row = (props: RowProps) => {
width="100%"
zIndex={1}
>
<Collapse in={isFullyOpen} unmountOnExit>
<TaskName
onToggle={memoizedToggle}
isGroup={isGroup}
isMapped={task.isMapped}
label={task.label}
isOpen={isOpen}
level={level}
/>
</Collapse>
<TaskName
onToggle={memoizedToggle}
isGroup={isGroup}
isMapped={task.isMapped}
label={task.label}
isOpen={isOpen}
level={level}
/>
</Td>
<Td width={0} p={0} borderBottom={0} />
<Td
Expand All @@ -182,20 +180,18 @@ const Row = (props: RowProps) => {
width={`${dagRunIds.length * columnWidth}px`}
borderBottom={0}
>
<Collapse in={isFullyOpen} unmountOnExit>
<TaskInstances
dagRunIds={dagRunIds}
task={task}
selectedRunId={selected.runId}
onSelect={onSelect}
hoveredTaskState={hoveredTaskState}
/>
</Collapse>
<TaskInstances
dagRunIds={dagRunIds}
task={task}
selectedRunId={selected.runId}
onSelect={onSelect}
hoveredTaskState={hoveredTaskState}
/>
</Td>
</Tr>
{isGroup && (
{isGroup && isOpen && (
renderTaskRows({
...props, level: level + 1, openParentCount: openParentCount + (isOpen ? 1 : 0),
...props, level: level + 1, openParentCount: openParentCount + 1,
})
)}
</>
Expand Down