From b0d57866a0ed0e2507d12ca480c17e0bb8cc0199 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 29 Mar 2024 06:32:25 -0700
Subject: [PATCH] Fix glances service widgets handling of default version

---
 src/widgets/glances/metrics/cpu.jsx     | 5 ++---
 src/widgets/glances/metrics/disk.jsx    | 3 +--
 src/widgets/glances/metrics/fs.jsx      | 3 +--
 src/widgets/glances/metrics/gpu.jsx     | 3 +--
 src/widgets/glances/metrics/info.jsx    | 6 ++----
 src/widgets/glances/metrics/memory.jsx  | 3 +--
 src/widgets/glances/metrics/net.jsx     | 5 ++---
 src/widgets/glances/metrics/process.jsx | 3 +--
 src/widgets/glances/metrics/sensor.jsx  | 3 +--
 src/widgets/glances/widget.js           | 2 +-
 10 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/widgets/glances/metrics/cpu.jsx b/src/widgets/glances/metrics/cpu.jsx
index bd12dc29a..553517bac 100644
--- a/src/widgets/glances/metrics/cpu.jsx
+++ b/src/widgets/glances/metrics/cpu.jsx
@@ -20,12 +20,11 @@ export default function Component({ service }) {
 
   const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit));
 
-  const { data, error } = useWidgetAPI(service.widget, "cpu", {
+  const { data, error } = useWidgetAPI(service.widget, `${version}/cpu`, {
     refreshInterval: Math.max(defaultInterval, refreshInterval),
-    version,
   });
 
-  const { data: quicklookData, error: quicklookError } = useWidgetAPI(service.widget, "quicklook", { version });
+  const { data: quicklookData, error: quicklookError } = useWidgetAPI(service.widget, `${version}/quicklook`);
 
   useEffect(() => {
     if (data) {
diff --git a/src/widgets/glances/metrics/disk.jsx b/src/widgets/glances/metrics/disk.jsx
index 662822efd..04a5071fa 100644
--- a/src/widgets/glances/metrics/disk.jsx
+++ b/src/widgets/glances/metrics/disk.jsx
@@ -24,9 +24,8 @@ export default function Component({ service }) {
   );
   const [ratePoints, setRatePoints] = useState(new Array(pointsLimit).fill({ a: 0, b: 0 }, 0, pointsLimit));
 
-  const { data, error } = useWidgetAPI(service.widget, "diskio", {
+  const { data, error } = useWidgetAPI(service.widget, `${version}/diskio`, {
     refreshInterval: Math.max(defaultInterval, refreshInterval),
-    version,
   });
 
   const calculateRates = (d) =>
diff --git a/src/widgets/glances/metrics/fs.jsx b/src/widgets/glances/metrics/fs.jsx
index 1a26c2ab0..3ec7eb6ce 100644
--- a/src/widgets/glances/metrics/fs.jsx
+++ b/src/widgets/glances/metrics/fs.jsx
@@ -15,9 +15,8 @@ export default function Component({ service }) {
   const [, fsName] = widget.metric.split("fs:");
   const diskUnits = widget.diskUnits === "bbytes" ? "common.bbytes" : "common.bytes";
 
-  const { data, error } = useWidgetAPI(widget, "fs", {
+  const { data, error } = useWidgetAPI(widget, `${version}/fs`, {
     refreshInterval: Math.max(defaultInterval, refreshInterval),
-    version,
   });
 
   if (error) {
diff --git a/src/widgets/glances/metrics/gpu.jsx b/src/widgets/glances/metrics/gpu.jsx
index cc8504fa7..174ae2e07 100644
--- a/src/widgets/glances/metrics/gpu.jsx
+++ b/src/widgets/glances/metrics/gpu.jsx
@@ -21,9 +21,8 @@ export default function Component({ service }) {
 
   const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ a: 0, b: 0 }, 0, pointsLimit));
 
-  const { data, error } = useWidgetAPI(widget, "gpu", {
+  const { data, error } = useWidgetAPI(widget, `${version}/gpu`, {
     refreshInterval: Math.max(defaultInterval, refreshInterval),
-    version,
   });
 
   useEffect(() => {
diff --git a/src/widgets/glances/metrics/info.jsx b/src/widgets/glances/metrics/info.jsx
index a90cbdb52..1ee47b980 100644
--- a/src/widgets/glances/metrics/info.jsx
+++ b/src/widgets/glances/metrics/info.jsx
@@ -76,14 +76,12 @@ export default function Component({ service }) {
   const { widget } = service;
   const { chart, refreshInterval = defaultInterval, version = 3 } = widget;
 
-  const { data: quicklookData, errorL: quicklookError } = useWidgetAPI(service.widget, "quicklook", {
+  const { data: quicklookData, errorL: quicklookError } = useWidgetAPI(service.widget, `${version}/quicklook`, {
     refreshInterval,
-    version,
   });
 
-  const { data: systemData, errorL: systemError } = useWidgetAPI(service.widget, "system", {
+  const { data: systemData, errorL: systemError } = useWidgetAPI(service.widget, `${version}/system`, {
     refreshInterval: defaultSystemInterval,
-    version,
   });
 
   if (quicklookError) {
diff --git a/src/widgets/glances/metrics/memory.jsx b/src/widgets/glances/metrics/memory.jsx
index 87ec0f787..49046a5fc 100644
--- a/src/widgets/glances/metrics/memory.jsx
+++ b/src/widgets/glances/metrics/memory.jsx
@@ -21,9 +21,8 @@ export default function Component({ service }) {
 
   const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit));
 
-  const { data, error } = useWidgetAPI(service.widget, "mem", {
+  const { data, error } = useWidgetAPI(service.widget, `${version}/mem`, {
     refreshInterval: Math.max(defaultInterval(chart), refreshInterval),
-    version,
   });
 
   useEffect(() => {
diff --git a/src/widgets/glances/metrics/net.jsx b/src/widgets/glances/metrics/net.jsx
index a51c8388b..c1ec937ed 100644
--- a/src/widgets/glances/metrics/net.jsx
+++ b/src/widgets/glances/metrics/net.jsx
@@ -26,9 +26,8 @@ export default function Component({ service }) {
 
   const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit));
 
-  const { data, error } = useWidgetAPI(widget, "network", {
+  const { data, error } = useWidgetAPI(widget, `${version}/network`, {
     refreshInterval: Math.max(defaultInterval(chart), refreshInterval),
-    version,
   });
 
   useEffect(() => {
@@ -51,7 +50,7 @@ export default function Component({ service }) {
         });
       }
     }
-  }, [data, interfaceName, pointsLimit]);
+  }, [data, interfaceName, pointsLimit, rxKey, txKey]);
 
   if (error) {
     return (
diff --git a/src/widgets/glances/metrics/process.jsx b/src/widgets/glances/metrics/process.jsx
index 24b447cb9..b242535ee 100644
--- a/src/widgets/glances/metrics/process.jsx
+++ b/src/widgets/glances/metrics/process.jsx
@@ -26,9 +26,8 @@ export default function Component({ service }) {
 
   const memoryInfoKey = version === 3 ? 0 : "data";
 
-  const { data, error } = useWidgetAPI(service.widget, "processlist", {
+  const { data, error } = useWidgetAPI(service.widget, `${version}/processlist`, {
     refreshInterval: Math.max(defaultInterval, refreshInterval),
-    version,
   });
 
   if (error) {
diff --git a/src/widgets/glances/metrics/sensor.jsx b/src/widgets/glances/metrics/sensor.jsx
index 9dc28bb1e..e0f679c13 100644
--- a/src/widgets/glances/metrics/sensor.jsx
+++ b/src/widgets/glances/metrics/sensor.jsx
@@ -21,9 +21,8 @@ export default function Component({ service }) {
 
   const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit));
 
-  const { data, error } = useWidgetAPI(service.widget, "sensors", {
+  const { data, error } = useWidgetAPI(service.widget, `${version}/sensors`, {
     refreshInterval: Math.max(defaultInterval, refreshInterval),
-    version,
   });
 
   useEffect(() => {
diff --git a/src/widgets/glances/widget.js b/src/widgets/glances/widget.js
index a824e4c1b..3357cf28e 100644
--- a/src/widgets/glances/widget.js
+++ b/src/widgets/glances/widget.js
@@ -1,7 +1,7 @@
 import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
 
 const widget = {
-  api: "{url}/api/{version}/{endpoint}",
+  api: "{url}/api/{endpoint}",
   proxyHandler: credentialedProxyHandler,
 };