Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-02 21:43:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix missing passing condition

Browse Source
This commit is contained in:
shamoon 2022-12-04 15:33:51 -08:00
parent 3f79a2fdda
commit cbf72eedab
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/scrutiny/component.jsx
View File

@ -14,16 +14,10 @@ export default function Component({ service }) {
// @see https://github.com/AnalogJ/scrutiny/blob/d8d56f77f9e868127c4849dac74d65512db658e8/webapp/frontend/src/app/core/config/app.config.ts // @see https://github.com/AnalogJ/scrutiny/blob/d8d56f77f9e868127c4849dac74d65512db658e8/webapp/frontend/src/app/core/config/app.config.ts
const DeviceStatusThreshold = { const DeviceStatusThreshold = {
smart : 1, smart: 1,
scrutiny: 2, scrutiny: 2,
both: 3 both: 3
} }
const thresholdStatusMapping = new Map([
[DeviceStatusThreshold.smart, DeviceStatus.failed_smart],
[DeviceStatusThreshold.scrutiny, DeviceStatus.failed_scrutiny],
[DeviceStatusThreshold.both, DeviceStatus.both]
])
const { widget } = service; const { widget } = service;
@ -48,9 +42,9 @@ export default function Component({ service }) {
const deviceIds = Object.values(scrutinyData.data.summary); const deviceIds = Object.values(scrutinyData.data.summary);
const statusThreshold = scrutinySettings.settings.metrics.status_threshold; 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 failed = deviceIds.filter(deviceId => (deviceId.device.device_status > 0 && statusThreshold === DeviceStatusThreshold.both) || [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 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 passed = deviceIds.filter(deviceId => deviceId.device.device_status === 0 || (deviceId.device.device_status > statusThreshold && deviceId.device.device_status < DeviceStatus.failed_both))?.length || 0;
return ( return (
<Container service={service}> <Container service={service}>