From 1d110d7ff9f72bf76b5b5930c731acbe3f4ffd74 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 12 Oct 2025 21:39:53 -0700
Subject: [PATCH] Drop fields

---
 docs/configs/services.md | 39 +++++++++++++++++++--------------------
 src/utils/highlights.js  |  8 +++++++-
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/docs/configs/services.md b/docs/configs/services.md
index fc5b75c2f..0a867dd7a 100644
--- a/docs/configs/services.md
+++ b/docs/configs/services.md
@@ -131,26 +131,25 @@ Widgets can tint their metric blocks automatically based on rules defined alongs
       url: http://sonarr.host.or.ip
       key: ${SONARR_API_KEY}
       highlight:
-        fields:
-          sonarr.queued:
-            numeric:
-              - level: danger
-                when: gte
-                value: 20
-              - level: warn
-                when: gte
-                value: 5
-              - level: good
-                when: eq
-                value: 0
-          sonarr.status:
-            string:
-              - level: danger
-                when: regex
-                value: "(failed|import) pending"
-              - level: good
-                when: equals
-                value: "All good"
+        sonarr.queued:
+          numeric:
+            - level: danger
+              when: gte
+              value: 20
+            - level: warn
+              when: gte
+              value: 5
+            - level: good
+              when: eq
+              value: 0
+        sonarr.status:
+          string:
+            - level: danger
+              when: regex
+              value: "(failed|import) pending"
+            - level: good
+              when: equals
+              value: "All good"
 ```
 
 Supported numeric operators for the `when` property are `gt`, `gte`, `lt`, `lte`, `eq`, `ne`, `between`, and `outside`. String rules support `equals`, `includes`, `startsWith`, `endsWith`, and `regex`. Each rule can be inverted with `negate: true`, and string rules may pass `caseSensitive: true` or custom regex `flags`. If you format values before passing them into `<Block>`, also pass the unformatted number or string via the `valueRaw` prop so the highlight engine can evaluate correctly.
diff --git a/src/utils/highlights.js b/src/utils/highlights.js
index d8b6e2e19..adc4ba756 100644
--- a/src/utils/highlights.js
+++ b/src/utils/highlights.js
@@ -11,7 +11,13 @@ export const buildHighlightConfig = (globalConfig, widgetConfig) => {
     ...(widgetConfig?.levels || {}),
   };
 
-  const fields = widgetConfig?.fields || {};
+  const { levels: _levels, ...fields } = widgetConfig || {};
+
+  Object.keys(fields).forEach((key) => {
+    if (fields[key] === null || fields[key] === undefined) {
+      delete fields[key];
+    }
+  });
 
   const hasLevels = Object.values(levels).some(Boolean);
   const hasFields = Object.keys(fields).length > 0;