Merge pull request #1475 from bluewave-labs/hotfix/fe/details-certificiate
hotfix: fix certificate format
This commit is contained in:
1 file changed
+6
-21
@@ -1,14 +1,6 @@
|
|||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
import { useEffect, useState, useCallback } from "react";
|
import { useEffect, useState, useCallback } from "react";
|
||||||
import {
|
import { Box, Button, Stack, Tooltip, Typography, useTheme } from "@mui/material";
|
||||||
Box,
|
|
||||||
Button,
|
|
||||||
Popover,
|
|
||||||
Stack,
|
|
||||||
Tooltip,
|
|
||||||
Typography,
|
|
||||||
useTheme,
|
|
||||||
} from "@mui/material";
|
|
||||||
import { useSelector } from "react-redux";
|
import { useSelector } from "react-redux";
|
||||||
import { useNavigate, useParams } from "react-router-dom";
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
import { networkService } from "../../../main";
|
import { networkService } from "../../../main";
|
||||||
@@ -17,7 +9,6 @@ import { formatDurationRounded, formatDurationSplit } from "../../../Utils/timeU
|
|||||||
import MonitorDetailsAreaChart from "../../../Components/Charts/MonitorDetailsAreaChart";
|
import MonitorDetailsAreaChart from "../../../Components/Charts/MonitorDetailsAreaChart";
|
||||||
import ButtonGroup from "@mui/material/ButtonGroup";
|
import ButtonGroup from "@mui/material/ButtonGroup";
|
||||||
import SettingsIcon from "../../../assets/icons/settings-bold.svg?react";
|
import SettingsIcon from "../../../assets/icons/settings-bold.svg?react";
|
||||||
import CertificateIcon from "../../../assets/icons/certificate.svg?react";
|
|
||||||
import UptimeIcon from "../../../assets/icons/uptime-icon.svg?react";
|
import UptimeIcon from "../../../assets/icons/uptime-icon.svg?react";
|
||||||
import ResponseTimeIcon from "../../../assets/icons/response-time-icon.svg?react";
|
import ResponseTimeIcon from "../../../assets/icons/response-time-icon.svg?react";
|
||||||
import AverageResponseIcon from "../../../assets/icons/average-response-icon.svg?react";
|
import AverageResponseIcon from "../../../assets/icons/average-response-icon.svg?react";
|
||||||
@@ -50,15 +41,8 @@ const DetailsPage = () => {
|
|||||||
const [certificateExpiry, setCertificateExpiry] = useState("N/A");
|
const [certificateExpiry, setCertificateExpiry] = useState("N/A");
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const [anchorEl, setAnchorEl] = useState(null);
|
const certificateDateFormat = "MMM D, YYYY h A";
|
||||||
const openCertificate = (event) => {
|
const dateFormat = dateRange === "day" ? "MMM D, h A" : "MMM D";
|
||||||
setAnchorEl(event.currentTarget);
|
|
||||||
};
|
|
||||||
const closeCertificate = () => {
|
|
||||||
setAnchorEl(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const dateFormat = dateRange === "day" ? "MMM D, YYYY h A" : "MMM D";
|
|
||||||
const uiTimezone = useSelector((state) => state.ui.timezone);
|
const uiTimezone = useSelector((state) => state.ui.timezone);
|
||||||
|
|
||||||
const fetchMonitor = useCallback(async () => {
|
const fetchMonitor = useCallback(async () => {
|
||||||
@@ -95,7 +79,9 @@ const DetailsPage = () => {
|
|||||||
});
|
});
|
||||||
if (res?.data?.data?.certificateDate) {
|
if (res?.data?.data?.certificateDate) {
|
||||||
const date = res.data.data.certificateDate;
|
const date = res.data.data.certificateDate;
|
||||||
setCertificateExpiry(formatDateWithTz(date, dateFormat, uiTimezone) ?? "N/A");
|
setCertificateExpiry(
|
||||||
|
formatDateWithTz(date, certificateDateFormat, uiTimezone) ?? "N/A"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setCertificateExpiry("N/A");
|
setCertificateExpiry("N/A");
|
||||||
@@ -210,7 +196,6 @@ const DetailsPage = () => {
|
|||||||
alignSelf: "flex-end",
|
alignSelf: "flex-end",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
||||||
{isAdmin && (
|
{isAdmin && (
|
||||||
<Button
|
<Button
|
||||||
variant="contained"
|
variant="contained"
|
||||||
|
|||||||
Reference in new issue
Block a user