Browse Source

Match lint settings

pull/815/head
Jasper Miller-Waugh 3 years ago
parent
commit
348c5ec995
No known key found for this signature in database GPG Key ID: 2A5F6F15443A805
  1. 7
      server/routers/api-router.js
  2. 1
      src/components/PublicGroupList.vue

7
server/routers/api-router.js

@ -142,12 +142,13 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
const publicGroupList = [];
let list = await R.find("group", " public = 1 ORDER BY weight ");
for (let groupBean of list) {
let monitor_info = await groupBean.toPublicJSON()
monitor_info.monitorList = await Promise.all(monitor_info.monitorList.map( async (monitor)=>{
let monitorGroup = await groupBean.toPublicJSON()
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]);
return {...monitor,tags: tags}
}))
publicGroupList.push(monitor_info);
publicGroupList.push(monitorGroup);
}
response.json(publicGroupList);

1
src/components/PublicGroupList.vue

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

Loading…
Cancel
Save