mirror of
https://github.com/hibiken/asynqmon.git
synced 2025-02-23 20:30:12 +08:00
Add checkbox and action buttons to DeadTasksTable
This commit is contained in:
parent
d213453342
commit
62780e201e
@ -5,6 +5,8 @@ import Table from "@material-ui/core/Table";
|
|||||||
import TableBody from "@material-ui/core/TableBody";
|
import TableBody from "@material-ui/core/TableBody";
|
||||||
import TableCell from "@material-ui/core/TableCell";
|
import TableCell from "@material-ui/core/TableCell";
|
||||||
import Button from "@material-ui/core/Button";
|
import Button from "@material-ui/core/Button";
|
||||||
|
import ButtonGroup from "@material-ui/core/ButtonGroup";
|
||||||
|
import Checkbox from "@material-ui/core/Checkbox";
|
||||||
import TableContainer from "@material-ui/core/TableContainer";
|
import TableContainer from "@material-ui/core/TableContainer";
|
||||||
import TableHead from "@material-ui/core/TableHead";
|
import TableHead from "@material-ui/core/TableHead";
|
||||||
import TableRow from "@material-ui/core/TableRow";
|
import TableRow from "@material-ui/core/TableRow";
|
||||||
@ -17,6 +19,7 @@ import KeyboardArrowDownIcon from "@material-ui/icons/KeyboardArrowDown";
|
|||||||
import Typography from "@material-ui/core/Typography";
|
import Typography from "@material-ui/core/Typography";
|
||||||
import TableFooter from "@material-ui/core/TableFooter";
|
import TableFooter from "@material-ui/core/TableFooter";
|
||||||
import TablePagination from "@material-ui/core/TablePagination";
|
import TablePagination from "@material-ui/core/TablePagination";
|
||||||
|
import MoreHorizIcon from "@material-ui/icons/MoreHoriz";
|
||||||
import Alert from "@material-ui/lab/Alert";
|
import Alert from "@material-ui/lab/Alert";
|
||||||
import AlertTitle from "@material-ui/lab/AlertTitle";
|
import AlertTitle from "@material-ui/lab/AlertTitle";
|
||||||
import SyntaxHighlighter from "react-syntax-highlighter";
|
import SyntaxHighlighter from "react-syntax-highlighter";
|
||||||
@ -38,6 +41,12 @@ const useStyles = makeStyles({
|
|||||||
table: {
|
table: {
|
||||||
minWidth: 650,
|
minWidth: 650,
|
||||||
},
|
},
|
||||||
|
actionsContainer: {
|
||||||
|
padding: "4px",
|
||||||
|
},
|
||||||
|
moreIcon: {
|
||||||
|
marginRight: "8px",
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const useRowStyles = makeStyles({
|
const useRowStyles = makeStyles({
|
||||||
@ -72,6 +81,7 @@ function DeadTasksTable(props: Props & ReduxProps) {
|
|||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
const [page, setPage] = useState(0);
|
const [page, setPage] = useState(0);
|
||||||
const [pageSize, setPageSize] = useState(defaultPageSize);
|
const [pageSize, setPageSize] = useState(defaultPageSize);
|
||||||
|
const [selected, setSelected] = useState<string[]>([]);
|
||||||
|
|
||||||
const handleChangePage = (
|
const handleChangePage = (
|
||||||
event: React.MouseEvent<HTMLButtonElement> | null,
|
event: React.MouseEvent<HTMLButtonElement> | null,
|
||||||
@ -87,6 +97,15 @@ function DeadTasksTable(props: Props & ReduxProps) {
|
|||||||
setPage(0);
|
setPage(0);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleSelectAllClick = (event: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
if (event.target.checked) {
|
||||||
|
const newSelected = props.tasks.map((t) => t.id);
|
||||||
|
setSelected(newSelected);
|
||||||
|
} else {
|
||||||
|
setSelected([]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const fetchData = useCallback(() => {
|
const fetchData = useCallback(() => {
|
||||||
const pageOpts = { page: page + 1, size: pageSize };
|
const pageOpts = { page: page + 1, size: pageSize };
|
||||||
listDeadTasksAsync(queue, pageOpts);
|
listDeadTasksAsync(queue, pageOpts);
|
||||||
@ -112,67 +131,116 @@ function DeadTasksTable(props: Props & ReduxProps) {
|
|||||||
{ label: "Actions" },
|
{ label: "Actions" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const rowCount = props.tasks.length;
|
||||||
|
const numSelected = selected.length;
|
||||||
return (
|
return (
|
||||||
<TableContainer component={Paper}>
|
<div>
|
||||||
<Table
|
<div className={classes.actionsContainer}>
|
||||||
stickyHeader={true}
|
<IconButton aria-label="actions" className={classes.moreIcon}>
|
||||||
className={classes.table}
|
<MoreHorizIcon />
|
||||||
aria-label="dead tasks table"
|
</IconButton>
|
||||||
size="small"
|
{numSelected > 0 && (
|
||||||
>
|
<ButtonGroup
|
||||||
<TableHead>
|
variant="text"
|
||||||
<TableRow>
|
color="primary"
|
||||||
{columns.map((col) => (
|
aria-label="text primary button group"
|
||||||
<TableCell key={col.label}>{col.label}</TableCell>
|
>
|
||||||
|
<Button>Run</Button>
|
||||||
|
<Button>Kill</Button>
|
||||||
|
<Button>Delete</Button>
|
||||||
|
</ButtonGroup>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<TableContainer component={Paper}>
|
||||||
|
<Table
|
||||||
|
stickyHeader={true}
|
||||||
|
className={classes.table}
|
||||||
|
aria-label="dead tasks table"
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<TableHead>
|
||||||
|
<TableRow>
|
||||||
|
<TableCell padding="checkbox">
|
||||||
|
<Checkbox
|
||||||
|
indeterminate={numSelected > 0 && numSelected < rowCount}
|
||||||
|
checked={rowCount > 0 && numSelected === rowCount}
|
||||||
|
onChange={handleSelectAllClick}
|
||||||
|
inputProps={{ "aria-label": "select all dead tasks" }}
|
||||||
|
/>
|
||||||
|
</TableCell>
|
||||||
|
{columns.map((col) => (
|
||||||
|
<TableCell key={col.label}>{col.label}</TableCell>
|
||||||
|
))}
|
||||||
|
</TableRow>
|
||||||
|
</TableHead>
|
||||||
|
<TableBody>
|
||||||
|
{props.tasks.map((task) => (
|
||||||
|
<Row
|
||||||
|
key={task.id}
|
||||||
|
task={task}
|
||||||
|
isSelected={selected.includes(task.id)}
|
||||||
|
onSelectChange={(checked: boolean) => {
|
||||||
|
if (checked) {
|
||||||
|
setSelected(selected.concat(task.id));
|
||||||
|
} else {
|
||||||
|
setSelected(selected.filter((id) => id !== task.id));
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onDeleteClick={() => {
|
||||||
|
props.deleteDeadTaskAsync(queue, task.key);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
))}
|
))}
|
||||||
</TableRow>
|
</TableBody>
|
||||||
</TableHead>
|
<TableFooter>
|
||||||
<TableBody>
|
<TableRow>
|
||||||
{props.tasks.map((task) => (
|
<TablePagination
|
||||||
<Row
|
rowsPerPageOptions={rowsPerPageOptions}
|
||||||
key={task.id}
|
colSpan={columns.length + 1 /* checkbox col */}
|
||||||
task={task}
|
count={props.totalTaskCount}
|
||||||
onDeleteClick={() => {
|
rowsPerPage={pageSize}
|
||||||
props.deleteDeadTaskAsync(queue, task.key);
|
page={page}
|
||||||
}}
|
SelectProps={{
|
||||||
/>
|
inputProps: { "aria-label": "rows per page" },
|
||||||
))}
|
native: true,
|
||||||
</TableBody>
|
}}
|
||||||
<TableFooter>
|
onChangePage={handleChangePage}
|
||||||
<TableRow>
|
onChangeRowsPerPage={handleChangeRowsPerPage}
|
||||||
<TablePagination
|
ActionsComponent={TablePaginationActions}
|
||||||
rowsPerPageOptions={rowsPerPageOptions}
|
/>
|
||||||
colSpan={columns.length}
|
</TableRow>
|
||||||
count={props.totalTaskCount}
|
</TableFooter>
|
||||||
rowsPerPage={pageSize}
|
</Table>
|
||||||
page={page}
|
</TableContainer>
|
||||||
SelectProps={{
|
</div>
|
||||||
inputProps: { "aria-label": "rows per page" },
|
|
||||||
native: true,
|
|
||||||
}}
|
|
||||||
onChangePage={handleChangePage}
|
|
||||||
onChangeRowsPerPage={handleChangeRowsPerPage}
|
|
||||||
ActionsComponent={TablePaginationActions}
|
|
||||||
/>
|
|
||||||
</TableRow>
|
|
||||||
</TableFooter>
|
|
||||||
</Table>
|
|
||||||
</TableContainer>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
interface RowProps {
|
interface RowProps {
|
||||||
task: DeadTaskExtended;
|
task: DeadTaskExtended;
|
||||||
|
isSelected: boolean;
|
||||||
|
onSelectChange: (checked: boolean) => void;
|
||||||
onDeleteClick: () => void;
|
onDeleteClick: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
function Row(props: RowProps) {
|
function Row(props: RowProps) {
|
||||||
const { task } = props;
|
const { task } = props;
|
||||||
const [open, setOpen] = React.useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const classes = useRowStyles();
|
const classes = useRowStyles();
|
||||||
|
|
||||||
|
const labelId = `dead-tasks-table-checkbox-${task.id}`;
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<TableRow key={task.id} className={classes.root}>
|
<TableRow key={task.id} className={classes.root}>
|
||||||
|
<TableCell padding="checkbox">
|
||||||
|
<Checkbox
|
||||||
|
onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
|
||||||
|
props.onSelectChange(event.target.checked)
|
||||||
|
}
|
||||||
|
checked={props.isSelected}
|
||||||
|
inputProps={{ "aria-labelledby": labelId }}
|
||||||
|
/>
|
||||||
|
</TableCell>
|
||||||
<TableCell>
|
<TableCell>
|
||||||
<IconButton
|
<IconButton
|
||||||
aria-label="expand row"
|
aria-label="expand row"
|
||||||
@ -195,7 +263,7 @@ function Row(props: RowProps) {
|
|||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
<TableRow>
|
<TableRow>
|
||||||
<TableCell style={{ paddingBottom: 0, paddingTop: 0 }} colSpan={6}>
|
<TableCell style={{ paddingBottom: 0, paddingTop: 0 }} colSpan={7}>
|
||||||
<Collapse in={open} timeout="auto" unmountOnExit>
|
<Collapse in={open} timeout="auto" unmountOnExit>
|
||||||
<Box margin={1}>
|
<Box margin={1}>
|
||||||
<Typography variant="h6" gutterBottom component="div">
|
<Typography variant="h6" gutterBottom component="div">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user