From cfca0ba58323ec09f8f64da2fee251ef14ba914a Mon Sep 17 00:00:00 2001 From: Jacob Hemming <45420315+rezstje@users.noreply.github.com> Date: Fri, 18 Apr 2025 12:49:59 +0200 Subject: [PATCH] fix: calculate available space correctly and filter unmounted drives (#2885) --- .../src/dashdot/dashdot-integration.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/integrations/src/dashdot/dashdot-integration.ts b/packages/integrations/src/dashdot/dashdot-integration.ts index 9df6720a9..7b0723b4d 100644 --- a/packages/integrations/src/dashdot/dashdot-integration.ts +++ b/packages/integrations/src/dashdot/dashdot-integration.ts @@ -30,13 +30,15 @@ export class DashDotIntegration extends Integration { cpuUtilization: cpuLoad.sumLoad, memUsed: `${memoryLoad.loadInBytes}`, memAvailable: `${info.maxAvailableMemoryBytes - memoryLoad.loadInBytes}`, - fileSystem: info.storage.map((storage, index) => ({ - deviceName: `Storage ${index + 1}: (${storage.disks.map((disk) => disk.device).join(", ")})`, - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - used: humanFileSize(storageLoad[index]!), - available: `${storage.size}`, - percentage: storageLoad[index] ? (storageLoad[index] / storage.size) * 100 : 0, - })), + fileSystem: info.storage + .filter((_, index) => storageLoad[index] !== -1) // filter out undermoutned drives, they display as -1 in the load API + .map((storage, index) => ({ + deviceName: `Storage ${index + 1}: (${storage.disks.map((disk) => disk.device).join(", ")})`, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + used: humanFileSize(storageLoad[index]!), + available: storageLoad[index] ? `${storage.size - storageLoad[index]}` : `${storage.size}`, + percentage: storageLoad[index] ? (storageLoad[index] / storage.size) * 100 : 0, + })), cpuModelName: info.cpuModel === "" ? `Unknown Model (${info.cpuBrand})` : `${info.cpuModel} (${info.cpuBrand})`, cpuTemp: cpuLoad.averageTemperature, availablePkgUpdates: 0,