Skip to content

Commit 9b0e4b2

Browse files
authored
fix(dashboards): Ensure custom tag options are displayed when adding global filters (#102597)
Custom tags were being filtered out from the tag options when adding global filters. This PR handles the case where these custom tags don't have value types. Fixes [DAIN-1057](https://linear.app/getsentry/issue/DAIN-1057/fix-bug-where-custom-tags-arent-shown-when-adding-global-filters)
1 parent de95336 commit 9b0e4b2

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

static/app/views/dashboards/globalFilter/addFilter.spec.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ describe('AddFilter', () => {
2424
name: 'Unsupported Function',
2525
kind: FieldKind.FUNCTION,
2626
},
27-
'unsupported.measurement': {
28-
key: 'unsupported.measurement',
29-
name: 'Unsupported Measurement',
30-
kind: FieldKind.MEASUREMENT,
31-
},
3227
};
3328

3429
const getSearchBarData = (_: WidgetType): SearchBarData => ({
@@ -92,9 +87,6 @@ describe('AddFilter', () => {
9287
expect(
9388
screen.queryByText(mockFilterKeys['unsupported.function']!.key)
9489
).not.toBeInTheDocument();
95-
expect(
96-
screen.queryByText(mockFilterKeys['unsupported.measurement']!.key)
97-
).not.toBeInTheDocument();
9890
});
9991

10092
it('calls onAddFilter with expected global filter object', async () => {

static/app/views/dashboards/globalFilter/addFilter.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function AddFilter({globalFilters, getSearchBarData, onAddFilter}: AddFilterProp
7676
? Object.entries(filterKeys).flatMap(([_, tag]) => {
7777
const fieldDefinition = getFieldDefinitionForDataset(tag, selectedDataset);
7878
const valueType = fieldDefinition?.valueType;
79-
if (!valueType || UNSUPPORTED_FIELD_VALUE_TYPES.includes(valueType)) {
79+
if (valueType && UNSUPPORTED_FIELD_VALUE_TYPES.includes(valueType)) {
8080
return [];
8181
}
8282
fieldDefinitionMap.set(tag.key, fieldDefinition);
@@ -127,8 +127,9 @@ function AddFilter({globalFilters, getSearchBarData, onAddFilter}: AddFilterProp
127127

128128
let defaultFilterValue = '';
129129
const fieldDefinition = fieldDefinitionMap.get(selectedFilterKey.key) ?? null;
130+
const valueType = fieldDefinition?.valueType;
130131

131-
if (fieldDefinition?.valueType !== FieldValueType.STRING) {
132+
if (valueType && valueType !== FieldValueType.STRING) {
132133
defaultFilterValue = getInitialFilterText(
133134
selectedFilterKey.key,
134135
fieldDefinition,

0 commit comments

Comments
 (0)