Skip to content
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

Jump to bottom

Grid fix details button truncated and small UI tweaks #23934

Merged
merged 4 commits into from
May 26, 2022
Merged

Grid fix details button truncated and small UI tweaks #23934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fbffac
Show details button and wrap on LegendRow.
pierrejeambrun May 26, 2022
e5df850
Update following brent review
pierrejeambrun May 26, 2022
ae79fba
Fix display on small width
pierrejeambrun May 26, 2022
57e1cff
Rotate icon for a 'ReadLess' effect
pierrejeambrun May 26, 2022
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
8 changes: 7 additions & 1 deletion airflow/www/static/js/grid/AutoRefresh.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ const AutoRefresh = () => {
return (
<FormControl display="flex" width="auto" mr={2}>
<Spinner color="blue.500" speed="1s" mr="4px" visibility={isRefreshOn ? 'visible' : 'hidden'} />
<FormLabel htmlFor="auto-refresh" mb={0} fontWeight="normal">
<FormLabel
htmlFor="auto-refresh"
mb={0}
fontWeight="normal"
display="flex"
alignItems="center"
>
Auto-refresh
</FormLabel>
<Switch
Expand Down
39 changes: 30 additions & 9 deletions airflow/www/static/js/grid/Grid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ import {
Box,
Thead,
Flex,
IconButton,
} from '@chakra-ui/react';

import { MdReadMore } from 'react-icons/md';
import { useGridData } from './api';
import renderTaskRows from './renderTaskRows';
import ResetRoot from './ResetRoot';
Expand All @@ -38,7 +40,7 @@ import AutoRefresh from './AutoRefresh';

const dagId = getMetaValue('dag_id');

const Grid = ({ isPanelOpen = false, hoveredTaskState }) => {
const Grid = ({ isPanelOpen = false, onPanelToggle, hoveredTaskState }) => {
const scrollRef = useRef();
const tableRef = useRef();

Expand Down Expand Up @@ -82,16 +84,35 @@ const Grid = ({ isPanelOpen = false, hoveredTaskState }) => {
overflow="auto"
ref={scrollRef}
flexGrow={1}
minWidth={isPanelOpen && '300px'}
minWidth={isPanelOpen && '350px'}
>
<Flex alignItems="center" position="sticky" top={0} left={0}>
<AutoRefresh />
<ToggleGroups
groups={groups}
openGroupIds={openGroupIds}
onToggleGroups={onToggleGroups}
<Flex
alignItems="center"
justifyContent="space-between"
position="sticky"
top={0}
left={0}
mb={2}
p={1}
>
<Flex alignItems="center">
<AutoRefresh />
<ToggleGroups
groups={groups}
openGroupIds={openGroupIds}
onToggleGroups={onToggleGroups}
/>
<ResetRoot />
</Flex>
<IconButton
fontSize="2xl"
onClick={onPanelToggle}
title={`${isPanelOpen ? 'Hide ' : 'Show '} Details Panel`}
aria-label={isPanelOpen ? 'Show Details' : 'Hide Details'}
icon={<MdReadMore />}
transform={!isPanelOpen && 'rotateZ(180deg)'}
transitionProperty="none"
/>
<ResetRoot />
</Flex>
<Table>
<Thead display="block" pr="10px" position="sticky" top={0} zIndex={2} bg="white">
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/static/js/grid/LegendRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const StatusBadge = ({

const LegendRow = ({ setHoveredTaskState }) => (
<Flex p={4} flexWrap="wrap" justifyContent="end">
<HStack spacing={2}>
<HStack spacing={2} wrap="wrap">
{
Object.entries(stateColors).map(([state, stateColor]) => (
<StatusBadge
Expand Down
22 changes: 7 additions & 15 deletions airflow/www/static/js/grid/Main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
Box,
Flex,
useDisclosure,
Button,
Divider,
} from '@chakra-ui/react';

Expand All @@ -42,7 +41,7 @@ const Main = () => {
const { clearSelection } = useSelection();
const [hoveredTaskState, setHoveredTaskState] = useState();

const toggleDetailsPanel = () => {
const onPanelToggle = () => {
if (!isOpen) {
localStorage.setItem(detailsPanelKey, false);
} else {
Expand All @@ -57,20 +56,13 @@ const Main = () => {
<FilterBar />
<LegendRow setHoveredTaskState={setHoveredTaskState} />
<Divider mb={5} borderBottomWidth={2} />
<Flex flexDirection="row" justifyContent="space-between">
<Grid isPanelOpen={isOpen} hoveredTaskState={hoveredTaskState} />
<Flex justifyContent="space-between">
<Grid
isPanelOpen={isOpen}
onPanelToggle={onPanelToggle}
hoveredTaskState={hoveredTaskState}
/>
<Box borderLeftWidth={isOpen ? 1 : 0} position="relative">
<Button
position="absolute"
top={0}
right={0}
onClick={toggleDetailsPanel}
aria-label={isOpen ? 'Show Details' : 'Hide Details'}
variant={isOpen ? 'solid' : 'outline'}
>
{isOpen ? 'Hide ' : 'Show '}
Details Panel
</Button>
{isOpen && (<Details />)}
</Box>
</Flex>
Expand Down