From 1a9445384962c3ff3f398cb81b3954f27c34a068 Mon Sep 17 00:00:00 2001 From: Niklas Date: Sun, 4 Dec 2022 19:33:15 +0100 Subject: [PATCH] Respect scrutiny device status threshold setting --- src/widgets/scrutiny/component.jsx | 37 ++++++++++++++++++++++++++---- src/widgets/scrutiny/widget.js | 6 +++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/widgets/scrutiny/component.jsx b/src/widgets/scrutiny/component.jsx index 2e44d7788..8bba30307 100644 --- a/src/widgets/scrutiny/component.jsx +++ b/src/widgets/scrutiny/component.jsx @@ -3,15 +3,39 @@ import Block from "components/services/widget/block"; import useWidgetAPI from "utils/proxy/use-widget-api"; export default function Component({ service }) { + + // @see https://github.com/AnalogJ/scrutiny/blob/d8d56f77f9e868127c4849dac74d65512db658e8/webapp/frontend/src/app/shared/device-status.pipe.ts + const DeviceStatus = { + passed: 0, + failed_smart: 1, + failed_scrutiny: 2, + failed_both: 3 + } + + // @see https://github.com/AnalogJ/scrutiny/blob/d8d56f77f9e868127c4849dac74d65512db658e8/webapp/frontend/src/app/core/config/app.config.ts + const DeviceStatusThreshold = { + smart : 1, + scrutiny: 2, + both: 3 + } + + const thresholdStatusMapping = new Map([ + [DeviceStatusThreshold.smart, DeviceStatus.failed_smart], + [DeviceStatusThreshold.scrutiny, DeviceStatus.scrutiny], + [DeviceStatusThreshold.both, DeviceStatusThreshold.both] + ]) + const { widget } = service; + const { data: scrutinySettings, error: scrutinySettingsError } = useWidgetAPI(widget, "settings"); const { data: scrutinyData, error: scrutinyError } = useWidgetAPI(widget, "summary"); - if (scrutinyError) { - return ; + if (scrutinyError || scrutinySettingsError) { + const finalError = scrutinyError ?? scrutinySettingsError; + return ; } - if (!scrutinyData) { + if (!scrutinyData || !scrutinySettings) { return ( @@ -22,10 +46,11 @@ export default function Component({ service }) { } const deviceIds = Object.values(scrutinyData.data.summary); + const statusThreshold = scrutinySettings.settings.metrics.status_threshold; + const failed = deviceIds.filter(deviceId => [thresholdStatusMapping.get(statusThreshold), DeviceStatus.failed_both].includes(deviceId.device.device_status))?.length || 0; + const unknown = deviceIds.filter(deviceId => deviceId.device.device_status < DeviceStatus.passed || deviceId.device.device_status > DeviceStatus.failed_both)?.length || 0; const passed = deviceIds.filter(deviceId => deviceId.device.device_status === 0)?.length || 0; - const failed = deviceIds.filter(deviceId => deviceId.device.device_status > 0 && deviceId.device.device_status <= 3)?.length || 0; - const unknown = deviceIds.length - (passed + failed) || 0; return ( @@ -35,3 +60,5 @@ export default function Component({ service }) { ); } + + diff --git a/src/widgets/scrutiny/widget.js b/src/widgets/scrutiny/widget.js index 8af7e04e9..0d2e6b5c8 100644 --- a/src/widgets/scrutiny/widget.js +++ b/src/widgets/scrutiny/widget.js @@ -11,6 +11,12 @@ const widget = { "data", ] }, + settings: { + endpoint: "settings", + validate: [ + "settings", + ] + } }, };