TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-05-24 15:52:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Updates

Browse source
This commit is contained in:
Gero Gerke 2022-07-26 13:47:23 +02:00
parent 3ac752246d
commit 80e7400185
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/model/group.js
View file

@ -9,12 +9,12 @@ class Group extends BeanModel {
* @param {boolean} [showTags=false] Should the JSON include monitor tags * @param {boolean} [showTags=false] Should the JSON include monitor tags
* @returns {Object} * @returns {Object}
*/ */
async toPublicJSON(showTags = false) { async toPublicJSON(showTags = false, showStatus = false) {
let monitorBeanList = await this.getMonitorList(); let monitorBeanList = await this.getMonitorList();
let monitorList = []; let monitorList = [];
for (let bean of monitorBeanList) { for (let bean of monitorBeanList) {
monitorList.push(await bean.toPublicJSON(showTags)); monitorList.push(await bean.toPublicJSON(showTags, showStatus));
} }
return { return {

12
server/model/status_page.js
View file

@ -73,8 +73,9 @@ class StatusPage extends BeanModel {
* Get all status page data in one call * Get all status page data in one call
* @param {StatusPage} statusPage * @param {StatusPage} statusPage
* @param {boolean} includeStatus whether each monitor should include the status of the monitor ("up" or "down") * @param {boolean} includeStatus whether each monitor should include the status of the monitor ("up" or "down")
* @param {boolean} includeConfig whether the config for the status paghe should be included in the returned JSON
*/ */
static async getStatusPageData(statusPage, includeStatus = false) { static async getStatusPageData(statusPage, includeStatus = false, includeConfig = true) {
// Incident // Incident
let incident = await R.findOne("incident", " pin = 1 AND active = 1 AND status_page_id = ? ", [ let incident = await R.findOne("incident", " pin = 1 AND active = 1 AND status_page_id = ? ", [
statusPage.id, statusPage.id,
@ -97,9 +98,16 @@ class StatusPage extends BeanModel {
publicGroupList.push(monitorGroup); publicGroupList.push(monitorGroup);
} }
let config = {};
if (includeConfig) {
config = {
config: await statusPage.toPublicJSON()
}
}
// Response // Response
return { return {
config: await statusPage.toPublicJSON(), ...config,
incident, incident,
publicGroupList publicGroupList
}; };

2
server/routers/status-page-router.js
View file

@ -41,7 +41,7 @@ router.get("/api/status-page/:slug/summary", cache("5 minutes"), async (request,
return null; return null;
} }
let statusPageData = await StatusPage.getStatusPageData(statusPage, true); let statusPageData = await StatusPage.getStatusPageData(statusPage, true, false);
if (!statusPageData) { if (!statusPageData) {
response.statusCode = 404; response.statusCode = 404;