diff --git a/Client/src/Pages/Incidents/IncidentTable/index.jsx b/Client/src/Pages/Incidents/IncidentTable/index.jsx index b31346b30..b0422c510 100644 --- a/Client/src/Pages/Incidents/IncidentTable/index.jsx +++ b/Client/src/Pages/Incidents/IncidentTable/index.jsx @@ -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 = ( ( @@ -105,7 +98,7 @@ const IncidentTable = ({ monitorId, filter }) => { return ( <> - + @@ -121,6 +114,7 @@ const IncidentTable = ({ monitorId, filter }) => { return ( + {monitors[check.monitorId]?.name} { }; IncidentTable.propTypes = { - monitorId: PropTypes.string.isRequired, + monitors: PropTypes.object.isRequired, + selectedMonitor: PropTypes.string.isRequired, filter: PropTypes.string.isRequired, }; diff --git a/Client/src/Pages/Incidents/index.jsx b/Client/src/Pages/Incidents/index.jsx index 45237a0d1..63e3ce69f 100644 --- a/Client/src/Pages/Incidents/index.jsx +++ b/Client/src/Pages/Incidents/index.jsx @@ -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 = () => { /> - + - // <> - // - // {loading ? ( - // - // ) : false ? ( - // <> - // - // Incident history for: - //