diff --git a/Client/src/Components/Table/TablePagination/index.jsx b/Client/src/Components/Table/TablePagination/index.jsx
index 4435454bc..a2c7ad067 100644
--- a/Client/src/Components/Table/TablePagination/index.jsx
+++ b/Client/src/Components/Table/TablePagination/index.jsx
@@ -94,6 +94,13 @@ function Pagination({
"&.Mui-focused > div": {
backgroundColor: theme.palette.background.main,
},
+ "& .MuiSelect-icon": {
+ // Add this style override
+ position: "absolute",
+ right: 0,
+ top: "50%",
+ transform: "translateY(-50%)",
+ },
},
},
}}
diff --git a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
index 78250c19a..8782948ae 100644
--- a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
+++ b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
@@ -78,12 +78,12 @@ export const getUptimeMonitorById = createAsyncThunk(
}
);
-export const getUptimeMonitorsByTeamId = createAsyncThunk(
- "monitors/getMonitorsByTeamId",
+export const getUptimeSummaryByTeamId = createAsyncThunk(
+ "monitors/getSummaryByTeamId",
async (token, thunkApi) => {
const user = jwtDecode(token);
try {
- const res = await networkService.getMonitorsAndSummaryByTeamId({
+ const res = await networkService.getMonitorsSummaryByTeamId({
authToken: token,
teamId: user.teamId,
types: ["http", "ping", "docker", "port"],
@@ -102,6 +102,38 @@ export const getUptimeMonitorsByTeamId = createAsyncThunk(
}
);
+export const getUptimeMonitorsByTeamId = createAsyncThunk(
+ "monitors/getMonitorsByTeamId",
+ async (config, thunkApi) => {
+ try {
+ const res = await networkService.getMonitorsByTeamId({
+ authToken: config.authToken,
+ teamId: config.teamId,
+ limit: 25,
+ types: ["http", "ping", "docker", "port"],
+ status: null,
+ checkOrder: "desc",
+ normalize: true,
+ page: config.page,
+ rowsPerPage: config.rowsPerPage,
+ filter: config.filter,
+ field: config.sort.field,
+ order: config.sort.order,
+ });
+ return res.data;
+ } catch (error) {
+ if (error.response && error.response.data) {
+ return thunkApi.rejectWithValue(error.response.data);
+ }
+ const payload = {
+ status: false,
+ msg: error.message ? error.message : "Unknown error",
+ };
+ return thunkApi.rejectWithValue(payload);
+ }
+ }
+);
+
export const updateUptimeMonitor = createAsyncThunk(
"monitors/updateMonitor",
async (data, thunkApi) => {
@@ -258,16 +290,33 @@ const uptimeMonitorsSlice = createSlice({
extraReducers: (builder) => {
builder
// *****************************************************
- // Monitors by teamId
+ // Summary by teamId
// *****************************************************
+ .addCase(getUptimeSummaryByTeamId.pending, (state) => {
+ state.isLoading = true;
+ })
+ .addCase(getUptimeSummaryByTeamId.fulfilled, (state, action) => {
+ state.isLoading = false;
+ state.success = action.payload.msg;
+ state.monitorsSummary = action.payload.data;
+ })
+ .addCase(getUptimeSummaryByTeamId.rejected, (state, action) => {
+ state.isLoading = false;
+ state.success = false;
+ state.msg = action.payload ? action.payload.msg : "Getting uptime summary failed";
+ })
+
+ // *****************************************************
+ // Monitors by teamId
+ // *****************************************************
.addCase(getUptimeMonitorsByTeamId.pending, (state) => {
state.isLoading = true;
})
.addCase(getUptimeMonitorsByTeamId.fulfilled, (state, action) => {
state.isLoading = false;
- state.success = action.payload.msg;
- state.monitorsSummary = action.payload.data;
+ state.success = action.payload.success;
+ state.msg = action.payload.msg;
})
.addCase(getUptimeMonitorsByTeamId.rejected, (state, action) => {
state.isLoading = false;
@@ -276,7 +325,6 @@ const uptimeMonitorsSlice = createSlice({
? action.payload.msg
: "Getting uptime monitors failed";
})
-
// *****************************************************
// Create Monitor
// *****************************************************
diff --git a/Client/src/Pages/Uptime/Configure/index.jsx b/Client/src/Pages/Uptime/Configure/index.jsx
index 32532d462..76c030776 100644
--- a/Client/src/Pages/Uptime/Configure/index.jsx
+++ b/Client/src/Pages/Uptime/Configure/index.jsx
@@ -11,7 +11,7 @@ import {
updateUptimeMonitor,
pauseUptimeMonitor,
getUptimeMonitorById,
- getUptimeMonitorsByTeamId,
+ getUptimeSummaryByTeamId,
deleteUptimeMonitor,
} from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
import TextInput from "../../../Components/Inputs/TextInput";
@@ -157,7 +157,7 @@ const Configure = () => {
const action = await dispatch(updateUptimeMonitor({ authToken, monitor: monitor }));
if (action.meta.requestStatus === "fulfilled") {
createToast({ body: "Monitor updated successfully!" });
- dispatch(getUptimeMonitorsByTeamId(authToken));
+ dispatch(getUptimeSummaryByTeamId(authToken));
} else {
createToast({ body: "Failed to update monitor." });
}
diff --git a/Client/src/Pages/Uptime/Home/CurrentMonitoring/index.jsx b/Client/src/Pages/Uptime/Home/CurrentMonitoring/index.jsx
deleted file mode 100644
index 2d9426137..000000000
--- a/Client/src/Pages/Uptime/Home/CurrentMonitoring/index.jsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { useTheme } from "@emotion/react";
-import { Box, Stack } from "@mui/material";
-import Search from "../../../../Components/Inputs/Search";
-import MemoizedMonitorTable from "../UptimeTable";
-import { useState } from "react";
-import useDebounce from "../../../../Utils/debounce";
-import PropTypes from "prop-types";
-import { Heading } from "../../../../Components/Heading";
-
-const CurrentMonitoring = ({ totalMonitors, monitors, isAdmin, handlePause }) => {
- const theme = useTheme();
- const [search, setSearch] = useState("");
- const [isSearching, setIsSearching] = useState(false);
- const debouncedFilter = useDebounce(search, 500);
- const handleSearch = (value) => {
- setIsSearching(true);
- setSearch(value);
- };
- return (
-
-
- Uptime monitors
-
-
- {totalMonitors}
-
-
-
-
-
-
-
- );
-};
-
-CurrentMonitoring.propTypes = {
- handlePause: PropTypes.func,
- totalMonitors: PropTypes.number,
- monitors: PropTypes.array,
- isAdmin: PropTypes.bool,
-};
-
-export { CurrentMonitoring };
diff --git a/Client/src/Pages/Uptime/Home/UptimeTable/Skeleton/index.jsx b/Client/src/Pages/Uptime/Home/UptimeDataTable/Skeleton/index.jsx
similarity index 100%
rename from Client/src/Pages/Uptime/Home/UptimeTable/Skeleton/index.jsx
rename to Client/src/Pages/Uptime/Home/UptimeDataTable/Skeleton/index.jsx
diff --git a/Client/src/Pages/Uptime/Home/UptimeDataTable/index.jsx b/Client/src/Pages/Uptime/Home/UptimeDataTable/index.jsx
new file mode 100644
index 000000000..d174c535f
--- /dev/null
+++ b/Client/src/Pages/Uptime/Home/UptimeDataTable/index.jsx
@@ -0,0 +1,242 @@
+// Components
+import { Box, Stack, CircularProgress } from "@mui/material";
+import Search from "../../../../Components/Inputs/Search";
+import { Heading } from "../../../../Components/Heading";
+import DataTable from "../../../../Components/Table";
+import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded";
+import ArrowUpwardRoundedIcon from "@mui/icons-material/ArrowUpwardRounded";
+import Host from "../host";
+import { StatusLabel } from "../../../../Components/Label";
+import BarChart from "../../../../Components/Charts/BarChart";
+import ActionsMenu from "../actionsMenu";
+
+// Utils
+import { useTheme } from "@emotion/react";
+import useDebounce from "../../../../Utils/debounce";
+import { useState } from "react";
+import useUtils from "../../utils";
+import { memo } from "react";
+import { useNavigate } from "react-router-dom";
+import "../index.css";
+
+const UptimeDataTable = ({
+ isAdmin,
+ isLoading,
+ monitors,
+ monitorCount,
+ sort,
+ setSort,
+ search,
+ setSearch,
+ isSearching,
+ setIsSearching,
+ triggerUpdate,
+}) => {
+ const { determineState } = useUtils();
+
+ const theme = useTheme();
+ const navigate = useNavigate();
+
+ //Utils
+ const debouncedFilter = useDebounce(search, 500);
+ const handleSearch = (value) => {
+ setIsSearching(true);
+ setSearch(value);
+ };
+
+ const handleSort = (field) => {
+ let order = "";
+ if (sort.field !== field) {
+ order = "desc";
+ } else {
+ order = sort.order === "asc" ? "desc" : "asc";
+ }
+ setSort({ field, order });
+ };
+
+ const headers = [
+ {
+ id: "name",
+ content: (
+ handleSort("name")}
+ >
+ Host
+
+ {sort.order === "asc" ? (
+
+ ) : (
+
+ )}
+
+
+ ),
+ render: (row) => (
+
+ ),
+ },
+ {
+ id: "status",
+ content: (
+ handleSort("status")}
+ >
+ {" "}
+ Status
+
+ {sort.order === "asc" ? (
+
+ ) : (
+
+ )}
+
+
+ ),
+ render: (row) => {
+ const status = determineState(row.monitor);
+ return (
+
+ );
+ },
+ },
+ {
+ id: "responseTime",
+ content: "Response Time",
+ render: (row) => ,
+ },
+ {
+ id: "type",
+ content: "Type",
+ render: (row) => (
+ {row.monitor.type}
+ ),
+ },
+ {
+ id: "actions",
+ content: "Actions",
+ render: (row) => (
+
+ ),
+ },
+ ];
+
+ return (
+
+
+ Uptime monitors
+
+
+ {monitorCount}
+
+
+
+
+
+
+ {isSearching && (
+ <>
+
+
+
+
+ >
+ )}
+ {
+ navigate(`/uptime/${row.id}`);
+ },
+ emptyView: "No monitors found",
+ }}
+ />
+
+
+ );
+};
+
+const MemoizedUptimeDataTable = memo(UptimeDataTable);
+export default MemoizedUptimeDataTable;
diff --git a/Client/src/Pages/Uptime/Home/UptimeTable/index.jsx b/Client/src/Pages/Uptime/Home/UptimeTable/index.jsx
deleted file mode 100644
index 0aa0eef90..000000000
--- a/Client/src/Pages/Uptime/Home/UptimeTable/index.jsx
+++ /dev/null
@@ -1,345 +0,0 @@
-import PropTypes from "prop-types";
-import { useState, useEffect, memo, useCallback, useRef } from "react";
-import { useNavigate } from "react-router";
-import { useDispatch, useSelector } from "react-redux";
-import { useTheme } from "@emotion/react";
-import useUtils from "../../utils";
-
-import { setRowsPerPage } from "../../../../Features/UI/uiSlice";
-import { logger } from "../../../../Utils/Logger";
-import { jwtDecode } from "jwt-decode";
-import { networkService } from "../../../../main";
-
-import { Box, CircularProgress } from "@mui/material";
-import ActionsMenu from "../actionsMenu";
-import Host from "../host";
-import { StatusLabel } from "../../../../Components/Label";
-import { TableSkeleton } from "./Skeleton";
-import BarChart from "../../../../Components/Charts/BarChart";
-
-import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded";
-import ArrowUpwardRoundedIcon from "@mui/icons-material/ArrowUpwardRounded";
-
-import { Pagination } from "../../../../Components/Table/TablePagination";
-import DataTable from "../../../../Components/Table";
-
-const MonitorTable = ({ isAdmin, filter, setIsSearching, isSearching, handlePause }) => {
- const theme = useTheme();
- const navigate = useNavigate();
- const dispatch = useDispatch();
- const { determineState } = useUtils();
-
- const { rowsPerPage } = useSelector((state) => state.ui.monitors);
- const authState = useSelector((state) => state.auth);
-
- const [page, setPage] = useState(0);
- const [monitors, setMonitors] = useState([]);
- const [monitorCount, setMonitorCount] = useState(0);
- const [updateTrigger, setUpdateTrigger] = useState(false);
- const [sort, setSort] = useState({});
- const [data, setData] = useState([]);
- const prevFilter = useRef(filter);
- const headers = [
- {
- id: "name",
- content: (
- handleSort("name")}>
- Host
-
- {sort.order === "asc" ? (
-
- ) : (
-
- )}
-
-
- ),
- render: (row) => (
-
- ),
- },
- {
- id: "status",
- content: (
- handleSort("status")}
- >
- {" "}
- Status
-
- {sort.order === "asc" ? (
-
- ) : (
-
- )}
-
-
- ),
- render: (row) => {
- const status = determineState(row.monitor);
- return (
-
- );
- },
- },
- {
- id: "responseTime",
- content: "Response Time",
- render: (row) => ,
- },
- {
- id: "type",
- content: "Type",
- render: (row) => (
- {row.monitor.type}
- ),
- },
- {
- id: "actions",
- content: "Actions",
- render: (row) => (
-
- ),
- },
- ];
-
- const handleRowUpdate = () => {
- setUpdateTrigger((prev) => !prev);
- };
-
- const handleChangePage = (event, newPage) => {
- setPage(newPage);
- };
-
- const handleChangeRowsPerPage = (event) => {
- dispatch(
- setRowsPerPage({
- value: parseInt(event.target.value, 10),
- table: "monitors",
- })
- );
- setPage(0);
- };
-
- const fetchPage = useCallback(async () => {
- try {
- const { authToken } = authState;
- const user = jwtDecode(authToken);
- const res = await networkService.getMonitorsByTeamId({
- authToken,
- teamId: user.teamId,
- limit: 25,
- types: ["http", "ping", "docker", "port"],
- status: null,
- checkOrder: "desc",
- normalize: true,
- page: page,
- rowsPerPage: rowsPerPage,
- filter: filter,
- field: sort.field,
- order: sort.order,
- });
- setMonitors(res?.data?.data?.monitors ?? []);
- setMonitorCount(res?.data?.data?.monitorCount ?? 0);
- } catch (error) {
- logger.error(error);
- } finally {
- setIsSearching(false);
- }
- }, [authState, page, rowsPerPage, filter, sort, setIsSearching]);
-
- useEffect(() => {
- fetchPage();
- }, [
- updateTrigger,
- authState,
- page,
- rowsPerPage,
- filter,
- sort,
- setIsSearching,
- fetchPage,
- ]);
-
- // Listen for changes in filter, if new value reset the page
- useEffect(() => {
- if (prevFilter.current !== filter) {
- setPage(0);
- fetchPage();
- }
- prevFilter.current = filter;
- }, [filter, fetchPage]);
-
- const handleSort = async (field) => {
- let order = "";
- if (sort.field !== field) {
- order = "desc";
- } else {
- order = sort.order === "asc" ? "desc" : "asc";
- }
- setSort({ field, order });
-
- const { authToken } = authState;
- const user = jwtDecode(authToken);
-
- const res = await networkService.getMonitorsByTeamId({
- authToken,
- teamId: user.teamId,
- limit: 25,
- types: ["http", "ping"],
- status: null,
- checkOrder: "desc",
- normalize: true,
- page: page,
- rowsPerPage: rowsPerPage,
- filter: null,
- field: field,
- order: order,
- });
- setMonitors(res?.data?.data?.monitors ?? []);
- setMonitorCount(res?.data?.data?.monitorCount ?? 0);
- };
-
- useEffect(() => {
- const mappedMonitors = monitors.map((monitor) => {
- let uptimePercentage = "";
- let percentageColor = theme.palette.percentage.uptimeExcellent;
-
- // Determine uptime percentage and color based on the monitor's uptimePercentage value
- if (monitor.uptimePercentage !== undefined) {
- uptimePercentage =
- monitor.uptimePercentage === 0
- ? "0"
- : (monitor.uptimePercentage * 100).toFixed(2);
-
- percentageColor =
- monitor.uptimePercentage < 0.25
- ? theme.palette.percentage.uptimePoor
- : monitor.uptimePercentage < 0.5
- ? theme.palette.percentage.uptimeFair
- : monitor.uptimePercentage < 0.75
- ? theme.palette.percentage.uptimeGood
- : theme.palette.percentage.uptimeExcellent;
- }
-
- return {
- id: monitor._id,
- url: monitor.url,
- title: monitor.name,
- percentage: uptimePercentage,
- percentageColor,
- monitor: monitor,
- };
- });
- setData(mappedMonitors);
- }, [monitors, theme]);
-
- return (
-
- {isSearching && (
- <>
-
-
-
-
- >
- )}
- {/*
- This is the original SX for the row, doesn't match infrastructure table
- rowSX: {
- cursor: "pointer",
- "&:hover": {
- filter: "brightness(.75)",
- opacity: 0.75,
- transition: "filter 0.3s ease, opacity 0.3s ease",
- },
- },
- */}
- {monitors.length > 0 ? (
- {
- navigate(`/uptime/${row.id}`);
- },
- emptyView: "No monitors found",
- }}
- />
- ) : (
-
- )}
-
-
- );
-};
-
-MonitorTable.propTypes = {
- isAdmin: PropTypes.bool,
- filter: PropTypes.string,
- setIsSearching: PropTypes.func,
- isSearching: PropTypes.bool,
- setMonitorUpdateTrigger: PropTypes.func,
- handlePause: PropTypes.func,
-};
-
-const MemoizedMonitorTable = memo(MonitorTable);
-export default MemoizedMonitorTable;
diff --git a/Client/src/Pages/Uptime/Home/actionsMenu.jsx b/Client/src/Pages/Uptime/Home/actionsMenu.jsx
index 01452b718..bda27bf15 100644
--- a/Client/src/Pages/Uptime/Home/actionsMenu.jsx
+++ b/Client/src/Pages/Uptime/Home/actionsMenu.jsx
@@ -34,7 +34,7 @@ const ActionsMenu = ({ monitor, isAdmin, updateRowCallback, pauseCallback }) =>
if (action.meta.requestStatus === "fulfilled") {
setIsOpen(false); // close modal
dispatch(getUptimeMonitorsByTeamId(authState.authToken));
- updateCallback();
+ updateRowCallback();
createToast({ body: "Monitor deleted successfully." });
} else {
createToast({ body: "Failed to delete monitor." });
@@ -169,6 +169,8 @@ const ActionsMenu = ({ monitor, isAdmin, updateRowCallback, pauseCallback }) =>
{isAdmin && (