From 30e4a2ae3ab5104168f67a87e37441f8a83fb92b Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 15 Dec 2023 14:12:14 -0800
Subject: [PATCH] Include truenas in uptime refactor

---
 public/locales/en/common.json     |  3 +--
 src/widgets/truenas/component.jsx | 30 +-----------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 1f800bf2b..aa4ef1e50 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -519,8 +519,7 @@
     "truenas": {
         "load": "System Load",
         "uptime": "Uptime",
-        "alerts": "Alerts",
-        "time": "{{value, number(style: unit; unitDisplay: long;)}}"
+        "alerts": "Alerts"
     },
     "pyload": {
         "speed": "Speed",
diff --git a/src/widgets/truenas/component.jsx b/src/widgets/truenas/component.jsx
index 456e20122..c1fc5c53a 100644
--- a/src/widgets/truenas/component.jsx
+++ b/src/widgets/truenas/component.jsx
@@ -4,34 +4,6 @@ import Container from "components/services/widget/container";
 import Block from "components/services/widget/block";
 import useWidgetAPI from "utils/proxy/use-widget-api";
 
-const processUptime = (uptime) => {
-  const seconds = uptime.toFixed(0);
-
-  const levels = [
-    [Math.floor(seconds / 31536000), "year"],
-    [Math.floor((seconds % 31536000) / 2592000), "month"],
-    [Math.floor(((seconds % 31536000) % 2592000) / 86400), "day"],
-    [Math.floor(((seconds % 31536000) % 86400) / 3600), "hour"],
-    [Math.floor((((seconds % 31536000) % 86400) % 3600) / 60), "minute"],
-    [(((seconds % 31536000) % 86400) % 3600) % 60, "second"],
-  ];
-
-  for (let i = 0; i < levels.length; i += 1) {
-    const level = levels[i];
-    if (level[0] > 0) {
-      return {
-        value: level[0],
-        unit: level[1],
-      };
-    }
-  }
-
-  return {
-    value: 0,
-    unit: "second",
-  };
-};
-
 export default function Component({ service }) {
   const { t } = useTranslation();
 
@@ -58,7 +30,7 @@ export default function Component({ service }) {
   return (
     <Container service={service}>
       <Block label="truenas.load" value={t("common.number", { value: statusData.loadavg[0] })} />
-      <Block label="truenas.uptime" value={t("truenas.time", processUptime(statusData.uptime_seconds))} />
+      <Block label="truenas.uptime" value={t("common.uptime", { value: statusData.uptime_seconds })} />
       <Block label="truenas.alerts" value={t("common.number", { value: alertData.pending })} />
     </Container>
   );