Merge pull request #1870 from Br0wnHammer/fix/fe/incidents-all-monitors

Fix: Incidents for All Monitors

src/Pages/Incidents/Components/IncidentTable/index.jsx

@@ -27,8 +27,11 @@ const IncidentTable = ({
 	//Local state
 	const [page, setPage] = useState(0);
 	const [rowsPerPage, setRowsPerPage] = useState(10);
+	const selectedMonitorDetails = monitors?.[selectedMonitor];
+	const selectedMonitorType = selectedMonitorDetails?.type;
 	const { isLoading, networkError, checks, checksCount } = useChecksFetch({
 		selectedMonitor,
+		selectedMonitorType,
 		filter,
 		dateRange,
 		page,

src/Pages/Incidents/Hooks/useChecksFetch.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import { networkService } from "../../../main";
 import { createToast } from "../../../Utils/toastUtils";
 import { useSelector } from "react-redux";
-const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage }) => {
+const useChecksFetch = ({ selectedMonitor, selectedMonitorType, filter, dateRange, page, rowsPerPage }) => {
 	//Redux
 	const { user } = useSelector((state) => state.auth);
 
@@ -33,6 +33,7 @@ const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage
 					res = await networkService.getChecksByMonitor({
 						status: false,
 						monitorId: selectedMonitor,
+						type: selectedMonitorType,
 						sortOrder: "desc",
 						limit: null,
 						dateRange,
@@ -51,7 +52,7 @@ const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage
 			}
 		};
 		fetchChecks();
-	}, [user, dateRange, page, rowsPerPage, filter, selectedMonitor]);
+	}, [user, dateRange, page, rowsPerPage, filter, selectedMonitor, selectedMonitorType]);
 	return { isLoading, networkError, checks, checksCount };
 };
 

src/Pages/Incidents/Hooks/useMonitorsFetch.jsx

@@ -25,9 +25,13 @@ const useMonitorsFetch = ({ teamId }) => {
 					field: null,
 					order: null,
 				});
-				if (res?.data?.data?.monitors?.length > 0) {
-					const monitorLookup = res.data.data.monitors.reduce((acc, monitor) => {
-						acc[monitor._id] = monitor;
+				if (res?.data?.data?.filteredMonitors?.length > 0) {
+					const monitorLookup = res.data.data.filteredMonitors.reduce((acc, monitor) => {
+						acc[monitor._id] = {
+							_id: monitor._id,
+							name: monitor.name,
+							type: monitor.type
+						};
 						return acc;
 					}, {});
 					setMonitors(monitorLookup);

src/Utils/NetworkService.js

@@ -567,6 +567,7 @@ class NetworkService {
 
 	async getChecksByMonitor(config) {
 		const params = new URLSearchParams();
+		if (config.type) params.append("type", config.type);
 		if (config.sortOrder) params.append("sortOrder", config.sortOrder);
 		if (config.limit) params.append("limit", config.limit);
 		if (config.dateRange) params.append("dateRange", config.dateRange);