Merge pull request #2506 from JefferMarcelino/feature/hide-admin-login-link

Add toggle to optionally display admin login link on status page and fix syntax errors

client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx

@@ -90,6 +90,13 @@ const Content = ({
 							isChecked={form.showUptimePercentage}
 							onChange={handleFormChange}
 						/>
+						<Checkbox
+							id="showAdminLoginLink"
+							name="showAdminLoginLink"
+							label={t("showAdminLoginLink")}
+							isChecked={form.showAdminLoginLink}
+							onChange={handleFormChange}
+						/>
 					</Stack>
 				</ConfigStack>
 			</Stack>

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);

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",

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);

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({

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",

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",

server/db/models/StatusPage.js

@@ -70,6 +70,10 @@ const StatusPageSchema = mongoose.Schema(
 			type: Boolean,
 			default: true,
 		},
+		showAdminLoginLink: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	{ timestamps: true }
 );

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: {

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