From a92839cf4e3afb6b2e0f2aa9906394165554e637 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 5 Mar 2025 19:23:23 -0800 Subject: [PATCH 1/7] new query --- src/Components/Inputs/Select/index.jsx | 17 ++++++++++++++++- .../Area/index.jsx | 2 +- src/Pages/DistributedUptime/Details/index.jsx | 3 +-- .../Monitors/Hooks/useSubscribeToMonitors.jsx | 6 +----- .../DistributedUptimeStatus/Status/index.jsx | 4 ++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/Components/Inputs/Select/index.jsx b/src/Components/Inputs/Select/index.jsx index f0a1d11c0..fa6108351 100644 --- a/src/Components/Inputs/Select/index.jsx +++ b/src/Components/Inputs/Select/index.jsx @@ -83,10 +83,25 @@ const Select = ({ name={name} inputProps={{ id: id }} IconComponent={KeyboardArrowDownIcon} - MenuProps={{ disableScrollLock: true }} + renderValue={(selected) => { + return ( + + {items.find((item) => item._id === selected)?.name} + + ); + }} sx={{ fontSize: 13, + maxWidth: "200px", minWidth: "125px", + "& fieldset": { borderRadius: theme.shape.borderRadius, borderColor: theme.palette.primary.lowContrast, diff --git a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx index ac6b770ac..1102f72b8 100644 --- a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx @@ -63,7 +63,7 @@ const DistributedUptimeResponseAreaChart = ({ checks }) => { } minTickGap={0} axisLine={false} diff --git a/src/Pages/DistributedUptime/Details/index.jsx b/src/Pages/DistributedUptime/Details/index.jsx index 24c625c24..420291d22 100644 --- a/src/Pages/DistributedUptime/Details/index.jsx +++ b/src/Pages/DistributedUptime/Details/index.jsx @@ -75,7 +75,6 @@ const DistributedUptimeDetails = () => { ); } - return ( { gap={theme.spacing(8)} > diff --git a/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx b/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx index ffca50cd7..3b6c262ba 100644 --- a/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx +++ b/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx @@ -25,11 +25,7 @@ const useSubscribeToMonitors = (page, rowsPerPage) => { const initialDataRes = await networkService.getDistributedUptimeMonitors({ teamId: user.teamId, limit: 25, - types: [ - typeof import.meta.env.VITE_DEPIN_TESTING === "undefined" - ? "distributed_http" - : "distributed_test", - ], + types: ["distributed_http"], page, rowsPerPage, }); diff --git a/src/Pages/DistributedUptimeStatus/Status/index.jsx b/src/Pages/DistributedUptimeStatus/Status/index.jsx index b2fb0780f..33bfe6844 100644 --- a/src/Pages/DistributedUptimeStatus/Status/index.jsx +++ b/src/Pages/DistributedUptimeStatus/Status/index.jsx @@ -234,7 +234,7 @@ const DistributedUptimeStatus = () => { direction={{ s: "column", md: "row" }} > { /> Date: Wed, 5 Mar 2025 19:35:34 -0800 Subject: [PATCH 2/7] add explain results --- .../DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx b/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx index e8a49e886..200257e12 100644 --- a/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx +++ b/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx @@ -36,6 +36,9 @@ const useSubscribeToDetails = ({ monitorId, isPublic, isPublished, dateRange }) setConnectionStatus("up"); setLastUpdateTrigger(Date.now()); setMonitor(responseData); + if (responseData.explainResults) { + console.log(responseData.explainResults); + } } catch (error) { setNetworkError(true); setConnectionStatus("down"); From 23b22fad38e8c291e44bb1fac5cab8952feb6c7e Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 6 Mar 2025 09:13:09 -0800 Subject: [PATCH 3/7] fix chart ID --- .../Components/DistributedUptimeResponseChart/Bar/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx index 6b013c29f..a6d3d455b 100644 --- a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx @@ -67,7 +67,7 @@ const DistributedUptimeResponseBarChart = ({ checks }) => { /> } minTickGap={0} axisLine={false} From 995bd644e5245f9a7e5c5fa07f8462bd3e8b965b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 6 Mar 2025 09:31:41 -0800 Subject: [PATCH 4/7] add map checks --- src/Pages/DistributedUptime/Details/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/DistributedUptime/Details/index.jsx b/src/Pages/DistributedUptime/Details/index.jsx index 420291d22..6e84240aa 100644 --- a/src/Pages/DistributedUptime/Details/index.jsx +++ b/src/Pages/DistributedUptime/Details/index.jsx @@ -113,7 +113,7 @@ const DistributedUptimeDetails = () => { gap={theme.spacing(8)} > From d447231780393f1acc8980def8dc5b40258a5e07 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 6 Mar 2025 09:35:44 -0800 Subject: [PATCH 5/7] revert status page --- src/Pages/DistributedUptimeStatus/Status/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/DistributedUptimeStatus/Status/index.jsx b/src/Pages/DistributedUptimeStatus/Status/index.jsx index 33bfe6844..515bd9be5 100644 --- a/src/Pages/DistributedUptimeStatus/Status/index.jsx +++ b/src/Pages/DistributedUptimeStatus/Status/index.jsx @@ -234,7 +234,7 @@ const DistributedUptimeStatus = () => { direction={{ s: "column", md: "row" }} > Date: Thu, 6 Mar 2025 09:39:58 -0800 Subject: [PATCH 6/7] remove diagnostic --- .../DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx b/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx index 200257e12..e8a49e886 100644 --- a/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx +++ b/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx @@ -36,9 +36,6 @@ const useSubscribeToDetails = ({ monitorId, isPublic, isPublished, dateRange }) setConnectionStatus("up"); setLastUpdateTrigger(Date.now()); setMonitor(responseData); - if (responseData.explainResults) { - console.log(responseData.explainResults); - } } catch (error) { setNetworkError(true); setConnectionStatus("down"); From e8fe3ceee3f5a47dabf667cb464955dc4e6053e4 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 6 Mar 2025 09:48:10 -0800 Subject: [PATCH 7/7] reset --- src/Components/Inputs/Select/index.jsx | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Components/Inputs/Select/index.jsx b/src/Components/Inputs/Select/index.jsx index fa6108351..f0a1d11c0 100644 --- a/src/Components/Inputs/Select/index.jsx +++ b/src/Components/Inputs/Select/index.jsx @@ -83,25 +83,10 @@ const Select = ({ name={name} inputProps={{ id: id }} IconComponent={KeyboardArrowDownIcon} - renderValue={(selected) => { - return ( - - {items.find((item) => item._id === selected)?.name} - - ); - }} + MenuProps={{ disableScrollLock: true }} sx={{ fontSize: 13, - maxWidth: "200px", minWidth: "125px", - "& fieldset": { borderRadius: theme.shape.borderRadius, borderColor: theme.palette.primary.lowContrast,