Merge branch 'develop' into fix/fe/field-refactor

Client/src/Components/Inputs/Field/index.css

@@ -2,13 +2,9 @@
 	min-width: var(--env-var-width-3);
 }
 
-.field-infrastructure-alert {
-	min-width: unset;
+.field-infrastructure-alert{
 	max-width: var(--env-var-width-4);
-}
-
-.field-infrastructure-alert .MuiInputBase-root:has(input) {
-	height: var(--env-var-height-2);
+	min-width: unset;
 }
 
 .field h3.MuiTypography-root,

Client/src/Pages/Infrastructure/Details/index.jsx

@@ -5,10 +5,11 @@ import { Stack, Box, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
 import CustomGauge from "../../../Components/Charts/CustomGauge";
 import AreaChart from "../../../Components/Charts/AreaChart";
+import { useSelector } from "react-redux";
+import { networkService } from "../../../main";
 import PulseDot from "../../../Components/Animated/PulseDot";
 import useUtils from "../../Monitors/utils";
 import { formatDurationRounded, formatDurationSplit } from "../../../Utils/timeUtils";
-import axios from "axios";
 import {
 	TzTick,
 	PercentTick,
@@ -167,6 +168,8 @@ const InfrastructureDetails = () => {
 		{ name: "details", path: `/infrastructure/${monitorId}` },
 	];
 	const [monitor, setMonitor] = useState(null);
+	const { authToken } = useSelector((state) => state.auth);
+	const [dateRange, setDateRange] = useState("day");
 	const { statusColor, determineState } = useUtils();
 	// These calculations are needed because ResponsiveContainer
 	// doesn't take padding of parent/siblings into account
@@ -183,11 +186,14 @@ const InfrastructureDetails = () => {
 	useEffect(() => {
 		const fetchData = async () => {
 			try {
-				const response = await axios.get("http://localhost:5000/api/v1/dummy-data", {
-					headers: {
-						"Content-Type": "application/json",
-						"Cache-Control": "no-cache",
-					},
+				const response = await networkService.getStatsByMonitorId({
+					authToken: authToken,
+					monitorId: monitorId,
+					sortOrder: null,
+					limit: null,
+					dateRange: dateRange,
+					numToDisplay: 50,
+					normalize: true,
 				});
 				setMonitor(response.data.data);
 			} catch (error) {