Implemented pagination for incidents component
This commit is contained in:
1 parent
3924099e3e
commit
26e3f81a91
7 files changed
+131
-176
No files matched your search
@@ -6,10 +6,9 @@ import {
|
||||
TableRow,
|
||||
TableCell,
|
||||
TableBody,
|
||||
TableFooter,
|
||||
TablePagination,
|
||||
Pagination,
|
||||
PaginationItem,
|
||||
Paper,
|
||||
} from "@mui/material";
|
||||
|
||||
import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded";
|
||||
@@ -20,29 +19,29 @@ import { useSelector } from "react-redux";
|
||||
import axiosInstance from "../../../Utils/axiosConfig";
|
||||
import { StatusLabel } from "../../../Components/Label";
|
||||
|
||||
const IncidentTable = ({ monitorId, filter }) => {
|
||||
const { authToken } = useSelector((state) => state.auth);
|
||||
const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
|
||||
const { authToken, user } = useSelector((state) => state.auth);
|
||||
const [checks, setChecks] = useState([]);
|
||||
const [checksCount, setChecksCount] = useState(0);
|
||||
const [paginationController, setPaginationController] = useState({
|
||||
page: 0,
|
||||
rowsPerPage: 5,
|
||||
rowsPerPage: 12,
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const fetchPage = async () => {
|
||||
try {
|
||||
if (monitorId === "0") {
|
||||
return;
|
||||
let url = `/checks/${selectedMonitor}?sortOrder=desc&filter=${filter}&page=${paginationController.page}&rowsPerPage=${paginationController.rowsPerPage}`;
|
||||
|
||||
if (selectedMonitor === "0") {
|
||||
url = `/checks/user/${user._id}?sortOrder=desc&filter=${filter}&page=${paginationController.page}&rowsPerPage=${paginationController.rowsPerPage}`;
|
||||
}
|
||||
const res = await axiosInstance.get(
|
||||
`/checks/${monitorId}?sortOrder=desc&filter=${filter}&page=${paginationController.page}&rowsPerPage=${paginationController.rowsPerPage}`,
|
||||
{
|
||||
headers: {
|
||||
Authorization: `Bearer ${authToken}`,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
const res = await axiosInstance.get(url, {
|
||||
headers: {
|
||||
Authorization: `Bearer ${authToken}`,
|
||||
},
|
||||
});
|
||||
setChecks(res.data.data.checks);
|
||||
setChecksCount(res.data.data.checksCount);
|
||||
} catch (error) {
|
||||
@@ -52,24 +51,18 @@ const IncidentTable = ({ monitorId, filter }) => {
|
||||
fetchPage();
|
||||
}, [
|
||||
authToken,
|
||||
monitorId,
|
||||
user,
|
||||
selectedMonitor,
|
||||
filter,
|
||||
paginationController.page,
|
||||
paginationController.rowsPerPage,
|
||||
]);
|
||||
|
||||
const handlePageChange = (_, newPage) => {
|
||||
console.log(newPage);
|
||||
setPaginationController({
|
||||
...paginationController,
|
||||
page: newPage,
|
||||
});
|
||||
};
|
||||
|
||||
const handleChangeRowsPerPage = (event) => {
|
||||
setPaginationController({
|
||||
...paginationController,
|
||||
rowsPerPage: parseInt(event.target.value, 10),
|
||||
page: 0,
|
||||
page: newPage - 1, // 0-indexed
|
||||
});
|
||||
};
|
||||
|
||||
@@ -78,7 +71,7 @@ const IncidentTable = ({ monitorId, filter }) => {
|
||||
paginationComponent = (
|
||||
<Pagination
|
||||
count={Math.ceil(checksCount / paginationController.rowsPerPage)}
|
||||
page={paginationController.page + 1}
|
||||
page={paginationController.page + 1} //0-indexed
|
||||
onChange={handlePageChange}
|
||||
shape="rounded"
|
||||
renderItem={(item) => (
|
||||
@@ -105,7 +98,7 @@ const IncidentTable = ({ monitorId, filter }) => {
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableContainer>
|
||||
<TableContainer component={Paper}>
|
||||
<Table>
|
||||
<TableHead>
|
||||
<TableRow>
|
||||
@@ -121,6 +114,7 @@ const IncidentTable = ({ monitorId, filter }) => {
|
||||
|
||||
return (
|
||||
<TableRow key={check._id}>
|
||||
<TableCell>{monitors[check.monitorId]?.name}</TableCell>
|
||||
<TableCell>
|
||||
<StatusLabel
|
||||
status={status}
|
||||
@@ -144,7 +138,8 @@ const IncidentTable = ({ monitorId, filter }) => {
|
||||
};
|
||||
|
||||
IncidentTable.propTypes = {
|
||||
monitorId: PropTypes.string.isRequired,
|
||||
monitors: PropTypes.object.isRequired,
|
||||
selectedMonitor: PropTypes.string.isRequired,
|
||||
filter: PropTypes.string.isRequired,
|
||||
};
|
||||
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { useSelector } from "react-redux";
|
||||
import { Typography, ButtonGroup, Stack, Box, Skeleton } from "@mui/material";
|
||||
import WestRoundedIcon from "@mui/icons-material/WestRounded";
|
||||
import { ButtonGroup, Stack, Skeleton } from "@mui/material";
|
||||
import Button from "../../Components/Button";
|
||||
import axiosInstance from "../../Utils/axiosConfig";
|
||||
import BasicTable from "../../Components/BasicTable";
|
||||
import { StatusLabel } from "../../Components/Label";
|
||||
import { useTheme } from "@emotion/react";
|
||||
import { useNavigate } from "react-router";
|
||||
import Select from "../../Components/Inputs/Select";
|
||||
@@ -122,96 +119,12 @@ const Incidents = () => {
|
||||
/>
|
||||
</ButtonGroup>
|
||||
</Stack>
|
||||
<IncidentTable monitorId={selectedMonitor} filter={filter} />
|
||||
<IncidentTable
|
||||
monitors={monitors}
|
||||
selectedMonitor={selectedMonitor}
|
||||
filter={filter}
|
||||
/>
|
||||
</Stack>
|
||||
// <>
|
||||
// <Stack className="incidents" gap={theme.gap.large}>
|
||||
// {loading ? (
|
||||
// <SkeletonLayout />
|
||||
// ) : false ? (
|
||||
// <>
|
||||
// <Stack direction="row" alignItems="center" gap={theme.gap.medium}>
|
||||
// <Typography component="h1">Incident history for: </Typography>
|
||||
// <Select
|
||||
// id="incidents-select-monitor"
|
||||
// placeholder="All servers"
|
||||
// value={selectedMonitor}
|
||||
// onChange={handleSelect}
|
||||
// items={Object.values(monitors)}
|
||||
// />
|
||||
// {hasAnyIncidents && hasSpecificIncidents && (
|
||||
// <ButtonGroup sx={{ ml: "auto" }}>
|
||||
// <Button
|
||||
// level="secondary"
|
||||
// label="All"
|
||||
// onClick={() => setFilter("all")}
|
||||
// sx={{
|
||||
// backgroundColor:
|
||||
// filter === "all" && theme.palette.otherColors.fillGray,
|
||||
// }}
|
||||
// />
|
||||
// <Button
|
||||
// level="secondary"
|
||||
// label="Down"
|
||||
// onClick={() => setFilter("down")}
|
||||
// sx={{
|
||||
// backgroundColor:
|
||||
// filter === "down" && theme.palette.otherColors.fillGray,
|
||||
// }}
|
||||
// />
|
||||
// <Button
|
||||
// level="secondary"
|
||||
// label="Cannot Resolve"
|
||||
// onClick={() => setFilter("resolve")}
|
||||
// sx={{
|
||||
// backgroundColor:
|
||||
// filter === "resolve" &&
|
||||
// theme.palette.otherColors.fillGray,
|
||||
// }}
|
||||
// />
|
||||
// </ButtonGroup>
|
||||
// )}
|
||||
// </Stack>
|
||||
// {hasAnyIncidents && hasSpecificIncidents ? (
|
||||
// <div>thing</div>
|
||||
// ) : (
|
||||
// <Typography alignSelf="center" mt={theme.gap.xxl}>
|
||||
// The monitor you have selected, has no recorded incidents yet.
|
||||
// </Typography>
|
||||
// )}
|
||||
// </>
|
||||
// ) : (
|
||||
// <Box>
|
||||
// <Button
|
||||
// level="tertiary"
|
||||
// label="Back"
|
||||
// animate="slideLeft"
|
||||
// img={<WestRoundedIcon />}
|
||||
// onClick={() => navigate(-1)}
|
||||
// sx={{
|
||||
// backgroundColor: theme.palette.otherColors.fillGray,
|
||||
// px: theme.gap.ml,
|
||||
// mb: theme.gap.ml,
|
||||
// "& svg.MuiSvgIcon-root": {
|
||||
// mr: theme.gap.small,
|
||||
// fill: theme.palette.otherColors.slateGray,
|
||||
// },
|
||||
// }}
|
||||
// />
|
||||
// <Box
|
||||
// padding={theme.gap.xxl}
|
||||
// gap={theme.gap.small}
|
||||
// border={1}
|
||||
// borderRadius={`${theme.shape.borderRadius}px`}
|
||||
// borderColor={theme.palette.otherColors.graishWhite}
|
||||
// backgroundColor={theme.palette.otherColors.white}
|
||||
// >
|
||||
// <Typography textAlign="center">No incidents, yet.</Typography>
|
||||
// </Box>
|
||||
// </Box>
|
||||
// )}
|
||||
// </Stack>
|
||||
// </>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@ import {
|
||||
TableRow,
|
||||
TableCell,
|
||||
TableBody,
|
||||
TableFooter,
|
||||
TablePagination,
|
||||
PaginationItem,
|
||||
Pagination,
|
||||
Paper,
|
||||
@@ -58,16 +56,16 @@ const PaginationTable = ({ monitorId, dateRange }) => {
|
||||
const handlePageChange = (_, newPage) => {
|
||||
setPaginationController({
|
||||
...paginationController,
|
||||
page: newPage - 1,
|
||||
page: newPage - 1, // 0-indexed
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
let paginationComponent = <></>;
|
||||
if (checksCount > paginationController.rowsPerPage) {
|
||||
paginationComponent = (
|
||||
<Pagination
|
||||
count={Math.ceil(checksCount / paginationController.rowsPerPage)}
|
||||
page={paginationController.page + 1}
|
||||
page={paginationController.page + 1} //0-indexed
|
||||
onChange={handlePageChange}
|
||||
shape="rounded"
|
||||
renderItem={(item) => (
|
||||
|
||||
@@ -3,6 +3,8 @@ const {
|
||||
createCheckBodyValidation,
|
||||
getChecksParamValidation,
|
||||
getChecksQueryValidation,
|
||||
getUserChecksParamValidation,
|
||||
getUserChecksQueryValidation,
|
||||
deleteChecksParamValidation,
|
||||
} = require("../validation/joi");
|
||||
const { successMessages } = require("../utils/messages");
|
||||
@@ -62,11 +64,22 @@ const getChecks = async (req, res, next) => {
|
||||
|
||||
const getUserChecks = async (req, res, next) => {
|
||||
try {
|
||||
const checks = req.db.getUserChecks(req);
|
||||
await getUserChecksParamValidation.validateAsync(req.params);
|
||||
await getUserChecksQueryValidation.validateAsync(req.query);
|
||||
} catch (error) {
|
||||
error.status = 422;
|
||||
error.service = SERVICE_NAME;
|
||||
error.message =
|
||||
error.details?.[0]?.message || error.message || "Validation Error";
|
||||
next(error);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const checkData = await req.db.getUserChecks(req);
|
||||
return res.status(200).json({
|
||||
success: true,
|
||||
msg: successMessages.CHECK_GET,
|
||||
data: { checksCount, checks },
|
||||
data: checkData,
|
||||
});
|
||||
} catch (error) {
|
||||
error.service = SERVICE_NAME;
|
||||
|
||||
@@ -74,14 +74,10 @@ const getChecks = async (req) => {
|
||||
const { monitorId } = req.params;
|
||||
let { sortOrder, limit, dateRange, filter, page, rowsPerPage } = req.query;
|
||||
// Default limit to 0 if not provided
|
||||
if (limit === undefined) limit = 0;
|
||||
limit = limit === "undefined" ? 0 : limit;
|
||||
|
||||
// Default sort order is newest -> oldest
|
||||
if (sortOrder === "asc") {
|
||||
sortOrder = 1;
|
||||
} else if (sortOrder === "desc") {
|
||||
sortOrder = -1;
|
||||
} else sortOrder = -1;
|
||||
sortOrder = sortOrder === "asc" ? 1 : -1;
|
||||
|
||||
// Build query
|
||||
const checksQuery = { monitorId: monitorId };
|
||||
@@ -121,43 +117,67 @@ const getChecks = async (req) => {
|
||||
}
|
||||
};
|
||||
|
||||
const getUserChecks = async (req) => {
|
||||
const { userId } = req.params;
|
||||
let { sortOrder, limit, dateRange, filter, page, rowsPerPage } = req.query;
|
||||
|
||||
// Get monitorIDs
|
||||
const userMonitors = await Monitor.find({ userId: userId });
|
||||
const monitorIds = userMonitors.map((monitor) => monitor._id);
|
||||
|
||||
//Build check query
|
||||
// Default limit to 0 if not provided
|
||||
limit = limit === "undefined" ? 0 : limit;
|
||||
|
||||
// Default sort order is newest -> oldest
|
||||
sortOrder = sortOrder === "asc" ? 1 : -1;
|
||||
|
||||
checksQuery = { monitorId: { $in: monitorIds } };
|
||||
|
||||
if (filter !== undefined) {
|
||||
checksQuery.status = false;
|
||||
switch (filter) {
|
||||
case "all":
|
||||
break;
|
||||
case "down":
|
||||
break;
|
||||
case "resolve":
|
||||
checksQuery.statusCode = 5000;
|
||||
break;
|
||||
default:
|
||||
console.log("default");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (dateRange !== undefined) {
|
||||
checksQuery.createdAt = { $gte: dateRangeLookup[dateRange] };
|
||||
}
|
||||
|
||||
// Skip and limit for pagination
|
||||
let skip = 0;
|
||||
if (page && rowsPerPage) {
|
||||
skip = page * rowsPerPage;
|
||||
}
|
||||
|
||||
const checksCount = await Check.countDocuments(checksQuery);
|
||||
|
||||
const checks = await Check.find(checksQuery)
|
||||
.skip(skip)
|
||||
.limit(rowsPerPage)
|
||||
.sort({ createdAt: sortOrder });
|
||||
|
||||
return { checksCount, checks };
|
||||
};
|
||||
|
||||
/**
|
||||
* Delete all checks for a monitor
|
||||
* Delete all checks for a user
|
||||
* @async
|
||||
* @param {string} monitorId
|
||||
* @returns {number}
|
||||
* @throws {Error}
|
||||
*/
|
||||
|
||||
const getUserChecks = async (req) => {
|
||||
const { userId } = req.params;
|
||||
try {
|
||||
const objectId = mongoose.Types.ObjectId.createFromHexString(userId);
|
||||
|
||||
const checks = await Check.aggregate([
|
||||
{
|
||||
$lookup: {
|
||||
from: "monitors", // The name of the Monitor collection
|
||||
localField: "monitorId",
|
||||
foreignField: "_id",
|
||||
as: "monitorDetails",
|
||||
},
|
||||
},
|
||||
{
|
||||
$unwind: "$monitorDetails",
|
||||
},
|
||||
{
|
||||
$match: {
|
||||
"monitorDetails.userId": objectId,
|
||||
},
|
||||
},
|
||||
]);
|
||||
return checks;
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
const deleteChecks = async (monitorId) => {
|
||||
try {
|
||||
const result = await Check.deleteMany({ monitorId });
|
||||
|
||||
+13
-12
@@ -4,7 +4,7 @@ const Notification = require("../models/Notification");
|
||||
|
||||
/**
|
||||
* Check Schema for MongoDB collection.
|
||||
*
|
||||
*
|
||||
* Represents a check associated with a monitor, storing information
|
||||
* about the status and response of a particular check event.
|
||||
*/
|
||||
@@ -12,7 +12,7 @@ const CheckSchema = mongoose.Schema(
|
||||
{
|
||||
/**
|
||||
* Reference to the associated Monitor document.
|
||||
*
|
||||
*
|
||||
* @type {mongoose.Schema.Types.ObjectId}
|
||||
*/
|
||||
monitorId: {
|
||||
@@ -22,7 +22,7 @@ const CheckSchema = mongoose.Schema(
|
||||
},
|
||||
/**
|
||||
* Status of the check (true for up, false for down).
|
||||
*
|
||||
*
|
||||
* @type {Boolean}
|
||||
*/
|
||||
status: {
|
||||
@@ -30,23 +30,23 @@ const CheckSchema = mongoose.Schema(
|
||||
},
|
||||
/**
|
||||
* Response time of the check in milliseconds.
|
||||
*
|
||||
*
|
||||
* @type {Number}
|
||||
*/
|
||||
responseTime: {
|
||||
type: Number,
|
||||
type: Number,
|
||||
},
|
||||
/**
|
||||
* HTTP status code received during the check.
|
||||
*
|
||||
*
|
||||
* @type {Number}
|
||||
*/
|
||||
statusCode: {
|
||||
type: Number,
|
||||
type: Number,
|
||||
},
|
||||
/**
|
||||
* Message or description of the check result.
|
||||
*
|
||||
*
|
||||
* @type {String}
|
||||
*/
|
||||
message: {
|
||||
@@ -54,7 +54,7 @@ const CheckSchema = mongoose.Schema(
|
||||
},
|
||||
/**
|
||||
* Expiry date of the check, auto-calculated to expire after 30 days.
|
||||
*
|
||||
*
|
||||
* @type {Date}
|
||||
*/
|
||||
expiry: {
|
||||
@@ -70,7 +70,7 @@ const CheckSchema = mongoose.Schema(
|
||||
|
||||
/**
|
||||
* Pre-save middleware to handle status change notifications.
|
||||
*
|
||||
*
|
||||
* This middleware checks if the status of the monitor associated
|
||||
* with the check has changed and sends notifications if necessary.
|
||||
*/
|
||||
@@ -79,7 +79,9 @@ CheckSchema.pre("save", async function (next) {
|
||||
const monitor = await mongoose.model("Monitor").findById(this.monitorId);
|
||||
|
||||
if (monitor) {
|
||||
const notifications = await Notification.find({ monitorId: this.monitorId });
|
||||
const notifications = await Notification.find({
|
||||
monitorId: this.monitorId,
|
||||
});
|
||||
|
||||
// Check if there are any notifications
|
||||
if (notifications && notifications.length > 0) {
|
||||
@@ -128,5 +130,4 @@ CheckSchema.pre("save", async function (next) {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
module.exports = mongoose.model("Check", CheckSchema);
|
||||
@@ -241,6 +241,19 @@ const getChecksQueryValidation = joi.object({
|
||||
rowsPerPage: joi.number(),
|
||||
});
|
||||
|
||||
const getUserChecksParamValidation = joi.object({
|
||||
userId: joi.string().required(),
|
||||
});
|
||||
|
||||
const getUserChecksQueryValidation = joi.object({
|
||||
sortOrder: joi.string().valid("asc", "desc"),
|
||||
limit: joi.number(),
|
||||
dateRange: joi.string().valid("day", "week", "month"),
|
||||
filter: joi.string().valid("all", "down", "resolve"),
|
||||
page: joi.number(),
|
||||
rowsPerPage: joi.number(),
|
||||
});
|
||||
|
||||
const deleteChecksParamValidation = joi.object({
|
||||
monitorId: joi.string().required(),
|
||||
});
|
||||
@@ -321,6 +334,8 @@ module.exports = {
|
||||
createCheckBodyValidation,
|
||||
getChecksParamValidation,
|
||||
getChecksQueryValidation,
|
||||
getUserChecksParamValidation,
|
||||
getUserChecksQueryValidation,
|
||||
deleteChecksParamValidation,
|
||||
deleteUserParamValidation,
|
||||
getPageSpeedCheckParamValidation,
|
||||
|
||||
Reference in new issue
Block a user