diff --git a/src/widgets/scrutiny/component.jsx b/src/widgets/scrutiny/component.jsx index 2e44d7788..0f769d9fd 100644 --- a/src/widgets/scrutiny/component.jsx +++ b/src/widgets/scrutiny/component.jsx @@ -2,16 +2,37 @@ import Container from "components/services/widget/container"; import Block from "components/services/widget/block"; import useWidgetAPI from "utils/proxy/use-widget-api"; + +// @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, + + isFailed(s){ return s > this.passed && s <= this.failed_both}, + isUnknown(s){ return s < this.passed || s > this.failed_both} +} + +// @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 +} + export default function Component({ service }) { 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 ( @@ -19,13 +40,14 @@ export default function Component({ service }) { ); - } + } const deviceIds = Object.values(scrutinyData.data.summary); - - 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; + const statusThreshold = scrutinySettings.settings.metrics.status_threshold; + + const failed = deviceIds.filter(deviceId => (DeviceStatus.isFailed(deviceId.device.device_status) && statusThreshold === DeviceStatusThreshold.both) || [statusThreshold, DeviceStatus.failed_both].includes(deviceId.device.device_status))?.length || 0; + const unknown = deviceIds.filter(deviceId => DeviceStatus.isUnknown(deviceId.device.device_status))?.length || 0; + const passed = deviceIds.length - (failed + unknown); return ( @@ -33,5 +55,8 @@ 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", + ] + } }, };