From 2febf54a3d679b51fd23693d6ba038c133419d45 Mon Sep 17 00:00:00 2001
From: Ahmed Mohamed <ahmed.mohamed@sentry.io>
Date: Mon, 3 Nov 2025 13:01:47 -0500
Subject: [PATCH 1/2] fix filter key filtering condition so custom filter tags
 without value types aren't removed

---
 static/app/views/dashboards/globalFilter/addFilter.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/static/app/views/dashboards/globalFilter/addFilter.tsx b/static/app/views/dashboards/globalFilter/addFilter.tsx
index e3597ae9017c08..208da08b79cbcd 100644
--- a/static/app/views/dashboards/globalFilter/addFilter.tsx
+++ b/static/app/views/dashboards/globalFilter/addFilter.tsx
@@ -76,7 +76,7 @@ function AddFilter({globalFilters, getSearchBarData, onAddFilter}: AddFilterProp
     ? Object.entries(filterKeys).flatMap(([_, tag]) => {
         const fieldDefinition = getFieldDefinitionForDataset(tag, selectedDataset);
         const valueType = fieldDefinition?.valueType;
-        if (!valueType || UNSUPPORTED_FIELD_VALUE_TYPES.includes(valueType)) {
+        if (valueType && UNSUPPORTED_FIELD_VALUE_TYPES.includes(valueType)) {
           return [];
         }
         fieldDefinitionMap.set(tag.key, fieldDefinition);
@@ -127,8 +127,9 @@ function AddFilter({globalFilters, getSearchBarData, onAddFilter}: AddFilterProp
 
             let defaultFilterValue = '';
             const fieldDefinition = fieldDefinitionMap.get(selectedFilterKey.key) ?? null;
+            const valueType = fieldDefinition?.valueType;
 
-            if (fieldDefinition?.valueType !== FieldValueType.STRING) {
+            if (valueType && valueType !== FieldValueType.STRING) {
               defaultFilterValue = getInitialFilterText(
                 selectedFilterKey.key,
                 fieldDefinition,

From 7a2c918b91ea2288c7c3ac0ef62024300141bcea Mon Sep 17 00:00:00 2001
From: Ahmed Mohamed <ahmed.mohamed@sentry.io>
Date: Mon, 3 Nov 2025 13:20:38 -0500
Subject: [PATCH 2/2] fix outdated addfilter test

---
 .../app/views/dashboards/globalFilter/addFilter.spec.tsx  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/static/app/views/dashboards/globalFilter/addFilter.spec.tsx b/static/app/views/dashboards/globalFilter/addFilter.spec.tsx
index fd9fe6d70dd698..97edb4e46cb04e 100644
--- a/static/app/views/dashboards/globalFilter/addFilter.spec.tsx
+++ b/static/app/views/dashboards/globalFilter/addFilter.spec.tsx
@@ -24,11 +24,6 @@ describe('AddFilter', () => {
       name: 'Unsupported Function',
       kind: FieldKind.FUNCTION,
     },
-    'unsupported.measurement': {
-      key: 'unsupported.measurement',
-      name: 'Unsupported Measurement',
-      kind: FieldKind.MEASUREMENT,
-    },
   };
 
   const getSearchBarData = (_: WidgetType): SearchBarData => ({
@@ -92,9 +87,6 @@ describe('AddFilter', () => {
     expect(
       screen.queryByText(mockFilterKeys['unsupported.function']!.key)
     ).not.toBeInTheDocument();
-    expect(
-      screen.queryByText(mockFilterKeys['unsupported.measurement']!.key)
-    ).not.toBeInTheDocument();
   });
 
   it('calls onAddFilter with expected global filter object', async () => {