Fix merge conflict, remove unused dispatch

Client/src/Pages/Uptime/Configure/index.jsx

@@ -11,7 +11,6 @@ import {
 	updateUptimeMonitor,
 	pauseUptimeMonitor,
 	getUptimeMonitorById,
-	getUptimeSummaryByTeamId,
 	deleteUptimeMonitor,
 } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import TextInput from "../../../Components/Inputs/TextInput";
@@ -157,7 +156,6 @@ const Configure = () => {
 		const action = await dispatch(updateUptimeMonitor({ authToken, monitor: monitor }));
 		if (action.meta.requestStatus === "fulfilled") {
 			createToast({ body: "Monitor updated successfully!" });
-			dispatch(getUptimeSummaryByTeamId(authToken));
 		} else {
 			createToast({ body: "Failed to update monitor." });
 		}

Client/src/Pages/Uptime/Home/index.jsx

@@ -14,7 +14,6 @@ import {
 	getUptimeSummaryByTeamId,
 	getUptimeMonitorsByTeamId,
 } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
-import { setRowsPerPage } from "../../../Features/UI/uiSlice";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useSelector, useDispatch } from "react-redux";
 import { useNavigate } from "react-router-dom";
@@ -26,15 +25,13 @@ const BREADCRUMBS = [{ name: `Uptime`, path: "/uptime" }];
 
 const UptimeMonitors = () => {
 	// Redux state
-	const { isLoading, monitorsSummary } = useSelector((state) => state.uptimeMonitors);
-	const authState = useSelector((state) => state.auth);
-	const { rowsPerPage } = useSelector((state) => state.ui.monitors);
 
 	// Local state
 	const [monitors, setMonitors] = useState([]);
 	const [sort, setSort] = useState({});
 	const [search, setSearch] = useState("");
 	const [page, setPage] = useState(0);
+	const [rowsPerPage, setRowsPerPage] = useState(10);
 	const [isSearching, setIsSearching] = useState(false);
 	const [monitorUpdateTrigger, setMonitorUpdateTrigger] = useState(false);
 
@@ -46,9 +43,6 @@ const UptimeMonitors = () => {
 	const isAdmin = useIsAdmin();
 	const { isLoading, monitorsSummary } = useSelector((state) => state.uptimeMonitors);
 	const authState = useSelector((state) => state.auth);
-	const dispatch = useDispatch({});
-	const [monitorUpdateTrigger, setMonitorUpdateTrigger] = useState(false);
-
 
 	const fetchParams = useMemo(
 		() => ({

Server/db/mongo/modules/monitorModule.js

@@ -30,15 +30,6 @@ const CHECK_MODEL_LOOKUP = {
 	hardware: HardwareCheck,
 };
 
-const MODEL_TYPE_MAPPING = {
-	http: "checks",
-	ping: "checks",
-	docker: "checks",
-	port: "checks",
-	pagespeed: "pagespeedchecks",
-	hardware: "hardwarechecks",
-};
-
 /**
  * Get all monitors
  * @async

Server/utils/dataUtils.js

@@ -26,7 +26,6 @@ const NormalizeData = (checks, rangeMin, rangeMax) => {
 		const min = calculatePercentile(checks, 0);
 		const max = calculatePercentile(checks, 95);
 		const normalizedChecks = checks.map((check) => {
-			console.log(check);
 			const originalResponseTime = check.responseTime;
 			// Normalize the response time between 1 and 100
 			let normalizedResponseTime =