From 55058520f3e7a3fafc3d7db50e05fa175fa80fbb Mon Sep 17 00:00:00 2001 From: Alvaro Torres Date: Mon, 12 Aug 2024 22:56:13 -0500 Subject: [PATCH 1/4] add develop branch to my repo --- Client/package-lock.json | 10 +++--- Client/package.json | 2 +- Server/package-lock.json | 68 ++++++++++++++++++++++++++-------------- Server/package.json | 4 +-- 4 files changed, 52 insertions(+), 32 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index 2a7b9b7e1..bca3d0ed7 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -18,7 +18,7 @@ "@mui/x-data-grid": "7.3.2", "@mui/x-date-pickers": "7.3.2", "@reduxjs/toolkit": "2.2.5", - "axios": "1.7.2", + "axios": "^1.3.1", "chart.js": "^4.4.3", "dayjs": "1.11.11", "joi": "17.13.1", @@ -2655,12 +2655,12 @@ } }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.1.tgz", + "integrity": "sha512-78pWJsQTceInlyaeBQeYZ/QgZeWS8hGeKiIJiDKQe3hEyBb7sEMq0K4gjx+Va6WHTYO4zI/RRl8qGRzn0YMadA==", "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.6", + "follow-redirects": "^1.15.0", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } diff --git a/Client/package.json b/Client/package.json index f711bff9a..18d202519 100644 --- a/Client/package.json +++ b/Client/package.json @@ -20,7 +20,7 @@ "@mui/x-data-grid": "7.3.2", "@mui/x-date-pickers": "7.3.2", "@reduxjs/toolkit": "2.2.5", - "axios": "1.7.2", + "axios": "^1.3.1", "chart.js": "^4.4.3", "dayjs": "1.11.11", "joi": "17.13.1", diff --git a/Server/package-lock.json b/Server/package-lock.json index 916c66648..e6e210b7b 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -9,8 +9,8 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@sendgrid/mail": "^8.1.3", - "axios": "^1.7.2", + "@sendgrid/mail": "^7.7.0", + "axios": "^1.3.1", "bcrypt": "^5.1.1", "bullmq": "5.7.15", "cors": "^2.8.5", @@ -772,38 +772,50 @@ } }, "node_modules/@sendgrid/client": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.3.tgz", - "integrity": "sha512-mRwTticRZIdUTsnyzvlK6dMu3jni9ci9J+dW/6fMMFpGRAJdCJlivFVYQvqk8kRS3RnFzS7sf6BSmhLl1ldDhA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.7.0.tgz", + "integrity": "sha512-SxH+y8jeAQSnDavrTD0uGDXYIIkFylCo+eDofVmZLQ0f862nnqbC3Vd1ej6b7Le7lboyzQF6F7Fodv02rYspuA==", + "license": "MIT", "dependencies": { - "@sendgrid/helpers": "^8.0.0", - "axios": "^1.6.8" + "@sendgrid/helpers": "^7.7.0", + "axios": "^0.26.0" }, "engines": { - "node": ">=12.*" + "node": "6.* || 8.* || >=10.*" + } + }, + "node_modules/@sendgrid/client/node_modules/axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.14.8" } }, "node_modules/@sendgrid/helpers": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-8.0.0.tgz", - "integrity": "sha512-Ze7WuW2Xzy5GT5WRx+yEv89fsg/pgy3T1E3FS0QEx0/VvRmigMZ5qyVGhJz4SxomegDkzXv/i0aFPpHKN8qdAA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.7.0.tgz", + "integrity": "sha512-3AsAxfN3GDBcXoZ/y1mzAAbKzTtUZ5+ZrHOmWQ279AuaFXUNCh9bPnRpN504bgveTqoW+11IzPg3I0WVgDINpw==", + "license": "MIT", "dependencies": { "deepmerge": "^4.2.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">= 6.0.0" } }, "node_modules/@sendgrid/mail": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-8.1.3.tgz", - "integrity": "sha512-Wg5iKSUOER83/cfY6rbPa+o3ChnYzWwv1OcsR8gCV8SKi+sUPIMroildimlnb72DBkQxcbylxng1W7f0RIX7MQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.7.0.tgz", + "integrity": "sha512-5+nApPE9wINBvHSUxwOxkkQqM/IAAaBYoP9hw7WwgDNQPxraruVqHizeTitVtKGiqWCKm2mnjh4XGN3fvFLqaw==", + "license": "MIT", "dependencies": { - "@sendgrid/client": "^8.1.3", - "@sendgrid/helpers": "^8.0.0" + "@sendgrid/client": "^7.7.0", + "@sendgrid/helpers": "^7.7.0" }, "engines": { - "node": ">=12.*" + "node": "6.* || 8.* || >=10.*" } }, "node_modules/@sideway/address": { @@ -980,14 +992,16 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.1.tgz", + "integrity": "sha512-78pWJsQTceInlyaeBQeYZ/QgZeWS8hGeKiIJiDKQe3hEyBb7sEMq0K4gjx+Va6WHTYO4zI/RRl8qGRzn0YMadA==", + "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.6", + "follow-redirects": "^1.15.0", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -1366,6 +1380,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -1710,6 +1725,7 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1734,6 +1750,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -2069,6 +2086,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -2108,6 +2126,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -4615,7 +4634,8 @@ "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" }, "node_modules/pstree.remy": { "version": "1.1.8", diff --git a/Server/package.json b/Server/package.json index ad0936654..3087f7b6a 100644 --- a/Server/package.json +++ b/Server/package.json @@ -11,8 +11,8 @@ "author": "", "license": "ISC", "dependencies": { - "@sendgrid/mail": "^8.1.3", - "axios": "^1.7.2", + "@sendgrid/mail": "^7.7.0", + "axios": "^1.3.1", "bcrypt": "^5.1.1", "bullmq": "5.7.15", "cors": "^2.8.5", From 8840e4b45b7c85bed5a7e43f9d8d958528a04256 Mon Sep 17 00:00:00 2001 From: Alvaro Torres Date: Wed, 14 Aug 2024 20:42:56 -0500 Subject: [PATCH 2/4] feat: monitor sort order on status --- Client/src/Pages/Monitors/index.jsx | 33 +++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx index f8efd7fa3..e03020c7d 100644 --- a/Client/src/Pages/Monitors/index.jsx +++ b/Client/src/Pages/Monitors/index.jsx @@ -9,6 +9,7 @@ import { useNavigate } from "react-router-dom"; import Button from "../../Components/Button"; import ServerStatus from "../../Components/Charts/Servers/ServerStatus"; import { useTheme } from "@emotion/react"; +import ArrowUpwardRoundedIcon from "@mui/icons-material/ArrowUpwardRounded"; import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded"; import OpenInNewPage from "../../assets/icons/open-in-new-page.svg?react"; import Settings from "../../assets/icons/settings-bold.svg?react"; @@ -152,28 +153,42 @@ const Monitors = () => { const down = monitorState.monitors.length - up; + // State variable to handle status of sorting + // Start with Up status -> Down status + const [sortOrder, setSortOrder] = useState('ascending'); + + // Sort existing monitors with default ascending order + const sortedMonitors = [...monitorState.monitors].sort(a => { + const sortDirection = sortOrder === 'ascending' ? 1 : -1; + return a.status ? -1 * sortDirection : 1 * sortDirection; + }); + + // Function to handle sorting on click of status text + const handleSort = () => { + setSortOrder(prevOrder => prevOrder === 'ascending' ? 'descending' : 'ascending'); + }; + const data = { cols: [ - { id: 1, name: "Host" }, + { id: 1, name: 'Host' }, { id: 2, name: ( - + Status - - - + {sortOrder === 'ascending' ? : } ), }, - { id: 3, name: "Response Time" }, - { id: 4, name: "Type" }, - { id: 5, name: "Actions" }, + { id: 3, name: 'Response Time' }, + { id: 4, name: 'Type' }, + { id: 5, name: 'Actions' }, ], rows: [], }; - data.rows = monitorState.monitors.map((monitor, idx) => { + // Render out sorted monitors by ascending order + data.rows = sortedMonitors.map((monitor, idx) => { const params = { url: monitor.url, title: monitor.name, From 3219772b9abb6f36fd34155a906e38d845e49c46 Mon Sep 17 00:00:00 2001 From: Alexander Holliday Date: Thu, 15 Aug 2024 10:40:49 -0700 Subject: [PATCH 3/4] Update package.json --- Client/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Client/package.json b/Client/package.json index 42167d0b0..769e1f4a6 100644 --- a/Client/package.json +++ b/Client/package.json @@ -20,7 +20,6 @@ "@mui/x-data-grid": "7.3.2", "@mui/x-date-pickers": "7.3.2", "@reduxjs/toolkit": "2.2.5", - "axios": "^1.3.1", "axios": "1.7.4", "chart.js": "^4.4.3", "dayjs": "1.11.11", From 639a69d46e3fd9846d262c76055349c3e8375a24 Mon Sep 17 00:00:00 2001 From: Alexander Holliday Date: Thu, 15 Aug 2024 10:42:26 -0700 Subject: [PATCH 4/4] Update package.json --- Server/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Server/package.json b/Server/package.json index da1d487c0..eb31dd480 100644 --- a/Server/package.json +++ b/Server/package.json @@ -11,8 +11,7 @@ "author": "", "license": "ISC", "dependencies": { - "@sendgrid/mail": "^7.7.0", - "axios": "^1.3.1", + "axios": "^1.7.2", "bcrypt": "^5.1.1", "bullmq": "5.7.15", "cors": "^2.8.5",