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/Pages/StatusPage/Status/index.jsx b/client/src/Pages/StatusPage/Status/index.jsx index 727daeeb1..45822f6c6 100644 --- a/client/src/Pages/StatusPage/Status/index.jsx +++ b/client/src/Pages/StatusPage/Status/index.jsx @@ -48,7 +48,7 @@ const PublicStatus = () => { let link = undefined; const isPublic = location.pathname.startsWith("/status/uptime/public"); // Public status page - if (isPublic) { + if (isPublic && statusPage && statusPage.showAdminLoginLink === true) { sx = { paddingTop: theme.spacing(20), paddingLeft: "20vw", diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js index 651f72fe0..653ed5c5b 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 b7db06202..a7c7c0a9f 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -316,6 +316,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 74a0b654f..38b08adaf 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", diff --git a/server/db/models/StatusPage.js b/server/db/models/StatusPage.js index e4c81707f..92cbab1cd 100755 --- a/server/db/models/StatusPage.js +++ b/server/db/models/StatusPage.js @@ -70,6 +70,10 @@ const StatusPageSchema = mongoose.Schema( type: Boolean, default: true, }, + showAdminLoginLink: { + type: Boolean, + default: false, + }, }, { timestamps: true } ); diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js index d6331fcf8..e94ffbd55 100755 --- a/server/db/mongo/modules/statusPageModule.js +++ b/server/db/mongo/modules/statusPageModule.js @@ -153,6 +153,7 @@ const getStatusPage = async (url) => { showCharts: 1, showUptimePercentage: 1, timezone: 1, + showAdminLoginLink: 1, url: 1, }, monitors: { diff --git a/server/validation/joi.js b/server/validation/joi.js index 448a844f1..e5c1d6e43 100755 --- a/server/validation/joi.js +++ b/server/validation/joi.js @@ -463,6 +463,7 @@ const createStatusPageBodyValidation = joi.object({ isPublished: joi.boolean(), showCharts: joi.boolean().optional(), showUptimePercentage: joi.boolean(), + showAdminLoginLink: joi.boolean().optional(), }); const imageValidation = joi