From c1b2bda62392665afffa9c44334156348b3845d1 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 20 Jan 2026 19:41:57 +0000 Subject: [PATCH] _id -> id --- .../src/Pages/Checks/Components/IncidentTable/index.jsx | 4 +++- .../src/Pages/Checks/Components/OptionsHeader/index.jsx | 9 +++++---- client/src/Pages/Checks/index.jsx | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/client/src/Pages/Checks/Components/IncidentTable/index.jsx b/client/src/Pages/Checks/Components/IncidentTable/index.jsx index cce9b10b7..31475f8b1 100644 --- a/client/src/Pages/Checks/Components/IncidentTable/index.jsx +++ b/client/src/Pages/Checks/Components/IncidentTable/index.jsx @@ -150,7 +150,9 @@ const IncidentTable = ({ { id: "monitorName", content: t("incidentsTableMonitorName"), - render: (row) => monitors[row.monitorId]?.name ?? "N/A", + render: (row) => { + return monitors?.[row.metadata?.monitorId]?.name || "N/A"; + }, }, { id: "status", diff --git a/client/src/Pages/Checks/Components/OptionsHeader/index.jsx b/client/src/Pages/Checks/Components/OptionsHeader/index.jsx index c16f54f18..74bea4711 100644 --- a/client/src/Pages/Checks/Components/OptionsHeader/index.jsx +++ b/client/src/Pages/Checks/Components/OptionsHeader/index.jsx @@ -20,12 +20,13 @@ const OptionsHeader = ({ }) => { const theme = useTheme(); const { t } = useTranslation(); + console.log(monitors); const monitorNames = typeof monitors !== "undefined" ? Object.values(monitors) : []; const filterOptions = [ - { _id: "all", name: t("incidentsOptionsHeaderFilterAll") }, - { _id: "down", name: t("incidentsOptionsHeaderFilterDown") }, - { _id: "resolve", name: t("incidentsOptionsHeaderFilterCannotResolve") }, - { _id: "resolved", name: t("incidentsOptionsHeaderFilterResolved") }, + { id: "all", name: t("incidentsOptionsHeaderFilterAll") }, + { id: "down", name: t("incidentsOptionsHeaderFilterDown") }, + { id: "resolve", name: t("incidentsOptionsHeaderFilterCannotResolve") }, + { id: "resolved", name: t("incidentsOptionsHeaderFilterResolved") }, ]; // The stacks below which are three in number have the same style so diff --git a/client/src/Pages/Checks/index.jsx b/client/src/Pages/Checks/index.jsx index d0c2ea80d..aa8717c1a 100644 --- a/client/src/Pages/Checks/index.jsx +++ b/client/src/Pages/Checks/index.jsx @@ -48,8 +48,8 @@ const Checks = () => { useEffect(() => { const monitorLookup = monitors?.reduce((acc, monitor) => { - acc[monitor._id] = { - _id: monitor._id, + acc[monitor.id] = { + id: monitor.id, name: monitor.name, type: monitor.type, };