From 71569e1d50b6315f1d3d2311e44c0bb3150d15ba Mon Sep 17 00:00:00 2001 From: Aryaman Kumar Sharma Date: Wed, 5 Mar 2025 00:58:43 +0530 Subject: [PATCH 01/11] Fix: Incidents for all monitors --- src/Pages/Incidents/Components/IncidentTable/index.jsx | 3 +++ src/Pages/Incidents/Hooks/useChecksFetch.jsx | 5 +++-- src/Pages/Incidents/Hooks/useMonitorsFetch.jsx | 10 +++++++--- src/Utils/NetworkService.js | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Pages/Incidents/Components/IncidentTable/index.jsx b/src/Pages/Incidents/Components/IncidentTable/index.jsx index ba7a03e05..16adcee16 100644 --- a/src/Pages/Incidents/Components/IncidentTable/index.jsx +++ b/src/Pages/Incidents/Components/IncidentTable/index.jsx @@ -27,8 +27,11 @@ const IncidentTable = ({ //Local state const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); + const selectedMonitorDetails = monitors?.[selectedMonitor]; + const selectedMonitorType = selectedMonitorDetails?.type; const { isLoading, networkError, checks, checksCount } = useChecksFetch({ selectedMonitor, + selectedMonitorType, filter, dateRange, page, diff --git a/src/Pages/Incidents/Hooks/useChecksFetch.jsx b/src/Pages/Incidents/Hooks/useChecksFetch.jsx index 8460a3036..bb1f201b0 100644 --- a/src/Pages/Incidents/Hooks/useChecksFetch.jsx +++ b/src/Pages/Incidents/Hooks/useChecksFetch.jsx @@ -2,7 +2,7 @@ import { useState, useEffect } from "react"; import { networkService } from "../../../main"; import { createToast } from "../../../Utils/toastUtils"; import { useSelector } from "react-redux"; -const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage }) => { +const useChecksFetch = ({ selectedMonitor, selectedMonitorType, filter, dateRange, page, rowsPerPage }) => { //Redux const { user } = useSelector((state) => state.auth); @@ -33,6 +33,7 @@ const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage res = await networkService.getChecksByMonitor({ status: false, monitorId: selectedMonitor, + type: selectedMonitorType, sortOrder: "desc", limit: null, dateRange, @@ -51,7 +52,7 @@ const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage } }; fetchChecks(); - }, [user, dateRange, page, rowsPerPage, filter, selectedMonitor]); + }, [user, dateRange, page, rowsPerPage, filter, selectedMonitor, selectedMonitorType]); return { isLoading, networkError, checks, checksCount }; }; diff --git a/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx b/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx index 3d80a89c7..fcf729cee 100644 --- a/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx +++ b/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx @@ -25,9 +25,13 @@ const useMonitorsFetch = ({ teamId }) => { field: null, order: null, }); - if (res?.data?.data?.monitors?.length > 0) { - const monitorLookup = res.data.data.monitors.reduce((acc, monitor) => { - acc[monitor._id] = monitor; + if (res?.data?.data?.filteredMonitors?.length > 0) { + const monitorLookup = res.data.data.filteredMonitors.reduce((acc, monitor) => { + acc[monitor._id] = { + _id: monitor._id, + name: monitor.name, + type: monitor.type + }; return acc; }, {}); setMonitors(monitorLookup); diff --git a/src/Utils/NetworkService.js b/src/Utils/NetworkService.js index 1f6a36726..8925ead1e 100644 --- a/src/Utils/NetworkService.js +++ b/src/Utils/NetworkService.js @@ -567,6 +567,7 @@ class NetworkService { async getChecksByMonitor(config) { const params = new URLSearchParams(); + if (config.type) params.append("type", config.type); if (config.sortOrder) params.append("sortOrder", config.sortOrder); if (config.limit) params.append("limit", config.limit); if (config.dateRange) params.append("dateRange", config.dateRange); From 6df3b985af7248a8cd8e9571c76f79918313d472 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 5 Mar 2025 17:46:51 +0000 Subject: [PATCH 02/11] Update material-ui monorepo --- package-lock.json | 50 +++++++++++++++++++++++------------------------ package.json | 6 +++--- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8921c721d..babcadf5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,9 +12,9 @@ "@emotion/styled": "^11.13.0", "@fontsource/roboto": "^5.0.13", "@hello-pangea/dnd": "^18.0.0", - "@mui/icons-material": "6.4.6", - "@mui/lab": "6.0.0-beta.29", - "@mui/material": "6.4.6", + "@mui/icons-material": "6.4.7", + "@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", @@ -3516,9 +3516,9 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.6.tgz", - "integrity": "sha512-rho5Q4IscbrVmK9rCrLTJmjLjfH6m/NcqKr/mchvck0EIXlyYUB9+Z0oVmkt/+Mben43LMRYBH8q/Uzxj/c4Vw==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.7.tgz", + "integrity": "sha512-XjJrKFNt9zAKvcnoIIBquXyFyhfrHYuttqMsoDS7lM7VwufYG4fAPw4kINjBFg++fqXM2BNAuWR9J7XVIuKIKg==", "license": "MIT", "funding": { "type": "opencollective", @@ -3526,9 +3526,9 @@ } }, "node_modules/@mui/icons-material": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.6.tgz", - "integrity": "sha512-rGJBvIQQbQAlyKYljHQ8wAQS/K2/uYwvemcpygnAmCizmCI4zSF9HQPuiG8Ql4YLZ6V/uKjA3WHIYmF/8sV+pQ==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.7.tgz", + "integrity": "sha512-Rk8cs9ufQoLBw582Rdqq7fnSXXZTqhYRbpe1Y5SAz9lJKZP3CIdrj0PfG8HJLGw1hrsHFN/rkkm70IDzhJsG1g==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0" @@ -3541,7 +3541,7 @@ "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@mui/material": "^6.4.6", + "@mui/material": "^6.4.7", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, @@ -3552,14 +3552,14 @@ } }, "node_modules/@mui/lab": { - "version": "6.0.0-beta.29", - "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-6.0.0-beta.29.tgz", - "integrity": "sha512-C5nTm9xfzVi4Zz4DLrZq1Kn+cQ2fGZmSJxyoUbOu+jDPlLZrUpSsgxEkkbjJB5dasiv6fgGKhO3EaKKyfobLAQ==", + "version": "6.0.0-beta.30", + "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-6.0.0-beta.30.tgz", + "integrity": "sha512-ayDYkzTlkm5cnDGa10bvuFygX+2b9Hm1T4QZYMqV8+nSx3frKE0TLAbE7/qQ4vInOO5E4aOkHVBwZjyO+UbMTA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0", "@mui/base": "5.0.0-beta.69", - "@mui/system": "^6.4.6", + "@mui/system": "^6.4.7", "@mui/types": "^7.2.21", "@mui/utils": "^6.4.6", "clsx": "^2.1.1", @@ -3575,8 +3575,8 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material": "^6.4.6", - "@mui/material-pigment-css": "^6.4.6", + "@mui/material": "^6.4.7", + "@mui/material-pigment-css": "^6.4.7", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -3597,14 +3597,14 @@ } }, "node_modules/@mui/material": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.4.6.tgz", - "integrity": "sha512-6UyAju+DBOdMogfYmLiT3Nu7RgliorimNBny1pN/acOjc+THNFVE7hlxLyn3RDONoZJNDi/8vO4AQQr6dLAXqA==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.4.7.tgz", + "integrity": "sha512-K65StXUeGAtFJ4ikvHKtmDCO5Ab7g0FZUu2J5VpoKD+O6Y3CjLYzRi+TMlI3kaL4CL158+FccMoOd/eaddmeRQ==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0", - "@mui/core-downloads-tracker": "^6.4.6", - "@mui/system": "^6.4.6", + "@mui/core-downloads-tracker": "^6.4.7", + "@mui/system": "^6.4.7", "@mui/types": "^7.2.21", "@mui/utils": "^6.4.6", "@popperjs/core": "^2.11.8", @@ -3625,7 +3625,7 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material-pigment-css": "^6.4.6", + "@mui/material-pigment-css": "^6.4.7", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -3713,9 +3713,9 @@ } }, "node_modules/@mui/system": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.4.6.tgz", - "integrity": "sha512-FQjWwPec7pMTtB/jw5f9eyLynKFZ6/Ej9vhm5kGdtmts1z5b7Vyn3Rz6kasfYm1j2TfrfGnSXRvvtwVWxjpz6g==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.4.7.tgz", + "integrity": "sha512-7wwc4++Ak6tGIooEVA9AY7FhH2p9fvBMORT4vNLMAysH3Yus/9B9RYMbrn3ANgsOyvT3Z7nE+SP8/+3FimQmcg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.26.0", diff --git a/package.json b/package.json index 86d69c015..60d1abaa1 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ "@mui/x-charts": "^7.5.1", "@mui/x-data-grid": "7.27.2", "@mui/x-date-pickers": "7.27.1", - "@mui/icons-material": "6.4.6", - "@mui/lab": "6.0.0-beta.29", - "@mui/material": "6.4.6", + "@mui/icons-material": "6.4.7", + "@mui/lab": "6.0.0-beta.30", + "@mui/material": "6.4.7", "@reduxjs/toolkit": "2.6.0", "@solana/wallet-adapter-base": "0.9.23", "@solana/wallet-adapter-material-ui": "0.16.34", From 5ac2bfe7b551ba8c768d9f5d11f317518a226007 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 5 Mar 2025 11:19:18 -0800 Subject: [PATCH 03/11] add recent date format --- src/Components/Charts/Utils/chartUtilFunctions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/Charts/Utils/chartUtilFunctions.js b/src/Components/Charts/Utils/chartUtilFunctions.js index 70f5ac9c3..d8ec6cdb6 100644 --- a/src/Components/Charts/Utils/chartUtilFunctions.js +++ b/src/Components/Charts/Utils/chartUtilFunctions.js @@ -13,6 +13,7 @@ export const tooltipDateFormatLookup = (dateRange) => { export const tickDateFormatLookup = (dateRange) => { const tickFormatLookup = { + recent: "h:mm A", day: "h:mm A", week: "MM/D, h:mm A", month: "ddd. M/D", From 65343e1e4b5ab8e630e3c93e0ffc71b29f294470 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 5 Mar 2025 11:19:48 -0800 Subject: [PATCH 04/11] Add recent to header --- src/Components/MonitorTimeFrameHeader/index.jsx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Components/MonitorTimeFrameHeader/index.jsx b/src/Components/MonitorTimeFrameHeader/index.jsx index e43d63494..9ac8b8b6a 100644 --- a/src/Components/MonitorTimeFrameHeader/index.jsx +++ b/src/Components/MonitorTimeFrameHeader/index.jsx @@ -20,6 +20,13 @@ const MonitorTimeFrameHeader = ({ if (hasDateRange) { timeFramePicker = ( +