Rename thunks to reflect teamId vs userId

Client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js

@@ -28,12 +28,12 @@ export const createPageSpeed = createAsyncThunk(
   }
 );
 
-export const getPageSpeedByUserId = createAsyncThunk(
-  "pageSpeedMonitors/getPageSpeedByUserId",
+export const getPageSpeedByTeamId = createAsyncThunk(
+  "pageSpeedMonitors/getPageSpeedByTeamId",
   async (token, thunkApi) => {
     const user = jwtDecode(token);
     try {
-      const res = await networkService.getMonitorsByUserId(
+      const res = await networkService.getMonitorsByTeamId(
         token,
         user._id,
         25,
@@ -127,15 +127,15 @@ const pageSpeedMonitorSlice = createSlice({
       // Monitors by userId
       // *****************************************************
 
-      .addCase(getPageSpeedByUserId.pending, (state) => {
+      .addCase(getPageSpeedByTeamId.pending, (state) => {
         state.isLoading = true;
       })
-      .addCase(getPageSpeedByUserId.fulfilled, (state, action) => {
+      .addCase(getPageSpeedByTeamId.fulfilled, (state, action) => {
         state.isLoading = false;
         state.success = action.payload.msg;
         state.monitors = action.payload.data;
       })
-      .addCase(getPageSpeedByUserId.rejected, (state, action) => {
+      .addCase(getPageSpeedByTeamId.rejected, (state, action) => {
         state.isLoading = false;
         state.success = false;
         state.msg = action.payload

Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js

@@ -28,8 +28,8 @@ export const createUptimeMonitor = createAsyncThunk(
   }
 );
 
-export const getUptimeMonitorsByUserId = createAsyncThunk(
-  "montiors/getMonitorsByUserId",
+export const getUptimeMonitorsByTeamId = createAsyncThunk(
+  "montiors/getMonitorsByTeamId",
   async (token, thunkApi) => {
     const user = jwtDecode(token);
     try {
@@ -126,15 +126,15 @@ const uptimeMonitorsSlice = createSlice({
       // Monitors by userId
       // *****************************************************
 
-      .addCase(getUptimeMonitorsByUserId.pending, (state) => {
+      .addCase(getUptimeMonitorsByTeamId.pending, (state) => {
         state.isLoading = true;
       })
-      .addCase(getUptimeMonitorsByUserId.fulfilled, (state, action) => {
+      .addCase(getUptimeMonitorsByTeamId.fulfilled, (state, action) => {
         state.isLoading = false;
         state.success = action.payload.msg;
         state.monitors = action.payload.data;
       })
-      .addCase(getUptimeMonitorsByUserId.rejected, (state, action) => {
+      .addCase(getUptimeMonitorsByTeamId.rejected, (state, action) => {
         state.isLoading = false;
         state.success = false;
         state.msg = action.payload

Client/src/Pages/Incidents/index.jsx

@@ -48,7 +48,7 @@ const Incidents = () => {
   useEffect(() => {
     const fetchMonitors = async () => {
       setLoading(true);
-      const res = await networkService.getMonitorsByUserId(
+      const res = await networkService.getMonitorsByTeamId(
         authState.authToken,
         authState.user._id,
         1,

Client/src/Pages/Monitors/Configure/index.jsx

@@ -8,7 +8,7 @@ import { createToast } from "../../../Utils/toastUtils";
 import { logger } from "../../../Utils/Logger";
 import {
   updateUptimeMonitor,
-  getUptimeMonitorsByUserId,
+  getUptimeMonitorsByTeamId,
   deleteUptimeMonitor,
 } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import Button from "../../../Components/Button";
@@ -177,7 +177,7 @@ const Configure = () => {
     );
     if (action.meta.requestStatus === "fulfilled") {
       createToast({ body: "Monitor updated successfully!" });
-      dispatch(getUptimeMonitorsByUserId(authToken));
+      dispatch(getUptimeMonitorsByTeamId(authToken));
     } else {
       createToast({ body: "Failed to update monitor." });
     }

Client/src/Pages/Monitors/index.jsx

@@ -3,7 +3,7 @@ import { useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import {
   deleteUptimeMonitor,
-  getUptimeMonitorsByUserId,
+  getUptimeMonitorsByTeamId,
 } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import { useNavigate } from "react-router-dom";
 import Button from "../../Components/Button";
@@ -44,7 +44,7 @@ const ActionsMenu = ({ monitor }) => {
     );
     if (action.meta.requestStatus === "fulfilled") {
       setIsOpen(false); // close modal
-      dispatch(getUptimeMonitorsByUserId(authState.authToken));
+      dispatch(getUptimeMonitorsByTeamId(authState.authToken));
       createToast({ body: "Monitor deleted successfully." });
     } else {
       createToast({ body: "Failed to delete monitor." });
@@ -269,7 +269,7 @@ const Monitors = () => {
   const dispatch = useDispatch({});
 
   useEffect(() => {
-    dispatch(getUptimeMonitorsByUserId(authState.authToken));
+    dispatch(getUptimeMonitorsByTeamId(authState.authToken));
   }, [authState.authToken, dispatch]);
 
   const up = monitorState.monitors.reduce((acc, cur) => {

Client/src/Pages/PageSpeed/Configure/index.jsx

@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { useNavigate, useParams } from "react-router";
 import {
   deletePageSpeed,
-  getPageSpeedByUserId,
+  getPageSpeedByTeamId,
   updatePageSpeed,
 } from "../../../Features/PageSpeedMonitor/pageSpeedMonitorSlice";
 import { monitorValidation } from "../../../Validation/validation";
@@ -127,7 +127,7 @@ const PageSpeedConfigure = () => {
     );
     if (action.meta.requestStatus === "fulfilled") {
       createToast({ body: "Monitor updated successfully!" });
-      dispatch(getPageSpeedByUserId(authToken));
+      dispatch(getPageSpeedByTeamId(authToken));
     } else {
       createToast({ body: "Failed to update monitor." });
     }

Client/src/Pages/PageSpeed/index.jsx

@@ -4,7 +4,7 @@ import { useTheme } from "@emotion/react";
 import { formatDate, formatDurationRounded } from "../../Utils/timeUtils";
 import { StatusLabel } from "../../Components/Label";
 import { useDispatch, useSelector } from "react-redux";
-import { getPageSpeedByUserId } from "../../Features/PageSpeedMonitor/pageSpeedMonitorSlice";
+import { getPageSpeedByTeamId } from "../../Features/PageSpeedMonitor/pageSpeedMonitorSlice";
 import PageSpeedIcon from "../../assets/icons/page-speed.svg?react";
 import Fallback from "../../Components/Fallback";
 import "./index.css";
@@ -133,7 +133,7 @@ const PageSpeed = () => {
     (state) => state.pageSpeedMonitors
   );
   useEffect(() => {
-    dispatch(getPageSpeedByUserId(authToken));
+    dispatch(getPageSpeedByTeamId(authToken));
   }, [authToken, dispatch]);
 
   // will show skeletons only on initial load