Synology widget : renaming widget to diskstation

public/locales/en/common.json

@@ -413,22 +413,12 @@
         "wanUpload": "WAN Upload",
         "wanDownload": "WAN Download"
     },
-    "synology": {
+    "diskstation": {
       "uptime": "Uptime",
       "volumeUsage": "Volume Usage",
       "cpuLoad": "CPU Load",
       "memoryUsage": "Memory Usage",
       "status": "Status",
       "volumeTotal": "Total space"
-    },
-    "opnsense": {
-        "cpu": "CPU Load",
-        "memory": "Memory Used",
-        "uptime": "Uptime",
-        "wanUpload": "WAN Upload",
-        "wanDownload": "WAN Download",
-        "wanUploadRate": "WAN Upload Rate",
-        "wanDownloadRate": "WAN Download Rate"
-
     }
 }

src/widgets/components.js

@@ -47,7 +47,7 @@ const components = {
   sonarr: dynamic(() => import("./sonarr/component")),
   speedtest: dynamic(() => import("./speedtest/component")),
   strelaysrv: dynamic(() => import("./strelaysrv/component")),
-  synology: dynamic(() => import("./synology/component")),
+  diskstation: dynamic(() => import("./diskstation/component")),
   tautulli: dynamic(() => import("./tautulli/component")),
   tdarr: dynamic(() => import("./tdarr/component")),
   traefik: dynamic(() => import("./traefik/component")),

src/widgets/diskstation/component.jsx

@@ -0,0 +1,40 @@
+import { useTranslation } from "next-i18next";
+
+import Container from "components/services/widget/container";
+import Block from "components/services/widget/block";
+import useWidgetAPI from "utils/proxy/use-widget-api";
+
+export default function Component({ service }) {
+  const { t } = useTranslation();
+
+  const { widget } = service;
+
+  const { data: dsData, error: dsError } = useWidgetAPI(widget);
+
+  if (dsError) {
+    return <Container error={ dsError } />;
+  }
+
+  if (!dsData) {
+    return (
+      <Container service={service}>
+        <Block label="diskstation.uptime" />
+        <Block label="diskstation.volumeUsage" />
+        <Block label="diskstation.volumeTotal" />
+        <Block label="diskstation.cpuLoad" />
+        <Block label="diskstation.memoryUsage" />
+      </Container>
+    );
+  }
+
+
+  return (
+    <Container service={service}>
+      <Block label="diskstation.uptime" value={ dsData.uptime }  />
+      <Block label="diskstation.volumeUsage" value={t("common.percent", { value: dsData.usedVolume })} />
+      <Block label="diskstation.volumeTotal" value={t("common.bytes", { value: dsData.totalSize })} />
+      <Block label="diskstation.cpuLoad" value={t("common.percent", { value: dsData.cpuLoad })} />
+      <Block label="diskstation.memoryUsage" value={t("common.percent", { value: dsData.memoryUsage })} />
+    </Container>
+  );
+}

src/widgets/diskstation/proxy.js

@@ -106,13 +106,12 @@ export default async function synologyProxyHandler(req, res) {
   const memoryUsage = 100 - (100 * (parseFloat(JSON.parse(data.toString()).data.memory.avail_real) + parseFloat(JSON.parse(data.toString()).data.memory.cached)) / parseFloat(JSON.parse(data.toString()).data.memory.total_real));
   const cpuLoad = parseFloat(JSON.parse(data.toString()).data.cpu.user_load) + parseFloat(JSON.parse(data.toString()).data.cpu.system_load);
 
-  const resdata = {
+  if (contentType) res.setHeader("Content-Type", contentType);
+  return res.status(status).send(JSON.stringify({
     uptime,
     usedVolume,
     totalSize,
     memoryUsage,
     cpuLoad,
-  }
+  }));
-  if (contentType) res.setHeader("Content-Type", contentType);
-  return res.status(status).send(JSON.stringify(resdata));
 }

src/widgets/synology/component.jsx

@@ -1,40 +0,0 @@
-import { useTranslation } from "next-i18next";
-
-import Container from "components/services/widget/container";
-import Block from "components/services/widget/block";
-import useWidgetAPI from "utils/proxy/use-widget-api";
-
-export default function Component({ service }) {
-  const { t } = useTranslation();
-
-  const { widget } = service;
-
-  const { data: dsData, error: dsError } = useWidgetAPI(widget);
-
-  if (dsError) {
-    return <Container error={ dsError } />;
-  }
-
-  if (!dsData) {
-    return (
-      <Container service={service}>
-        <Block label="synology.uptime" />
-        <Block label="synology.volumeUsage" />
-        <Block label="synology.volumeTotal" />
-        <Block label="synology.cpuLoad" />
-        <Block label="synology.memoryUsage" />
-      </Container>
-    );
-  }
-
-
-  return (
-    <Container service={service}>
-      <Block label="synology.uptime" value={ dsData.uptime }  />
-      <Block label="synology.volumeUsage" value={t("common.percent", { value: dsData.usedVolume })} />
-      <Block label="synology.volumeTotal" value={t("common.bytes", { value: dsData.totalSize })} />
-      <Block label="synology.cpuLoad" value={t("common.percent", { value: dsData.cpuLoad })} />
-      <Block label="synology.memoryUsage" value={t("common.percent", { value: dsData.memoryUsage })} />
-    </Container>
-  );
-}

src/widgets/widgets.js

@@ -42,7 +42,7 @@ import scrutiny from "./scrutiny/widget";
 import sonarr from "./sonarr/widget";
 import speedtest from "./speedtest/widget";
 import strelaysrv from "./strelaysrv/widget";
-import synology from "./synology/widget";
+import diskstation from "./diskstation/widget";
 import tautulli from "./tautulli/widget";
 import tdarr from "./tdarr/widget";
 import traefik from "./traefik/widget";
@@ -61,7 +61,7 @@ const widgets = {
   changedetectionio,
   coinmarketcap,
   deluge,
-  diskstation: downloadstation,
+  diskstation,
   downloadstation,
   emby,
   flood,
@@ -100,7 +100,6 @@ const widgets = {
   sonarr,
   speedtest,
   strelaysrv,
-  synology,
   tautulli,
   tdarr,
   traefik,