Merge branch 'develop' into fix/colorful-revamp-extravaganza

This commit is contained in:
Alex Holliday committed 2024-08-29 16:12:40 -07:00
commit bddca58a37
16 files changed
+319 -89

No files matched your search

@@ -101,6 +101,7 @@ const PaginationTable = ({ monitorId, dateRange }) => {
<TableRow>
<TableCell>Status</TableCell>
<TableCell>Date & Time</TableCell>
<TableCell>Status Code</TableCell>
<TableCell>Message</TableCell>
</TableRow>
</TableHead>
@@ -120,7 +121,10 @@ const PaginationTable = ({ monitorId, dateRange }) => {
<TableCell>
{new Date(check.createdAt).toLocaleString()}
</TableCell>
<TableCell>{check.statusCode}</TableCell>
<TableCell>
{check.statusCode ? check.statusCode : "N/A"}
</TableCell>
<TableCell>{check.message}</TableCell>
</TableRow>
);
})}
+4 -1
View File
@@ -172,6 +172,9 @@ const DetailsPage = ({ isAdmin }) => {
useEffect(() => {
const fetchCertificate = async () => {
if (monitor?.type !== "http") {
return;
}
try {
const res = await networkService.getCertificateExpiry(
authToken,
@@ -183,7 +186,7 @@ const DetailsPage = ({ isAdmin }) => {
}
};
fetchCertificate();
}, [authToken, monitorId]);
}, [authToken, monitorId, monitor]);
let loading = Object.keys(monitor).length === 0;
return (