fix(management): fix uptime not being able to extend past 24h

ravenclaw900 · Oct 31, 2021 · d3e45d1 · d3e45d1
1 parent 11dda26
commit d3e45d1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/frontend/.yarn/cache/humanize-duration-npm-3.27.0-dde7ed8208-db34111b39.zip b/src/frontend/.yarn/cache/humanize-duration-npm-3.27.0-dde7ed8208-db34111b39.zip
diff --git a/src/frontend/.yarn/install-state.gz b/src/frontend/.yarn/install-state.gz
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -29,6 +29,7 @@
   "dependencies": {
     "autosize": "^5.0.1",
     "chart.js": "^3.6.0",
+    "humanize-duration": "^3.27.0",
     "microlight": "^0.0.7",
     "xterm": "^4.14.1",
     "xterm-addon-attach": "^0.6.0",

diff --git a/src/frontend/src/pages/Management.svelte b/src/frontend/src/pages/Management.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import Card from "../components/Card.svelte";
+    import humanizeDuration from "humanize-duration";
 
     export let socket;
     export let socketData;
@@ -9,7 +10,8 @@
     let msg = "";
 
     $: socketData.uptime &&
-        ((uptime = new Date(socketData.uptime * 1000)), (dialog = false));
+        ((uptime = humanizeDuration(socketData.uptime * 1000)),
+        (dialog = false));
 
     function sendData(data) {
         socket.send(JSON.stringify({ cmd: data }));
@@ -64,7 +66,7 @@
                     class="even:bg-white odd:bg-gray-200 dark:even:bg-black dark:odd:bg-gray-800"
                 >
                     <td class="p-1 font-semibold">Uptime:</td>
-                    <td class="p-1">{uptime.toISOString().substr(11, 8)}</td>
+                    <td class="p-1">{uptime}</td>
                 </tr>
                 <tr
                     class="even:bg-white odd:bg-gray-200 dark:even:bg-black dark:odd:bg-gray-800"

diff --git a/src/frontend/yarn.lock b/src/frontend/yarn.lock
@@ -505,6 +505,7 @@ __metadata:
     "@tsconfig/svelte": ^2.0.1
     autosize: ^5.0.1
     chart.js: ^3.6.0
+    humanize-duration: ^3.27.0
     microlight: ^0.0.7
     svelte: ^3.37.0
     svelte-check: ^2.1.0
@@ -917,6 +918,13 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
+"humanize-duration@npm:^3.27.0":
+  version: 3.27.0
+  resolution: "humanize-duration@npm:3.27.0"
+  checksum: db34111b391056bd0da8d6a3cc965ee52c2de497892c85f16d5559529232924dfabd8f3c4210135fbd12d0cea7da34dade05accc14ef69f2cba758ff4b4bbd3d
+  languageName: node
+  linkType: hard
+
 "humanize-ms@npm:^1.2.1":
   version: 1.2.1
   resolution: "humanize-ms@npm:1.2.1"