This commit is contained in:
Alex Holliday committed 2025-11-19 20:53:25 +00:00
1 parent eea6b12be6
commit 459d78cbcb
11 files changed
+287 -15

No files matched your search

+71 -4
View File
@@ -5,6 +5,7 @@ import { Table, Pagination, StatusLabel } from "@/components/design-elements";
import { HistogramResponseTime } from "@/components/monitors";
import type { Header } from "@/components/design-elements/Table";
import { ActionsMenu } from "@/components/actions-menu";
import { ArrowDown, ArrowUp } from "lucide-react";
import { useTranslation } from "react-i18next";
import { useTheme } from "@mui/material/styles";
@@ -18,6 +19,10 @@ export const MonitorTable = ({
monitors,
refetch,
setSelectedMonitor,
sortField,
setSortField,
sortOrder,
setSortOrder,
count,
page,
setPage,
@@ -27,6 +32,10 @@ export const MonitorTable = ({
monitors: IMonitor[];
refetch: Function;
setSelectedMonitor: Function;
sortField: string;
setSortField: (field: string) => void;
sortOrder: "asc" | "desc";
setSortOrder: (order: "asc" | "desc") => void;
count: number;
page: number;
setPage: (page: number) => void;
@@ -57,6 +66,19 @@ export const MonitorTable = ({
setRowsPerPage(value);
};
const handleSort = (e: any, field: string) => {
e.preventDefault();
e.stopPropagation();
if (sortField === field) {
const newOrder = sortOrder === "asc" ? "desc" : "asc";
setSortOrder(newOrder);
} else {
setSortField(field);
setSortOrder("desc");
}
refetch();
};
const getActions = (monitor: IMonitor): ActionMenuItem[] => {
return [
{
@@ -116,17 +138,50 @@ export const MonitorTable = ({
};
const getHeaders = () => {
const renderSortIcon = (isActive: boolean) => (
<ArrowUp
size={16}
style={{
visibility: isActive ? "visible" : "hidden",
transform: sortOrder === "asc" ? "none" : "rotate(180deg)",
}}
/>
);
const headers: Header<IMonitor>[] = [
{
id: "name",
content: t("host"),
content: (
<Stack
gap={theme.spacing(4)}
direction={"row"}
alignItems={"center"}
onClick={(e) => handleSort(e, "name")}
sx={{ cursor: "pointer" }}
>
{t("name")}
{renderSortIcon(sortField === "name")}
</Stack>
),
render: (row) => {
return row.name;
return row?.name;
},
},
{
id: "status",
content: t("status"),
content: (
<Stack
gap={theme.spacing(4)}
direction={"row"}
justifyContent={"center"}
alignItems={"center"}
onClick={(e) => handleSort(e, "status")}
sx={{ cursor: "pointer" }}
>
{t("status")}
{renderSortIcon(sortField === "status")}
</Stack>
),
render: (row) => {
return <StatusLabel status={row.status} />;
},
@@ -144,7 +199,19 @@ export const MonitorTable = ({
},
{
id: "type",
content: t("type"),
content: (
<Stack
gap={theme.spacing(4)}
direction={"row"}
justifyContent={"center"}
alignItems={"center"}
onClick={(e) => handleSort(e, "type")}
sx={{ cursor: "pointer" }}
>
{t("type")}
{renderSortIcon(sortField === "type")}
</Stack>
),
render: (row) => {
return row.type;
},
@@ -34,6 +34,8 @@ const UptimeMonitors = () => {
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
const [selectedMonitor, setSelectedMonitor] = useState<IMonitor | null>(null);
const isDialogOpen = Boolean(selectedMonitor);
const [sortField, setSortField] = useState<string>("name");
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
const [page, setPage] = useState(0);
const [rowsPerPage, setRowsPerPage] = useState(10);
const [selectedTypes, setSelectedTypes] = useState<UptimeMonitorType[]>([
@@ -66,6 +68,8 @@ const UptimeMonitors = () => {
"embedChecks=true",
typeQuery,
statusQuery,
`sortField=${sortField}`,
`sortOrder=${sortOrder}`,
`page=${page}`,
`rowsPerPage=${rowsPerPage}`,
].filter(Boolean);
@@ -140,6 +144,10 @@ const UptimeMonitors = () => {
monitors={monitors}
refetch={refetch}
setSelectedMonitor={setSelectedMonitor}
sortField={sortField}
setSortField={setSortField}
sortOrder={sortOrder}
setSortOrder={setSortOrder}
count={count}
page={page}
setPage={setPage}