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
+91 -7

No files matched your search

+3 -2
View File
@@ -14,7 +14,7 @@ import Dot from "../Dot";
* @param {number} params.percentage - The percentage to display. * @param {number} params.percentage - The percentage to display.
* @returns {React.ElementType} Returns a div element with the host details. * @returns {React.ElementType} Returns a div element with the host details.
*/ */
const Host = ({ url, title, percentageColor, percentage }) => { const Host = ({ url, title, percentageColor, percentage, showURL }) => {
const theme = useTheme(); const theme = useTheme();
return ( return (
<Stack> <Stack>
@@ -40,7 +40,7 @@ const Host = ({ url, title, percentageColor, percentage }) => {
</> </>
)} )}
</Stack> </Stack>
<span style={{ opacity: 0.6 }}>{url}</span> {showURL && <span style={{ opacity: 0.6 }}>{url}</span>}
</Stack> </Stack>
); );
}; };
@@ -50,6 +50,7 @@ Host.propTypes = {
percentageColor: PropTypes.string, percentageColor: PropTypes.string,
percentage: PropTypes.string, percentage: PropTypes.string,
url: PropTypes.string, url: PropTypes.string,
showURL: PropTypes.bool,
}; };
export default Host; export default Host;
+5
View File
@@ -20,6 +20,7 @@ const initialState = {
collapsed: false, collapsed: false,
}, },
mode: initialMode, mode: initialMode,
statusURL: "disabled",
greeting: { index: 0, lastUpdate: null }, greeting: { index: 0, lastUpdate: null },
timezone: "America/Toronto", timezone: "America/Toronto",
distributedUptimeEnabled: false, distributedUptimeEnabled: false,
@@ -46,6 +47,9 @@ const uiSlice = createSlice({
setMode: (state, action) => { setMode: (state, action) => {
state.mode = action.payload; state.mode = action.payload;
}, },
setStatusURL: (state, action) => {
state.statusURL = action.payload;
},
setGreeting(state, action) { setGreeting(state, action) {
state.greeting.index = action.payload.index; state.greeting.index = action.payload.index;
state.greeting.lastUpdate = action.payload.lastUpdate; state.greeting.lastUpdate = action.payload.lastUpdate;
@@ -67,6 +71,7 @@ export const {
setRowsPerPage, setRowsPerPage,
toggleSidebar, toggleSidebar,
setMode, setMode,
setStatusURL,
setGreeting, setGreeting,
setTimezone, setTimezone,
setDistributedUptimeEnabled, setDistributedUptimeEnabled,
+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 Breadcrumbs from "../../Components/Breadcrumbs";
import SettingsTimeZone from "./SettingsTimeZone"; import SettingsTimeZone from "./SettingsTimeZone";
import SettingsUI from "./SettingsUI"; import SettingsUI from "./SettingsUI";
import SettingsURL from "./SettingsURL";
import SettingsPagespeed from "./SettingsPagespeed"; import SettingsPagespeed from "./SettingsPagespeed";
import SettingsDemoMonitors from "./SettingsDemoMonitors"; import SettingsDemoMonitors from "./SettingsDemoMonitors";
import SettingsAbout from "./SettingsAbout"; import SettingsAbout from "./SettingsAbout";
@@ -15,7 +16,7 @@ import { useState } from "react";
import { useTheme } from "@emotion/react"; import { useTheme } from "@emotion/react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { useSelector, useDispatch } from "react-redux"; 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 SettingsStats from "./SettingsStats";
import { import {
deleteMonitorChecksByTeamId, deleteMonitorChecksByTeamId,
@@ -31,7 +32,7 @@ const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }];
const Settings = () => { const Settings = () => {
// Redux state // 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); const { user } = useSelector((state) => state.auth);
// Local state // Local state
@@ -67,6 +68,7 @@ const Settings = () => {
const { error } = settingsValidation.validate(newSettingsData.settings, { const { error } = settingsValidation.validate(newSettingsData.settings, {
abortEarly: false, abortEarly: false,
}); });
console.log(error)
if (!error || error.details.length === 0) { if (!error || error.details.length === 0) {
setErrors({}); setErrors({});
} else { } else {
@@ -85,6 +87,10 @@ const Settings = () => {
dispatch(setMode(value)); dispatch(setMode(value));
} }
if (name === "statusURL") {
dispatch(setStatusURL(value));
}
if (name === "language") { if (name === "language") {
dispatch(setLanguage(value)); dispatch(setLanguage(value));
i18n.changeLanguage(value); i18n.changeLanguage(value);
@@ -164,6 +170,11 @@ const Settings = () => {
setSettingsData={setSettingsData} setSettingsData={setSettingsData}
isApiKeySet={settingsData?.pagespeedKeySet ?? false} isApiKeySet={settingsData?.pagespeedKeySet ?? false}
/> />
<SettingsURL
HEADING_SX={HEADING_SX}
handleChange={handleChange}
statusURL={statusURL}
/>
<SettingsStats <SettingsStats
isAdmin={isAdmin} isAdmin={isAdmin}
HEADING_SX={HEADING_SX} HEADING_SX={HEADING_SX}
@@ -8,9 +8,16 @@ import { StatusLabel } from "../../../../../Components/Label";
import { useTheme } from "@mui/material/styles"; import { useTheme } from "@mui/material/styles";
import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils"; import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { useSelector } from "react-redux";
const MonitorsList = ({ isLoading = false, shouldRender = true, monitors = [] }) => { const MonitorsList = ({ isLoading = false, shouldRender = true, monitors = [] }) => {
const theme = useTheme(); const theme = useTheme();
const { determineState } = useUtils(); const { determineState } = useUtils();
const { statusURL } = useSelector((state) => state.ui);
const showURL = statusURL === "enabled";
return ( return (
<> <>
{monitors?.map((monitor) => { {monitors?.map((monitor) => {
@@ -27,6 +34,7 @@ const MonitorsList = ({ isLoading = false, shouldRender = true, monitors = [] })
title={monitor.name} title={monitor.name}
percentageColor={monitor.percentageColor} percentageColor={monitor.percentageColor}
percentage={monitor.percentage} percentage={monitor.percentage}
showURL={showURL}
/> />
<Stack <Stack
direction="row" direction="row"
@@ -19,6 +19,7 @@ import { useState } from "react";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
const PublicStatus = () => { const PublicStatus = () => {
const { url } = useParams(); const { url } = useParams();
+1
View File
@@ -277,6 +277,7 @@ const settingsValidation = joi.object({
}), }),
pagespeedApiKey: joi.string().allow("").optional(), pagespeedApiKey: joi.string().allow("").optional(),
language: joi.string().required(), language: joi.string().required(),
statusURL: joi.string().required(),
systemEmailHost: joi.string().allow(""), systemEmailHost: joi.string().allow(""),
systemEmailPort: joi.number().allow(null, ""), systemEmailPort: joi.number().allow(null, ""),
systemEmailAddress: joi.string().allow(""), systemEmailAddress: joi.string().allow(""),
+3
View File
@@ -75,6 +75,9 @@
"settingsThemeModeLight": "Light", "settingsThemeModeLight": "Light",
"settingsThemeModeDark": "Dark", "settingsThemeModeDark": "Dark",
"settingsLanguage": "Language", "settingsLanguage": "Language",
"settingsURLTitle": "Monitor IP/URL on Status Page",
"settingsURLDescription": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
"settingsURLSelectTitle": "Display IP/URL on status page",
"settingsDistributedUptime": "Distributed uptime", "settingsDistributedUptime": "Distributed uptime",
"settingsDistributedUptimeDescription": "Enable/disable distributed uptime monitoring.", "settingsDistributedUptimeDescription": "Enable/disable distributed uptime monitoring.",
"settingsEnabled": "Enabled", "settingsEnabled": "Enabled",
+7 -1
View File
@@ -89,6 +89,9 @@
"settingsThemeModeLight": "Светлая", "settingsThemeModeLight": "Светлая",
"settingsThemeModeDark": "Тёмная", "settingsThemeModeDark": "Тёмная",
"settingsLanguage": "Язык", "settingsLanguage": "Язык",
"settingsURLTitle": "Отображать IP/URL на странице статуса",
"settingsURLDescription": "Отображать IP-адрес или URL-адрес монитора на общедоступной странице статуса. Если отключено, будет отображаться только имя монитора для защиты конфиденциальной информации.",
"settingsURLSelectTitle": "Показать IP/URL на странице статуса",
"settingsDistributedUptime": "Distributed uptime", "settingsDistributedUptime": "Distributed uptime",
"settingsDistributedUptimeDescription": "Включить/выключить distributed uptime monitoring.", "settingsDistributedUptimeDescription": "Включить/выключить distributed uptime monitoring.",
"settingsEnabled": "Включено", "settingsEnabled": "Включено",
@@ -152,7 +155,6 @@
"http": "HTTP", "http": "HTTP",
"monitor": "монитор", "monitor": "монитор",
"aboutus": "О Нас", "aboutus": "О Нас",
"now": "Сейчас", "now": "Сейчас",
"delete": "Удалить", "delete": "Удалить",
"configure": "Настроить", "configure": "Настроить",
@@ -409,6 +411,10 @@
"pageSpeedWarning": "Предупреждение: Вы не добавили ключ API Google PageSpeed. Без него монитор PageSpeed не будет работать.", "pageSpeedWarning": "Предупреждение: Вы не добавили ключ API Google PageSpeed. Без него монитор PageSpeed не будет работать.",
"pageSpeedLearnMoreLink": "Нажмите здесь, чтобы узнать", "pageSpeedLearnMoreLink": "Нажмите здесь, чтобы узнать",
"pageSpeedAddApiKey": "как добавить ваш ключ API.", "pageSpeedAddApiKey": "как добавить ваш ключ API.",
"pageSpeedApiKeyFieldTitle": "Ключ Google PageSpeed API",
"pageSpeedApiKeyFieldLabel": "Ключ PageSpeed API",
"pageSpeedApiKeyFieldDescription": "Введите свой ключ Google PageSpeed API, чтобы включить мониторинг скорости страниц. Нажмите «Сбросить», чтобы обновить ключ.",
"pageSpeedApiKeyFieldResetLabel": "Ключ API установлен. Нажмите «Сбросить», чтобы изменить его.",
"createNew": "Создать новый", "createNew": "Создать новый",
"greeting": { "greeting": {
"prepend": "Привет", "prepend": "Привет",
+6 -2
View File
@@ -73,6 +73,9 @@
"settingsThemeModeLight": "Açık", "settingsThemeModeLight": "Açık",
"settingsThemeModeDark": "Koyu", "settingsThemeModeDark": "Koyu",
"settingsLanguage": "Dil", "settingsLanguage": "Dil",
"settingsURLTitle": "Durum Sayfasında IP/URL'yi Göster",
"settingsURLDescription": "Monitörün IP adresini veya URL'sini genel Durum sayfasında göster. Devre dışı bırakıldığında, hassas bilgileri korumak için yalnızca monitör adı gösterilecektir.",
"settingsURLSelectTitle": "Durum sayfasında IP/URL'yi göster",
"settingsDistributedUptime": "Dağıtılmış çalışma süresi", "settingsDistributedUptime": "Dağıtılmış çalışma süresi",
"settingsDistributedUptimeDescription": "Dağıtılmış çalışma süresi izlemeyi etkinleştirin/devre dışı bırakın.", "settingsDistributedUptimeDescription": "Dağıtılmış çalışma süresi izlemeyi etkinleştirin/devre dışı bırakın.",
"settingsEnabled": "Etkin", "settingsEnabled": "Etkin",
@@ -124,7 +127,6 @@
"http": "HTTP", "http": "HTTP",
"monitor": "monitör", "monitor": "monitör",
"aboutus": "Hakkımızda", "aboutus": "Hakkımızda",
"now": "Şimdi", "now": "Şimdi",
"delete": "Sil", "delete": "Sil",
"configure": "Yapılandır", "configure": "Yapılandır",
@@ -397,7 +399,9 @@
"pageSpeedWarning": "Uyarı: Google PageSpeed API anahtarı eklemediniz. Bu olmadan, PageSpeed monitörü çalışmayacaktır.", "pageSpeedWarning": "Uyarı: Google PageSpeed API anahtarı eklemediniz. Bu olmadan, PageSpeed monitörü çalışmayacaktır.",
"pageSpeedLearnMoreLink": "Daha fazla bilgi için tıklayın", "pageSpeedLearnMoreLink": "Daha fazla bilgi için tıklayın",
"pageSpeedAddApiKey": "API anahtarınızı nasıl ekleyeceğinizi öğrenin.", "pageSpeedAddApiKey": "API anahtarınızı nasıl ekleyeceğinizi öğrenin.",
"pageSpeedApiKeyFieldDescription": "Sayfa hızı izlemeyi etkinleştirmek için Google PageSpeed API anahtarınızı girin. Anahtarı güncellemek için Sıfırla'ya tıklayın.", "pageSpeedApiKeyFieldTitle": "Google PageSpeed API anahtarı",
"pageSpeedApiKeyFieldLabel": "PageSpeed API anahtarı",
"pageSpeedApiKeyFieldDescription": "PageSpeed izlemeyi etkinleştirmek için Google PageSpeed API anahtarınızı girin. Anahtarı güncellemek için Sıfırla'ya tıklayın.",
"pageSpeedApiKeyFieldResetLabel": "API anahtarı ayarlandı. Değiştirmek için Sıfırla'ya tıklayın.", "pageSpeedApiKeyFieldResetLabel": "API anahtarı ayarlandı. Değiştirmek için Sıfırla'ya tıklayın.",
"reset": "Sıfırla", "reset": "Sıfırla",
"invalidFileFormat": "", "invalidFileFormat": "",
+1
View File
@@ -427,6 +427,7 @@ const updateAppSettingsBodyValidation = joi.object({
checkTTL: joi.number().allow(""), checkTTL: joi.number().allow(""),
pagespeedApiKey: joi.string().allow(""), pagespeedApiKey: joi.string().allow(""),
language: joi.string().allow(""), language: joi.string().allow(""),
statusURL: joi.string().required(),
systemEmailHost: joi.string().allow(""), systemEmailHost: joi.string().allow(""),
systemEmailPort: joi.number().allow(""), systemEmailPort: joi.number().allow(""),
systemEmailAddress: joi.string().allow(""), systemEmailAddress: joi.string().allow(""),