From 4a36bd3157c24ef48cb375457db96187938fa1ad Mon Sep 17 00:00:00 2001 From: Jeffer Marcelino Date: Sun, 22 Jun 2025 18:28:17 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20add=20toggle=20to=20show/hide=20?= =?UTF-8?q?=E2=80=9CAdministrator=3F=20Login=20Here=E2=80=9D=20link=20in?= =?UTF-8?q?=20status=20page=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/StatusPage/Create/Components/Tabs/Content.jsx | 7 +++++++ client/src/Pages/StatusPage/Create/index.jsx | 4 +++- client/src/Utils/NetworkService.js | 3 +++ client/src/Validation/validation.js | 1 + client/src/locales/en.json | 1 + client/src/locales/pt-BR.json | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx b/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx index 7423b05bd..327a2fb0a 100644 --- a/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx +++ b/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx @@ -90,6 +90,13 @@ const Content = ({ isChecked={form.showUptimePercentage} onChange={handleFormChange} /> + diff --git a/client/src/Pages/StatusPage/Create/index.jsx b/client/src/Pages/StatusPage/Create/index.jsx index 50535cd90..63c248786 100644 --- a/client/src/Pages/StatusPage/Create/index.jsx +++ b/client/src/Pages/StatusPage/Create/index.jsx @@ -20,7 +20,7 @@ const TAB_LIST = ["General settings", "Contents"]; const ERROR_TAB_MAPPING = [ ["companyName", "url", "timezone", "color", "isPublished", "logo"], - ["monitors", "showUptimePercentage", "showCharts"], + ["monitors", "showUptimePercentage", "showCharts", "showAdminLoginLink"], ]; const CreateStatusPage = () => { @@ -39,6 +39,7 @@ const CreateStatusPage = () => { monitors: [], showCharts: true, showUptimePercentage: true, + showAdminLoginLink: false, }); const [errors, setErrors] = useState({}); const [selectedMonitors, setSelectedMonitors] = useState([]); @@ -195,6 +196,7 @@ const CreateStatusPage = () => { logo: newLogo, showCharts: statusPage?.showCharts ?? true, showUptimePercentage: statusPage?.showUptimePercentage ?? true, + showAdminLoginLink: statusPage?.showAdminLoginLink ?? false, }; }); setSelectedMonitors(statusPageMonitors); diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js index e7021d585..20281abf5 100644 --- a/client/src/Utils/NetworkService.js +++ b/client/src/Utils/NetworkService.js @@ -871,6 +871,9 @@ class NetworkService { if (form.showUptimePercentage !== undefined) { fd.append("showUptimePercentage", String(form.showUptimePercentage)); } + if (form.showAdminLoginLink !== undefined) { + fd.append("showAdminLoginLink", String(form.showAdminLoginLink)); + } form.monitors && form.monitors.forEach((monitorId) => { fd.append("monitors[]", monitorId); diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js index 4e6a806c8..d86bbd556 100644 --- a/client/src/Validation/validation.js +++ b/client/src/Validation/validation.js @@ -277,6 +277,7 @@ const statusPageValidation = joi.object({ logo: logoImageValidation, showUptimePercentage: joi.boolean(), showCharts: joi.boolean(), + showAdminLoginLink: joi.boolean(), }); const settingsValidation = joi.object({ diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 81a664290..818258905 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -319,6 +319,7 @@ "statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page", "showCharts": "Show charts", "showUptimePercentage": "Show uptime percentage", + "showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page", "removeLogo": "Remove Logo", "statusPageStatus": "A public status page is not set up.", "statusPageStatusContactAdmin": "Please contact to your administrator", diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json index a783a820c..7368c360c 100644 --- a/client/src/locales/pt-BR.json +++ b/client/src/locales/pt-BR.json @@ -312,6 +312,7 @@ "statusPageCreateTabsContentFeaturesDescription": "Mostrar mais detalhes na página de status", "showCharts": "Mostrar gráficos", "showUptimePercentage": "Mostrar porcentagem de Uptime", + "showAdminLoginLink": "Mostrar o link \"Administrador? Efetue login aqui\" na página de status", "removeLogo": "Remover logo", "statusPageStatus": "Uma página de status pública não está configurada.", "statusPageStatusContactAdmin": "Entre em contato com seu administrador",