The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix: update loading state for filter bars (#42457)
Ali Waseem48d894243f45
diff --git a/apps/studio/components/grid/components/header/HeaderNew.tsx b/apps/studio/components/grid/components/header/HeaderNew.tsxindex 16b646bf522..d1bd062b213 100644--- a/apps/studio/components/grid/components/header/HeaderNew.tsx+++ b/apps/studio/components/grid/components/header/HeaderNew.tsx@@ -30,19 +30,19 @@ import { useTableEditorStateSnapshot } from 'state/table-editor'import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'import {Button,+ cn,+ copyToClipboard,DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,Separator,- cn,- copyToClipboard,} from 'ui'import { useInitializeFiltersFromUrl, useSyncFiltersToUrl } from '../../hooks/useFilterLifeCycle'import { ExportDialog } from './ExportDialog'-import { formatRowsForCSV } from './Header.utils'import { FilterPopoverNew } from './filter/FilterPopoverNew'+import { formatRowsForCSV } from './Header.utils'import { SortPopover } from './sort/SortPopover'export type HeaderProps = {@@ -71,7 +71,7 @@ export const HeaderNew = ({) : snap.selectedRows.size > 0 ? (<RowHeader tableQueriesEnabled={tableQueriesEnabled} />) : (- <DefaultHeader tableQueriesEnabled={tableQueriesEnabled} />+ <DefaultHeader tableQueriesEnabled={tableQueriesEnabled} isRefetching={isRefetching} />)}<div className="flex items-center gap-2"><GridHeaderActions table={snap.originalTable} isRefetching={isRefetching} />@@ -84,11 +84,12 @@ export const HeaderNew = ({const DefaultHeader = ({tableQueriesEnabled = true,-}: Pick<HeaderProps, 'tableQueriesEnabled'>) => {+ isRefetching,+}: Pick<HeaderProps, 'tableQueriesEnabled' | 'isRefetching'>) => {return (<>- <div className="flex-1 min-w-0">- <FilterPopoverNew />+ <div className="flex-1 min-w-0 flex items-center gap-2">+ <FilterPopoverNew isRefetching={isRefetching} /></div><SortPopover tableQueriesEnabled={tableQueriesEnabled} /></>diff --git a/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx b/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsxindex 61374c40a76..b4323dde9d5 100644--- a/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx+++ b/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx@@ -2,6 +2,7 @@ import { useTableFilterNew } from 'components/grid/hooks/useTableFilterNew'import type { Filter } from 'components/grid/types'import { useSqlFilterGenerateMutation } from 'data/ai/sql-filter-mutation'import { format } from 'date-fns'+import { Loader2 } from 'lucide-react'import { useCallback, useMemo, useState } from 'react'import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'import { Button, Calendar } from 'ui'@@ -20,6 +21,7 @@ import { columnToFilterProperty } from './FilterPopoverNew.utils'export interface FilterPopoverProps {portal?: boolean+ isRefetching?: boolean}// Convert Filter[] to FilterGroup@@ -114,7 +116,7 @@ function serializeFilterProperties(}))}-export const FilterPopoverNew = ({ portal = true }: FilterPopoverProps) => {+export const FilterPopoverNew = ({ isRefetching = false }: FilterPopoverProps) => {const { filters, setFilters } = useTableFilterNew()const snap = useTableEditorTableStateSnapshot()@@ -188,17 +190,24 @@ export const FilterPopoverNew = ({ portal = true }: FilterPopoverProps) => {[generateFilters, serializableFilterProperties, handleFilterChange, setFreeformText])+ const icon = isRefetching ? (+ <Loader2 className="animate-spin text-brand h-4 w-4 shrink-0" aria-label="Loading table data" />+ ) : null+return (- <FilterBar- filterProperties={filterProperties}- filters={filterGroup}- onFilterChange={handleFilterChange}- freeformText={freeformText}- onFreeformTextChange={setFreeformText}- actions={actions}- isLoading={isGenerating}- variant="pill"- className="bg-transparent border-0"- />+ <div className="flex-1 min-w-0">+ <FilterBar+ filterProperties={filterProperties}+ filters={filterGroup}+ onFilterChange={handleFilterChange}+ freeformText={freeformText}+ onFreeformTextChange={setFreeformText}+ actions={actions}+ isLoading={isGenerating}+ variant="pill"+ className="bg-transparent border-0"+ icon={icon}+ />+ </div>)}diff --git a/packages/ui-patterns/src/FilterBar/FilterBar.tsx b/packages/ui-patterns/src/FilterBar/FilterBar.tsxindex 63b8cbb072c..a109ed6c27e 100644--- a/packages/ui-patterns/src/FilterBar/FilterBar.tsx+++ b/packages/ui-patterns/src/FilterBar/FilterBar.tsx@@ -2,7 +2,9 @@import { motion } from 'framer-motion'import { Search } from 'lucide-react'+import React from 'react'import { cn } from 'ui'+import { FilterBarRoot, useFilterBar, type FilterBarVariant } from './FilterBarContext'import { FilterGroup } from './FilterGroup'import { FilterBarAction, FilterGroup as FilterGroupType, FilterProperty } from './types'@@ -18,10 +20,11 @@ export type FilterBarProps = {className?: stringsupportsOperators?: booleanvariant?: FilterBarVariant+ icon?: React.ReactNode}function FilterBarContent({ className }: { className?: string }) {- const { filters, error, optionsError, isLoading, variant } = useFilterBar()+ const { filters, error, optionsError, isLoading, variant, icon: loadingIcon } = useFilterBar()return (<div className="w-full space-y-2 relative">@@ -33,11 +36,21 @@ function FilterBarContent({ className }: { className?: string }) {><divclassName={cn(- 'flex items-center shrink-0 px-2 bg-surface-200',+ 'relative flex items-center justify-center shrink-0 px-2 bg-surface-200',variant === 'pill' ? 'bg-transparent border-r-0' : 'border-r')}>- <Search className="text-foreground-muted w-4 h-4 sticky" />+ <div+ className={cn(+ 'transition-opacity duration-300 ease-in-out',+ loadingIcon ? 'opacity-0' : 'opacity-100'+ )}+ >+ <Search className="text-foreground-muted w-4 h-4 sticky" />+ </div>+ {loadingIcon && (+ <div className="absolute inset-0 flex items-center justify-center">{loadingIcon}</div>+ )}</div><motion.divclassName="flex-1 flex flex-wrap items-stretch gap-0"@@ -97,6 +110,7 @@ export function FilterBar({className,supportsOperators = false,variant = 'default',+ icon,}: FilterBarProps) {return (<FilterBarRoot@@ -109,6 +123,7 @@ export function FilterBar({isLoading={isLoading}supportsOperators={supportsOperators}variant={variant}+ icon={icon}><FilterBarContent className={className} /></FilterBarRoot>diff --git a/packages/ui-patterns/src/FilterBar/FilterBarContext.tsx b/packages/ui-patterns/src/FilterBar/FilterBarContext.tsxindex 3209976d6f0..a9bf5c3fdbc 100644--- a/packages/ui-patterns/src/FilterBar/FilterBarContext.tsx+++ b/packages/ui-patterns/src/FilterBar/FilterBarContext.tsx@@ -1,6 +1,7 @@'use client'import React, { createContext, useCallback, useContext, useEffect, useRef } from 'react'+import { ActiveInput, useFilterBarState, useOptionsCache } from './hooks'import { MenuItem } from './menuItems'import { FilterBarAction, FilterGroup, FilterOptionObject, FilterProperty } from './types'@@ -54,6 +55,7 @@ export type FilterBarContextValue = {supportsOperators: booleanvariant: FilterBarVariantactions?: FilterBarAction[]+ icon?: React.ReactNode// RefsrootRef: React.RefObject<HTMLDivElement>@@ -80,6 +82,7 @@ export type FilterBarRootProps = {isLoading?: booleansupportsOperators?: booleanvariant?: FilterBarVariant+ icon?: React.ReactNode}export type FilterBarVariant = 'default' | 'pill'@@ -95,6 +98,7 @@ export function FilterBarRoot({isLoading: externalLoading,supportsOperators = false,variant = 'default',+ icon,}: FilterBarRootProps) {const rootRef = useRef<HTMLDivElement>(null)@@ -306,6 +310,7 @@ export function FilterBarRoot({supportsOperators,variant,actions,+ icon,// RefsrootRef,