Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Monitors -> Uptime resovles #1333 #1338

Merged
merged 4 commits into from
Dec 12, 2024
Merged

fix: Monitors -> Uptime resovles #1333 #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c793da
Monitors -> Uptime
ajhollid Dec 10, 2024
f57b9a0
remove daterange from dependency array
ajhollid Dec 12, 2024
fff8528
Merge branch 'develop' into fix/fe/monitors-rename
ajhollid Dec 12, 2024
33ed541
Merge branch 'develop' into fix/fe/monitors-rename
ajhollid Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import NotFound from "./Pages/NotFound";
import Login from "./Pages/Auth/Login";
import Register from "./Pages/Auth/Register/Register";
import Account from "./Pages/Account";
import Monitors from "./Pages/Monitors/Home";
import CreateMonitor from "./Pages/Monitors/CreateMonitor";
import Uptime from "./Pages/Uptime/Home";
import CreateMonitor from "./Pages/Uptime/CreateUptime";
import CreateInfrastructureMonitor from "./Pages/Infrastructure/CreateMonitor";
import Incidents from "./Pages/Incidents";
import Status from "./Pages/Status";
Expand All @@ -20,10 +20,10 @@ import CheckEmail from "./Pages/Auth/CheckEmail";
import SetNewPassword from "./Pages/Auth/SetNewPassword";
import NewPasswordConfirmed from "./Pages/Auth/NewPasswordConfirmed";
import ProtectedRoute from "./Components/ProtectedRoute";
import Details from "./Pages/Monitors/Details";
import UptimeDetails from "./Pages/Uptime/Details";
import AdvancedSettings from "./Pages/AdvancedSettings";
import Maintenance from "./Pages/Maintenance";
import Configure from "./Pages/Monitors/Configure";
import Configure from "./Pages/Uptime/Configure";
import PageSpeed from "./Pages/PageSpeed";
import CreatePageSpeed from "./Pages/PageSpeed/CreatePageSpeed";
import CreateNewMaintenanceWindow from "./Pages/Maintenance/CreateMaintenance";
Expand All @@ -43,8 +43,8 @@ import { Infrastructure } from "./Pages/Infrastructure";
import InfrastructureDetails from "./Pages/Infrastructure/Details";
function App() {
const AdminCheckedRegister = withAdminCheck(Register);
const MonitorsWithAdminProp = withAdminProp(Monitors);
const MonitorDetailsWithAdminProp = withAdminProp(Details);
const UptimeWithAdminProp = withAdminProp(Uptime);
const UptimeDetailsWithAdminProp = withAdminProp(UptimeDetails);
const PageSpeedWithAdminProp = withAdminProp(PageSpeed);
const PageSpeedDetailsWithAdminProp = withAdminProp(PageSpeedDetails);
const MaintenanceWithAdminProp = withAdminProp(Maintenance);
Expand Down Expand Up @@ -92,22 +92,22 @@ function App() {
<Route
exact
path="/"
element={<Navigate to="/monitors" />}
element={<Navigate to="/uptime" />}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Old monitor routes have been successfully replaced

The codebase search shows that all /monitors routes have been properly updated to their new paths under /uptime. The only remaining references to the old path are:

  • Two navigation calls in fallback handlers that need updating:
    • Client/src/Pages/Uptime/Home/fallback.jsx: navigate("/monitors/create");
    • Client/src/Pages/Auth/NewPasswordConfirmed.jsx: onClick={() => navigate("/monitors")}

These are minor UI navigation issues that should be updated to use the new /uptime paths, but they don't represent actual route definitions or backend endpoints.

🔗 Analysis chain

Verify complete removal of old monitor routes

The route changes look good, but let's verify no old monitor routes remain in the codebase.

Also applies to: 98-111

Let me search more thoroughly to ensure we catch all instances and understand their context better.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any remaining references to old monitor routes
rg -i "path=\"/monitors" 
rg -i "navigate\(\"/monitors"
rg -i "to=\"/monitors"

Length of output: 249

Script:

#!/bin/bash
# Let's check for any other variations of monitor routes and related code
rg -i "monitor" -g "*.{jsx,js,ts,tsx}" -A 2 -B 2

Length of output: 106571

/>
<Route
path="/monitors"
element={<ProtectedRoute Component={MonitorsWithAdminProp} />}
path="/uptime"
element={<ProtectedRoute Component={UptimeWithAdminProp} />}
/>
<Route
path="/monitors/create/:monitorId?"
path="/uptime/create/:monitorId?"
element={<ProtectedRoute Component={CreateMonitor} />}
/>
<Route
path="/monitors/:monitorId/"
element={<ProtectedRoute Component={MonitorDetailsWithAdminProp} />}
path="/uptime/:monitorId/"
element={<ProtectedRoute Component={UptimeDetailsWithAdminProp} />}
/>
<Route
path="/monitors/configure/:monitorId/"
path="/uptime/configure/:monitorId/"
element={<ProtectedRoute Component={Configure} />}
/>
<Route
Expand Down
6 changes: 3 additions & 3 deletions Client/src/Components/Sidebar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import Folder from "../../assets/icons/folder.svg?react";
import "./index.css";

const menu = [
{ name: "Monitors", path: "monitors", icon: <Monitors /> },
{ name: "Uptime", path: "uptime", icon: <Monitors /> },
{ name: "Pagespeed", path: "pagespeed", icon: <PageSpeed /> },
{ name: "Infrastructure", path: "infrastructure", icon: <Integrations /> },
{ name: "Incidents", path: "incidents", icon: <Incidents /> },
Expand Down Expand Up @@ -262,10 +262,10 @@ function Sidebar() {
Menu
</ListSubheader>
}
sx={{
sx={{
px: theme.spacing(6),
height: "100%",
overflow: "hidden"
overflow: "hidden",
}}
>
{menu.map((item) =>
Expand Down
4 changes: 2 additions & 2 deletions Client/src/Pages/Auth/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ const Login = () => {

useEffect(() => {
if (authToken) {
navigate("/monitors");
navigate("/uptime");
return;
}
networkService
Expand Down Expand Up @@ -454,7 +454,7 @@ const Login = () => {
} else {
const action = await dispatch(login(form));
if (action.payload.success) {
navigate("/monitors");
navigate("/uptime");
createToast({
body: "Welcome back! You're successfully logged in.",
});
Expand Down
2 changes: 1 addition & 1 deletion Client/src/Pages/Auth/Register/Register.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ const Register = ({ isSuperAdmin }) => {
if (action.payload.success) {
const authToken = action.payload.data;
localStorage.setItem("token", authToken);
navigate("/monitors");
navigate("/uptime");
createToast({
body: "Welcome! Your account was created successfully.",
});
Expand Down
2 changes: 1 addition & 1 deletion Client/src/Pages/Infrastructure/CreateMonitor/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useNavigate } from "react-router-dom";
import { useTheme } from "@emotion/react";
import { createToast } from "../../../Utils/toastUtils";
import Link from "../../../Components/Link";
import { ConfigBox } from "../../Monitors/styled";
import { ConfigBox } from "../../Uptime/styled";
import TextInput from "../../../Components/Inputs/TextInput";
import Select from "../../../Components/Inputs/Select";
import Checkbox from "../../../Components/Inputs/Checkbox";
Expand Down
2 changes: 1 addition & 1 deletion Client/src/Pages/Infrastructure/Details/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import AreaChart from "../../../Components/Charts/AreaChart";
import { useSelector } from "react-redux";
import { networkService } from "../../../main";
import PulseDot from "../../../Components/Animated/PulseDot";
import useUtils from "../../Monitors/utils";
import useUtils from "../../Uptime/utils";
import { useNavigate } from "react-router-dom";
import Empty from "./empty";
import { logger } from "../../../Utils/Logger";
Expand Down
82 changes: 0 additions & 82 deletions Client/src/Pages/Infrastructure/components/Menu/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,88 +109,6 @@ const InfrastructureMenu = ({ monitor, isAdmin, updateCallback }) => {
},
}}
>
{/*
Open site action. Not necessary for infrastructure?

{actions.url !== null ? (
<MenuItem
onClick={(e) => {
closeMenu(e);
e.stopPropagation();
window.open(actions.url, "_blank", "noreferrer");
}}
>
Open site
</MenuItem>
) : (
""
)}
*/}
<MenuItem onClick={() => openDetails(monitor.id)}>Details</MenuItem>
{/*
Incidents. Necessary?
<MenuItem
onClick={(e) => {
e.stopPropagation();
navigate(`/incidents/${actions.id}`);
}}
>
Incidents
</MenuItem> */}
{/*
Configure. Necessary?
{isAdmin && (
<MenuItem
onClick={(e) => {
e.stopPropagation();

navigate(`/monitors/configure/${actions.id}`);
}}
>
Configure
</MenuItem>
)} */}
{/*
Clone. Necessary?
{isAdmin && (
<MenuItem
onClick={(e) => {
e.stopPropagation();
navigate(`/monitors/create/${actions.id}`);
}}
>
Clone
</MenuItem>
)} */}
{/*
Pause. Necessary?
const handlePause = async () => {
try {
const action = await dispatch(
pauseUptimeMonitor({ authToken, monitorId: monitor._id })
);
if (pauseUptimeMonitor.fulfilled.match(action)) {
updateCallback();
const state = action?.payload?.data.isActive === false ? "paused" : "resumed";
createToast({ body: `Monitor ${state} successfully.` });
} else {
throw new Error(action?.error?.message ?? "Failed to pause monitor.");
}
} catch (error) {
logger.error("Error pausing monitor:", monitor._id, error);
createToast({ body: "Failed to pause monitor." });
}
};
{isAdmin && (
<MenuItem
onClick={(e) => {
e.stopPropagation();
handlePause(e);
}}
>
{monitor?.isActive === true ? "Pause" : "Resume"}
</MenuItem>
)} */}
{isAdmin && <MenuItem onClick={openRemove}>Remove</MenuItem>}
</Menu>
<Dialog
Expand Down
4 changes: 2 additions & 2 deletions Client/src/Pages/Infrastructure/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { useNavigate } from "react-router-dom";
import { /* useDispatch, */ useSelector } from "react-redux";
import { useTheme } from "@emotion/react";
import useUtils from "../Monitors/utils";
import useUtils from "../Uptime/utils.jsx";
import { jwtDecode } from "jwt-decode";
import SkeletonLayout from "./skeleton";
import Fallback from "../../Components/Fallback";
Expand All @@ -28,7 +28,7 @@ import { Pagination } from "./components/TablePagination";
// import { getInfrastructureMonitorsByTeamId } from "../../Features/InfrastructureMonitors/infrastructureMonitorsSlice";
import { networkService } from "../../Utils/NetworkService.js";
import CustomGauge from "../../Components/Charts/CustomGauge/index.jsx";
import Host from "../Monitors/Home/host.jsx";
import Host from "../Uptime/Home/host.jsx";
import { useIsAdmin } from "../../Hooks/useIsAdmin.js";
import { InfrastructureMenu } from "./components/Menu";

Expand Down
4 changes: 2 additions & 2 deletions Client/src/Pages/PageSpeed/Configure/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import { monitorValidation } from "../../../Validation/validation";
import { createToast } from "../../../Utils/toastUtils";
import { logger } from "../../../Utils/Logger";
import { ConfigBox } from "../../Monitors/styled";
import { ConfigBox } from "../../Uptime/styled";
import TextInput from "../../../Components/Inputs/TextInput";
import Select from "../../../Components/Inputs/Select";
import Checkbox from "../../../Components/Inputs/Checkbox";
Expand All @@ -23,7 +23,7 @@ import PulseDot from "../../../Components/Animated/PulseDot";
import LoadingButton from "@mui/lab/LoadingButton";
import PlayCircleOutlineRoundedIcon from "@mui/icons-material/PlayCircleOutlineRounded";
import SkeletonLayout from "./skeleton";
import useUtils from "../../Monitors/utils";
import useUtils from "../../Uptime/utils";
import "./index.css";
import Dialog from "../../../Components/Dialog";

Expand Down
2 changes: 1 addition & 1 deletion Client/src/Pages/PageSpeed/Details/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import PulseDot from "../../../Components/Animated/PulseDot";
import PagespeedDetailsAreaChart from "./Charts/AreaChart";
import Checkbox from "../../../Components/Inputs/Checkbox";
import PieChart from "./Charts/PieChart";
import useUtils from "../../Monitors/utils";
import useUtils from "../../Uptime/utils";
import "./index.css";

const PageSpeedDetails = ({ isAdmin }) => {
Expand Down
2 changes: 1 addition & 1 deletion Client/src/Pages/PageSpeed/card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { IconBox } from "./Details/styled";
import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
import { useSelector } from "react-redux";
import { formatDateWithTz, formatDurationSplit } from "../../Utils/timeUtils";
import useUtils from "../Monitors/utils";
import useUtils from "../Uptime/utils";
import { useState } from "react";

/**
Expand Down
0 ...nt/src/Pages/Monitors/Configure/index.css → Client/src/Pages/Uptime/Configure/index.css
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...nt/src/Pages/Monitors/Configure/index.jsx → Client/src/Pages/Uptime/Configure/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const Configure = () => {
event.preventDefault();
const action = await dispatch(deleteUptimeMonitor({ authToken, monitor }));
if (action.meta.requestStatus === "fulfilled") {
navigate("/monitors");
navigate("/uptime");
} else {
createToast({ body: "Failed to delete monitor." });
}
Expand Down Expand Up @@ -207,9 +207,9 @@ const Configure = () => {
<>
<Breadcrumbs
list={[
{ name: "monitors", path: "/monitors" },
{ name: "details", path: `/monitors/${monitorId}` },
{ name: "configure", path: `/monitors/configure/${monitorId}` },
{ name: "uptime", path: "/uptime" },
{ name: "details", path: `/uptime/${monitorId}` },
{ name: "configure", path: `/uptime/configure/${monitorId}` },
Comment on lines +210 to +212
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Breadcrumb paths need attention in Infrastructure section

The Infrastructure section still uses "monitors" in its breadcrumb paths, which is inconsistent with the migration to "uptime":

  • Client/src/Pages/Infrastructure/Details/index.jsx: Uses "infrastructure monitors"
  • Client/src/Pages/Infrastructure/CreateMonitor/index.jsx: Uses "Infrastructure monitors"
🔗 Analysis chain

Breadcrumb paths have been consistently updated

The breadcrumb navigation paths have been properly updated to use 'uptime' instead of 'monitors'.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify consistent usage of 'uptime' in breadcrumb paths across the application
# Test: Search for any remaining instances of 'monitors' in breadcrumb paths
rg -i "monitors.*path:" "Client/src/Pages"

Length of output: 279

Script:

#!/bin/bash
# Let's verify if these are actually breadcrumb paths and not something else
# by checking the context around these matches
rg -i "monitors.*path:" "Client/src/Pages" -B 5 -A 5

Length of output: 1918

Script:

#!/bin/bash
# Let's also check for any other breadcrumb-related code in these files
# to understand the full context
fd "index.jsx" "Client/src/Pages/Infrastructure" --exec ast-grep --pattern 'const breadcrumbs = $_'

Length of output: 97

Script:

#!/bin/bash
# Let's verify if there are any other breadcrumb definitions in the Infrastructure pages
rg "breadcrumbs" "Client/src/Pages/Infrastructure" -B 2 -A 2

Length of output: 58

]}
/>
<Stack
Expand Down
0 ...src/Pages/Monitors/Configure/skeleton.jsx → ...t/src/Pages/Uptime/Configure/skeleton.jsx
View file
Open in desktop
File renamed without changes.
0 ...rc/Pages/Monitors/CreateMonitor/index.css → ...t/src/Pages/Uptime/CreateUptime/index.css
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...rc/Pages/Monitors/CreateMonitor/index.jsx → ...t/src/Pages/Uptime/CreateUptime/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ const CreateMonitor = () => {
const theme = useTheme();
const { monitorId } = useParams();
const crumbs = [
{ name: "monitors", path: "/monitors" },
{ name: "create", path: `/monitors/create` },
{ name: "uptime", path: "/uptime" },
{ name: "create", path: `/uptime/create` },
];

// State
Expand Down Expand Up @@ -125,7 +125,7 @@ const CreateMonitor = () => {
const action = await dispatch(createUptimeMonitor({ authToken, monitor: form }));
if (action.meta.requestStatus === "fulfilled") {
createToast({ body: "Monitor created successfully!" });
navigate("/monitors");
navigate("/uptime");
} else {
createToast({ body: "Failed to create monitor." });
}
Expand Down
0 ...c/Pages/Monitors/Details/Charts/index.jsx → ...src/Pages/Uptime/Details/Charts/index.jsx
View file
Open in desktop
File renamed without changes.
0 ...onitors/Details/PaginationTable/index.jsx → .../Uptime/Details/PaginationTable/index.jsx
View file
Open in desktop
File renamed without changes.
0 Client/src/Pages/Monitors/Details/index.css → Client/src/Pages/Uptime/Details/index.css
View file
Open in desktop
File renamed without changes.
15 changes: 7 additions & 8 deletions Client/src/Pages/Monitors/Details/index.jsx → Client/src/Pages/Uptime/Details/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const DetailsPage = ({ isAdmin }) => {
}
};
fetchCertificate();
}, [authToken, monitorId, monitor]);
}, [authToken, monitorId, monitor, uiTimezone, dateFormat]);

const splitDuration = (duration) => {
const { time, format } = formatDurationSplit(duration);
Expand All @@ -117,18 +117,17 @@ const DetailsPage = ({ isAdmin }) => {
const [hoveredUptimeData, setHoveredUptimeData] = useState(null);
const [hoveredIncidentsData, setHoveredIncidentsData] = useState(null);

const BREADCRUMBS = [
{ name: "uptime", path: "/uptime" },
{ name: "details", path: `/uptime/${monitorId}` },
];
return (
<Box className="monitor-details">
{loading ? (
<SkeletonLayout />
) : (
<>
<Breadcrumbs
list={[
{ name: "monitors", path: "/monitors" },
{ name: "details", path: `/monitors/${monitorId}` },
]}
/>
<Breadcrumbs list={BREADCRUMBS} />
<Stack
gap={theme.spacing(10)}
mt={theme.spacing(10)}
Expand Down Expand Up @@ -262,7 +261,7 @@ const DetailsPage = ({ isAdmin }) => {
<Button
variant="contained"
color="secondary"
onClick={() => navigate(`/monitors/configure/${monitorId}`)}
onClick={() => navigate(`/uptime/configure/${monitorId}`)}
sx={{
px: theme.spacing(5),
"& svg": {
Expand Down
0 ...t/src/Pages/Monitors/Details/skeleton.jsx → Client/src/Pages/Uptime/Details/skeleton.jsx
View file
Open in desktop
File renamed without changes.
0 Client/src/Pages/Monitors/Details/styled.jsx → Client/src/Pages/Uptime/Details/styled.jsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...Monitors/Home/CurrentMonitoring/index.jsx → ...s/Uptime/Home/CurrentMonitoring/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTheme } from "@emotion/react";
import { Box, Stack } from "@mui/material";
import Search from "../../../../Components/Inputs/Search";
import MemoizedMonitorTable from "../MonitorTable";
import MemoizedMonitorTable from "../UptimeTable";
import { useState } from "react";
import useDebounce from "../../../../Utils/debounce";
import PropTypes from "prop-types";
Expand All @@ -26,7 +26,7 @@ const CurrentMonitoring = ({ totalMonitors, monitors, isAdmin, handlePause }) =>
alignItems="center"
mb={theme.spacing(8)}
>
<Heading component="h2">Actively monitoring</Heading>
<Heading component="h2">Uptime monitors</Heading>

<Box
className="current-monitors-counter"
Expand Down
0 Client/src/Pages/Monitors/Home/StatusBox.jsx → Client/src/Pages/Uptime/Home/StatusBox.jsx
View file
Open in desktop
File renamed without changes.
0 ...tors/Home/MonitorTable/Skeleton/index.jsx → ...ptime/Home/UptimeTable/Skeleton/index.jsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ages/Monitors/Home/MonitorTable/index.jsx → ...c/Pages/Uptime/Home/UptimeTable/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ const MonitorTable = ({ isAdmin, filter, setIsSearching, isSearching, handlePaus
},
}}
onClick={() => {
navigate(`/monitors/${monitor._id}`);
navigate(`/uptime/${monitor._id}`);
}}
>
<TableCell>
Expand Down
Loading
Loading