diff --git a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
index 59a40e1c4..ac3ce1d6f 100644
--- a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
+++ b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
@@ -3,7 +3,7 @@ import { jwtDecode } from "jwt-decode";
import { networkService } from "../../main";
const initialState = {
isLoading: false,
- monitors: [],
+ monitorsSummary: [],
success: null,
msg: null,
};
@@ -171,7 +171,7 @@ const uptimeMonitorsSlice = createSlice({
reducers: {
clearUptimeMonitorState: (state) => {
state.isLoading = false;
- state.monitors = [];
+ state.monitorsSummary = [];
state.success = null;
state.msg = null;
},
@@ -188,7 +188,7 @@ const uptimeMonitorsSlice = createSlice({
.addCase(getUptimeMonitorsByTeamId.fulfilled, (state, action) => {
state.isLoading = false;
state.success = action.payload.msg;
- state.monitors = action.payload.data;
+ state.monitorsSummary = action.payload.data;
})
.addCase(getUptimeMonitorsByTeamId.rejected, (state, action) => {
state.isLoading = false;
diff --git a/Client/src/Pages/Monitors/Home/index.jsx b/Client/src/Pages/Monitors/Home/index.jsx
index 8bff60d19..19d8eb5a6 100644
--- a/Client/src/Pages/Monitors/Home/index.jsx
+++ b/Client/src/Pages/Monitors/Home/index.jsx
@@ -23,23 +23,9 @@ const Monitors = ({ isAdmin }) => {
useEffect(() => {
dispatch(getUptimeMonitorsByTeamId(authState.authToken));
}, [authState.authToken, dispatch]);
-
- const monitorStats = monitorState?.monitors?.monitors?.reduce(
- (acc, monitor) => {
- if (monitor.isActive === false) {
- acc["paused"] += 1;
- } else if (monitor.status === true) {
- acc["up"] += 1;
- } else {
- acc["down"] += 1;
- }
- return acc;
- },
- { paused: 0, up: 0, down: 0 }
- );
-
- let loading = monitorState.isLoading && monitorState.monitors.length === 0;
-
+ let loading =
+ monitorState?.isLoading &&
+ monitorState?.monitorsSummary?.monitors?.length === 0;
return (
{loading ? (
@@ -55,7 +41,7 @@ const Monitors = ({ isAdmin }) => {
mt={theme.spacing(5)}
>
- {monitorState.monitors?.length !== 0 && (
+ {monitorState?.montiorsSummary?.monitors?.length !== 0 && (
- {isAdmin && monitorState.monitors?.length === 0 && (
+ {isAdmin && monitorState?.monitorsSummary?.monitors?.length === 0 && (
)}
- {monitorState.monitors?.length !== 0 && (
+ {monitorState?.monitorsSumarry?.monitors?.length !== 0 && (
<>
-
-
-
+
+
+
{
borderColor={theme.palette.border.light}
backgroundColor={theme.palette.background.accent}
>
- {monitorState.monitors.monitors.length}
+ {monitorState?.monitorsSummary.monitors?.monitors?.length ||
+ 0}
{/* TODO - add search bar */}