From 69ee459e8acc1eca05c1ae05eb0e505be18e9dd7 Mon Sep 17 00:00:00 2001 From: Daniel Li Date: Tue, 19 Sep 2023 23:46:16 +0800 Subject: [PATCH 1/9] Fix: SMART result of OMV should always from monitored devices (#2025) --- src/widgets/openmediavault/methods/smart_get_list.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/openmediavault/methods/smart_get_list.jsx b/src/widgets/openmediavault/methods/smart_get_list.jsx index 55a76db6..b8ca33ee 100644 --- a/src/widgets/openmediavault/methods/smart_get_list.jsx +++ b/src/widgets/openmediavault/methods/smart_get_list.jsx @@ -3,13 +3,13 @@ import Container from "components/services/widget/container"; import Block from "components/services/widget/block"; const passedReduce = (acc, e) => { - if (e.overallstatus === "GOOD") { + if (e.monitor && e.overallstatus === "GOOD") { return acc + 1; } return acc; }; const failedReduce = (acc, e) => { - if (e.overallstatus !== "GOOD") { + if (e.monitor && e.overallstatus !== "GOOD") { return acc + 1; } return acc; From c094bd3d83becb9b227830825a6be725ceea1250 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:12:03 -0700 Subject: [PATCH 2/9] Update service-helpers.js --- src/utils/config/service-helpers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 619c0cb2..a2b66c62 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -189,7 +189,7 @@ export async function servicesFromKubernetes() { const traefikIngressListContaino = await crd .listClusterCustomObject("traefik.containo.us", "v1alpha1", "ingressroutes") - .then((response) => response.body ?? []) + .then((response) => response.body) .catch(async (error) => { if (traefikContainoExists) { logger.error( @@ -205,7 +205,7 @@ export async function servicesFromKubernetes() { const traefikIngressListIo = await crd .listClusterCustomObject("traefik.io", "v1alpha1", "ingressroutes") - .then((response) => response.body ?? []) + .then((response) => response.body) .catch(async (error) => { if (traefikExists) { logger.error( From 7d2bfa2d84627baf31660ace71dd6bdc77c6ee99 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:10:19 -0700 Subject: [PATCH 3/9] Update index.jsx --- src/pages/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 9b3869aa..b623b010 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -362,7 +362,7 @@ function Home({ initialSettings }) { /> -