From f57f9137c7a7e789d9c0d850ee05d6aabfa49061 Mon Sep 17 00:00:00 2001
From: Romein van Buren <romein@vburen.nl>
Date: Mon, 11 Jul 2022 13:15:39 +0200
Subject: [PATCH] More dashboard fixes

Signed-off-by: Romein van Buren <romein@vburen.nl>
---
 dashboard/socket.js                |  2 +-
 gui/dashboard/app.css              |  1 +
 gui/dashboard/app.svelte           | 15 ++++++++++----
 gui/dashboard/tile-rawvalue.svelte |  3 ++-
 gui/dashboard/tile.svelte          | 33 +++++++++++++++++++++++-------
 gui/dashboard/tiles.svelte         |  8 +++++---
 index.js                           |  5 +++++
 7 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/dashboard/socket.js b/dashboard/socket.js
index 88ed900..3a5b64f 100644
--- a/dashboard/socket.js
+++ b/dashboard/socket.js
@@ -35,7 +35,7 @@ async function createDashboardSocket(server) {
           const lastBeat = heartbeats.find(h => h.webservice === s.id);
           mappedServices[s.id] = {
             name: s.name,
-            lastBeat: lastBeat,
+            lastBeat: lastBeat || {},
           };
         }
 
diff --git a/gui/dashboard/app.css b/gui/dashboard/app.css
index 6c76784..855af77 100644
--- a/gui/dashboard/app.css
+++ b/gui/dashboard/app.css
@@ -1,6 +1,7 @@
 html, body {
   --body-bg: #000;
   --tile-bg: #181818;
+  --grey: grey;
   --red: red;
   --green: green;
   --radius: 10px;
diff --git a/gui/dashboard/app.svelte b/gui/dashboard/app.svelte
index 036901c..6725b2a 100644
--- a/gui/dashboard/app.svelte
+++ b/gui/dashboard/app.svelte
@@ -1,5 +1,4 @@
 <script>
-  import './app.css';
   import { onMount } from 'svelte';
   import TileRawValue from './tile-rawvalue.svelte';
   import Tiles from './tiles.svelte';
@@ -10,6 +9,7 @@
   let services = {};
   let servicesUp = {};
   let servicesDown = {};
+  let servicesUnknown = {};
   let loading = true;
 
   onMount(() => {
@@ -32,7 +32,13 @@
 
           for (const id of ids) {
             const service = services[id];
-            if (service.lastBeat && service.lastBeat.down) {
+            if (!service.lastBeat || !service.lastBeat.date) {
+              servicesUnknown = {
+                ...servicesUnknown,
+                [id]: service,
+              };
+            }
+            else if (service.lastBeat.down) {
               servicesDown = {
                 ...servicesDown,
                 [id]: service,
@@ -64,8 +70,9 @@
       <TileRawValue title="Last updated" value={lastUpdatedFormatted} />
 
       {#if !loading}
-        <Tiles services={servicesDown} />
-        <Tiles services={servicesUp} />
+        <Tiles services={servicesDown} color="red" value="down" />
+        <Tiles services={servicesUp} color="green" value="up" />
+        <Tiles services={servicesUnknown} color="grey" value="no data" />
       {:else}
         loading
       {/if}
diff --git a/gui/dashboard/tile-rawvalue.svelte b/gui/dashboard/tile-rawvalue.svelte
index 6b8d1d5..48f0895 100644
--- a/gui/dashboard/tile-rawvalue.svelte
+++ b/gui/dashboard/tile-rawvalue.svelte
@@ -5,9 +5,10 @@
   export let subtitle;
   export let color;
   export let value;
+  export let date;
 </script>
 
-<Tile {title} {subtitle} {color}>
+<Tile {title} {subtitle} {color} {date}>
   <div class="value {color}">
     {value}
   </div>
diff --git a/gui/dashboard/tile.svelte b/gui/dashboard/tile.svelte
index a1a15c5..a4c5c82 100644
--- a/gui/dashboard/tile.svelte
+++ b/gui/dashboard/tile.svelte
@@ -2,22 +2,31 @@
   export let title;
   export let subtitle;
   export let color;
+  export let date;
 </script>
 
 <div class="tile {color}">
-  {#if title || subtitle}
+  {#if title || subtitle || date}
     <div class="desc">
-      {#if title}
-        <div class="title">{title}</div>
-      {/if}
+      <div>
+        {#if title}
+          <div class="title">{title}</div>
+        {/if}
 
-      {#if subtitle}
-        <div class="subtitle">{subtitle}</div>
+        {#if subtitle}
+          <div class="subtitle">{subtitle}</div>
+        {/if}
+      </div>
+
+      {#if date}
+        <div class="time">{date.toLocaleTimeString('en-GB', {
+          timeStyle: 'short',
+        })}</div>
       {/if}
     </div>
   {/if}
 
-  <slot />
+  <div class="content"><slot /></div>
 </div>
 
 <style>
@@ -38,9 +47,14 @@
     border-color: var(--green);
   }
 
+  .tile.grey .content {
+    color: var(--grey);
+  }
+
   .desc {
     font-size: 1.3rem;
     margin-bottom: 1rem;
+    display: flex;
   }
 
   .desc .title {
@@ -50,4 +64,9 @@
   .desc .subtitle {
     font-weight: 100;
   }
+
+  .desc .time {
+    opacity: 0.6;
+    margin-left: auto;
+  }
 </style>
diff --git a/gui/dashboard/tiles.svelte b/gui/dashboard/tiles.svelte
index c625d87..67d132c 100644
--- a/gui/dashboard/tiles.svelte
+++ b/gui/dashboard/tiles.svelte
@@ -2,13 +2,15 @@
   import TileRawValue from './tile-rawvalue.svelte';
 
   export let services;
+  export let color;
+  export let value;
 </script>
 
 {#each Object.entries(services) as [ id, service ] (id)}
-  {@const isDown = service.lastBeat.down}
   <TileRawValue
     title={service.name.en}
-    value={isDown ? 'down' : 'up'}
-    color={isDown ? 'red' : 'green'}
+    date={service.lastBeat.date ? new Date(service.lastBeat.date) : false}
+    {value}
+    {color}
   />
 {/each}
diff --git a/index.js b/index.js
index 84ae197..b9f4c0c 100644
--- a/index.js
+++ b/index.js
@@ -5,6 +5,7 @@ const { processOutage } = require('./lib/processoutage');
 const buildDashboard = require('./dashboard/build');
 const createDashboardSocket = require('./dashboard/socket');
 const { minifyHtml } = require('core/strings');
+const { readFile } = require('fs/promises');
 
 const guiCluster = 'web service status';
 const icons = {
@@ -533,6 +534,9 @@ module.exports = {
         try {
           if (!renderedDashboard) {
             renderedDashboard = await buildDashboard(server);
+            renderedDashboard.globalCss = await readFile(
+              __dirname + '/gui/dashboard/app.css'
+            );
           }
           const dashboardHtml = minifyHtml(`
             <!DOCTYPE html>
@@ -542,6 +546,7 @@ module.exports = {
                 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
                 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
                 <title>Web service status dashboard</title>
+                <style>${renderedDashboard.globalCss || ''}</style>
                 <style>${renderedDashboard.css || ''}</style>
               </head>
               <body>