Browse Source
Apply formatting suggestions from code review
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
pull/815/head
Jasper Miller-Waugh
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
server/routers/api-router.js
-
src/pages/StatusPage.vue
|
|
@ -149,7 +149,7 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request, |
|
|
|
for (let groupBean of list) { |
|
|
|
let monitorGroup = await groupBean.toPublicJSON(); |
|
|
|
if (tagsVisible) { |
|
|
|
monitorGroup.monitorList = await Promise.all(monitorGroup.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
|
|
|
|
const tags = await R.getAll( |
|
|
|
`SELECT monitor_tag.monitor_id, monitor_tag.value, tag.name, tag.color
|
|
|
@ -158,7 +158,7 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request, |
|
|
|
ON monitor_tag.tag_id = tag.id |
|
|
|
WHERE monitor_tag.monitor_id = ?`, [monitor.id]
|
|
|
|
); |
|
|
|
return {...monitor,tags: tags} |
|
|
|
return {...monitor, tags: tags} |
|
|
|
})); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -493,10 +493,10 @@ export default { |
|
|
|
// On load, the status page will not include tags if it's not enabled for security reasons |
|
|
|
// Which means if we enable tags, it won't show in the UI until saved |
|
|
|
// So we have this to enhance UX and load in the tags from the authenticated source instantly |
|
|
|
this.$root.publicGroupList = this.$root.publicGroupList.map((group)=>{ |
|
|
|
this.$root.publicGroupList = this.$root.publicGroupList.map((group) => { |
|
|
|
return { |
|
|
|
...group, |
|
|
|
monitorList: group.monitorList.map((monitor)=> { |
|
|
|
monitorList: group.monitorList.map((monitor) => { |
|
|
|
// We only include the tags if visible so we can reuse the logic to hide the tags on disable |
|
|
|
return { |
|
|
|
...monitor, |
|
|
|