From 2e9094ee2c9f22f1dfe7d3ab3c61a232e10109b3 Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@rusackas.com>
Date: Thu, 23 Apr 2026 02:33:16 -0700
Subject: [PATCH] address review: guard clickHeaderHandler against missing
 filter values

---
 .../src/react-pivottable/TableRenderers.tsx                | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
index 199cd6bb481..fe55ccf3168 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
@@ -416,7 +416,12 @@ export function TableRenderer({
       const filters: Record<string, string> = {};
       for (let i = 0; i <= attrIdx; i += 1) {
         const attr = attrs[i];
-        filters[attr] = values[i];
+        const value = values[i];
+        // Subtotal/grand-total handlers may pass an empty `values` array, so
+        // guard against undefined entries rather than leaking them through.
+        if (attr != null && value != null) {
+          filters[attr] = value;
+        }
       }
       return (e: MouseEvent) =>
         callback?.(