diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx index 2a580d512..3f89de700 100644 --- a/Client/src/Components/BasicTable/index.jsx +++ b/Client/src/Components/BasicTable/index.jsx @@ -135,7 +135,9 @@ const BasicTable = ({ data, paginated, reversed, rowsPerPage = 5 }) => { {displayData.map((row) => { return ( diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx index 9c9f99d15..d7e3d542d 100644 --- a/Client/src/Pages/Monitors/index.jsx +++ b/Client/src/Pages/Monitors/index.jsx @@ -60,6 +60,7 @@ const Monitors = () => { const [anchorEl, setAnchorEl] = useState(null); const [actions, setActions] = useState({}); const openMenu = (event, id, url) => { + event.preventDefault(); setAnchorEl(event.currentTarget); setActions({ id: id, url: url }); }; @@ -137,7 +138,7 @@ const Monitors = () => { return { id: monitor._id, // disabled for now - // handleClick: () => navigate(`/monitors/${monitor._id}`), + handleClick: () => navigate(`/monitors/${monitor._id}`), data: [ { id: idx, data: }, { @@ -163,7 +164,10 @@ const Monitors = () => { <> openMenu(event, monitor._id, monitor.url)} + onClick={(event) => { + event.stopPropagation(); + openMenu(event, monitor._id, monitor.url); + }} sx={{ "&:focus": { outline: "none", @@ -227,7 +231,10 @@ const Monitors = () => { onClose={closeMenu} > window.open(actions.url, "_blank", "noreferrer")} + onClick={(event) => { + event.stopPropagation(); + window.open(actions.url, "_blank", "noreferrer"); + }} > Open site