add pagination components
This commit is contained in:
1 parent
4729863826
commit
ee0bc5e500
3 files changed
+59
-16
No files matched your search
@@ -4,6 +4,7 @@ import Box from "@mui/material/Box";
|
|||||||
import { TableJobs, TableFailedJobs } from "./components/TableJobs";
|
import { TableJobs, TableFailedJobs } from "./components/TableJobs";
|
||||||
import { TableWorkers } from "./components/TableWorkers";
|
import { TableWorkers } from "./components/TableWorkers";
|
||||||
import { useTheme } from "@mui/material";
|
import { useTheme } from "@mui/material";
|
||||||
|
import { useState } from "react";
|
||||||
import { useTranslation, Trans } from "react-i18next";
|
import { useTranslation, Trans } from "react-i18next";
|
||||||
import { useGet, usePost } from "@/Hooks/UseApi";
|
import { useGet, usePost } from "@/Hooks/UseApi";
|
||||||
import type { QueueData } from "@/Types/Queue";
|
import type { QueueData } from "@/Types/Queue";
|
||||||
@@ -15,16 +16,23 @@ import { SPACING } from "@/Utils/Theme/constants";
|
|||||||
export const TabQueue = () => {
|
export const TabQueue = () => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const [page, setPage] = useState(0);
|
||||||
|
const [rowsPerPage, setRowsPerPage] = useState(10);
|
||||||
const {
|
const {
|
||||||
data: queueData,
|
data: queueData,
|
||||||
isLoading,
|
isLoading,
|
||||||
// error,
|
// error,
|
||||||
refetch,
|
refetch,
|
||||||
} = useGet<QueueData>("/queue/all-metrics", {}, { refreshInterval: 1000 });
|
} = useGet<QueueData>(
|
||||||
|
`/queue/all-metrics?page=${page}&rowsPerPage=${rowsPerPage}`,
|
||||||
|
{},
|
||||||
|
{ refreshInterval: 1000, keepPreviousData: true }
|
||||||
|
);
|
||||||
|
|
||||||
const { post, loading: isFlushing } = usePost();
|
const { post, loading: isFlushing } = usePost();
|
||||||
|
|
||||||
const jobs = queueData?.jobs ?? [];
|
const jobs = queueData?.jobs ?? [];
|
||||||
|
const jobsCount = queueData?.count ?? 0;
|
||||||
const workers = (queueData?.metrics?.workers ?? []).map((worker, idx) => ({
|
const workers = (queueData?.metrics?.workers ?? []).map((worker, idx) => ({
|
||||||
...worker,
|
...worker,
|
||||||
id: idx,
|
id: idx,
|
||||||
@@ -104,7 +112,17 @@ export const TabQueue = () => {
|
|||||||
/>
|
/>
|
||||||
</Typography>
|
</Typography>
|
||||||
</Stack>
|
</Stack>
|
||||||
<TableJobs jobs={jobs} />
|
<TableJobs
|
||||||
|
jobs={jobs}
|
||||||
|
count={jobsCount}
|
||||||
|
page={page}
|
||||||
|
rowsPerPage={rowsPerPage}
|
||||||
|
onPageChange={(_, newPage) => setPage(newPage)}
|
||||||
|
onRowsPerPageChange={(event) => {
|
||||||
|
setRowsPerPage(parseInt(event.target.value, 10));
|
||||||
|
setPage(0);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Stack gap={theme.spacing(3)}>
|
<Stack gap={theme.spacing(3)}>
|
||||||
<Stack gap={theme.spacing(1)}>
|
<Stack gap={theme.spacing(1)}>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Table } from "@/Components/design-elements";
|
import { Table, Pagination } from "@/Components/design-elements";
|
||||||
import { Typography, useTheme } from "@mui/material";
|
import { Typography, useTheme } from "@mui/material";
|
||||||
import prettyMilliseconds from "pretty-ms";
|
import prettyMilliseconds from "pretty-ms";
|
||||||
import { formatTimestamp } from "@/Utils/TimeUtils";
|
import { formatTimestamp } from "@/Utils/TimeUtils";
|
||||||
@@ -6,14 +6,27 @@ import { formatTimestamp } from "@/Utils/TimeUtils";
|
|||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import type { QueueJobFailure, QueueJobSummary, QueueMetrics } from "@/Types/Queue";
|
import type { QueueJobFailure, QueueJobSummary, QueueMetrics } from "@/Types/Queue";
|
||||||
import type { Header } from "@/Components/design-elements";
|
import type { Header } from "@/Components/design-elements";
|
||||||
|
import type { TablePaginationProps } from "@mui/material/TablePagination";
|
||||||
|
|
||||||
type QueueJobWithId = QueueJobSummary & { id: string | number };
|
type QueueJobWithId = QueueJobSummary & { id: string | number };
|
||||||
|
|
||||||
interface TableJobsProps {
|
interface TableJobsProps {
|
||||||
jobs: QueueJobSummary[];
|
jobs: QueueJobSummary[];
|
||||||
|
count: number;
|
||||||
|
page: number;
|
||||||
|
rowsPerPage: number;
|
||||||
|
onPageChange: TablePaginationProps["onPageChange"];
|
||||||
|
onRowsPerPageChange: TablePaginationProps["onRowsPerPageChange"];
|
||||||
}
|
}
|
||||||
|
|
||||||
export const TableJobs = ({ jobs }: TableJobsProps) => {
|
export const TableJobs = ({
|
||||||
|
jobs,
|
||||||
|
count,
|
||||||
|
page,
|
||||||
|
rowsPerPage,
|
||||||
|
onPageChange,
|
||||||
|
onRowsPerPageChange,
|
||||||
|
}: TableJobsProps) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
|
|
||||||
@@ -151,18 +164,29 @@ export const TableJobs = ({ jobs }: TableJobsProps) => {
|
|||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table
|
<>
|
||||||
headers={headers}
|
<Table
|
||||||
data={jobsWithId}
|
headers={headers}
|
||||||
getRowSx={(row) => ({
|
data={jobsWithId}
|
||||||
...(row.lockedAt && {
|
getRowSx={(row) => ({
|
||||||
"& td": { backgroundColor: theme.palette.rowStatus.running },
|
...(row.lockedAt && {
|
||||||
}),
|
"& td": { backgroundColor: theme.palette.rowStatus.running },
|
||||||
...(row.monitorActive === false && {
|
}),
|
||||||
"& td": { backgroundColor: theme.palette.rowStatus.paused },
|
...(row.monitorActive === false && {
|
||||||
}),
|
"& td": { backgroundColor: theme.palette.rowStatus.paused },
|
||||||
})}
|
}),
|
||||||
/>
|
})}
|
||||||
|
/>
|
||||||
|
<Pagination
|
||||||
|
component="div"
|
||||||
|
count={count}
|
||||||
|
page={page}
|
||||||
|
rowsPerPage={rowsPerPage}
|
||||||
|
onPageChange={onPageChange}
|
||||||
|
onRowsPerPageChange={onRowsPerPageChange}
|
||||||
|
itemsOnPage={jobs.length}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -51,5 +51,6 @@ export type QueueJobSummary = {
|
|||||||
|
|
||||||
export interface QueueData {
|
export interface QueueData {
|
||||||
jobs: QueueJobSummary[];
|
jobs: QueueJobSummary[];
|
||||||
|
count: number;
|
||||||
metrics: QueueMetrics;
|
metrics: QueueMetrics;
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user