Add update hook

This commit is contained in:
Alex Holliday committed 2024-09-04 18:42:50 -07:00
1 parent 1212a273aa
commit bc7f110b01
4 files changed
+29 -13

No files matched your search

@@ -36,6 +36,11 @@ const MonitorTable = ({ isAdmin }) => {
const [monitors, setMonitors] = useState([]); const [monitors, setMonitors] = useState([]);
const [monitorCount, setMonitorCount] = useState(0); const [monitorCount, setMonitorCount] = useState(0);
const authState = useSelector((state) => state.auth); const authState = useSelector((state) => state.auth);
const [updateTrigger, setUpdateTrigger] = useState(false);
const handleActionMenuDelete = () => {
setUpdateTrigger((prev) => !prev);
};
const handlePageChange = (_, newPage) => { const handlePageChange = (_, newPage) => {
setPaginationController({ setPaginationController({
@@ -60,15 +65,19 @@ const MonitorTable = ({ isAdmin }) => {
paginationController.page, paginationController.page,
paginationController.rowsPerPage paginationController.rowsPerPage
); );
console.log(res.data.data); setMonitors(res?.data?.data?.monitors ?? []);
setMonitors(res?.data?.data ?? []); setMonitorCount(res?.data?.data?.monitorCount ?? 0);
setMonitorCount(0);
} catch (error) { } catch (error) {
logger.error(error); logger.error(error);
} }
}; };
fetchPage(); fetchPage();
}, []); }, [
updateTrigger,
authState,
paginationController.page,
paginationController.rowsPerPage,
]);
let paginationComponent = <></>; let paginationComponent = <></>;
if (monitorCount > paginationController.rowsPerPage) { if (monitorCount > paginationController.rowsPerPage) {
@@ -168,7 +177,11 @@ const MonitorTable = ({ isAdmin }) => {
</span> </span>
</TableCell> </TableCell>
<TableCell> <TableCell>
<ActionsMenu monitor={monitor} isAdmin={isAdmin} /> <ActionsMenu
monitor={monitor}
isAdmin={isAdmin}
updateCallback={handleActionMenuDelete}
/>
</TableCell> </TableCell>
</TableRow> </TableRow>
); );
@@ -181,4 +194,8 @@ const MonitorTable = ({ isAdmin }) => {
); );
}; };
MonitorTable.propTypes = {
isAdmin: PropTypes.bool,
};
export default MonitorTable; export default MonitorTable;
@@ -19,7 +19,7 @@ import {
import Settings from "../../../assets/icons/settings-bold.svg?react"; import Settings from "../../../assets/icons/settings-bold.svg?react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
const ActionsMenu = ({ monitor, isAdmin }) => { const ActionsMenu = ({ monitor, isAdmin, updateCallback }) => {
const [anchorEl, setAnchorEl] = useState(null); const [anchorEl, setAnchorEl] = useState(null);
const [actions, setActions] = useState({}); const [actions, setActions] = useState({});
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
@@ -37,6 +37,7 @@ const ActionsMenu = ({ monitor, isAdmin }) => {
if (action.meta.requestStatus === "fulfilled") { if (action.meta.requestStatus === "fulfilled") {
setIsOpen(false); // close modal setIsOpen(false); // close modal
dispatch(getUptimeMonitorsByTeamId(authState.authToken)); dispatch(getUptimeMonitorsByTeamId(authState.authToken));
updateCallback();
createToast({ body: "Monitor deleted successfully." }); createToast({ body: "Monitor deleted successfully." });
} else { } else {
createToast({ body: "Failed to delete monitor." }); createToast({ body: "Failed to delete monitor." });
@@ -222,6 +223,7 @@ ActionsMenu.propTypes = {
type: PropTypes.string, type: PropTypes.string,
}).isRequired, }).isRequired,
isAdmin: PropTypes.bool, isAdmin: PropTypes.bool,
updateCallback: PropTypes.func,
}; };
export default ActionsMenu; export default ActionsMenu;
+2 -6
View File
@@ -9,7 +9,6 @@ import PropTypes from "prop-types";
import SkeletonLayout from "./skeleton"; import SkeletonLayout from "./skeleton";
import Fallback from "./fallback"; import Fallback from "./fallback";
import StatusBox from "./StatusBox"; import StatusBox from "./StatusBox";
import { buildData } from "./monitorData";
import Breadcrumbs from "../../../Components/Breadcrumbs"; import Breadcrumbs from "../../../Components/Breadcrumbs";
import Greeting from "../../../Utils/greeting"; import Greeting from "../../../Utils/greeting";
import MonitorTable from "./MonitorTable"; import MonitorTable from "./MonitorTable";
@@ -25,7 +24,7 @@ const Monitors = ({ isAdmin }) => {
dispatch(getUptimeMonitorsByTeamId(authState.authToken)); dispatch(getUptimeMonitorsByTeamId(authState.authToken));
}, [authState.authToken, dispatch]); }, [authState.authToken, dispatch]);
const monitorStats = monitorState.monitors.reduce( const monitorStats = monitorState.monitors.monitors.reduce(
(acc, monitor) => { (acc, monitor) => {
if (monitor.isActive === false) { if (monitor.isActive === false) {
acc["paused"] += 1; acc["paused"] += 1;
@@ -39,8 +38,6 @@ const Monitors = ({ isAdmin }) => {
{ paused: 0, up: 0, down: 0 } { paused: 0, up: 0, down: 0 }
); );
const data = buildData(monitorState.monitors, isAdmin, navigate);
let loading = monitorState.isLoading && monitorState.monitors.length === 0; let loading = monitorState.isLoading && monitorState.monitors.length === 0;
return ( return (
@@ -119,8 +116,7 @@ const Monitors = ({ isAdmin }) => {
</Box> </Box>
{/* TODO - add search bar */} {/* TODO - add search bar */}
</Stack> </Stack>
<MonitorTable teamId="test" /> <MonitorTable isAdmin={isAdmin} />
{/* <BasicTable data={data} paginated={true} table={"monitors"} /> */}
</Box> </Box>
</> </>
)} )}
+2 -1
View File
@@ -396,6 +396,7 @@ const getMonitorsByTeamId = async (req, res) => {
let { limit, type, status, sortOrder, normalize, page, rowsPerPage } = let { limit, type, status, sortOrder, normalize, page, rowsPerPage } =
req.query || {}; req.query || {};
const monitorQuery = { teamId: req.params.teamId }; const monitorQuery = { teamId: req.params.teamId };
const monitorsCount = await Monitor.countDocuments(monitorQuery);
// Pagination // Pagination
let skip = 0; let skip = 0;
@@ -449,7 +450,7 @@ const getMonitorsByTeamId = async (req, res) => {
return { ...monitor.toObject(), checks }; return { ...monitor.toObject(), checks };
}) })
); );
return monitorsWithChecks; return { monitors: monitorsWithChecks, monitorCount: monitorsCount };
} catch (error) { } catch (error) {
throw error; throw error;
} }