The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix: AI filter re-render by seperating URL logic syncing and local state (#42396)
Ali Waseemb279601d0957
diff --git a/apps/studio/components/grid/SupabaseGrid.tsx b/apps/studio/components/grid/SupabaseGrid.tsxindex e0c82bece5f..ae19845de9f 100644--- a/apps/studio/components/grid/SupabaseGrid.tsx+++ b/apps/studio/components/grid/SupabaseGrid.tsx@@ -1,34 +1,32 @@-import { PropsWithChildren, useEffect, useRef, useState } from 'react'-import { DataGridHandle } from 'react-data-grid'-import { DndProvider } from 'react-dnd'-import { HTML5Backend } from 'react-dnd-html5-backend'-import { createPortal } from 'react-dom'-+import { keepPreviousData, useQueryClient } from '@tanstack/react-query'import { useFlag, useParams } from 'common'import { isMsSqlForeignTable } from 'data/table-editor/table-editor-types'import { useTableRowsQuery } from 'data/table-rows/table-rows-query'+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { RoleImpersonationState } from 'lib/role-impersonation'import { EMPTY_ARR } from 'lib/void'+import { PropsWithChildren, useEffect, useRef, useState } from 'react'+import { DataGridHandle } from 'react-data-grid'+import { DndProvider } from 'react-dnd'+import { HTML5Backend } from 'react-dnd-html5-backend'+import { createPortal } from 'react-dom'import { useRoleImpersonationStateSnapshot } from 'state/role-impersonation-state'import { useTableEditorStateSnapshot } from 'state/table-editor'-import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'import { QueuedOperation } from 'state/table-editor-operation-queue.types'+import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'+import { useIsQueueOperationsEnabled } from '../interfaces/App/FeaturePreview/FeaturePreviewContext'+import { validateMsSqlSorting } from './MsSqlValidation'import { Shortcuts } from './components/common/Shortcuts'import { Footer } from './components/footer/Footer'import { Grid } from './components/grid/Grid'import { Header, HeaderProps } from './components/header/Header'import { HeaderNew } from './components/header/HeaderNew'import { RowContextMenu } from './components/menu/RowContextMenu'-import { GridProps } from './types'-import { reapplyOptimisticUpdates } from './utils/queueOperationUtils'--import { keepPreviousData, useQueryClient } from '@tanstack/react-query'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { useTableFilter } from './hooks/useTableFilter'import { useTableSort } from './hooks/useTableSort'-import { validateMsSqlSorting } from './MsSqlValidation'-import { useIsQueueOperationsEnabled } from '../interfaces/App/FeaturePreview/FeaturePreviewContext'+import { GridProps } from './types'+import { reapplyOptimisticUpdates } from './utils/queueOperationUtils'export const SupabaseGrid = ({customHeader,diff --git a/apps/studio/components/grid/components/grid/Grid.tsx b/apps/studio/components/grid/components/grid/Grid.tsxindex b24fa4a2c86..0a0ea847b82 100644--- a/apps/studio/components/grid/components/grid/Grid.tsx+++ b/apps/studio/components/grid/components/grid/Grid.tsx@@ -1,6 +1,7 @@import type { PostgresColumn } from '@supabase/postgres-meta'+import { useFlag } from 'common'import { handleCopyCell } from 'components/grid/SupabaseGrid.utils'-import { useTableFilter } from 'components/grid/hooks/useTableFilter'+import { useTableFilterNew } from 'components/grid/hooks/useTableFilterNew'import { formatForeignKeys } from 'components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.utils'import { useForeignKeyConstraintsQuery } from 'data/database/foreign-key-constraints-query'import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'@@ -9,7 +10,7 @@ import { useSendEventMutation } from 'data/telemetry/send-event-mutation'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { useCsvFileDrop } from 'hooks/ui/useCsvFileDrop'-import { Ref, forwardRef, memo, useMemo, useRef } from 'react'+import { Ref, forwardRef, memo, useCallback, useMemo, useRef } from 'react'import DataGrid, { CalculatedColumn, DataGridHandle } from 'react-data-grid'import { useTableEditorStateSnapshot } from 'state/table-editor'import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'@@ -17,6 +18,7 @@ import { Button, cn } from 'ui'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import { ref as valtioRef } from 'valtio'+import { useTableFilter } from '../../hooks/useTableFilter'import type { GridProps, SupaRow } from '../../types'import { useOnRowsChange } from './Grid.utils'import { GridError } from './GridError'@@ -56,9 +58,12 @@ export const Grid = memo(},ref: Ref<DataGridHandle> | undefined) => {+ const newFilterBarEnabled = useFlag('tableEditorNewFilterBar')+const tableEditorSnap = useTableEditorStateSnapshot()const snap = useTableEditorTableStateSnapshot()- const { filters, onApplyFilters } = useTableFilter()+ const { filters: oldFilters, clearFilters: clearOldFilters } = useTableFilter()+ const { filters: newFilters, clearFilters: clearNewFilters } = useTableFilterNew()const { data: org } = useSelectedOrganizationQuery()const { data: project } = useSelectedProjectQuery()@@ -146,7 +151,21 @@ export const Grid = memo(}}- const removeAllFilters = () => onApplyFilters([])+ const removeAllFilters = useCallback(() => {+ if (newFilterBarEnabled) {+ clearNewFilters()+ } else {+ clearOldFilters()+ }+ }, [clearOldFilters, clearNewFilters, newFilterBarEnabled])++ const filters = useMemo(() => {+ if (newFilterBarEnabled) {+ return newFilters+ } else {+ return oldFilters+ }+ }, [newFilters, oldFilters, newFilterBarEnabled])// Compute columns with cellClass for dirty cells// This needs to be computed at render time so it reacts to operation queue changesdiff --git a/apps/studio/components/grid/components/header/HeaderNew.tsx b/apps/studio/components/grid/components/header/HeaderNew.tsxindex 2011df0ccf7..915668e3175 100644--- a/apps/studio/components/grid/components/header/HeaderNew.tsx+++ b/apps/studio/components/grid/components/header/HeaderNew.tsx@@ -1,11 +1,7 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { ArrowUp, ChevronDown, FileText, Trash } from 'lucide-react'-import { ReactNode, useState } from 'react'-import { toast } from 'sonner'-import { keepPreviousData } from '@tanstack/react-query'import { useParams } from 'common'-import { useTableFilter } from 'components/grid/hooks/useTableFilter'+import { useTableFilterNew } from 'components/grid/hooks/useTableFilterNew'import { useTableSort } from 'components/grid/hooks/useTableSort'import { GridHeaderActions } from 'components/interfaces/TableGridEditor/GridHeaderActions'import { formatTableRowsToSQL } from 'components/interfaces/TableGridEditor/TableEntity.utils'@@ -22,6 +18,9 @@ import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { RoleImpersonationState } from 'lib/role-impersonation'+import { ArrowUp, ChevronDown, FileText, Trash } from 'lucide-react'+import { ReactNode, useState } from 'react'+import { toast } from 'sonner'import {useRoleImpersonationStateSnapshot,useSubscribeToImpersonatedRole,@@ -30,17 +29,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 { FilterPopoverNew } from './filter/FilterPopoverNew'import { formatRowsForCSV } from './Header.utils'+import { FilterPopoverNew } from './filter/FilterPopoverNew'import { SortPopover } from './sort/SortPopover'export type HeaderProps = {@@ -54,6 +55,10 @@ export const HeaderNew = ({isRefetching,tableQueriesEnabled = true,}: HeaderProps) => {+ useInitializeFiltersFromUrl()++ useSyncFiltersToUrl()+const snap = useTableEditorTableStateSnapshot()const showInsertButton = snap.selectedRows.size === 0@@ -223,7 +228,7 @@ const RowHeader = ({ tableQueriesEnabled = true }: RowHeaderProps) => {const roleImpersonationState = useRoleImpersonationStateSnapshot()const isImpersonatingRole = roleImpersonationState.role !== undefined- const { filters } = useTableFilter()+ const filters = snap.filtersconst { sorts } = useTableSort()const [isExporting, setIsExporting] = useState(false)diff --git a/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx b/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsxindex cdaf1d37be7..61374c40a76 100644--- a/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx+++ b/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx@@ -1,10 +1,8 @@-import { format } from 'date-fns'-import { useCallback, useEffect, useMemo, useState } from 'react'--import { useDebounce } from '@uidotdev/usehooks'-import { useTableFilter } from 'components/grid/hooks/useTableFilter'+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 { useCallback, useMemo, useState } from 'react'import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'import { Button, Calendar } from 'ui'import {@@ -13,10 +11,11 @@ import {FilterGroup,FilterOption,FilterProperty,- isGroup,SerializableFilterProperty,+ isGroup,updateGroupAtPath,} from 'ui-patterns'+import { columnToFilterProperty } from './FilterPopoverNew.utils'export interface FilterPopoverProps {@@ -116,22 +115,14 @@ function serializeFilterProperties(}export const FilterPopoverNew = ({ portal = true }: FilterPopoverProps) => {- const { filters: urlFilters, onApplyFilters } = useTableFilter()+ const { filters, setFilters } = useTableFilterNew()const snap = useTableEditorTableStateSnapshot()- // Local state for immediate UI updates- const [localFilters, setLocalFilters] = useState<Filter[]>(urlFilters)- const debouncedLocalFilters = useDebounce(localFilters, 500)-- useEffect(() => {- onApplyFilters(debouncedLocalFilters)- }, [debouncedLocalFilters, onApplyFilters])-const [freeformText, setFreeformText] = useState('')const { mutateAsync: generateFilters, isPending: isGenerating } = useSqlFilterGenerateMutation()// Convert filters to FilterGroup for the FilterBar- const filterGroup = useMemo(() => filtersToFilterGroup(localFilters), [localFilters])+ const filterGroup = useMemo(() => filtersToFilterGroup(filters), [filters])const columns = useMemo(() => snap.table?.columns ?? [], [snap.table?.columns])@@ -162,11 +153,13 @@ export const FilterPopoverNew = ({ portal = true }: FilterPopoverProps) => {)// Handle filter changes from FilterBar- const handleFilterChange = useCallback((newFilterGroup: FilterGroup) => {- const newFilters = filterGroupToFilters(newFilterGroup)- // Update local state immediately for responsive UI- setLocalFilters(newFilters)- }, [])+ const handleFilterChange = useCallback(+ (newFilterGroup: FilterGroup) => {+ const newFilters = filterGroupToFilters(newFilterGroup)+ setFilters(newFilters)+ },+ [setFilters]+ )const actions = useMemo(() => [diff --git a/apps/studio/components/grid/hooks/useFilterLifeCycle.ts b/apps/studio/components/grid/hooks/useFilterLifeCycle.tsnew file mode 100644index 00000000000..d8ba6257096--- /dev/null+++ b/apps/studio/components/grid/hooks/useFilterLifeCycle.ts@@ -0,0 +1,64 @@+import { useEffect, useRef } from 'react'++import { filtersToUrlParams, formatFilterURLParams } from '../SupabaseGrid.utils'+import { useTableEditorFiltersSort } from '@/hooks/misc/useTableEditorFiltersSort'+import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'+import { useTableEditorTableStateSnapshot } from '@/state/table-editor-table'++/**+ * Hook to initialize filters from URL on mount.+ * This runs once when the component mounts to handle bookmarked/filtered URLs.+ * After initialization, snap.filters is the source of truth.+ */+export function useInitializeFiltersFromUrl() {+ const snap = useTableEditorTableStateSnapshot()+ const { filters: urlFilters } = useTableEditorFiltersSort()++ const initializeFilters = useStaticEffectEvent(() => {+ const parsedFilters = formatFilterURLParams(urlFilters)+ if (parsedFilters.length > 0) {+ snap.setFilters(parsedFilters)+ }+ })++ useEffect(() => {+ initializeFilters()+ }, [initializeFilters])+}++/**+ * Hook to sync filters from snap state to URL params.+ * This is a one-way sync: snap state → URL (for bookmarking/sharing).+ * Debounced by 500ms to avoid excessive URL updates.+ */+export function useSyncFiltersToUrl() {+ const snap = useTableEditorTableStateSnapshot()+ const { setParams } = useTableEditorFiltersSort()+ const timeoutRef = useRef<NodeJS.Timeout | null>(null)++ useEffect(() => {+ // Clear any existing timeout+ if (timeoutRef.current) {+ clearTimeout(timeoutRef.current)+ }++ // Debounce URL updates by 500ms+ timeoutRef.current = setTimeout(() => {+ // Convert filters to URL format+ const urlFilters = filtersToUrlParams(snap.filters)++ // Update URL params+ setParams((prev) => ({+ ...prev,+ filter: urlFilters,+ }))+ }, 500)++ // Cleanup on unmount or filter change+ return () => {+ if (timeoutRef.current) {+ clearTimeout(timeoutRef.current)+ }+ }+ }, [snap.filters, setParams])+}diff --git a/apps/studio/components/grid/hooks/useTableFilter.ts b/apps/studio/components/grid/hooks/useTableFilter.tsindex a93df6386bb..c4fb62a177f 100644--- a/apps/studio/components/grid/hooks/useTableFilter.ts+++ b/apps/studio/components/grid/hooks/useTableFilter.ts@@ -1,8 +1,7 @@-import { useCallback } from 'react'-import { filtersToUrlParams, formatFilterURLParams } from 'components/grid/SupabaseGrid.utils'import type { Filter } from 'components/grid/types'import { useTableEditorFiltersSort } from 'hooks/misc/useTableEditorFiltersSort'+import { useCallback } from 'react'/*** Hook for managing table filter URL parameters and saving.@@ -21,9 +20,14 @@ export function useTableFilter() {[setParams])+ const clearFilters = useCallback(() => {+ setParams((prevParams) => ({ ...prevParams, filter: [] }))+ }, [setParams])+return {filters, // Formatted Filter[] object arrayurlFilters, // Raw string[] from URLonApplyFilters, // Callback to apply changes+ clearFilters, // Callback to clear filters}}diff --git a/apps/studio/components/grid/hooks/useTableFilterNew.ts b/apps/studio/components/grid/hooks/useTableFilterNew.tsnew file mode 100644index 00000000000..25fed971f8d--- /dev/null+++ b/apps/studio/components/grid/hooks/useTableFilterNew.ts@@ -0,0 +1,17 @@+import { Filter } from 'components/grid/types'+import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'++/**+ * Hook for managing table filters via the table editor state (snap).+ * This is the NEW hook for the new filter bar and should NOT be used by the old filter system.+ * For the old filter system, use useTableFilter instead.+ */+export function useTableFilterNew() {+ const snap = useTableEditorTableStateSnapshot()++ return {+ filters: snap.filters,+ setFilters: (filters: Filter[]) => snap.setFilters(filters),+ clearFilters: () => snap.clearFilters(),+ }+}diff --git a/apps/studio/state/table-editor-table.tsx b/apps/studio/state/table-editor-table.tsxindex 384681fcd2e..d5a02dd8f28 100644--- a/apps/studio/state/table-editor-table.tsx+++ b/apps/studio/state/table-editor-table.tsx@@ -1,8 +1,3 @@-import { PropsWithChildren, createContext, useContext, useEffect, useRef } from 'react'-import { CalculatedColumn } from 'react-data-grid'-import { proxy, ref, subscribe, useSnapshot } from 'valtio'-import { proxySet } from 'valtio/utils'-import { useFlag } from 'common'import {loadTableEditorStateFromLocalStorage,@@ -10,10 +5,15 @@ import {saveTableEditorStateToLocalStorageDebounced,} from 'components/grid/SupabaseGrid.utils'import { TableIndexAdvisorProvider } from 'components/grid/context/TableIndexAdvisorContext'-import { SupaRow } from 'components/grid/types'+import { Filter, SupaRow } from 'components/grid/types'import { getInitialGridColumns } from 'components/grid/utils/column'import { getGridColumns } from 'components/grid/utils/gridColumns'import { Entity } from 'data/table-editor/table-editor-types'+import { PropsWithChildren, createContext, useContext, useEffect, useRef } from 'react'+import { CalculatedColumn } from 'react-data-grid'+import { proxy, ref, subscribe, useSnapshot } from 'valtio'+import { proxySet } from 'valtio/utils'+import { useTableEditorStateSnapshot } from './table-editor'export const createTableEditorTableState = ({@@ -158,6 +158,15 @@ export const createTableEditorTableState = ({{ gridColumns: state.gridColumns })},++ /* Filters (NOTE: this is only for the new AI filter bar) */+ filters: [] as Filter[],+ setFilters: (filters: Filter[]) => {+ state.filters = filters+ },+ clearFilters: () => {+ state.filters = []+ },})return state