Fix: Optionally show IP/URL of the monitor in status page

This commit is contained in:
Asim Ahmed Siddiqui committed 2025-05-23 12:40:47 +05:30
1 parent e7694afeba
commit e8d636dcfd
11 files changed
+92 -8

No files matched your search

+43
View File
@@ -0,0 +1,43 @@
import Box from "@mui/material/Box";
import Stack from "@mui/material/Stack";
import Typography from "@mui/material/Typography";
import ConfigBox from "../../Components/ConfigBox";
import Select from "../../Components/Inputs/Select";
// Utils
import { useTheme } from "@emotion/react";
import { PropTypes } from "prop-types";
import { useTranslation } from "react-i18next";
const SettingsURL = ({ HEADING_SX, handleChange, statusURL }) => {
const { t } = useTranslation();
const theme = useTheme();
return (
<ConfigBox>
<Box>
<Typography component="h1">{t("settingsURLTitle")}</Typography>
<Typography sx={HEADING_SX}>{t("settingsURLDescription")}</Typography>
</Box>
<Stack gap={theme.spacing(20)}>
<Select
name="statusURL"
label={t("settingsURLSelectTitle")}
value={statusURL}
onChange={handleChange}
items={[
{ _id: "enabled", name: "Enabled" },
{ _id: "disabled", name: "Disabled" },
]}
></Select>
</Stack>
</ConfigBox>
);
};
SettingsURL.propTypes = {
HEADING_SX: PropTypes.object,
handleChange: PropTypes.func,
statusURL: PropTypes.string,
};
export default SettingsURL;
+13 -2
View File
@@ -3,6 +3,7 @@ import Typography from "@mui/material/Typography";
import Breadcrumbs from "../../Components/Breadcrumbs";
import SettingsTimeZone from "./SettingsTimeZone";
import SettingsUI from "./SettingsUI";
import SettingsURL from "./SettingsURL";
import SettingsPagespeed from "./SettingsPagespeed";
import SettingsDemoMonitors from "./SettingsDemoMonitors";
import SettingsAbout from "./SettingsAbout";
@@ -15,7 +16,7 @@ import { useState } from "react";
import { useTheme } from "@emotion/react";
import { useTranslation } from "react-i18next";
import { useSelector, useDispatch } from "react-redux";
import { setTimezone, setMode, setLanguage } from "../../Features/UI/uiSlice";
import { setTimezone, setMode, setLanguage, setStatusURL } from "../../Features/UI/uiSlice";
import SettingsStats from "./SettingsStats";
import {
deleteMonitorChecksByTeamId,
@@ -31,7 +32,7 @@ const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }];
const Settings = () => {
// Redux state
const { mode, language, timezone } = useSelector((state) => state.ui);
const { mode, language, timezone, statusURL } = useSelector((state) => state.ui);
const { user } = useSelector((state) => state.auth);
// Local state
@@ -67,6 +68,7 @@ const Settings = () => {
const { error } = settingsValidation.validate(newSettingsData.settings, {
abortEarly: false,
});
console.log(error)
if (!error || error.details.length === 0) {
setErrors({});
} else {
@@ -85,6 +87,10 @@ const Settings = () => {
dispatch(setMode(value));
}
if (name === "statusURL") {
dispatch(setStatusURL(value));
}
if (name === "language") {
dispatch(setLanguage(value));
i18n.changeLanguage(value);
@@ -164,6 +170,11 @@ const Settings = () => {
setSettingsData={setSettingsData}
isApiKeySet={settingsData?.pagespeedKeySet ?? false}
/>
<SettingsURL
HEADING_SX={HEADING_SX}
handleChange={handleChange}
statusURL={statusURL}
/>
<SettingsStats
isAdmin={isAdmin}
HEADING_SX={HEADING_SX}
@@ -8,9 +8,16 @@ import { StatusLabel } from "../../../../../Components/Label";
import { useTheme } from "@mui/material/styles";
import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils";
import PropTypes from "prop-types";
import { useSelector } from "react-redux";
const MonitorsList = ({ isLoading = false, shouldRender = true, monitors = [] }) => {
const theme = useTheme();
const { determineState } = useUtils();
const { statusURL } = useSelector((state) => state.ui);
const showURL = statusURL === "enabled";
return (
<>
{monitors?.map((monitor) => {
@@ -27,6 +34,7 @@ const MonitorsList = ({ isLoading = false, shouldRender = true, monitors = [] })
title={monitor.name}
percentageColor={monitor.percentageColor}
percentage={monitor.percentage}
showURL={showURL}
/>
<Stack
direction="row"
@@ -19,6 +19,7 @@ import { useState } from "react";
import { useParams } from "react-router-dom";
import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
const PublicStatus = () => {
const { url } = useParams();