summary

client/src/Pages/Incidents2/Components/IncidentTable/index.jsx

@@ -15,6 +15,7 @@ import { useTranslation } from "react-i18next";
 import { Button, Typography, useTheme } from "@mui/material";
 
 const IncidentTable = ({
+	monitors = [],
 	incidents = [],
 	incidentsCount = 0,
 	isLoading = false,
@@ -44,7 +45,11 @@ const IncidentTable = ({
 		{
 			id: "monitorName",
 			content: t("incidentsTableMonitorName"),
-			render: (row) => row.monitorName ?? "N/A",
+			render: (row) => {
+				console.log(monitors, row);
+				const monitor = monitors.find((monitor) => monitor.id === row.monitorId);
+				return monitor ? monitor.name : "N/A";
+			},
 		},
 		{
 			id: "status",
@@ -130,7 +135,7 @@ const IncidentTable = ({
 								lineHeight: 1.2,
 							}}
 							onClick={() => {
-								handleResolveIncident(row._id);
+								handleResolveIncident(row.id);
 							}}
 						>
 							{t("incidentsPage.incidentsTableActionResolveManually")}

client/src/Pages/Incidents2/hooks/useFetchIncidents.js

@@ -45,9 +45,8 @@ const useFetchIncidents = () => {
 			setNetworkError(false);
 
 			const res = await networkService.getIncidentsByTeam(config);
-
 			setIncidents(res.data?.data?.incidents || []);
-			setIncidentsCount(res.data?.data?.incidentsCount || 0);
+			setIncidentsCount(res.data?.data?.count || 0);
 		} catch (error) {
 			setNetworkError(true);
 			console.error(t("incidentsPage.errorFetchingIncidents"), error);

client/src/Pages/Incidents2/index.jsx

@@ -88,7 +88,7 @@ const Incidents2 = () => {
 	useEffect(() => {
 		const lookup = monitors?.reduce((acc, monitor) => {
 			acc[monitor.id] = {
-				_id: monitor.id,
+				id: monitor.id,
 				name: monitor.name,
 				type: monitor.type,
 			};
@@ -132,6 +132,7 @@ const Incidents2 = () => {
 			/>
 
 			<IncidentTable
+				monitors={monitors || []}
 				incidents={incidents || []}
 				incidentsCount={incidentsCount || 0}
 				isLoading={isLoadingIncidents}