From 287ea3e5a6638bbd3b677abe77eb3989213b2962 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Tue, 17 Jun 2025 13:27:51 +0530
Subject: [PATCH] Updated params

---
 client/src/Hooks/checkHooks.js                | 23 ++++++++++++++-----
 .../Components/IncidentTable/index.jsx        | 11 +++++----
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/client/src/Hooks/checkHooks.js b/client/src/Hooks/checkHooks.js
index ed4cffe3f..2f05d3538 100644
--- a/client/src/Hooks/checkHooks.js
+++ b/client/src/Hooks/checkHooks.js
@@ -3,7 +3,6 @@ import { networkService } from "../main";
 import { createToast } from "../Utils/toastUtils";
 
 const useFetchChecksTeam = ({
-	teamId,
 	status,
 	sortOrder,
 	limit,
@@ -11,6 +10,7 @@ const useFetchChecksTeam = ({
 	filter,
 	page,
 	rowsPerPage,
+	enabled = true,
 }) => {
 	const [checks, setChecks] = useState(undefined);
 	const [checksCount, setChecksCount] = useState(undefined);
@@ -19,13 +19,12 @@ const useFetchChecksTeam = ({
 
 	useEffect(() => {
 		const fetchChecks = async () => {
-			if (!teamId) {
+			if (!enabled) {
 				return;
 			}
 
 			const config = {
 				status,
-				teamId,
 				sortOrder,
 				limit,
 				dateRange,
@@ -48,7 +47,7 @@ const useFetchChecksTeam = ({
 		};
 
 		fetchChecks();
-	}, [teamId, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
+	}, [status, sortOrder, limit, dateRange, filter, page, rowsPerPage, enabled]);
 
 	return [checks, checksCount, isLoading, networkError];
 };
@@ -63,6 +62,7 @@ const useFetchChecksByMonitor = ({
 	filter,
 	page,
 	rowsPerPage,
+	enabled = true,
 }) => {
 	const [checks, setChecks] = useState(undefined);
 	const [checksCount, setChecksCount] = useState(undefined);
@@ -71,7 +71,7 @@ const useFetchChecksByMonitor = ({
 
 	useEffect(() => {
 		const fetchChecks = async () => {
-			if (!type) {
+			if (!enabled) {
 				return;
 			}
 
@@ -101,7 +101,18 @@ const useFetchChecksByMonitor = ({
 		};
 
 		fetchChecks();
-	}, [monitorId, type, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
+	}, [
+		monitorId,
+		type,
+		status,
+		sortOrder,
+		limit,
+		dateRange,
+		filter,
+		page,
+		rowsPerPage,
+		enabled,
+	]);
 
 	return [checks, checksCount, isLoading, networkError];
 };
diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index b36abad70..71abf842c 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -43,11 +43,11 @@ const IncidentTable = ({
 			filter: filter,
 			page: page,
 			rowsPerPage: rowsPerPage,
+			enabled: selectedMonitor !== "0",
 		});
 
 	const [checksTeam, checksCountTeam, isLoadingTeam, networkErrorTeam] =
 		useFetchChecksTeam({
-			teamId: "placeholder",
 			status: false,
 			sortOrder: "desc",
 			limit: null,
@@ -55,12 +55,13 @@ const IncidentTable = ({
 			filter: filter,
 			page: page,
 			rowsPerPage: rowsPerPage,
+			enabled: selectedMonitor === "0",
 		});
 
-	const checks = checksTeam || checksMonitor;
-	const checksCount = checksCountTeam || checksCountMonitor;
-	const isLoading = isLoadingTeam || isLoadingMonitor;
-	const networkError = networkErrorTeam || networkErrorMonitor;
+	const checks = selectedMonitor === "0" ? checksTeam : checksMonitor;
+	const checksCount = selectedMonitor === "0" ? checksCountTeam : checksCountMonitor;
+	const isLoading = selectedMonitor === "0" ? isLoadingTeam : isLoadingMonitor;
+	const networkError = selectedMonitor === "0" ? networkErrorTeam : networkErrorMonitor;
 
 	const { t } = useTranslation();