reenable sorting

This commit is contained in:
Alex Holliday committed 2026-01-24 00:29:19 +00:00
1 parent a0a8ceb0db
commit 61f3aa1d1c
3 files changed
+41 -55

No files matched your search

@@ -24,7 +24,7 @@ import {
} from "lucide-react";
import TablePagination from "@mui/material/TablePagination";
import type { TablePaginationProps, TablePaginationOwnProps } from "@mui/material/TablePagination";
import type { TablePaginationOwnProps } from "@mui/material/TablePagination";
import { useTranslation } from "react-i18next";
import { useState, Fragment } from "react";
@@ -15,20 +15,19 @@ import { useTranslation } from "react-i18next";
import { useTheme } from "@mui/material/styles";
import { useNavigate } from "react-router-dom";
import { usePost } from "@/Hooks/UseApi";
import { useSelector } from "react-redux";
import type { Check } from "@/Types/Check";
import type { Monitor } from "@/Types/Monitor";
import type { ActionMenuItem } from "@/Components/v2/actions-menu";
// import type { ChartType } from "@/features/uiSlice";
import type { RootState } from "@/Types/state";
export const MonitorTable = ({
monitors,
refetch,
// setSelectedMonitor,
// sortField,
// setSortField,
// sortOrder,
// setSortOrder,
sortField,
setSortField,
sortOrder,
setSortOrder,
count,
page,
setPage,
@@ -37,11 +36,10 @@ export const MonitorTable = ({
}: {
monitors: Monitor[];
refetch: Function;
// setSelectedMonitor: Function;
// sortField: string;
// setSortField: (field: string) => void;
// sortOrder: "asc" | "desc";
// setSortOrder: (order: "asc" | "desc") => void;
sortField: string;
setSortField: (field: string) => void;
sortOrder: "asc" | "desc";
setSortOrder: (order: "asc" | "desc") => void;
count: number;
page: number;
setPage: (page: number) => void;
@@ -51,40 +49,25 @@ export const MonitorTable = ({
const { t } = useTranslation();
const theme = useTheme();
const navigate = useNavigate();
const chartType = "histogram";
const chartType = useSelector((state: RootState) => state.ui?.chartType ?? "histogram");
const {
post,
// loading: isPosting,
// error: postError,
} = usePost<any, Monitor>();
// const handlePageChange = (
// _e: React.MouseEvent<HTMLButtonElement> | null,
// newPage: number
// ) => {
// setPage(newPage);
// };
// const handleRowsPerPageChange = (
// e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>
// ) => {
// const value = Number(e.target.value);
// setPage(0);
// 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("asc");
// }
// refetch();
// };
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("asc");
}
refetch();
};
const getActions = (monitor: Monitor): ActionMenuItem[] => {
return [
@@ -158,13 +141,13 @@ export const MonitorTable = ({
display="inline-flex"
justifyContent="center"
>
{/* {isActive ? (
{isActive ? (
sortOrder === "asc" ? (
<ArrowUp size={16} />
) : (
<ArrowDown size={16} />
)
) : null} */}
) : null}
</Box>
);
const headers: Header<Monitor>[] = [
@@ -175,11 +158,11 @@ export const MonitorTable = ({
gap={theme.spacing(4)}
direction={"row"}
alignItems={"center"}
// onClick={(e) => handleSort(e, "name")}
onClick={(e) => handleSort(e, "name")}
sx={{ cursor: "pointer" }}
>
{t("common.table.headers.name")}
{/* {renderSortIcon(sortField === "name")} */}
{renderSortIcon(sortField === "name")}
</Stack>
),
@@ -195,11 +178,11 @@ export const MonitorTable = ({
direction={"row"}
justifyContent={"center"}
alignItems={"center"}
// onClick={(e) => handleSort(e, "status")}
onClick={(e) => handleSort(e, "status")}
sx={{ cursor: "pointer" }}
>
{t("common.table.headers.status")}
{/* {renderSortIcon(sortField === "status")} */}
{renderSortIcon(sortField === "status")}
</Stack>
),
render: (row) => {
@@ -230,11 +213,11 @@ export const MonitorTable = ({
direction={"row"}
justifyContent={"center"}
alignItems={"center"}
// onClick={(e) => handleSort(e, "type")}
onClick={(e) => handleSort(e, "type")}
sx={{ cursor: "pointer" }}
>
{t("common.table.headers.type")}
{/* {renderSortIcon(sortField === "type")} */}
{renderSortIcon(sortField === "type")}
</Stack>
),
render: (row) => {
+9 -6
View File
@@ -36,9 +36,8 @@ const UptimeMonitorsPage = () => {
const [selectedState, setSelectedState] = useState<string>("");
const [page, setPage] = useState<number>(0);
const [search, setSearch] = useState<string>("");
const [sort, setSort] = useState<{ field: string; order: "asc" | "desc" } | undefined>(
undefined
);
const [sortField, setSortField] = useState<string>("");
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
// Convert filter selections to API filter values
// Status: "up" -> true, "down" -> false
@@ -62,7 +61,7 @@ const UptimeMonitorsPage = () => {
[toFilterActive, "isActive"],
]);
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
const field = activeFilter?.[1] || (search ? "name" : sort?.field);
const field = activeFilter?.[1] || (search ? "name" : sortField || undefined);
const filter = activeFilter?.[0] || search;
// Default to all types when none selected
@@ -78,9 +77,9 @@ const UptimeMonitorsPage = () => {
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
if (filter) params.append("filter", filter);
if (field) params.append("field", field);
if (sort?.order) params.append("order", sort.order);
if (sortOrder) params.append("order", sortOrder);
return `/monitors/team/with-checks?${params.toString()}`;
}, [effectiveTypes, page, rowsPerPage, filter, field, sort?.order]);
}, [effectiveTypes, page, rowsPerPage, filter, field, sortOrder]);
// Data fetching
const {
@@ -155,6 +154,10 @@ const UptimeMonitorsPage = () => {
page={page}
setPage={setPage}
rowsPerPage={rowsPerPage}
sortField={sortField}
setSortField={setSortField}
sortOrder={sortOrder}
setSortOrder={setSortOrder}
setRowsPerPage={(e: any) => {
dispatch(
setRowsPerPage({