Merge remote-tracking branch 'upstream/develop' into feat/swagger-ui

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";
     });
   }

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,

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,