diff --git a/client/src/pages/checks/ChecksPage.tsx b/client/src/pages/checks/ChecksPage.tsx index c68f4ffc9..239035e4d 100644 --- a/client/src/pages/checks/ChecksPage.tsx +++ b/client/src/pages/checks/ChecksPage.tsx @@ -23,22 +23,14 @@ const ChecksPage = () => { const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); - const { - response: monitorResponse, - loading: monitorsLoading, - isValidating: monitorsValidating, - } = useGet>( - `/monitors`, - {}, - { keepPreviousData: true } - ); + const { response: monitorResponse, loading: monitorsLoading } = useGet< + ApiResponse + >(`/monitors`, {}, { keepPreviousData: true }); const monitors: IMonitor[] = monitorResponse?.data || []; - const { - response: checksResponse, - loading: checksLoading, - isValidating: checksValidating, - } = useGet>( + const { response: checksResponse, loading: checksLoading } = useGet< + ApiResponse<{ count: number; checks: ICheck[] }> + >( `/checks?page=${page}&rowsPerPage=${rowsPerPage}&range=${range}&status=${status}${ selectedMonitorId !== "all" ? `&monitorId=${selectedMonitorId}` : "" }`, @@ -93,7 +85,7 @@ const ChecksPage = () => { Down diff --git a/client/src/pages/checks/ChecksTable.tsx b/client/src/pages/checks/ChecksTable.tsx index 8c516285b..4a79acecb 100644 --- a/client/src/pages/checks/ChecksTable.tsx +++ b/client/src/pages/checks/ChecksTable.tsx @@ -12,6 +12,7 @@ import { formatDateWithTz } from "@/utils/TimeUtils"; import { useAppSelector } from "@/hooks/AppHooks"; import type { ICheck } from "@/types/check"; import type { MonitorStatus } from "@/types/monitor"; +import { useNavigate } from "react-router"; type CheckWithMonitor = ICheck & { metadata?: { monitorId?: { name?: string } }; @@ -34,6 +35,7 @@ export const ChecksTable = ({ }) => { const { t } = useTranslation(); const uiTimezone = useAppSelector((state: any) => state.ui.timezone); + const navigate = useNavigate(); const getHeaders = (t: Function, uiTimezone: string) => { const headers: Header[] = [ @@ -105,6 +107,9 @@ export const ChecksTable = ({ { + navigate(`/checks/${row._id}`); + }} emptyViewText={t("checks.table.empty")} />