diff --git a/src/Components/ActionsMenu/index.jsx b/src/Components/ActionsMenu/index.jsx index c39c130cb..9c0e19596 100644 --- a/src/Components/ActionsMenu/index.jsx +++ b/src/Components/ActionsMenu/index.jsx @@ -25,8 +25,6 @@ const ActionsMenu = ({ const [isOpen, setIsOpen] = useState(false); const dispatch = useDispatch(); const theme = useTheme(); - const authState = useSelector((state) => state.auth); - const authToken = authState.authToken; const { isLoading } = useSelector((state) => state.uptimeMonitors); const handleRemove = async (event) => { @@ -34,7 +32,7 @@ const ActionsMenu = ({ event.stopPropagation(); let monitor = { _id: actions.id }; const action = await dispatch( - deleteUptimeMonitor({ authToken: authState.authToken, monitor }) + deleteUptimeMonitor({ monitor }) ); if (action.meta.requestStatus === "fulfilled") { setIsOpen(false); // close modal @@ -49,7 +47,7 @@ const ActionsMenu = ({ try { setIsLoading(true); const action = await dispatch( - pauseUptimeMonitor({ authToken, monitorId: monitor._id }) + pauseUptimeMonitor({ monitorId: monitor._id }) ); if (pauseUptimeMonitor.fulfilled.match(action)) { const state = action?.payload?.data.isActive === false ? "paused" : "resumed"; diff --git a/src/Components/TabPanels/Account/PasswordPanel.jsx b/src/Components/TabPanels/Account/PasswordPanel.jsx index 26e405463..6f2775cf1 100644 --- a/src/Components/TabPanels/Account/PasswordPanel.jsx +++ b/src/Components/TabPanels/Account/PasswordPanel.jsx @@ -30,7 +30,7 @@ const PasswordPanel = () => { const SPACING_GAP = theme.spacing(12); //redux state - const { authToken, isLoading } = useSelector((state) => state.auth); + const { isLoading } = useSelector((state) => state.auth); const idToName = { "edit-current-password": "password", @@ -89,7 +89,7 @@ const PasswordPanel = () => { }); setErrors(newErrors); } else { - const action = await dispatch(update({ authToken, localData })); + const action = await dispatch(update({ localData })); if (action.payload.success) { createToast({ body: "Your password was changed successfully.", diff --git a/src/Components/TabPanels/Account/ProfilePanel.jsx b/src/Components/TabPanels/Account/ProfilePanel.jsx index fdd34d686..7cf123667 100644 --- a/src/Components/TabPanels/Account/ProfilePanel.jsx +++ b/src/Components/TabPanels/Account/ProfilePanel.jsx @@ -32,7 +32,7 @@ const ProfilePanel = () => { const SPACING_GAP = theme.spacing(12); //redux state - const { user, authToken, isLoading } = useSelector((state) => state.auth); + const { user, isLoading } = useSelector((state) => state.auth); const idToName = { "edit-first-name": "firstName", @@ -164,7 +164,7 @@ const ProfilePanel = () => { return; } - const action = await dispatch(update({ authToken, localData })); + const action = await dispatch(update({ localData })); if (action.payload.success) { createToast({ body: "Your profile data was changed successfully.", @@ -187,7 +187,7 @@ const ProfilePanel = () => { // Initiates the account deletion process const handleDeleteAccount = async () => { - const action = await dispatch(deleteUser(authToken)); + const action = await dispatch(deleteUser()); if (action.payload.success) { dispatch(clearAuthState()); dispatch(clearUptimeMonitorState()); diff --git a/src/Components/TabPanels/Account/TeamPanel.jsx b/src/Components/TabPanels/Account/TeamPanel.jsx index b7174c337..eef7b6421 100644 --- a/src/Components/TabPanels/Account/TeamPanel.jsx +++ b/src/Components/TabPanels/Account/TeamPanel.jsx @@ -23,7 +23,6 @@ const TeamPanel = () => { const SPACING_GAP = theme.spacing(12); - const { authToken } = useSelector((state) => state.auth); const [toInvite, setToInvite] = useState({ email: "", role: ["0"], @@ -63,9 +62,7 @@ const TeamPanel = () => { useEffect(() => { const fetchTeam = async () => { try { - const response = await networkService.getAllUsers({ - authToken: authToken, - }); + const response = await networkService.getAllUsers(); setMembers(response.data.data); } catch (error) { createToast({ @@ -75,7 +72,7 @@ const TeamPanel = () => { }; fetchTeam(); - }, [authToken]); + }, []); useEffect(() => { const ROLE_MAP = { @@ -150,7 +147,6 @@ const TeamPanel = () => { try { await networkService.requestInvitationToken({ - authToken: authToken, email: toInvite.email, role: toInvite.role, }); diff --git a/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx b/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx index 2351fb0e0..b2634e9a7 100644 --- a/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx +++ b/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx @@ -4,17 +4,15 @@ import { useSelector } from "react-redux"; import { createToast } from "../../../../Utils/toastUtils"; const useCreateDistributedUptimeMonitor = ({ isCreate, monitorId }) => { - const { authToken, user } = useSelector((state) => state.auth); - const [isLoading, setIsLoading] = useState(false); const [networkError, setNetworkError] = useState(false); const createDistributedUptimeMonitor = async ({ form }) => { setIsLoading(true); try { if (isCreate) { - await networkService.createMonitor({ authToken, monitor: form }); + await networkService.createMonitor({ monitor: form }); } else { - await networkService.updateMonitor({ authToken, monitor: form, monitorId }); + await networkService.updateMonitor({ monitor: form, monitorId }); } return true; diff --git a/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx b/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx index cf7f3c377..efffbe437 100644 --- a/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx +++ b/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; -export const useMonitorFetch = ({ authToken, monitorId, isCreate }) => { +export const useMonitorFetch = ({ monitorId, isCreate }) => { const [networkError, setNetworkError] = useState(false); const [isLoading, setIsLoading] = useState(true); const [monitor, setMonitor] = useState(undefined); @@ -12,7 +12,6 @@ export const useMonitorFetch = ({ authToken, monitorId, isCreate }) => { try { if (isCreate) return; const res = await networkService.getUptimeDetailsById({ - authToken: authToken, monitorId: monitorId, normalize: true, }); @@ -25,7 +24,7 @@ export const useMonitorFetch = ({ authToken, monitorId, isCreate }) => { } }; fetchMonitors(); - }, [authToken, monitorId, isCreate]); + }, [monitorId, isCreate]); return [monitor, isLoading, networkError]; }; diff --git a/src/Pages/DistributedUptime/Create/index.jsx b/src/Pages/DistributedUptime/Create/index.jsx index 6a1d0b292..7f18123cd 100644 --- a/src/Pages/DistributedUptime/Create/index.jsx +++ b/src/Pages/DistributedUptime/Create/index.jsx @@ -48,7 +48,7 @@ const CreateDistributedUptime = () => { ]; // Redux state - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); // Local state const [https, setHttps] = useState(true); @@ -68,7 +68,6 @@ const CreateDistributedUptime = () => { useCreateDistributedUptimeMonitor({ isCreate, monitorId }); const [monitor, monitorIsLoading, monitorNetworkError] = useMonitorFetch({ - authToken, monitorId, isCreate, }); diff --git a/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx b/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx index ece7c42e5..8d73e55a9 100644 --- a/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx +++ b/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx @@ -5,11 +5,10 @@ import { createToast } from "../../../../Utils/toastUtils"; const useDeleteMonitor = ({ monitorId }) => { const [isLoading, setIsLoading] = useState(false); - const { authToken } = useSelector((state) => state.auth); const deleteMonitor = async () => { try { setIsLoading(true); - await networkService.deleteMonitorById({ authToken, monitorId }); + await networkService.deleteMonitorById({ monitorId }); return true; } catch (error) { createToast({ diff --git a/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx b/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx index 9ee7fa873..e3b4227aa 100644 --- a/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx +++ b/src/Pages/DistributedUptime/Details/Hooks/useSubscribeToDetails.jsx @@ -53,7 +53,6 @@ const useSubscribeToDetails = ({ monitorId, isPublic, isPublished, dateRange }) const [monitor, setMonitor] = useState(undefined); const [lastUpdateTrigger, setLastUpdateTrigger] = useState(0); const [devices, setDevices] = useState(Array.from({ length: 5 }, getRandomDevice)); - const authToken = useSelector((state) => state.auth.token); const prevDateRangeRef = useRef(dateRange); @@ -68,7 +67,6 @@ const useSubscribeToDetails = ({ monitorId, isPublic, isPublished, dateRange }) try { const cleanup = networkService.subscribeToDistributedUptimeDetails({ - authToken, monitorId, dateRange: dateRange, normalize: true, @@ -105,7 +103,6 @@ const useSubscribeToDetails = ({ monitorId, isPublic, isPublished, dateRange }) setNetworkError(true); } }, [ - authToken, dateRange, monitorId, retryCount, diff --git a/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx b/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx index 428791a3e..6fe727efb 100644 --- a/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx +++ b/src/Pages/DistributedUptime/Monitors/Hooks/useSubscribeToMonitors.jsx @@ -7,7 +7,7 @@ import { createToast } from "../../../../Utils/toastUtils"; const useSubscribeToMonitors = () => { // Redux - const { authToken, user } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); // Local state const [isLoading, setIsLoading] = useState(true); @@ -22,7 +22,6 @@ const useSubscribeToMonitors = () => { useEffect(() => { try { const cleanup = networkService.subscribeToDistributedUptimeMonitors({ - authToken: authToken, teamId: user.teamId, limit: 25, types: ["distributed_http"], @@ -57,7 +56,7 @@ const useSubscribeToMonitors = () => { }); setNetworkError(true); } - }, [authToken, user, getMonitorWithPercentage, theme]); + }, [user, getMonitorWithPercentage, theme]); return [isLoading, networkError, monitors, monitorsSummary, filteredMonitors]; }; export { useSubscribeToMonitors }; diff --git a/src/Pages/DistributedUptimeStatus/Status/Hooks/useStatusPageFetchByUrl.jsx b/src/Pages/DistributedUptimeStatus/Status/Hooks/useStatusPageFetchByUrl.jsx index 0ca6346a0..de68aed20 100644 --- a/src/Pages/DistributedUptimeStatus/Status/Hooks/useStatusPageFetchByUrl.jsx +++ b/src/Pages/DistributedUptimeStatus/Status/Hooks/useStatusPageFetchByUrl.jsx @@ -9,12 +9,10 @@ const useStatusPageFetchByUrl = ({ url }) => { const [statusPage, setStatusPage] = useState(undefined); const [monitorId, setMonitorId] = useState(undefined); const [isPublished, setIsPublished] = useState(false); - const { authToken } = useSelector((state) => state.auth); useEffect(() => { const fetchStatusPageByUrl = async () => { try { const response = await networkService.getStatusPageByUrl({ - authToken, url, type: "distributed", }); @@ -33,7 +31,7 @@ const useStatusPageFetchByUrl = ({ url }) => { } }; fetchStatusPageByUrl(); - }, [authToken, url]); + }, [url]); return [isLoading, networkError, statusPage, monitorId, isPublished]; }; diff --git a/src/Pages/Incidents/Hooks/useChecksFetch.jsx b/src/Pages/Incidents/Hooks/useChecksFetch.jsx index 614006792..8460a3036 100644 --- a/src/Pages/Incidents/Hooks/useChecksFetch.jsx +++ b/src/Pages/Incidents/Hooks/useChecksFetch.jsx @@ -4,7 +4,7 @@ import { createToast } from "../../../Utils/toastUtils"; import { useSelector } from "react-redux"; const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage }) => { //Redux - const { authToken, user } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); //Local const [isLoading, setIsLoading] = useState(true); @@ -20,7 +20,6 @@ const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage if (selectedMonitor === "0") { res = await networkService.getChecksByTeam({ - authToken: authToken, status: false, teamId: user.teamId, sortOrder: "desc", @@ -32,7 +31,6 @@ const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage }); } else { res = await networkService.getChecksByMonitor({ - authToken: authToken, status: false, monitorId: selectedMonitor, sortOrder: "desc", @@ -53,7 +51,7 @@ const useChecksFetch = ({ selectedMonitor, filter, dateRange, page, rowsPerPage } }; fetchChecks(); - }, [authToken, user, dateRange, page, rowsPerPage, filter, selectedMonitor]); + }, [user, dateRange, page, rowsPerPage, filter, selectedMonitor]); return { isLoading, networkError, checks, checksCount }; }; diff --git a/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx b/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx index 20043e80d..3d80a89c7 100644 --- a/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx +++ b/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx @@ -1,7 +1,7 @@ import { useState, useEffect } from "react"; import { networkService } from "../../../main"; import { createToast } from "../../../Utils/toastUtils"; -const useMonitorsFetch = ({ authToken, teamId }) => { +const useMonitorsFetch = ({ teamId }) => { //Local state const [isLoading, setIsLoading] = useState(true); const [networkError, setNetworkError] = useState(false); @@ -13,7 +13,6 @@ const useMonitorsFetch = ({ authToken, teamId }) => { try { setIsLoading(true); const res = await networkService.getMonitorsByTeamId({ - authToken, teamId, limit: null, types: null, @@ -44,7 +43,7 @@ const useMonitorsFetch = ({ authToken, teamId }) => { }; fetchMonitors(); - }, [authToken, teamId]); + }, [teamId]); return { isLoading, monitors, networkError }; }; diff --git a/src/Pages/Incidents/index.jsx b/src/Pages/Incidents/index.jsx index a5b534ccc..8a5d1560a 100644 --- a/src/Pages/Incidents/index.jsx +++ b/src/Pages/Incidents/index.jsx @@ -16,7 +16,7 @@ const BREADCRUMBS = [{ name: `Incidents`, path: "/incidents" }]; const Incidents = () => { // Redux state - const { authToken, user } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); // Local state const [selectedMonitor, setSelectedMonitor] = useState("0"); @@ -26,7 +26,6 @@ const Incidents = () => { const theme = useTheme(); const { monitors, isLoading, networkError } = useMonitorsFetch({ - authToken, teamId: user.teamId, }); diff --git a/src/Pages/Infrastructure/Create/index.jsx b/src/Pages/Infrastructure/Create/index.jsx index c2a692702..a3ec8459a 100644 --- a/src/Pages/Infrastructure/Create/index.jsx +++ b/src/Pages/Infrastructure/Create/index.jsx @@ -48,7 +48,7 @@ const getAlertError = (errors) => { const CreateInfrastructureMonitor = () => { const theme = useTheme(); - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const monitorState = useSelector((state) => state.infrastructureMonitor); const dispatch = useDispatch(); const navigate = useNavigate(); @@ -148,7 +148,7 @@ const CreateInfrastructureMonitor = () => { }; const action = await dispatch( - createInfrastructureMonitor({ authToken, monitor: form }) + createInfrastructureMonitor({ monitor: form }) ); if (action.meta.requestStatus === "fulfilled") { createToast({ body: "Infrastructure monitor created successfully!" }); diff --git a/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx b/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx index 49972debb..5eb1936aa 100644 --- a/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx +++ b/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx @@ -7,13 +7,10 @@ const useHardwareMonitorsFetch = ({ monitorId, dateRange }) => { const [networkError, setNetworkError] = useState(false); const [monitor, setMonitor] = useState(undefined); - const { authToken } = useSelector((state) => state.auth); - useEffect(() => { const fetchData = async () => { try { const response = await networkService.getHardwareDetailsByMonitorId({ - authToken: authToken, monitorId: monitorId, dateRange: dateRange, }); @@ -26,7 +23,7 @@ const useHardwareMonitorsFetch = ({ monitorId, dateRange }) => { } }; fetchData(); - }, [monitorId, dateRange, authToken]); + }, [monitorId, dateRange]); return { isLoading, diff --git a/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx b/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx index 39a9d18cb..d8bb05151 100644 --- a/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx +++ b/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx @@ -30,8 +30,6 @@ const InfrastructureMenu = ({ monitor, isAdmin, updateCallback }) => { const [isOpen, setIsOpen] = useState(false); const [isDialogOpen, setIsDialogOpen] = useState(false); const theme = useTheme(); - const authState = useSelector((state) => state.auth); - const authToken = authState.authToken; const { isLoading } = useSelector((state) => state.uptimeMonitors); const openMenu = (e) => { @@ -61,7 +59,6 @@ const InfrastructureMenu = ({ monitor, isAdmin, updateCallback }) => { const handleRemove = async () => { try { await networkService.deleteMonitorById({ - authToken, monitorId: monitor.id, }); createToast({ body: "Monitor deleted successfully." }); diff --git a/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx b/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx index 8e316b728..0efe76211 100644 --- a/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx +++ b/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx @@ -5,7 +5,7 @@ import { createToast } from "../../../../Utils/toastUtils"; const useMonitorFetch = ({ page, rowsPerPage, updateTrigger }) => { // Redux state - const { authToken, user } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); // Local state const [isLoading, setIsLoading] = useState(true); @@ -17,7 +17,6 @@ const useMonitorFetch = ({ page, rowsPerPage, updateTrigger }) => { const fetchMonitors = async () => { try { const response = await networkService.getMonitorsByTeamId({ - authToken, teamId: user.teamId, limit: 1, types: ["hardware"], @@ -37,7 +36,7 @@ const useMonitorFetch = ({ page, rowsPerPage, updateTrigger }) => { }; fetchMonitors(); - }, [page, rowsPerPage, authToken, user.teamId, updateTrigger]); + }, [page, rowsPerPage, user.teamId, updateTrigger]); return { monitors, summary, isLoading, networkError }; }; diff --git a/src/Pages/Maintenance/CreateMaintenance/index.jsx b/src/Pages/Maintenance/CreateMaintenance/index.jsx index 04121df9c..9563107ce 100644 --- a/src/Pages/Maintenance/CreateMaintenance/index.jsx +++ b/src/Pages/Maintenance/CreateMaintenance/index.jsx @@ -113,7 +113,7 @@ const CreateMaintenance = () => { const { maintenanceWindowId } = useParams(); const navigate = useNavigate(); const theme = useTheme(); - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const [monitors, setMonitors] = useState([]); const [search, setSearch] = useState(""); const [isLoading, setIsLoading] = useState(false); @@ -133,7 +133,6 @@ const CreateMaintenance = () => { setIsLoading(true); try { const response = await networkService.getMonitorsByTeamId({ - authToken: authToken, teamId: user.teamId, limit: null, types: ["http", "ping", "pagespeed"], @@ -146,7 +145,6 @@ const CreateMaintenance = () => { } const res = await networkService.getMaintenanceWindowById({ - authToken: authToken, maintenanceWindowId: maintenanceWindowId, }); const maintenanceWindow = res.data.data; @@ -174,7 +172,7 @@ const CreateMaintenance = () => { } }; fetchMonitors(); - }, [authToken, user]); + }, [user]); const handleSearch = (value) => { setSearch(value); @@ -239,7 +237,7 @@ const CreateMaintenance = () => { submit.expiry = end; } - const requestConfig = { authToken: authToken, maintenanceWindow: submit }; + const requestConfig = { maintenanceWindow: submit }; if (maintenanceWindowId !== undefined) { requestConfig.maintenanceWindowId = maintenanceWindowId; diff --git a/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx b/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx index 704e8c230..83abdc066 100644 --- a/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx +++ b/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx @@ -13,7 +13,6 @@ import Dialog from "../../../../Components/Dialog"; const ActionsMenu = ({ /* isAdmin, */ maintenanceWindow, updateCallback }) => { maintenanceWindow; - const { authToken } = useSelector((state) => state.auth); const [anchorEl, setAnchorEl] = useState(null); const [isOpen, setIsOpen] = useState(false); const [isLoading, setIsLoading] = useState(false); @@ -26,7 +25,6 @@ const ActionsMenu = ({ /* isAdmin, */ maintenanceWindow, updateCallback }) => { try { setIsLoading(true); await networkService.deleteMaintenanceWindow({ - authToken, maintenanceWindowId: maintenanceWindow._id, }); updateCallback(); @@ -47,7 +45,6 @@ const ActionsMenu = ({ /* isAdmin, */ maintenanceWindow, updateCallback }) => { active: !maintenanceWindow.active, }; await networkService.editMaintenanceWindow({ - authToken, maintenanceWindowId: maintenanceWindow._id, maintenanceWindow: data, }); diff --git a/src/Pages/Maintenance/index.jsx b/src/Pages/Maintenance/index.jsx index f077f25b6..f963032bf 100644 --- a/src/Pages/Maintenance/index.jsx +++ b/src/Pages/Maintenance/index.jsx @@ -13,7 +13,6 @@ import { useIsAdmin } from "../../Hooks/useIsAdmin"; const Maintenance = () => { const theme = useTheme(); const navigate = useNavigate(); - const { authToken } = useSelector((state) => state.auth); const { rowsPerPage } = useSelector((state) => state.ui.maintenance); const isAdmin = useIsAdmin(); const [maintenanceWindows, setMaintenanceWindows] = useState([]); @@ -30,7 +29,6 @@ const Maintenance = () => { const fetchMaintenanceWindows = async () => { try { const response = await networkService.getMaintenanceWindowsByTeamId({ - authToken: authToken, page: page, rowsPerPage: rowsPerPage, }); @@ -42,7 +40,7 @@ const Maintenance = () => { } }; fetchMaintenanceWindows(); - }, [authToken, page, rowsPerPage, updateTrigger]); + }, [page, rowsPerPage, updateTrigger]); return ( { const navigate = useNavigate(); const dispatch = useDispatch(); const MS_PER_MINUTE = 60000; - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const { isLoading } = useSelector((state) => state.pageSpeedMonitors); const { monitorId } = useParams(); const [monitor, setMonitor] = useState({}); @@ -59,7 +59,7 @@ const PageSpeedConfigure = () => { useEffect(() => { const fetchMonitor = async () => { try { - const action = await dispatch(getPagespeedMonitorById({ authToken, monitorId })); + const action = await dispatch(getPagespeedMonitorById({ monitorId })); if (getPagespeedMonitorById.fulfilled.match(action)) { const monitor = action.payload.data; @@ -73,7 +73,7 @@ const PageSpeedConfigure = () => { } }; fetchMonitor(); - }, [dispatch, authToken, monitorId, navigate]); + }, [dispatch, monitorId, navigate]); const handleChange = (event, name) => { let { value, id } = event.target; @@ -130,7 +130,7 @@ const PageSpeedConfigure = () => { const handlePause = async () => { try { - const action = await dispatch(pausePageSpeed({ authToken, monitorId })); + const action = await dispatch(pausePageSpeed({ monitorId })); if (pausePageSpeed.fulfilled.match(action)) { const monitor = action.payload.data; setMonitor(monitor); @@ -147,10 +147,10 @@ const PageSpeedConfigure = () => { const handleSave = async (event) => { event.preventDefault(); - const action = await dispatch(updatePageSpeed({ authToken, monitor: monitor })); + const action = await dispatch(updatePageSpeed({ monitor: monitor })); if (action.meta.requestStatus === "fulfilled") { createToast({ body: "Monitor updated successfully!" }); - dispatch(getPageSpeedByTeamId(authToken)); + dispatch(getPageSpeedByTeamId()); } else { createToast({ body: "Failed to update monitor." }); } @@ -160,7 +160,7 @@ const PageSpeedConfigure = () => { const handleRemove = async (event) => { event.preventDefault(); setButtonLoading(true); - const action = await dispatch(deletePageSpeed({ authToken, monitor })); + const action = await dispatch(deletePageSpeed({ monitor })); if (action.meta.requestStatus === "fulfilled") { navigate("/pagespeed"); } else { diff --git a/src/Pages/PageSpeed/Create/index.jsx b/src/Pages/PageSpeed/Create/index.jsx index 008741afd..3e32ffea2 100644 --- a/src/Pages/PageSpeed/Create/index.jsx +++ b/src/Pages/PageSpeed/Create/index.jsx @@ -54,7 +54,7 @@ const CreatePageSpeed = () => { const [https, setHttps] = useState(true); const [errors, setErrors] = useState({}); - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const { isLoading } = useSelector((state) => state.pageSpeedMonitors); // Setup @@ -87,7 +87,7 @@ const CreatePageSpeed = () => { } const checkEndpointAction = await dispatch( - checkEndpointResolution({ authToken, monitorURL: form.url }) + checkEndpointResolution({ monitorURL: form.url }) ); if (checkEndpointAction.meta.requestStatus === "rejected") { @@ -106,7 +106,7 @@ const CreatePageSpeed = () => { notifications: monitor.notifications, }; - const action = await dispatch(createPageSpeed({ authToken, monitor: form })); + const action = await dispatch(createPageSpeed({ monitor: form })); if (action.meta.requestStatus === "fulfilled") { createToast({ body: "Monitor created successfully!" }); navigate("/pagespeed"); diff --git a/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx b/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx index 1d15f4a42..18ffd8782 100644 --- a/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx +++ b/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; import { useNavigate } from "react-router-dom"; -const useMonitorFetch = ({ authToken, monitorId }) => { +const useMonitorFetch = ({ monitorId }) => { const navigate = useNavigate(); const [monitor, setMonitor] = useState(undefined); @@ -13,7 +13,6 @@ const useMonitorFetch = ({ authToken, monitorId }) => { const fetchMonitor = async () => { try { const res = await networkService.getStatsByMonitorId({ - authToken: authToken, monitorId: monitorId, sortOrder: "desc", limit: 50, @@ -32,7 +31,7 @@ const useMonitorFetch = ({ authToken, monitorId }) => { }; fetchMonitor(); - }, [authToken, monitorId, navigate]); + }, [monitorId, navigate]); return { monitor, audits, isLoading }; }; diff --git a/src/Pages/PageSpeed/Details/index.jsx b/src/Pages/PageSpeed/Details/index.jsx index b40a4aca0..f5746dcfa 100644 --- a/src/Pages/PageSpeed/Details/index.jsx +++ b/src/Pages/PageSpeed/Details/index.jsx @@ -25,10 +25,8 @@ const PageSpeedDetails = () => { const theme = useTheme(); const isAdmin = useIsAdmin(); const { monitorId } = useParams(); - const { authToken } = useSelector((state) => state.auth); const { monitor, audits, isLoading, networkError } = useMonitorFetch({ - authToken, monitorId, }); diff --git a/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx b/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx index 72bfbfc35..d2f0f4842 100644 --- a/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx +++ b/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; -const useMonitorsFetch = ({ authToken, teamId }) => { +const useMonitorsFetch = ({ teamId }) => { const [isLoading, setIsLoading] = useState(true); const [monitors, setMonitors] = useState([]); const [summary, setSummary] = useState({}); @@ -13,7 +13,6 @@ const useMonitorsFetch = ({ authToken, teamId }) => { try { setIsLoading(true); const res = await networkService.getMonitorsByTeamId({ - authToken: authToken, teamId: teamId, limit: 10, types: ["pagespeed"], @@ -38,7 +37,7 @@ const useMonitorsFetch = ({ authToken, teamId }) => { }; fetchMonitors(); - }, [authToken, teamId]); + }, [teamId]); return { isLoading, monitors, summary, networkError }; }; diff --git a/src/Pages/PageSpeed/Monitors/index.jsx b/src/Pages/PageSpeed/Monitors/index.jsx index ea3ed93af..661ad3be9 100644 --- a/src/Pages/PageSpeed/Monitors/index.jsx +++ b/src/Pages/PageSpeed/Monitors/index.jsx @@ -19,10 +19,9 @@ const BREADCRUMBS = [{ name: `pagespeed`, path: "/pagespeed" }]; const PageSpeed = () => { const theme = useTheme(); const isAdmin = useIsAdmin(); - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const { isLoading, monitors, summary, networkError } = useMonitorsFetch({ - authToken: authToken, teamId: user.teamId, }); diff --git a/src/Pages/Settings/index.jsx b/src/Pages/Settings/index.jsx index f06be40e3..40e3ac1ed 100644 --- a/src/Pages/Settings/index.jsx +++ b/src/Pages/Settings/index.jsx @@ -39,7 +39,7 @@ const SECONDS_PER_DAY = 86400; const Settings = () => { const theme = useTheme(); const isAdmin = useIsAdmin(); - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const { checkTTL } = user; const { isLoading } = useSelector((state) => state.uptimeMonitors); const { isLoading: authIsLoading } = useSelector((state) => state.auth); @@ -115,11 +115,10 @@ const Settings = () => { try { setChecksIsLoading(true); await networkService.updateChecksTTL({ - authToken: authToken, ttl: form.ttl, }); const updatedUser = { ...user, checkTTL: form.ttl }; - const action = await dispatch(update({ authToken, localData: updatedUser })); + const action = await dispatch(update({ localData: updatedUser })); if (action.payload.success) { createToast({ @@ -149,7 +148,7 @@ const Settings = () => { const handleClearStats = async () => { try { const action = await dispatch( - deleteMonitorChecksByTeamId({ teamId: user.teamId, authToken }) + deleteMonitorChecksByTeamId({ teamId: user.teamId }) ); if (deleteMonitorChecksByTeamId.fulfilled.match(action)) { @@ -167,7 +166,7 @@ const Settings = () => { const handleInsertDemoMonitors = async () => { try { - const action = await dispatch(addDemoMonitors({ authToken })); + const action = await dispatch(addDemoMonitors()); if (addDemoMonitors.fulfilled.match(action)) { createToast({ body: "Successfully added demo monitors" }); } else { @@ -181,7 +180,7 @@ const Settings = () => { const handleDeleteAllMonitors = async () => { try { - const action = await dispatch(deleteAllMonitors({ authToken })); + const action = await dispatch(deleteAllMonitors()); if (deleteAllMonitors.fulfilled.match(action)) { createToast({ body: "Successfully deleted all monitors" }); } else { diff --git a/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx b/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx index 4972672f3..8407955a6 100644 --- a/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx +++ b/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx @@ -4,14 +4,14 @@ import { useSelector } from "react-redux"; import { createToast } from "../../../../Utils/toastUtils"; const useCreateStatusPage = (isCreate, url) => { - const { authToken, user } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const [isLoading, setIsLoading] = useState(false); const [networkError, setNetworkError] = useState(false); const createStatusPage = async ({ form }) => { setIsLoading(true); try { - await networkService.createStatusPage({ authToken, user, form, isCreate, url }); + await networkService.createStatusPage({ user, form, isCreate, url }); return true; } catch (error) { setNetworkError(true); diff --git a/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx b/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx index 4813157d1..a665aa9eb 100644 --- a/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx +++ b/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import { createToast } from "../../../../Utils/toastUtils"; const useMonitorsFetch = () => { - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const [monitors, setMonitors] = useState(undefined); const [isLoading, setIsLoading] = useState(true); @@ -13,7 +13,6 @@ const useMonitorsFetch = () => { const fetchMonitors = async () => { try { const response = await networkService.getMonitorsByTeamId({ - authToken: authToken, teamId: user.teamId, limit: null, // donot return any checks for the monitors types: ["http"], // status page is available only for the uptime type @@ -27,7 +26,7 @@ const useMonitorsFetch = () => { } }; fetchMonitors(); - }, [authToken, user]); + }, [user]); return [monitors, isLoading, networkError]; }; diff --git a/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx b/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx index 00b1401a3..d5c87c530 100644 --- a/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx +++ b/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx @@ -5,11 +5,10 @@ import { createToast } from "../../../../Utils/toastUtils"; const useStatusPageDelete = (fetchStatusPage, url) => { const [isLoading, setIsLoading] = useState(false); - const { authToken } = useSelector((state) => state.auth); const deleteStatusPage = async () => { try { setIsLoading(true); - await networkService.deleteStatusPage({ authToken, url }); + await networkService.deleteStatusPage({ url }); fetchStatusPage?.(); return true; } catch (error) { diff --git a/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx b/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx index 317dfe7b6..ae9c7b579 100644 --- a/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx +++ b/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx @@ -10,13 +10,11 @@ const useStatusPageFetch = (isCreate = false, url) => { const [networkError, setNetworkError] = useState(false); const [statusPage, setStatusPage] = useState(undefined); const [monitors, setMonitors] = useState(undefined); - const { authToken } = useSelector((state) => state.auth); const theme = useTheme(); const { getMonitorWithPercentage } = useMonitorUtils(); const fetchStatusPage = useCallback(async () => { try { const response = await networkService.getStatusPageByUrl({ - authToken, url, type: "uptime", }); @@ -40,7 +38,7 @@ const useStatusPageFetch = (isCreate = false, url) => { } finally { setIsLoading(false); } - }, [authToken, theme, getMonitorWithPercentage, url]); + }, [theme, getMonitorWithPercentage, url]); useEffect(() => { if (isCreate === true) { diff --git a/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx b/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx index 26eec8104..db7a33396 100644 --- a/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx +++ b/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import { createToast } from "../../../../Utils/toastUtils"; const useStatusPagesFetch = () => { - const { authToken, user } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const [isLoading, setIsLoading] = useState(true); const [networkError, setNetworkError] = useState(false); @@ -14,7 +14,6 @@ const useStatusPagesFetch = () => { const fetchStatusPages = async () => { try { const res = await networkService.getStatusPagesByTeamId({ - authToken, teamId: user.teamId, }); setStatusPages(res?.data?.data); @@ -28,7 +27,7 @@ const useStatusPagesFetch = () => { } }; fetchStatusPages(); - }, [authToken, user]); + }, [user]); return [isLoading, networkError, statusPages]; }; diff --git a/src/Pages/Uptime/Configure/index.jsx b/src/Pages/Uptime/Configure/index.jsx index 243e8ab36..c3d73dbb6 100644 --- a/src/Pages/Uptime/Configure/index.jsx +++ b/src/Pages/Uptime/Configure/index.jsx @@ -48,7 +48,7 @@ const Configure = () => { const navigate = useNavigate(); const theme = useTheme(); const dispatch = useDispatch(); - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const { isLoading } = useSelector((state) => state.uptimeMonitors); const [monitor, setMonitor] = useState({}); const [errors, setErrors] = useState({}); @@ -76,7 +76,7 @@ const Configure = () => { useEffect(() => { const fetchMonitor = async () => { try { - const action = await dispatch(getUptimeMonitorById({ authToken, monitorId })); + const action = await dispatch(getUptimeMonitorById({ monitorId })); if (getUptimeMonitorById.fulfilled.match(action)) { const monitor = action.payload.data; @@ -90,7 +90,7 @@ const Configure = () => { } }; fetchMonitor(); - }, [monitorId, authToken, navigate]); + }, [monitorId, navigate]); const handleChange = (event, name) => { let { value, id } = event.target; @@ -147,7 +147,7 @@ const Configure = () => { const handlePause = async () => { try { - const action = await dispatch(pauseUptimeMonitor({ authToken, monitorId })); + const action = await dispatch(pauseUptimeMonitor({ monitorId })); if (pauseUptimeMonitor.fulfilled.match(action)) { const monitor = action.payload.data; setMonitor(monitor); @@ -164,7 +164,7 @@ const Configure = () => { const handleSubmit = async (event) => { event.preventDefault(); - const action = await dispatch(updateUptimeMonitor({ authToken, monitor: monitor })); + const action = await dispatch(updateUptimeMonitor({ monitor: monitor })); if (action.meta.requestStatus === "fulfilled") { createToast({ body: "Monitor updated successfully!" }); } else { @@ -175,7 +175,7 @@ const Configure = () => { const [isOpen, setIsOpen] = useState(false); const handleRemove = async (event) => { event.preventDefault(); - const action = await dispatch(deleteUptimeMonitor({ authToken, monitor })); + const action = await dispatch(deleteUptimeMonitor({ monitor })); if (action.meta.requestStatus === "fulfilled") { navigate("/uptime"); } else { diff --git a/src/Pages/Uptime/Create/index.jsx b/src/Pages/Uptime/Create/index.jsx index 799998d3f..76a60222d 100644 --- a/src/Pages/Uptime/Create/index.jsx +++ b/src/Pages/Uptime/Create/index.jsx @@ -68,7 +68,7 @@ const CreateMonitor = () => { }, }; - const { user, authToken } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const { isLoading } = useSelector((state) => state.uptimeMonitors); const dispatch = useDispatch(); const navigate = useNavigate(); @@ -126,7 +126,7 @@ const CreateMonitor = () => { if (monitor.type === "http") { // const checkEndpointAction = await dispatch( - // checkEndpointResolution({ authToken, monitorURL: form.url }) + // checkEndpointResolution({ monitorURL: form.url }) // ); // if (checkEndpointAction.meta.requestStatus === "rejected") { // createToast({ @@ -144,7 +144,7 @@ const CreateMonitor = () => { userId: user._id, notifications: monitor.notifications, }; - const action = await dispatch(createUptimeMonitor({ authToken, monitor: form })); + const action = await dispatch(createUptimeMonitor({ monitor: form })); if (action.meta.requestStatus === "fulfilled") { createToast({ body: "Monitor created successfully!" }); navigate("/uptime"); @@ -205,7 +205,7 @@ const CreateMonitor = () => { useEffect(() => { const fetchMonitor = async () => { if (monitorId) { - const action = await dispatch(getUptimeMonitorById({ authToken, monitorId })); + const action = await dispatch(getUptimeMonitorById({ monitorId })); if (action.payload.success) { const data = action.payload.data; @@ -228,7 +228,7 @@ const CreateMonitor = () => { } }; fetchMonitor(); - }, [monitorId, authToken, dispatch, navigate]); + }, [monitorId, dispatch, navigate]); return ( diff --git a/src/Pages/Uptime/Details/Hooks/useCertificateFetch.jsx b/src/Pages/Uptime/Details/Hooks/useCertificateFetch.jsx index 6a820ff6f..ad0db6f70 100644 --- a/src/Pages/Uptime/Details/Hooks/useCertificateFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useCertificateFetch.jsx @@ -5,7 +5,6 @@ import { formatDateWithTz } from "../../../../Utils/timeUtils"; const useCertificateFetch = ({ monitor, - authToken, monitorId, certificateDateFormat, uiTimezone, @@ -22,7 +21,6 @@ const useCertificateFetch = ({ try { setIsLoading(true); const res = await networkService.getCertificateExpiry({ - authToken: authToken, monitorId: monitorId, }); if (res?.data?.data?.certificateDate) { @@ -39,7 +37,7 @@ const useCertificateFetch = ({ } }; fetchCertificate(); - }, [authToken, monitorId, certificateDateFormat, uiTimezone, monitor]); + }, [monitorId, certificateDateFormat, uiTimezone, monitor]); return [certificateExpiry, isLoading]; }; diff --git a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx index 8f57f63c0..7f87771b4 100644 --- a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx @@ -3,7 +3,6 @@ import { useEffect } from "react"; import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; export const useChecksFetch = ({ - authToken, monitorId, dateRange, page, @@ -19,7 +18,6 @@ export const useChecksFetch = ({ try { setIsLoading(true); const res = await networkService.getChecksByMonitor({ - authToken: authToken, monitorId: monitorId, sortOrder: "desc", limit: null, @@ -38,7 +36,7 @@ export const useChecksFetch = ({ } }; fetchChecks(); - }, [authToken, monitorId, dateRange, page, rowsPerPage]); + }, [monitorId, dateRange, page, rowsPerPage]); return [checks, checksCount, isLoading, networkError]; }; diff --git a/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx b/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx index 06d833d13..9491e7cc3 100644 --- a/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx @@ -3,7 +3,7 @@ import { networkService } from "../../../../main"; import { useNavigate } from "react-router-dom"; import { createToast } from "../../../../Utils/toastUtils"; -export const useMonitorFetch = ({ authToken, monitorId, dateRange }) => { +export const useMonitorFetch = ({ monitorId, dateRange }) => { const [networkError, setNetworkError] = useState(false); const [isLoading, setIsLoading] = useState(true); const [monitor, setMonitor] = useState(undefined); @@ -13,7 +13,6 @@ export const useMonitorFetch = ({ authToken, monitorId, dateRange }) => { const fetchMonitors = async () => { try { const res = await networkService.getUptimeDetailsById({ - authToken: authToken, monitorId: monitorId, dateRange: dateRange, normalize: true, @@ -27,7 +26,7 @@ export const useMonitorFetch = ({ authToken, monitorId, dateRange }) => { } }; fetchMonitors(); - }, [authToken, dateRange, monitorId, navigate]); + }, [dateRange, monitorId, navigate]); return [monitor, isLoading, networkError]; }; diff --git a/src/Pages/Uptime/Details/index.jsx b/src/Pages/Uptime/Details/index.jsx index 3063ba27a..24b5793f2 100644 --- a/src/Pages/Uptime/Details/index.jsx +++ b/src/Pages/Uptime/Details/index.jsx @@ -31,7 +31,6 @@ const certificateDateFormat = "MMM D, YYYY h A"; const UptimeDetails = () => { // Redux state - const { authToken } = useSelector((state) => state.auth); const uiTimezone = useSelector((state) => state.ui.timezone); // Local state @@ -48,21 +47,18 @@ const UptimeDetails = () => { const isAdmin = useIsAdmin(); const [monitor, monitorIsLoading, monitorNetworkError] = useMonitorFetch({ - authToken, monitorId, dateRange, }); const [certificateExpiry, certificateIsLoading] = useCertificateFetch({ monitor, - authToken, monitorId, certificateDateFormat, uiTimezone, }); const [checks, checksCount, checksAreLoading, checksNetworkError] = useChecksFetch({ - authToken, monitorId, dateRange, page, diff --git a/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx b/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx index b65de3525..95782d757 100644 --- a/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx +++ b/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx @@ -5,7 +5,6 @@ import { useTheme } from "@emotion/react"; import { useMonitorUtils } from "../../../../Hooks/useMonitorUtils"; export const useMonitorFetch = ({ - authToken, teamId, limit, page, @@ -28,7 +27,6 @@ export const useMonitorFetch = ({ try { setMonitorsAreLoading(true); const res = await networkService.getMonitorsByTeamId({ - authToken, teamId, limit, types: ["http", "ping", "docker", "port"], @@ -56,7 +54,6 @@ export const useMonitorFetch = ({ }; fetchMonitors(); }, [ - authToken, teamId, limit, field, diff --git a/src/Pages/Uptime/Monitors/index.jsx b/src/Pages/Uptime/Monitors/index.jsx index 572f3fc62..9a5d6756f 100644 --- a/src/Pages/Uptime/Monitors/index.jsx +++ b/src/Pages/Uptime/Monitors/index.jsx @@ -54,7 +54,7 @@ CreateMonitorButton.propTypes = { const UptimeMonitors = () => { // Redux state - const { authToken, user } = useSelector((state) => state.auth); + const { user } = useSelector((state) => state.auth); const rowsPerPage = useSelector((state) => state.ui.monitors.rowsPerPage); // Local state @@ -96,7 +96,6 @@ const UptimeMonitors = () => { monitorsSummary, networkError, } = useMonitorsFetch({ - authToken, teamId, limit: 25, page: page,