From f1f5e1c35e571e50756e3dd854f588e3018834e3 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 4 Mar 2024 11:03:18 -0800
Subject: [PATCH] Change: default merge pihole blocked fields

---
 src/widgets/pihole/component.jsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/widgets/pihole/component.jsx b/src/widgets/pihole/component.jsx
index c9b036107..a36071a1b 100644
--- a/src/widgets/pihole/component.jsx
+++ b/src/widgets/pihole/component.jsx
@@ -15,6 +15,10 @@ export default function Component({ service }) {
     return <Container service={service} error={piholeError} />;
   }
 
+  if (!widget.fields) {
+    widget.fields = ["queries", "blocked", "gravity"];
+  }
+
   if (!piholeData) {
     return (
       <Container service={service}>
@@ -26,10 +30,15 @@ export default function Component({ service }) {
     );
   }
 
+  let blockedValue = `${t("common.number", { value: parseInt(piholeData.ads_blocked_today, 10) })}`;
+  if (!widget.fields.includes("blocked_percent")) {
+    blockedValue += ` (${t("common.percent", { value: parseFloat(piholeData.ads_percentage_today.toPrecision(3)) })})`;
+  }
+
   return (
     <Container service={service}>
       <Block label="pihole.queries" value={t("common.number", { value: parseInt(piholeData.dns_queries_today, 10) })} />
-      <Block label="pihole.blocked" value={t("common.number", { value: parseInt(piholeData.ads_blocked_today, 10) })} />
+      <Block label="pihole.blocked" value={blockedValue} />
       <Block
         label="pihole.blocked_percent"
         value={t("common.percent", { value: parseFloat(piholeData.ads_percentage_today.toPrecision(3)) })}