diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx
index 31029fb45..d95f84e2d 100644
--- a/Client/src/Pages/Monitors/Details/index.jsx
+++ b/Client/src/Pages/Monitors/Details/index.jsx
@@ -1,22 +1,19 @@
import PropTypes from "prop-types";
import { useEffect, useState, useCallback } from "react";
import {
- Box,
- Button,
- Popover,
- Stack,
- Tooltip,
- Typography,
- useTheme,
+ Box,
+ Button,
+ Popover,
+ Stack,
+ Tooltip,
+ Typography,
+ useTheme,
} from "@mui/material";
import { useSelector } from "react-redux";
import { useNavigate, useParams } from "react-router-dom";
import { networkService } from "../../../main";
import { logger } from "../../../Utils/Logger";
-import {
- formatDurationRounded,
- formatDurationSplit,
-} from "../../../Utils/timeUtils";
+import { formatDurationRounded, formatDurationSplit } from "../../../Utils/timeUtils";
import MonitorDetailsAreaChart from "../../../Components/Charts/MonitorDetailsAreaChart";
import ButtonGroup from "@mui/material/ButtonGroup";
import SettingsIcon from "../../../assets/icons/settings-bold.svg?react";
@@ -41,447 +38,455 @@ import { formatDateWithTz } from "../../../Utils/timeUtils";
* @component
*/
const DetailsPage = ({ isAdmin }) => {
- const theme = useTheme();
- const { statusColor, statusStyles, statusMsg, determineState } = useUtils();
- const [monitor, setMonitor] = useState({});
- const { monitorId } = useParams();
- const { authToken } = useSelector((state) => state.auth);
- const [dateRange, setDateRange] = useState("day");
- const [certificateExpiry, setCertificateExpiry] = useState("N/A");
- const navigate = useNavigate();
+ const theme = useTheme();
+ const { statusColor, statusStyles, statusMsg, determineState } = useUtils();
+ const [monitor, setMonitor] = useState({});
+ const { monitorId } = useParams();
+ const { authToken } = useSelector((state) => state.auth);
+ const [dateRange, setDateRange] = useState("day");
+ const [certificateExpiry, setCertificateExpiry] = useState("N/A");
+ const navigate = useNavigate();
- const [anchorEl, setAnchorEl] = useState(null);
- const openCertificate = (event) => {
- setAnchorEl(event.currentTarget);
- };
- const closeCertificate = () => {
- setAnchorEl(null);
- };
+ const [anchorEl, setAnchorEl] = useState(null);
+ const openCertificate = (event) => {
+ setAnchorEl(event.currentTarget);
+ };
+ const closeCertificate = () => {
+ setAnchorEl(null);
+ };
- const dateFormat = dateRange === "day" ? "MMM D, h A" : "MMM D";
- const uiTimezone = useSelector((state) => state.ui.timezone);
+ const dateFormat = dateRange === "day" ? "MMM D, h A" : "MMM D";
+ const uiTimezone = useSelector((state) => state.ui.timezone);
- const fetchMonitor = useCallback(async () => {
- try {
- const res = await networkService.getStatsByMonitorId({
- authToken: authToken,
- monitorId: monitorId,
- sortOrder: null,
- limit: null,
- dateRange: dateRange,
- numToDisplay: 50,
- normalize: true,
- });
- setMonitor(res?.data?.data ?? {});
- } catch (error) {
- logger.error(error);
- navigate("/not-found", { replace: true });
- }
- }, [authToken, monitorId, navigate, dateRange]);
+ const fetchMonitor = useCallback(async () => {
+ try {
+ const res = await networkService.getStatsByMonitorId({
+ authToken: authToken,
+ monitorId: monitorId,
+ sortOrder: null,
+ limit: null,
+ dateRange: dateRange,
+ numToDisplay: 50,
+ normalize: true,
+ });
+ setMonitor(res?.data?.data ?? {});
+ } catch (error) {
+ logger.error(error);
+ navigate("/not-found", { replace: true });
+ }
+ }, [authToken, monitorId, navigate, dateRange]);
- useEffect(() => {
- fetchMonitor();
- }, [fetchMonitor]);
+ useEffect(() => {
+ fetchMonitor();
+ }, [fetchMonitor]);
- useEffect(() => {
- const fetchCertificate = async () => {
- if (monitor?.type !== "http") {
- return;
- }
- try {
- const res = await networkService.getCertificateExpiry({
- authToken: authToken,
- monitorId: monitorId,
- });
+ useEffect(() => {
+ const fetchCertificate = async () => {
+ if (monitor?.type !== "http") {
+ return;
+ }
+ try {
+ const res = await networkService.getCertificateExpiry({
+ authToken: authToken,
+ monitorId: monitorId,
+ });
+ if (res?.data?.data?.certificateDate) {
+ const date = res.data.data.certificateDate;
+ setCertificateExpiry(formatDateWithTz(date, dateFormat, uiTimezone) ?? "N/A");
+ }
+ } catch (error) {
+ console.error(error);
+ }
+ };
+ fetchCertificate();
+ }, [authToken, monitorId, monitor]);
- if (res?.data?.data?.certificateDate) {
- let [month, day, year] = res.data.data.certificateDate.split("/");
- const date = new Date(year, month - 1, day);
+ const splitDuration = (duration) => {
+ const { time, format } = formatDurationSplit(duration);
+ return (
+ <>
+ {time}
+ {format}
+ >
+ );
+ };
- setCertificateExpiry(
- formatDateWithTz(date, dateFormat, uiTimezone) ?? "N/A"
- );
- }
- } catch (error) {
- console.error(error);
- }
- };
- fetchCertificate();
- }, [authToken, monitorId, monitor]);
+ let loading = Object.keys(monitor).length === 0;
- const splitDuration = (duration) => {
- const { time, format } = formatDurationSplit(duration);
- return (
- <>
- {time}
- {format}
- >
- );
- };
+ const [hoveredUptimeData, setHoveredUptimeData] = useState(null);
+ const [hoveredIncidentsData, setHoveredIncidentsData] = useState(null);
- let loading = Object.keys(monitor).length === 0;
-
- const [hoveredUptimeData, setHoveredUptimeData] = useState(null);
- const [hoveredIncidentsData, setHoveredIncidentsData] = useState(null);
-
- return (
-
- {loading ? (
-
- ) : (
- <>
-
-
-
-
-
- {monitor.name}
-
-
-
-
-
-
-
-
- {monitor.url?.replace(/^https?:\/\//, "") || "..."}
-
-
- Checking every {formatDurationRounded(monitor?.interval)}.
-
-
-
-
-
-
-
-
- Certificate Expiry
-
- {certificateExpiry}
-
-
- {isAdmin && (
-
- )}
-
-
-
-
- active for
-
- {splitDuration(monitor?.uptimeDuration)}
-
-
-
- last check
-
- {splitDuration(monitor?.lastChecked)}
- ago
-
-
-
- last response time
-
- {monitor?.latestResponseTime}
- ms
-
-
-
-
-
-
- Showing statistics for past{" "}
- {dateRange === "day"
- ? "24 hours"
- : dateRange === "week"
- ? "7 days"
- : "30 days"}
- .
-
-
-
-
-
-
-
-
-
-
-
-
-
- Uptime
-
-
-
- Total Checks
-
- {hoveredUptimeData !== null
- ? hoveredUptimeData.totalChecks
- : monitor?.periodTotalChecks}
-
- {hoveredUptimeData !== null &&
- hoveredUptimeData.time !== null && (
-
- {formatDateWithTz(
- hoveredUptimeData.time,
- dateFormat,
- uiTimezone
- )}
-
- )}
-
-
- Uptime Percentage
-
- {hoveredUptimeData !== null
- ? Math.floor(
- hoveredUptimeData.uptimePercentage * 10
- ) / 10
- : Math.floor(monitor?.periodUptime * 10) / 10}
- %
-
-
-
-
-
-
-
-
-
-
- Incidents
-
-
- Total Incidents
-
- {hoveredIncidentsData !== null
- ? hoveredIncidentsData.totalIncidents
- : monitor?.periodIncidents}
-
- {hoveredIncidentsData !== null &&
- hoveredIncidentsData.time !== null && (
-
- {formatDateWithTz(
- hoveredIncidentsData.time,
- dateFormat,
- uiTimezone
- )}
-
- )}
-
-
-
-
-
-
-
-
-
- Average Response Time
-
-
-
-
-
-
-
-
-
- Response Times
-
-
-
-
-
-
-
-
-
- History
-
-
-
-
-
-
-
- >
- )}
-
- );
+ return (
+
+ {loading ? (
+
+ ) : (
+ <>
+
+
+
+
+
+ {monitor.name}
+
+
+
+
+
+
+
+
+ {monitor.url?.replace(/^https?:\/\//, "") || "..."}
+
+
+ Checking every {formatDurationRounded(monitor?.interval)}.
+
+
+
+
+
+
+
+
+ Certificate Expiry
+
+ {certificateExpiry}
+
+
+ {isAdmin && (
+
+ )}
+
+
+
+
+ active for
+ {splitDuration(monitor?.uptimeDuration)}
+
+
+ last check
+
+ {splitDuration(monitor?.lastChecked)}
+ ago
+
+
+
+ last response time
+
+ {monitor?.latestResponseTime}
+ ms
+
+
+
+
+
+
+ Showing statistics for past{" "}
+ {dateRange === "day"
+ ? "24 hours"
+ : dateRange === "week"
+ ? "7 days"
+ : "30 days"}
+ .
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Uptime
+
+
+
+ Total Checks
+
+ {hoveredUptimeData !== null
+ ? hoveredUptimeData.totalChecks
+ : monitor?.periodTotalChecks}
+
+ {hoveredUptimeData !== null && hoveredUptimeData.time !== null && (
+
+ {formatDateWithTz(
+ hoveredUptimeData.time,
+ dateFormat,
+ uiTimezone
+ )}
+
+ )}
+
+
+ Uptime Percentage
+
+ {hoveredUptimeData !== null
+ ? Math.floor(hoveredUptimeData.uptimePercentage * 10) / 10
+ : Math.floor(monitor?.periodUptime * 10) / 10}
+ %
+
+
+
+
+
+
+
+
+
+
+ Incidents
+
+
+ Total Incidents
+
+ {hoveredIncidentsData !== null
+ ? hoveredIncidentsData.totalIncidents
+ : monitor?.periodIncidents}
+
+ {hoveredIncidentsData !== null &&
+ hoveredIncidentsData.time !== null && (
+
+ {formatDateWithTz(
+ hoveredIncidentsData.time,
+ dateFormat,
+ uiTimezone
+ )}
+
+ )}
+
+
+
+
+
+
+
+
+ Average Response Time
+
+
+
+
+
+
+
+
+ Response Times
+
+
+
+
+
+
+
+
+
+ History
+
+
+
+
+
+
+
+ >
+ )}
+
+ );
};
DetailsPage.propTypes = {
- isAdmin: PropTypes.bool,
+ isAdmin: PropTypes.bool,
};
export default DetailsPage;