@@ -83,6 +83,7 @@ import {
8383} from './DBSearchPageFilters/PinShareMenu' ;
8484import { SharedFiltersSection } from './DBSearchPageFilters/SharedFilters' ;
8585import {
86+ type FacetEntry ,
8687 getFilterStateEntry ,
8788 groupFacetsByBaseName ,
8889 toQuotedClickHouseKeyExpression ,
@@ -1016,7 +1017,7 @@ export const FilterGroup = ({
10161017 chevron : 'm-0' ,
10171018 label : 'p-0' ,
10181019 } }
1019- className = { hasOptions ? '' : 'opacity-50' }
1020+ className = { hasOptions || optionsLoading ? '' : 'opacity-50' }
10201021 >
10211022 < Tooltip
10221023 openDelay = { displayName . length > 26 ? 0 : 1500 }
@@ -1028,12 +1029,21 @@ export const FilterGroup = ({
10281029 >
10291030 < Text size = "xs" fw = "500" truncate = "end" >
10301031 { displayName }
1031- { showFilterCounts && (
1032- < Text
1033- component = "span"
1034- size = "xs"
1035- c = "dimmed"
1036- > { ` (${ totalAppliedFiltersSize > 0 ? totalAppliedFiltersSize : options . length } )` } </ Text >
1032+ { totalAppliedFiltersSize === 0 && optionsLoading ? (
1033+ < Loader
1034+ size = { 8 }
1035+ color = "var(--color-text-muted)"
1036+ ml = { 6 }
1037+ data-testid = { `filter-values-loading-${ name } ` }
1038+ />
1039+ ) : (
1040+ showFilterCounts && (
1041+ < Text
1042+ component = "span"
1043+ size = "xs"
1044+ c = "dimmed"
1045+ > { ` (${ totalAppliedFiltersSize > 0 ? totalAppliedFiltersSize : options . length } )` } </ Text >
1046+ )
10371047 ) }
10381048 </ Text >
10391049 </ Tooltip >
@@ -1232,7 +1242,7 @@ const DBSearchPageFiltersComponent = ({
12321242 filterState,
12331243 showMoreFields,
12341244 } ) ;
1235- const facets = fetchFacetsData . keyValues ;
1245+ const { keyValues : facets , pendingKeys } = fetchFacetsData ;
12361246
12371247 useEffect ( ( ) => {
12381248 if ( error ) {
@@ -1246,7 +1256,7 @@ const DBSearchPageFiltersComponent = ({
12461256 } , [ error ] ) ;
12471257
12481258 // Merge pinned filter values into the queried facets, so that pinned values are always available
1249- const facetsWithPinnedValues = useMemo ( ( ) => {
1259+ const facetsWithPinnedValues = useMemo ( ( ) : FacetEntry [ ] => {
12501260 const facetsMap = new Map ( ( facets ?? [ ] ) . map ( f => [ f . key , f . value ] ) ) ;
12511261 const mergedKeys = new Set < string > ( [
12521262 ...facetsMap . keys ( ) ,
@@ -1262,9 +1272,13 @@ const DBSearchPageFiltersComponent = ({
12621272 ...( pinnedValues ?? [ ] ) ,
12631273 ] ) ;
12641274
1265- return { key, value : Array . from ( mergedValues ) } ;
1275+ return {
1276+ key,
1277+ value : Array . from ( mergedValues ) ,
1278+ isLoading : pendingKeys . has ( key ) ,
1279+ } ;
12661280 } ) ;
1267- } , [ facets , pinnedFilters , getPinnedFields ] ) ;
1281+ } , [ facets , pinnedFilters , getPinnedFields , pendingKeys ] ) ;
12681282
12691283 // Build the set of team-pinned fields for the Shared Filters section,
12701284 // so we can avoid duplicating them in the regular Filters list below.
@@ -1278,7 +1292,7 @@ const DBSearchPageFiltersComponent = ({
12781292
12791293 // Build the facet list for the Shared Filters section.
12801294 // For each team-pinned field: merge pinned values with dynamic facet values.
1281- const sharedFacets = useMemo ( ( ) => {
1295+ const sharedFacets = useMemo ( ( ) : FacetEntry [ ] => {
12821296 if ( sharedFilterKeys . size === 0 ) return [ ] ;
12831297
12841298 const facetMap = new Map (
@@ -1288,6 +1302,7 @@ const DBSearchPageFiltersComponent = ({
12881302 return Array . from ( sharedFilterKeys ) . map ( key => {
12891303 const teamVals = pinnedFiltersApiData ?. team ?. filters [ key ] ?? [ ] ;
12901304 const dynamicValues = facetMap . get ( key ) ?? [ ] ;
1305+ const isLoading = pendingKeys . has ( key ) ;
12911306
12921307 let merged : ( string | boolean ) [ ] ;
12931308 if ( teamVals . length > 0 ) {
@@ -1302,12 +1317,17 @@ const DBSearchPageFiltersComponent = ({
13021317 merged = [ ...dynamicValues ] ;
13031318 }
13041319
1305- return { key, value : merged } ;
1320+ return { key, value : merged , isLoading } ;
13061321 } ) ;
1307- } , [ sharedFilterKeys , facetsWithPinnedValues , pinnedFiltersApiData ] ) ;
1322+ } , [
1323+ sharedFilterKeys ,
1324+ facetsWithPinnedValues ,
1325+ pinnedFiltersApiData ,
1326+ pendingKeys ,
1327+ ] ) ;
13081328
13091329 const shownFacets = useMemo ( ( ) => {
1310- const _facets : { key : string ; value : ( string | boolean ) [ ] } [ ] = [ ] ;
1330+ const _facets : FacetEntry [ ] = [ ] ;
13111331 for ( const _facet of facetsWithPinnedValues ?? [ ] ) {
13121332 const facet = structuredClone ( _facet ) ;
13131333 if ( jsonColumns ?. some ( col => facet . key . startsWith ( col ) ) ) {
@@ -1319,12 +1339,18 @@ const DBSearchPageFiltersComponent = ({
13191339 continue ;
13201340 }
13211341
1322- // don't include empty facets, unless they are already selected or pinned
1342+ // don't include empty facets, unless they are already selected, pinned,
1343+ // or still waiting on their values
13231344 const filter = filterState [ facet . key ] ;
13241345 const hasSelectedValues =
13251346 filter && ( filter . included . size > 0 || filter . excluded . size > 0 ) ;
13261347 const isPinned = isFieldPinned ( facet . key ) ;
1327- if ( facet . value ?. length > 0 || hasSelectedValues || isPinned ) {
1348+ if (
1349+ facet . value ?. length > 0 ||
1350+ hasSelectedValues ||
1351+ isPinned ||
1352+ facet . isLoading
1353+ ) {
13281354 _facets . push ( facet ) ;
13291355 }
13301356 }
@@ -1466,7 +1492,7 @@ const DBSearchPageFiltersComponent = ({
14661492 */
14671493 const renderFacetList = useCallback (
14681494 (
1469- facets : { key : string ; value : ( string | boolean ) [ ] } [ ] ,
1495+ facets : FacetEntry [ ] ,
14701496 options ?: { keyPrefix ?: string ; isDefaultExpanded ?: boolean } ,
14711497 ) => {
14721498 const { keyPrefix = '' , isDefaultExpanded : forceExpanded } =
@@ -1582,7 +1608,7 @@ const DBSearchPageFiltersComponent = ({
15821608 value,
15831609 label : value . toString ( ) ,
15841610 } ) ) }
1585- optionsLoading = { isFacetsLoading }
1611+ optionsLoading = { isFacetsLoading || ! ! facet . isLoading }
15861612 selectedValues = {
15871613 getFilterStateEntry ( filterState , facet . key ) ?? {
15881614 included : new Set ( ) ,
@@ -1876,16 +1902,15 @@ const DBSearchPageFiltersComponent = ({
18761902 />
18771903 ) }
18781904
1879- { isFacetsLoading ? (
1880- < Flex align = "center" justify = "center" >
1881- < Loader size = "xs" color = "gray" / >
1882- </ Flex >
1883- ) : (
1884- shownFacets . length === 0 && (
1905+ { shownFacets . length === 0 &&
1906+ ( isFacetsLoading ? (
1907+ < Flex align = "center" justify = "center" >
1908+ < Loader size = "xs" color = "gray" / >
1909+ </ Flex >
1910+ ) : (
18851911 < Text size = "xxs" > No filters available</ Text >
1886- )
1887- ) }
1888- { /* Show facets even when loading to ensure pinned filters are visible while loading */ }
1912+ ) ) }
1913+ { /* Filters show their own loader until their values arrive */ }
18891914 { renderFacetList ( shownFacets ) }
18901915
18911916 < Button
0 commit comments