Refactored monitor to uptimeMonitor (#484)

* Refactored monitor to uptimeMonitor

* Updated Configure
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-07-30 11:25:14 -07:00
1 parent 27b9a6055f
commit 05574a08ac
8 files changed
+40 -36

No files matched your search

+4 -4
View File
@@ -12,7 +12,7 @@ import MenuItem from "@mui/material/MenuItem";
import { useTheme } from "@mui/material/styles";
import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import { clearAuthState } from "../../Features/Auth/authSlice";
import { clearMonitorState } from "../../Features/Monitors/monitorsSlice";
import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
import { useDispatch, useSelector } from "react-redux";
import { useNavigate } from "react-router-dom";
@@ -36,7 +36,7 @@ function AddBorderOnScroll(props) {
disableHysteresis: true,
threshold: 0,
});
return (
<AppBar
className={trigger ? "scrolled" : ""}
@@ -47,7 +47,7 @@ function AddBorderOnScroll(props) {
borderBottom: "1px solid transparent",
"&.scrolled": {
borderBottom: "1px solid #eaecf0",
backgroundColor: "white"
backgroundColor: "white",
},
}}
>
@@ -96,7 +96,7 @@ function NavBar() {
const logout = () => {
// Clear auth state
dispatch(clearAuthState());
dispatch(clearMonitorState());
dispatch(clearUptimeMonitorState());
navigate("/login");
};
@@ -17,7 +17,7 @@ import {
import ImageIcon from "@mui/icons-material/Image";
import ProgressUpload from "../../ProgressBars";
import { formatBytes } from "../../../Utils/fileUtils";
import { clearMonitorState } from "../../../Features/Monitors/monitorsSlice";
import { clearUptimeMonitorState } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
import { createToast } from "../../../Utils/toastUtils";
/**
@@ -194,7 +194,7 @@ const ProfilePanel = () => {
const action = await dispatch(deleteUser(authToken));
if (action.payload.success) {
dispatch(clearAuthState());
dispatch(clearMonitorState());
dispatch(clearUptimeMonitorState());
} else {
if (action.payload) {
// dispatch errors
@@ -8,7 +8,7 @@ const initialState = {
msg: null,
};
export const createMonitor = createAsyncThunk(
export const createUptimeMonitor = createAsyncThunk(
"monitors/createMonitor",
async (data, thunkApi) => {
try {
@@ -30,7 +30,7 @@ export const createMonitor = createAsyncThunk(
}
);
export const getMonitors = createAsyncThunk(
export const getUptimeMonitors = createAsyncThunk(
"monitors/getMonitors",
async (token, thunkApi) => {
try {
@@ -45,7 +45,7 @@ export const getMonitors = createAsyncThunk(
}
);
export const getMonitorsByUserId = createAsyncThunk(
export const getUptimeMonitorsByUserId = createAsyncThunk(
"montiors/getMonitorsByUserId",
async (token, thunkApi) => {
const user = jwtDecode(token);
@@ -68,11 +68,11 @@ export const getMonitorsByUserId = createAsyncThunk(
}
);
const monitorsSlice = createSlice({
name: "monitors",
const uptimeMonitorsSlice = createSlice({
name: "uptimeMonitors",
initialState,
reducers: {
clearMonitorState: (state) => {
clearUptimeMonitorState: (state) => {
state.isLoading = false;
state.monitors = [];
state.success = null;
@@ -84,63 +84,64 @@ const monitorsSlice = createSlice({
// *****************************************************
// All Monitors
// *****************************************************
.addCase(getMonitors.pending, (state) => {
.addCase(getUptimeMonitors.pending, (state) => {
state.isLoading = true;
})
.addCase(getMonitors.fulfilled, (state, action) => {
.addCase(getUptimeMonitors.fulfilled, (state, action) => {
state.isLoading = false;
state.success = action.payload.success;
state.msg = action.payload.msg;
state.monitors = action.payload.data;
})
.addCase(getMonitors.rejected, (state, action) => {
.addCase(getUptimeMonitors.rejected, (state, action) => {
state.isLoading = false;
state.success = false;
state.msg = action.payload
? action.payload.msg
: "Getting montiors failed";
: "Getting uptime monitors failed";
})
// *****************************************************
// Monitors by userId
// *****************************************************
.addCase(getMonitorsByUserId.pending, (state) => {
.addCase(getUptimeMonitorsByUserId.pending, (state) => {
state.isLoading = true;
})
.addCase(getMonitorsByUserId.fulfilled, (state, action) => {
.addCase(getUptimeMonitorsByUserId.fulfilled, (state, action) => {
state.isLoading = false;
state.success = action.payload.msg;
state.monitors = action.payload.data;
})
.addCase(getMonitorsByUserId.rejected, (state, action) => {
.addCase(getUptimeMonitorsByUserId.rejected, (state, action) => {
state.isLoading = false;
state.success = false;
state.msg = action.payload
? action.payload.msg
: "Getting montiors failed";
: "Getting uptime monitors failed";
})
// *****************************************************
// Create Monitor
// *****************************************************
.addCase(createMonitor.pending, (state) => {
.addCase(createUptimeMonitor.pending, (state) => {
state.isLoading = true;
})
.addCase(createMonitor.fulfilled, (state, action) => {
.addCase(createUptimeMonitor.fulfilled, (state, action) => {
state.isLoading = false;
state.success = action.payload.success;
state.msg = action.payload.msg;
})
.addCase(createMonitor.rejected, (state, action) => {
.addCase(createUptimeMonitor.rejected, (state, action) => {
state.isLoading = false;
state.success = false;
state.msg = action.payload
? action.payload.msg
: "Failed to create monitor";
: "Failed to create uptime monitor";
});
},
});
export const { setMonitors, clearMonitorState } = monitorsSlice.actions;
export const { setUptimeMonitors, clearUptimeMonitorState } =
uptimeMonitorsSlice.actions;
export default monitorsSlice.reducer;
export default uptimeMonitorsSlice.reducer;
@@ -8,7 +8,7 @@ import { useTheme } from "@emotion/react";
import { useNavigate } from "react-router";
import { useDispatch } from "react-redux";
import { clearAuthState } from "../../Features/Auth/authSlice";
import { clearMonitorState } from "../../Features/Monitors/monitorsSlice";
import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
const NewPasswordConfirmed = () => {
const theme = useTheme();
@@ -17,7 +17,7 @@ const NewPasswordConfirmed = () => {
const handleNavigate = () => {
dispatch(clearAuthState());
dispatch(clearMonitorState());
dispatch(clearUptimeMonitorState());
navigate("/login");
};
@@ -38,7 +38,7 @@ const Configure = () => {
const theme = useTheme();
const dispatch = useDispatch();
const { authToken } = useSelector((state) => state.auth);
const { monitors } = useSelector((state) => state.monitors);
const { monitors } = useSelector((state) => state.uptimeMonitors);
const { monitorId } = useParams();
const idMap = {
@@ -5,7 +5,7 @@ import Button from "../../../Components/Button";
import { Box, ButtonGroup, Stack, Typography } from "@mui/material";
import { useSelector, useDispatch } from "react-redux";
import { monitorValidation } from "../../../Validation/validation";
import { createMonitor } from "../../../Features/Monitors/monitorsSlice";
import { createUptimeMonitor } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
import { useNavigate } from "react-router-dom";
import { useTheme } from "@emotion/react";
import WestRoundedIcon from "@mui/icons-material/WestRounded";
@@ -117,7 +117,9 @@ const CreateMonitor = () => {
interval: advancedSettings.interval * MS_PER_MINUTE,
};
try {
const action = await dispatch(createMonitor({ authToken, monitor }));
const action = await dispatch(
createUptimeMonitor({ authToken, monitor })
);
if (action.meta.requestStatus === "fulfilled") {
navigate("/monitors");
}
+3 -3
View File
@@ -1,7 +1,7 @@
import "./index.css";
import { useEffect } from "react";
import { useSelector, useDispatch } from "react-redux";
import { getMonitorsByUserId } from "../../Features/Monitors/monitorsSlice";
import { getUptimeMonitorsByUserId } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
import { useNavigate } from "react-router-dom";
import Button from "../../Components/Button";
import ServerStatus from "../../Components/Charts/Servers/ServerStatus";
@@ -45,12 +45,12 @@ const Host = ({ params }) => {
const Monitors = () => {
const theme = useTheme();
const navigate = useNavigate();
const monitorState = useSelector((state) => state.monitors);
const monitorState = useSelector((state) => state.uptimeMonitors);
const authState = useSelector((state) => state.auth);
const dispatch = useDispatch();
useEffect(() => {
dispatch(getMonitorsByUserId(authState.authToken));
dispatch(getUptimeMonitorsByUserId(authState.authToken));
}, []);
const up = monitorState.monitors.reduce((acc, cur) => {
+3 -2
View File
@@ -1,6 +1,7 @@
import { configureStore, combineReducers } from "@reduxjs/toolkit";
import uptimeMonitorsReducer from "./Features/UptimeMonitors/uptimeMonitorsSlice";
import pageSpeedMonitorReducer from "./Features/PageSpeedMonitor/pageSpeedMonitorSlice";
import monitorsReducer from "./Features/Monitors/monitorsSlice";
import authReducer from "./Features/Auth/authSlice";
import storage from "redux-persist/lib/storage";
import { persistReducer, persistStore, createTransform } from "redux-persist";
@@ -24,7 +25,7 @@ const persistConfig = {
};
const rootReducer = combineReducers({
monitors: monitorsReducer,
uptimeMonitors: uptimeMonitorsReducer,
auth: authReducer,
pageSpeedMonitors: pageSpeedMonitorReducer,
});