mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-26 14:09:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Match lint settings

Browse source
This commit is contained in:
Jasper Miller-Waugh 2021-10-28 15:07:19 +13:00
parent 9143b73f84
commit 348c5ec995
No known key found for this signature in database
GPG key ID: 02A5F6F15443A805
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/routers/api-router.js
View file

@ -142,12 +142,13 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
const publicGroupList = []; const publicGroupList = [];
let list = await R.find("group", " public = 1 ORDER BY weight "); let list = await R.find("group", " public = 1 ORDER BY weight ");
for (let groupBean of list) { for (let groupBean of list) {
let monitor_info = await groupBean.toPublicJSON() let monitorGroup = await groupBean.toPublicJSON()
monitor_info.monitorList = await Promise.all(monitor_info.monitorList.map( async (monitor)=>{ monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map( async (monitor)=>{
// Includes tags as an array in response, allows for tags to be displayed on public status page
let tags = await R.getAll("SELECT mt.monitor_id,mt.value, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [monitor.id]); let tags = await R.getAll("SELECT mt.monitor_id,mt.value, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [monitor.id]);
return {...monitor,tags: tags} return {...monitor,tags: tags}
})) }))
publicGroupList.push(monitor_info); publicGroupList.push(monitorGroup);
} }
response.json(publicGroupList); response.json(publicGroupList);

1
src/components/PublicGroupList.vue
View file

@ -40,7 +40,6 @@
<Uptime :monitor="monitor.element" type="24" :pill="true" /> <Uptime :monitor="monitor.element" type="24" :pill="true" />
{{ monitor.element.name }} {{ monitor.element.name }}
</div> </div>
<div class="tags"> <div class="tags">
<Tag v-for="tag in monitor.element.tags" :key="tag" :item="tag" :size="'sm'" /> <Tag v-for="tag in monitor.element.tags" :key="tag" :item="tag" :size="'sm'" />