From 37958d7307313b62c1982f248699f2b48c5e9f03 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 6 Mar 2025 12:04:49 -0800 Subject: [PATCH 1/8] refactor to use monitor-stats --- .../DistributedUptimeResponseChart/Helpers/ToolTip.jsx | 2 +- .../Details/Components/StatBoxes/index.jsx | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx index db8cb3890..064678897 100644 --- a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx +++ b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx @@ -75,7 +75,7 @@ CustomToolTip.propTypes = { PropTypes.shape({ value: PropTypes.number, payload: PropTypes.shape({ - _id: PropTypes.string, + _id: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), avgResponseTime: PropTypes.number, originalAvgResponseTime: PropTypes.number, }), diff --git a/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx b/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx index ffc8dbac8..0cdd3f01d 100644 --- a/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx @@ -9,6 +9,11 @@ import PropTypes from "prop-types"; const StatBoxes = ({ monitor, lastUpdateTrigger }) => { const theme = useTheme(); + let timeSinceLastCheck = 0; + + if (monitor?.lastCheckTimestamp) { + timeSinceLastCheck = Date.now() - monitor?.lastCheckTimestamp; + } return ( { heading={"Last check"} subHeading={ } From dce8cf6ad53baa65f1c95927cc873b80a680ea65 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 6 Mar 2025 13:54:04 -0800 Subject: [PATCH 2/8] use simplified map query --- .../Details/Components/DistributedUptimeMap/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx index 858eaab78..03993dcc3 100644 --- a/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx @@ -75,7 +75,7 @@ const DistributedUptimeMap = ({ type: "Feature", geometry: { type: "Point", - coordinates: [check.lng, check.lat], + coordinates: [check._id.lng, check._id.lat], }, properties: { color: theme.palette.accent.main, From 199fd5cf380483ba6a426afd5012036db9b278ea Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Mar 2025 11:27:05 +0000 Subject: [PATCH 3/8] Update dependency axios to v1.8.2 --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index babcadf5c..fa200b220 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9189,9 +9189,9 @@ } }, "node_modules/axios": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz", - "integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz", + "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", From 2259f45dc09764f85fba56cea407ad59bf8c251d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Mar 2025 11:27:16 +0000 Subject: [PATCH 4/8] Update material-ui monorepo to v7.27.3 --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index babcadf5c..10ae53f7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,8 @@ "@mui/lab": "6.0.0-beta.30", "@mui/material": "6.4.7", "@mui/x-charts": "^7.5.1", - "@mui/x-data-grid": "7.27.2", - "@mui/x-date-pickers": "7.27.1", + "@mui/x-data-grid": "7.27.3", + "@mui/x-date-pickers": "7.27.3", "@reduxjs/toolkit": "2.6.0", "@solana/wallet-adapter-base": "0.9.23", "@solana/wallet-adapter-material-ui": "0.16.34", @@ -3861,9 +3861,9 @@ } }, "node_modules/@mui/x-data-grid": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.27.2.tgz", - "integrity": "sha512-Nj6PWp6WN0gkps676j1Jai3mP1fQotJbqMTvllU7LwQp09S/RE/uJicYdqfeWQLxtQipWm5dnAY63gzsTiAHGA==", + "version": "7.27.3", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.27.3.tgz", + "integrity": "sha512-7zbDbFrhV6ODjyn3ImOZG34nbMbCvmHgqYTYP273TNAj8hMy4BiLyiKFFZTzVddIj3KQ6qLzBpByhqifGgEDOg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.25.7", @@ -3899,9 +3899,9 @@ } }, "node_modules/@mui/x-date-pickers": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.27.1.tgz", - "integrity": "sha512-2YPhTM9TM39dmIkEQdSB6P6NASePB9LuhXXKQqq0PX4FXGymYEPz/acQXkk617zwfxJJaDhJZ6g8SAv5pklTJQ==", + "version": "7.27.3", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.27.3.tgz", + "integrity": "sha512-igfKTPC4ZVCmS5j/NXcXBtj/hHseQHzRpCpIB1PMnJGhMdRYXnz8qZz5XhlNBKlzJVXkGu6Uil+obZpCLNj1xg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.25.7", diff --git a/package.json b/package.json index 60d1abaa1..04d073a96 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "@fontsource/roboto": "^5.0.13", "@hello-pangea/dnd": "^18.0.0", "@mui/x-charts": "^7.5.1", - "@mui/x-data-grid": "7.27.2", - "@mui/x-date-pickers": "7.27.1", + "@mui/x-data-grid": "7.27.3", + "@mui/x-date-pickers": "7.27.3", "@mui/icons-material": "6.4.7", "@mui/lab": "6.0.0-beta.30", "@mui/material": "6.4.7", From ce9d5f1ae8dde366d2cdb505abd91d8bdfe190d4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Mar 2025 13:02:41 +0000 Subject: [PATCH 5/8] Update dependency mui-color-input to v6 --- package-lock.json | 19 ++++++++++--------- package.json | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index babcadf5c..42fd3edaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "joi": "17.13.3", "jwt-decode": "^4.0.0", "maplibre-gl": "5.2.0", - "mui-color-input": "^5.0.1", + "mui-color-input": "^6.0.0", "react": "18.3.1", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", @@ -14848,19 +14848,20 @@ "license": "MIT" }, "node_modules/mui-color-input": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mui-color-input/-/mui-color-input-5.0.1.tgz", - "integrity": "sha512-50Ws4vhg4UPQSZEZDCNc7vyUBSb9x1bK+bO1o0wxJvQYgeSyg2r7mYDlavpCh+ZvisgBL/98y0GVN6M9901JWg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/mui-color-input/-/mui-color-input-6.0.0.tgz", + "integrity": "sha512-F9n/RqPLq7fnPWeF53/qssbIHvart7clpOfE+f+dsM+3ddfawwg98+PEhzv3cdAYlJLE9zfVViVTsp/ckUUd3g==", + "license": "MIT", "dependencies": { "@ctrl/tinycolor": "^4.1.0" }, "peerDependencies": { - "@emotion/react": "^11.5.0", - "@emotion/styled": "^11.3.0", + "@emotion/react": "^11.13.0", + "@emotion/styled": "^11.13.0", "@mui/material": "^6.0.0", - "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0" + "@types/react": "^18.0.0 || ^19.0.0", + "react": "^18.0.0 || ^19.0.0", + "react-dom": "^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { diff --git a/package.json b/package.json index 60d1abaa1..74b8b1fc9 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "immutability-helper": "^3.1.1", "joi": "17.13.3", "maplibre-gl": "5.2.0", - "mui-color-input": "^5.0.1", + "mui-color-input": "^6.0.0", "react": "18.3.1", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", From 94f4d63e96c407dabaa9e149b5c3cfb833f83f46 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 7 Mar 2025 11:14:40 -0800 Subject: [PATCH 6/8] fix timeSinceLastCheck --- .../Details/Components/StatBoxes/index.jsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx b/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx index 0cdd3f01d..97513bb4f 100644 --- a/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx @@ -9,11 +9,6 @@ import PropTypes from "prop-types"; const StatBoxes = ({ monitor, lastUpdateTrigger }) => { const theme = useTheme(); - let timeSinceLastCheck = 0; - - if (monitor?.lastCheckTimestamp) { - timeSinceLastCheck = Date.now() - monitor?.lastCheckTimestamp; - } return ( { heading={"Last check"} subHeading={ } From 353f4a9dd62875ce77f395120c42446d58d4f948 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 7 Mar 2025 11:15:19 -0800 Subject: [PATCH 7/8] correct timeSinceLastCheck and uptimePercentage --- .../Details/Components/StatusHeader/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx b/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx index dd3263372..316427cec 100644 --- a/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx @@ -59,7 +59,7 @@ const StatusHeader = ({ monitor, connectionStatus, elementToCapture }) => { backgroundColor={theme.palette.successSecondary.lowContrast} color={theme.palette.success.lowContrast} > - Uptime: {(monitor.totalUptime * 100).toFixed(2)}% + Uptime: {(monitor.uptimePercentage * 100).toFixed(2)}% { Last updated{" "} From 056e0191b89bc9f8894fa1e45d5f15fa2310882e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sat, 8 Mar 2025 01:54:38 +0000 Subject: [PATCH 8/8] Update dependency @reduxjs/toolkit to v2.6.1 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89b17b968..5120f576b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@mui/x-charts": "^7.5.1", "@mui/x-data-grid": "7.27.3", "@mui/x-date-pickers": "7.27.3", - "@reduxjs/toolkit": "2.6.0", + "@reduxjs/toolkit": "2.6.1", "@solana/wallet-adapter-base": "0.9.23", "@solana/wallet-adapter-material-ui": "0.16.34", "@solana/wallet-adapter-react": "0.15.35", @@ -4692,9 +4692,9 @@ } }, "node_modules/@reduxjs/toolkit": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.0.tgz", - "integrity": "sha512-mWJCYpewLRyTuuzRSEC/IwIBBkYg2dKtQas8mty5MaV2iXzcmicS3gW554FDeOvLnY3x13NIk8MB1e8wHO7rqQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.1.tgz", + "integrity": "sha512-SSlIqZNYhqm/oMkXbtofwZSt9lrncblzo6YcZ9zoX+zLngRBrCOjK4lNLdkNucJF58RHOWrD9txT3bT3piH7Zw==", "license": "MIT", "dependencies": { "immer": "^10.0.3", diff --git a/package.json b/package.json index a8fa1128e..5100a0529 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@mui/icons-material": "6.4.7", "@mui/lab": "6.0.0-beta.30", "@mui/material": "6.4.7", - "@reduxjs/toolkit": "2.6.0", + "@reduxjs/toolkit": "2.6.1", "@solana/wallet-adapter-base": "0.9.23", "@solana/wallet-adapter-material-ui": "0.16.34", "@solana/wallet-adapter-react": "0.15.35",