From 33b62f94e1f20b4382d9993d081db1014f8da5ac Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 22 May 2023 10:34:06 -0700 Subject: [PATCH] Prevent unused glances API class --- src/components/widgets/glances/glances.jsx | 12 ++++++++---- src/pages/api/widgets/glances.js | 22 ++++++++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/components/widgets/glances/glances.jsx b/src/components/widgets/glances/glances.jsx index ddf14188..85dd44c0 100644 --- a/src/components/widgets/glances/glances.jsx +++ b/src/components/widgets/glances/glances.jsx @@ -92,9 +92,13 @@ export default function Widget({ options }) { } const tempPercent = Math.round((mainTemp / maxTemp) * 100); - const disks = Array.isArray(options.disk) - ? options.disk.map((disk) => data.fs.find((d) => d.mnt_point === disk)).filter((d) => d) - : [data.fs.find((d) => d.mnt_point === options.disk)].filter((d) => d); + let disks = []; + + if (options.disk) { + disks = Array.isArray(options.disk) + ? options.disk.map((disk) => data.fs.find((d) => d.mnt_point === disk)).filter((d) => d) + : [data.fs.find((d) => d.mnt_point === options.disk)].filter((d) => d); + } return ( @@ -157,7 +161,7 @@ export default function Widget({ options }) { - {options.disk && disks.map((disk) => ( + {disks.map((disk) => (
diff --git a/src/pages/api/widgets/glances.js b/src/pages/api/widgets/glances.js index 9e1fed48..7605144d 100644 --- a/src/pages/api/widgets/glances.js +++ b/src/pages/api/widgets/glances.js @@ -40,25 +40,31 @@ async function retrieveFromGlancesAPI(privateWidgetOptions, endpoint) { } export default async function handler(req, res) { - const { index } = req.query; + const { index, cputemp: includeCpuTemp, uptime: includeUptime, disk: includeDisks } = req.query; const privateWidgetOptions = await getPrivateWidgetOptions("glances", index); try { const cpuData = await retrieveFromGlancesAPI(privateWidgetOptions, "cpu"); const loadData = await retrieveFromGlancesAPI(privateWidgetOptions, "load"); - const uptimeData = await retrieveFromGlancesAPI(privateWidgetOptions, "uptime"); - const sensorData = await retrieveFromGlancesAPI(privateWidgetOptions, "sensors"); const memoryData = await retrieveFromGlancesAPI(privateWidgetOptions, "mem"); - const filesystemData = await retrieveFromGlancesAPI(privateWidgetOptions, "fs"); - const data = { cpu: cpuData, load: loadData, - uptime: uptimeData, - sensors: sensorData, mem: memoryData, - fs: filesystemData, + } + + // Disabled by default, dont call unless needed + if (includeUptime) { + data.uptime = await retrieveFromGlancesAPI(privateWidgetOptions, "uptime"); + } + + if (includeCpuTemp) { + data.sensors = await retrieveFromGlancesAPI(privateWidgetOptions, "sensors"); + } + + if (includeDisks) { + data.fs = await retrieveFromGlancesAPI(privateWidgetOptions, "fs"); } return res.status(200).send(data);