Merge branch 'develop' into 1229-add-a-placeholder-if-there-are-no-infrastructure-monitors

This commit is contained in:
Alex Holliday committed 2024-12-03 11:03:09 +08:00
commit 40282ebcc6
11 files changed
+19 -21

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
import React, { useState } from "react";
import { useState } from "react";
import PropTypes from "prop-types";
import { useNavigate } from "react-router";
import { useSelector } from "react-redux";
@@ -103,7 +103,7 @@ const InfrastructureMenu = ({ monitor, isAdmin, updateCallback }) => {
"& ul": { p: theme.spacing(2.5) },
"& li": { m: 0 },
"& li:last-of-type": {
color: theme.palette.error.contrastText,
color: theme.palette.error.main,
},
},
},
+1 -4
View File
@@ -190,10 +190,7 @@ function Infrastructure() {
{isActuallyLoading ? (
<SkeletonLayout />
) : monitorState.monitors?.length !== 0 ? (
<Stack
component="main"
style={{ width: "100%", gap: "1rem" }}
>
<Stack gap={theme.spacing(8)}>
<Breadcrumbs list={BREADCRUMBS} />
<Stack
direction="row"
@@ -114,7 +114,7 @@ const ActionsMenu = ({ /* isAdmin, */ maintenanceWindow, updateCallback }) => {
"& ul": { p: theme.spacing(2.5) },
"& li": { m: 0 },
"& li:last-of-type": {
color: theme.palette.error.contrastText,
color: theme.palette.error.main,
},
},
},
@@ -109,7 +109,7 @@ const ActionsMenu = ({ monitor, isAdmin, updateCallback }) => {
"& ul": { p: theme.spacing(2.5) },
"& li": { m: 0 },
"& li:last-of-type": {
color: theme.palette.error.contrastText,
color: theme.palette.error.main,
},
},
},
-2
View File
@@ -20,8 +20,6 @@ const Monitors = ({ isAdmin }) => {
const authState = useSelector((state) => state.auth);
const dispatch = useDispatch({});
console.log({ monitorState });
useEffect(() => {
dispatch(getUptimeMonitorsByTeamId(authState.authToken));
}, [authState.authToken, dispatch]);