From e8183cc4f32d7f5d67821d31c49ef16305606de6 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 24 Sep 2024 13:34:56 +0800 Subject: [PATCH 1/3] Fixed hardcoded array access --- Client/src/Components/Sidebar/index.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 1333b6f67..aa80e0c85 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -93,8 +93,9 @@ function Sidebar() { const { user } = useSelector((state) => state.auth); // Remove demo password if demo - if (user.role?.includes("demo")) { - menu[3].nested = menu[3].nested.filter((item) => { + const accountMenuItem = menu.find((item) => item.name === "account"); + if (user.role?.includes("demo") && accountMenuItem) { + accountMenuItem.nested = accountMenuItem.nested.filter((item) => { return item.name !== "Password"; }); } From 47f2f4fcb1fd99d93f5dc7d76b42d6ba257644a9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 24 Sep 2024 13:49:44 +0800 Subject: [PATCH 2/3] userId -> teamId --- Client/src/Pages/Incidents/IncidentTable/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Pages/Incidents/IncidentTable/index.jsx b/Client/src/Pages/Incidents/IncidentTable/index.jsx index f47ad0cf0..ef8356031 100644 --- a/Client/src/Pages/Incidents/IncidentTable/index.jsx +++ b/Client/src/Pages/Incidents/IncidentTable/index.jsx @@ -55,7 +55,7 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => { if (selectedMonitor === "0") { res = await networkService.getChecksByTeam({ authToken: authToken, - userId: user.teamId, + teamId: user.teamId, sortOrder: "desc", limit: null, dateRange: null, From 7398ce219faeca47851e4fe6e602da7c7166f39b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 24 Sep 2024 13:58:39 +0800 Subject: [PATCH 3/3] Fix typo in monitor details page --- Client/src/Pages/Monitors/Details/PaginationTable/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Pages/Monitors/Details/PaginationTable/index.jsx b/Client/src/Pages/Monitors/Details/PaginationTable/index.jsx index 8538ac169..009ec0b71 100644 --- a/Client/src/Pages/Monitors/Details/PaginationTable/index.jsx +++ b/Client/src/Pages/Monitors/Details/PaginationTable/index.jsx @@ -42,7 +42,7 @@ const PaginationTable = ({ monitorId, dateRange }) => { try { const res = await networkService.getChecksByMonitor({ authToken: authToken, - monitoirId: monitorId, + monitorId: monitorId, sortOrder: "desc", limit: null, dateRange: dateRange,