From 6dde4646d8206eb612932b9e6337409c5be58ede Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 2 Aug 2024 10:53:24 -0700 Subject: [PATCH 1/3] Add prevent default to action toggle --- Client/src/Components/BasicTable/index.jsx | 4 +++- Client/src/Pages/Monitors/index.jsx | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) 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 From 004e43092b5de425e5fa38859d7e65bb2986bb0b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 2 Aug 2024 10:57:12 -0700 Subject: [PATCH 2/3] Stop event bubbling on link to monitor site --- Client/src/Pages/Monitors/index.jsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx index d7e3d542d..451c76f30 100644 --- a/Client/src/Pages/Monitors/index.jsx +++ b/Client/src/Pages/Monitors/index.jsx @@ -41,7 +41,14 @@ import { const Host = ({ params }) => { return ( - + { + event.stopPropagation(); + }} + > {params.title} @@ -231,8 +238,7 @@ const Monitors = () => { onClose={closeMenu} > { - event.stopPropagation(); + onClick={() => { window.open(actions.url, "_blank", "noreferrer"); }} > From 8d5850607071f9718a8099f0526f1e48360514cd Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 2 Aug 2024 11:16:02 -0700 Subject: [PATCH 3/3] Add inline style to ResponseTime chart --- Client/src/Components/Charts/ResponseTimeChart/index.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Client/src/Components/Charts/ResponseTimeChart/index.jsx b/Client/src/Components/Charts/ResponseTimeChart/index.jsx index d76abc196..063ce3b16 100644 --- a/Client/src/Components/Charts/ResponseTimeChart/index.jsx +++ b/Client/src/Components/Charts/ResponseTimeChart/index.jsx @@ -8,7 +8,12 @@ const ResponseTimeChart = ({ checks = [] }) => { return (
- + {normalizedChecks.map((check, index) => (