From 5133ebe71caaf4191b34100eed28f1f323dd9983 Mon Sep 17 00:00:00 2001 From: Aaron Knudtson <87577305+knudtty@users.noreply.github.com> Date: Fri, 16 Oct 2026 14:59:47 -0400 Subject: [PATCH 1/2] fix: sort filter keys alphabetically --- .changeset/nested-filter-keys-sorted.md | 7 +++++ .../src/components/DBSearchPageFilters.tsx | 4 +++ .../DBSearchPageFilters/utils.test.ts | 29 +++++++++++++++++++ .../components/DBSearchPageFilters/utils.ts | 25 ++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 .changeset/nested-filter-keys-sorted.md diff --git a/.changeset/nested-filter-keys-sorted.md b/.changeset/nested-filter-keys-sorted.md new file mode 100644 index 0000000000..c385a9361f --- /dev/null +++ b/.changeset/nested-filter-keys-sorted.md @@ -0,0 +1,7 @@ +--- +'@hyperdx/app': patch +--- + +fix: keys inside Map and JSON filter groups (e.g. `LogAttributes`) in the search +page filter sidebar are sorted alphabetically, after keys with a selected value +and pinned keys. diff --git a/packages/app/src/components/DBSearchPageFilters.tsx b/packages/app/src/components/DBSearchPageFilters.tsx index 4ac0ea29e7..8edfba8607 100644 --- a/packages/app/src/components/DBSearchPageFilters.tsx +++ b/packages/app/src/components/DBSearchPageFilters.tsx @@ -85,6 +85,7 @@ import { SharedFiltersSection } from './DBSearchPageFilters/SharedFilters'; import { getFilterStateEntry, groupFacetsByBaseName, + sortNestedFacetKeys, toQuotedClickHouseKeyExpression, } from './DBSearchPageFilters/utils'; @@ -1340,6 +1341,9 @@ const DBSearchPageFiltersComponent = ({ }); } + // sort keys within nested groups alphabetically + sortNestedFacetKeys(_facets); + // prioritize facets that are primary keys _facets.sort((a, b) => { const aIsPk = isFieldPrimary(tableMetadata, a.key); diff --git a/packages/app/src/components/DBSearchPageFilters/utils.test.ts b/packages/app/src/components/DBSearchPageFilters/utils.test.ts index 10fa53c521..f88cbfa109 100644 --- a/packages/app/src/components/DBSearchPageFilters/utils.test.ts +++ b/packages/app/src/components/DBSearchPageFilters/utils.test.ts @@ -4,6 +4,7 @@ import { cleanClickHouseExpression, getFilterStateEntry, groupFacetsByBaseName, + sortNestedFacetKeys, toClickHouseKeyExpression, toQuotedClickHouseKeyExpression, } from './utils'; @@ -77,6 +78,34 @@ describe('groupFacetsByBaseName — dot/bracket de-duplication', () => { }); }); +describe('sortNestedFacetKeys', () => { + it('sorts keys A–Z within each nested group without reordering groups or other facets', () => { + const facets = [ + 'SeverityText', + "ResourceAttributes['service.name']", + "LogAttributes['user.id']", + 'ServiceName', + "ResourceAttributes['host.name']", + "LogAttributes['attr10']", + 'LogAttributes.http.method', + "LogAttributes['attr9']", + ].map(key => ({ key })); + + sortNestedFacetKeys(facets); + + expect(facets.map(f => f.key)).toEqual([ + 'SeverityText', + 'ServiceName', + "ResourceAttributes['host.name']", + "ResourceAttributes['service.name']", + "LogAttributes['attr9']", + "LogAttributes['attr10']", + 'LogAttributes.http.method', + "LogAttributes['user.id']", + ]); + }); +}); + describe('getFilterStateEntry', () => { const makeEntry = (included: string[]): FilterState[string] => ({ included: new Set(included), diff --git a/packages/app/src/components/DBSearchPageFilters/utils.ts b/packages/app/src/components/DBSearchPageFilters/utils.ts index 86f0465426..93d9f38154 100644 --- a/packages/app/src/components/DBSearchPageFilters/utils.ts +++ b/packages/app/src/components/DBSearchPageFilters/utils.ts @@ -122,6 +122,31 @@ export function groupFacetsByBaseName( return { grouped: Array.from(grouped.values()), nonGrouped }; } +const naturalCompare = new Intl.Collator(undefined, { numeric: true }).compare; + +// Sorts the keys inside each nested group A–Z, keeping groups in the order they +// first appear. Other facets keep their order and move ahead of the nested +// ones, which is harmless because grouped and non-grouped facets render +// separately. +export function sortNestedFacetKeys(facets: { key: string }[]) { + const groupOrder = new Map(); + for (const { key } of facets) { + const baseName = parseMapFieldName(key)?.baseName; + if (baseName != null && !groupOrder.has(baseName)) { + groupOrder.set(baseName, groupOrder.size); + } + } + facets.sort((a, b) => { + const nestedA = parseMapFieldName(a.key); + const nestedB = parseMapFieldName(b.key); + if (!nestedA || !nestedB) return Number(!!nestedA) - Number(!!nestedB); + return ( + groupOrder.get(nestedA.baseName)! - groupOrder.get(nestedB.baseName)! || + naturalCompare(nestedA.propertyPath, nestedB.propertyPath) + ); + }); +} + // Look up a filterState entry by either bracket-form or dot-form map sub-key. // Bracket form is the canonical SQL key used in facet results; dot form is // what setFilterValue stores after its parseKeyPath().join('.') normalization From 7c3e6d263c285c404824ee0980febc42cc1f517b Mon Sep 17 00:00:00 2001 From: Aaron Knudtson <87577305+knudtty@users.noreply.github.com> Date: Fri, 16 Oct 2026 16:44:27 -0400 Subject: [PATCH 2/2] Update packages/app/src/components/DBSearchPageFilters.tsx Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- packages/app/src/components/DBSearchPageFilters.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/components/DBSearchPageFilters.tsx b/packages/app/src/components/DBSearchPageFilters.tsx index cd8184ab76..cd99aa2d23 100644 --- a/packages/app/src/components/DBSearchPageFilters.tsx +++ b/packages/app/src/components/DBSearchPageFilters.tsx @@ -1367,7 +1367,6 @@ const DBSearchPageFiltersComponent = ({ }); } - // sort keys within nested groups alphabetically sortNestedFacetKeys(_facets); // prioritize facets that are primary keys