Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore(studio): remove old table editor filter bar (#45220)

Ali Waseemd6e400620d63
diff --git a/apps/studio/components/grid/SupabaseGrid.tsx b/apps/studio/components/grid/SupabaseGrid.tsx
index edbd7bb60f0..4c7871006de 100644
--- a/apps/studio/components/grid/SupabaseGrid.tsx
+++ b/apps/studio/components/grid/SupabaseGrid.tsx
@@ -3,13 +3,10 @@ import { useParams } from 'common'
import { PropsWithChildren, useRef } from 'react'
import { DataGridHandle } from 'react-data-grid'
-import { useIsTableFilterBarEnabled } from '../interfaces/App/FeaturePreview/FeaturePreviewContext'
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 { useTableFilter } from './hooks/useTableFilter'
import { useTableSort } from './hooks/useTableSort'
import { validateMsSqlSorting } from './MsSqlValidation'
import { GridProps } from './types'
@@ -42,9 +39,8 @@ export const SupabaseGrid = ({
const preflightCheck = !tableEditorSnap.tablesToIgnorePreflightCheck.includes(tableId ?? -1)
const gridRef = useRef<DataGridHandle>(null)
- const newFilterBarEnabled = useIsTableFilterBarEnabled()
- const { filters } = useTableFilter()
+ const filters = snap.filters
const { sorts, onApplySorts } = useTableSort()
const roleImpersonationState = useRoleImpersonationStateSnapshot()
@@ -89,11 +85,9 @@ export const SupabaseGrid = ({
const baseRows = data?.rows ?? EMPTY_ARR
const rows = formatGridDataWithOperationValues({ operations, rows: baseRows })
- const HeaderComponent = newFilterBarEnabled ? HeaderNew : Header
-
return (
<div className="sb-grid h-full flex flex-col">
- <HeaderComponent
+ <Header
customHeader={customHeader}
isRefetching={isRefetching}
tableQueriesEnabled={tableQueriesEnabled}
diff --git a/apps/studio/components/grid/components/grid/Grid.tsx b/apps/studio/components/grid/components/grid/Grid.tsx
index dd29d33d39e..f24549522af 100644
--- a/apps/studio/components/grid/components/grid/Grid.tsx
+++ b/apps/studio/components/grid/components/grid/Grid.tsx
@@ -7,16 +7,14 @@ 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, SupaColumn, SupaRow } from '../../types'
import { isPendingAddRow, isPendingDeleteRow } from '../../types'
import { ColumnOverlayItem } from './ColumnOverlayItem'
import { useOnRowsChange } from './Grid.utils'
import { GridError } from './GridError'
import { RowContextMenuProvider, RowRenderer } from './RowRenderer'
-import { useTableFilterNew } from '@/components/grid/hooks/useTableFilterNew'
+import { useTableFilter } from '@/components/grid/hooks/useTableFilter'
import { handleCopyCell } from '@/components/grid/SupabaseGrid.utils'
-import { useIsTableFilterBarEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
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'
@@ -61,12 +59,9 @@ export const Grid = memo(
},
ref: Ref<DataGridHandle> | undefined
) => {
- const newFilterBarEnabled = useIsTableFilterBarEnabled()
-
const tableEditorSnap = useTableEditorStateSnapshot()
const snap = useTableEditorTableStateSnapshot()
- const { filters: oldFilters, clearFilters: clearOldFilters } = useTableFilter()
- const { filters: newFilters, clearFilters: clearNewFilters } = useTableFilterNew()
+ const { filters, clearFilters } = useTableFilter()
const { data: org } = useSelectedOrganizationQuery()
const { data: project } = useSelectedProjectQuery()
@@ -149,20 +144,8 @@ export const Grid = memo(
}
const removeAllFilters = useCallback(() => {
- if (newFilterBarEnabled) {
- clearNewFilters()
- } else {
- clearOldFilters()
- }
- }, [clearOldFilters, clearNewFilters, newFilterBarEnabled])
-
- const filters = useMemo(() => {
- if (newFilterBarEnabled) {
- return newFilters
- } else {
- return oldFilters
- }
- }, [newFilters, oldFilters, newFilterBarEnabled])
+ clearFilters()
+ }, [clearFilters])
// Compute columns with cellClass for dirty cells
// This needs to be computed at render time so it reacts to operation queue changes
diff --git a/apps/studio/components/grid/components/grid/GridError.tsx b/apps/studio/components/grid/components/grid/GridError.tsx
index b3870798673..1574b239fd4 100644
--- a/apps/studio/components/grid/components/grid/GridError.tsx
+++ b/apps/studio/components/grid/components/grid/GridError.tsx
@@ -6,9 +6,7 @@ import { Admonition } from 'ui-patterns'
import { isFilterRelatedError } from './GridError.utils'
import { useTableFilter } from '@/components/grid/hooks/useTableFilter'
-import { useTableFilterNew } from '@/components/grid/hooks/useTableFilterNew'
import { useTableSort } from '@/components/grid/hooks/useTableSort'
-import { useIsTableFilterBarEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import AlertError from '@/components/ui/AlertError'
import { HighCostError } from '@/components/ui/HighQueryCost'
import { InlineLink } from '@/components/ui/InlineLink'
@@ -26,21 +24,15 @@ export const GridError = ({ error }: { error?: ResponseError | null }) => {
const queryClient = useQueryClient()
const { data: project } = useSelectedProjectQuery()
- const newFilterBarEnabled = useIsTableFilterBarEnabled()
- const { filters: oldFilters, clearFilters: clearOldFilters } = useTableFilter()
- const { filters: newFilters, clearFilters: clearNewFilters } = useTableFilterNew()
+ const { filters, clearFilters } = useTableFilter()
const { sorts } = useTableSort()
const snap = useTableEditorTableStateSnapshot()
const tableEditorSnap = useTableEditorStateSnapshot()
const removeAllFilters = useCallback(() => {
- if (newFilterBarEnabled) {
- clearNewFilters()
- } else {
- clearOldFilters()
- }
- }, [clearOldFilters, clearNewFilters, newFilterBarEnabled])
+ clearFilters()
+ }, [clearFilters])
const handleLoadData = useCallback(() => {
if (!!tableId) {
@@ -61,7 +53,7 @@ export const GridError = ({ error }: { error?: ResponseError | null }) => {
const isForeignTableMissingVaultKeyError =
isForeignTable && error?.message?.includes('query vault failed')
- const hasActiveFilters = oldFilters.length > 0 || newFilters.length > 0
+ const hasActiveFilters = filters.length > 0
const hasFilterRelatedError = hasActiveFilters && isFilterRelatedError(error?.message)
diff --git a/apps/studio/components/grid/components/header/Header.tsx b/apps/studio/components/grid/components/header/Header.tsx
index 0fe8adac20c..9929ac61f8e 100644
--- a/apps/studio/components/grid/components/header/Header.tsx
+++ b/apps/studio/components/grid/components/header/Header.tsx
@@ -1,5 +1,5 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { keepPreviousData, useQueryClient } from '@tanstack/react-query'
+import { keepPreviousData } from '@tanstack/react-query'
import { useParams } from 'common'
import { ArrowUp, ChevronDown, FileText, Trash } from 'lucide-react'
import { ReactNode, useState } from 'react'
@@ -15,11 +15,11 @@ import {
Separator,
} from 'ui'
+import { useInitializeFiltersFromUrl, useSyncFiltersToUrl } from '../../hooks/useFilterLifeCycle'
import { ExportDialog } from './ExportDialog'
-import { FilterPopover } from './filter/FilterPopover'
+import { FilterPopoverNew } from './filter/FilterPopoverNew'
import { formatRowsForCSV } from './Header.utils'
import { SortPopover } from './sort/SortPopover'
-import { useTableFilter } from '@/components/grid/hooks/useTableFilter'
import { useTableRowOperations } from '@/components/grid/hooks/useTableRowOperations'
import { useTableSort } from '@/components/grid/hooks/useTableSort'
import { GridHeaderActions } from '@/components/interfaces/TableGridEditor/GridHeaderActions'
@@ -51,27 +51,40 @@ export type HeaderProps = {
}
export const Header = ({ customHeader, isRefetching, tableQueriesEnabled = true }: HeaderProps) => {
+ useInitializeFiltersFromUrl()
+
+ useSyncFiltersToUrl()
+
const snap = useTableEditorTableStateSnapshot()
+ const showInsertButton = snap.selectedRows.size === 0
return (
<div>
- <div className="flex h-10 items-center justify-between bg-dash-sidebar dark:bg-surface-100 px-1.5 py-1.5 gap-2 overflow-x-auto ">
+ <div className="flex flex-wrap min-h-10 items-center bg-dash-sidebar dark:bg-surface-100 py-1.5 gap-2">
{customHeader ? (
- customHeader
+ <div className="flex-1 px-1.5">{customHeader}</div>
) : snap.selectedRows.size > 0 ? (
- <RowHeader tableQueriesEnabled={tableQueriesEnabled} />
+ <div className="flex-1 px-1.5">
+ <RowHeader tableQueriesEnabled={tableQueriesEnabled} />
+ </div>
) : (
- <DefaultHeader tableQueriesEnabled={tableQueriesEnabled} />
+ <div className="w-full flex items-center gap-2 px-1.5 pb-1.5 border-b border-border">
+ <FilterPopoverNew isRefetching={isRefetching} />
+ </div>
)}
- <GridHeaderActions table={snap.originalTable} isRefetching={isRefetching} />
+ <div className="flex items-center gap-2 overflow-x-auto px-1.5">
+ {!customHeader && snap.selectedRows.size === 0 && (
+ <SortPopover tableQueriesEnabled={tableQueriesEnabled} />
+ )}
+ <GridHeaderActions table={snap.originalTable} isRefetching={isRefetching} />
+ {showInsertButton && <InsertButton />}
+ </div>
</div>
</div>
)
}
-const DefaultHeader = ({
- tableQueriesEnabled = true,
-}: Pick<HeaderProps, 'tableQueriesEnabled'>) => {
+const InsertButton = () => {
const { ref: projectRef } = useParams()
const { data: org } = useSelectedOrganizationQuery()
@@ -90,129 +103,106 @@ const DefaultHeader = ({
const canAddNew = onAddRow !== undefined || onAddColumn !== undefined
+ if (!canAddNew || !canCreateColumns) return null
+
return (
- <div className="flex items-center gap-4">
- <div className="flex items-center gap-2">
- <FilterPopover />
- <SortPopover tableQueriesEnabled={tableQueriesEnabled} />
- </div>
- {canAddNew && (
- <>
- <div className="h-[20px] w-px border-r border-control" />
- <div className="flex items-center gap-2">
- {canCreateColumns && (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- data-testid="table-editor-insert-new-row"
- type="primary"
- size="tiny"
- icon={<ChevronDown strokeWidth={1.5} />}
- >
- Insert
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent side="bottom" align="start">
- {[
- ...(onAddRow !== undefined
- ? [
- <DropdownMenuItem
- key="add-row"
- className="group space-x-2"
- onClick={onAddRow}
- >
- <div className="-mt-2 pr-1.5">
- <div className="border border-foreground-lighter w-[15px] h-[4px]" />
- <div className="border border-foreground-lighter w-[15px] h-[4px] my-[2px]" />
- <div
- className={cn([
- 'border border-foreground-light w-[15px] h-[4px] translate-x-0.5',
- 'transition duration-200 group-data-[highlighted]:border-brand group-data-[highlighted]:translate-x-0',
- ])}
- />
- </div>
- <div>
- <p>Insert row</p>
- <p className="text-foreground-light">
- Insert a new row into {snap.table.name}
- </p>
- </div>
- </DropdownMenuItem>,
- ]
- : []),
- ...(onAddColumn !== undefined
- ? [
- <DropdownMenuItem
- key="add-column"
- className="group space-x-2"
- onClick={onAddColumn}
- >
- <div className="flex -mt-2 pr-1.5">
- <div className="border border-foreground-lighter w-[4px] h-[15px]" />
- <div className="border border-foreground-lighter w-[4px] h-[15px] mx-[2px]" />
- <div
- className={cn([
- 'border border-foreground-light w-[4px] h-[15px] -translate-y-0.5',
- 'transition duration-200 group-data-[highlighted]:border-brand group-data-[highlighted]:translate-y-0',
- ])}
- />
- </div>
- <div>
- <p>Insert column</p>
- <p className="text-foreground-light">
- Insert a new column into {snap.table.name}
- </p>
- </div>
- </DropdownMenuItem>,
- ]
- : []),
- ...(onImportData !== undefined
- ? [
- <DropdownMenuItem
- key="import-data"
- className="group space-x-2"
- onClick={() => {
- onImportData()
- sendEvent({
- action: 'import_data_button_clicked',
- properties: { tableType: 'Existing Table' },
- groups: {
- project: projectRef ?? 'Unknown',
- organization: org?.slug ?? 'Unknown',
- },
- })
- }}
- >
- <div className="relative -mt-2">
- <FileText
- size={18}
- strokeWidth={1.5}
- className="-translate-x-[2px]"
- />
- <ArrowUp
- className={cn(
- 'transition duration-200 absolute bottom-0 right-0 translate-y-1 opacity-0 bg-brand-400 rounded-full',
- 'group-data-[highlighted]:translate-y-0 group-data-[highlighted]:text-brand group-data-[highlighted]:opacity-100'
- )}
- strokeWidth={3}
- size={12}
- />
- </div>
- <div>
- <p>Import data from CSV</p>
- <p className="text-foreground-light">Insert new rows from a CSV</p>
- </div>
- </DropdownMenuItem>,
- ]
- : []),
- ]}
- </DropdownMenuContent>
- </DropdownMenu>
- )}
- </div>
- </>
- )}
- </div>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ data-testid="table-editor-insert-new-row"
+ type="primary"
+ size="tiny"
+ icon={<ChevronDown strokeWidth={1.5} />}
+ >
+ Insert
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent side="bottom" align="end">
+ {[
+ ...(onAddRow !== undefined
+ ? [
+ <DropdownMenuItem key="add-row" className="group space-x-2" onClick={onAddRow}>
+ <div className="-mt-2 pr-1.5">
+ <div className="border border-foreground-lighter w-[15px] h-[4px]" />
+ <div className="border border-foreground-lighter w-[15px] h-[4px] my-[2px]" />
+ <div
+ className={cn([
+ 'border border-foreground-light w-[15px] h-[4px] translate-x-0.5',
+ 'transition duration-200 group-data-[highlighted]:border-brand group-data-[highlighted]:translate-x-0',
+ ])}
+ />
+ </div>
+ <div>
+ <p>Insert row</p>
+ <p className="text-foreground-light">Insert a new row into {snap.table.name}</p>
+ </div>
+ </DropdownMenuItem>,
+ ]
+ : []),
+ ...(onAddColumn !== undefined
+ ? [
+ <DropdownMenuItem
+ key="add-column"
+ className="group space-x-2"
+ onClick={onAddColumn}
+ >
+ <div className="flex -mt-2 pr-1.5">
+ <div className="border border-foreground-lighter w-[4px] h-[15px]" />
+ <div className="border border-foreground-lighter w-[4px] h-[15px] mx-[2px]" />
+ <div
+ className={cn([
+ 'border border-foreground-light w-[4px] h-[15px] -translate-y-0.5',
+ 'transition duration-200 group-data-[highlighted]:border-brand group-data-[highlighted]:translate-y-0',
+ ])}
+ />
+ </div>
+ <div>
+ <p>Insert column</p>
+ <p className="text-foreground-light">
+ Insert a new column into {snap.table.name}
+ </p>
+ </div>
+ </DropdownMenuItem>,
+ ]
+ : []),
+ ...(onImportData !== undefined
+ ? [
+ <DropdownMenuItem
+ key="import-data"
+ className="group space-x-2"
+ onClick={() => {
+ onImportData()
+ sendEvent({
+ action: 'import_data_button_clicked',
+ properties: { tableType: 'Existing Table' },
+ groups: {
+ project: projectRef ?? 'Unknown',
+ organization: org?.slug ?? 'Unknown',
+ },
+ })
+ }}
+ >
+ <div className="relative -mt-2">
+ <FileText size={18} strokeWidth={1.5} className="-translate-x-[2px]" />
+ <ArrowUp
+ className={cn(
+ 'transition duration-200 absolute bottom-0 right-0 translate-y-1 opacity-0 bg-brand-400 rounded-full',
+ 'group-data-[highlighted]:translate-y-0 group-data-[highlighted]:text-brand group-data-[highlighted]:opacity-100'
+ )}
+ strokeWidth={3}
+ size={12}
+ />
+ </div>
+ <div>
+ <p>Import data from CSV</p>
+ <p className="text-foreground-light">Insert new rows from a CSV</p>
+ </div>
+ </DropdownMenuItem>,
+ ]
+ : []),
+ ]}
+ </DropdownMenuContent>
+ </DropdownMenu>
)
}
@@ -232,7 +222,7 @@ const RowHeader = ({ tableQueriesEnabled = true }: RowHeaderProps) => {
const roleImpersonationState = useRoleImpersonationStateSnapshot()
const isImpersonatingRole = roleImpersonationState.role !== undefined
- const { filters } = useTableFilter()
+ const filters = snap.filters
const { sorts } = useTableSort()
const [isExporting, setIsExporting] = useState(false)
diff --git a/apps/studio/components/grid/components/header/HeaderNew.tsx b/apps/studio/components/grid/components/header/HeaderNew.tsx
deleted file mode 100644
index e36ba1ea2b3..00000000000
--- a/apps/studio/components/grid/components/header/HeaderNew.tsx
+++ /dev/null
@@ -1,505 +0,0 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { keepPreviousData } from '@tanstack/react-query'
-import { useParams } from 'common'
-import { ArrowUp, ChevronDown, FileText, Trash } from 'lucide-react'
-import { ReactNode, useState } from 'react'
-import { toast } from 'sonner'
-import {
- Button,
- cn,
- copyToClipboard,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
- Separator,
-} from 'ui'
-
-import { useInitializeFiltersFromUrl, useSyncFiltersToUrl } from '../../hooks/useFilterLifeCycle'
-import { ExportDialog } from './ExportDialog'
-import { FilterPopoverNew } from './filter/FilterPopoverNew'
-import { formatRowsForCSV } from './Header.utils'
-import { SortPopover } from './sort/SortPopover'
-import { useTableRowOperations } from '@/components/grid/hooks/useTableRowOperations'
-import { useTableSort } from '@/components/grid/hooks/useTableSort'
-import { GridHeaderActions } from '@/components/interfaces/TableGridEditor/GridHeaderActions'
-import { formatTableRowsToSQL } from '@/components/interfaces/TableGridEditor/TableEntity.utils'
-import {
- useExportAllRowsAsCsv,
- useExportAllRowsAsJson,
- useExportAllRowsAsSql,
-} from '@/components/layouts/TableEditorLayout/ExportAllRows'
-import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useTableRowsCountQuery } from '@/data/table-rows/table-rows-count-query'
-import { useTableRowsQuery } from '@/data/table-rows/table-rows-query'
-import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'
-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 {
- useRoleImpersonationStateSnapshot,
- useSubscribeToImpersonatedRole,
-} from '@/state/role-impersonation-state'
-import { useTableEditorStateSnapshot } from '@/state/table-editor'
-import { useTableEditorTableStateSnapshot } from '@/state/table-editor-table'
-
-export type HeaderProps = {
- customHeader: ReactNode
- isRefetching: boolean
- tableQueriesEnabled?: boolean
-}
-
-export const HeaderNew = ({
- customHeader,
- isRefetching,
- tableQueriesEnabled = true,
-}: HeaderProps) => {
- useInitializeFiltersFromUrl()
-
- useSyncFiltersToUrl()
-
- const snap = useTableEditorTableStateSnapshot()
- const showInsertButton = snap.selectedRows.size === 0
-
- return (
- <div>
- <div className="flex flex-wrap min-h-10 items-center bg-dash-sidebar dark:bg-surface-100 py-1.5 gap-2">
- {customHeader ? (
- <div className="flex-1 px-1.5">{customHeader}</div>
- ) : snap.selectedRows.size > 0 ? (
- <div className="flex-1 px-1.5">
- <RowHeader tableQueriesEnabled={tableQueriesEnabled} />
- </div>
- ) : (
- <div className="w-full flex items-center gap-2 px-1.5 pb-1.5 border-b border-border">
- <FilterPopoverNew isRefetching={isRefetching} />
- </div>
- )}
- <div className="flex items-center gap-2 overflow-x-auto px-1.5">
- {!customHeader && snap.selectedRows.size === 0 && (
- <SortPopover tableQueriesEnabled={tableQueriesEnabled} />
- )}
- <GridHeaderActions table={snap.originalTable} isRefetching={isRefetching} />
- {showInsertButton && <InsertButton />}
- </div>
- </div>
- </div>
- )
-}
-
-const InsertButton = () => {
- const { ref: projectRef } = useParams()
- const { data: org } = useSelectedOrganizationQuery()
-
- const snap = useTableEditorTableStateSnapshot()
- const tableEditorSnap = useTableEditorStateSnapshot()
- const { can: canCreateColumns } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'columns'
- )
- const { mutate: sendEvent } = useSendEventMutation()
-
- const onAddRow =
- snap.editable && (snap.table.columns ?? []).length > 0 ? tableEditorSnap.onAddRow : undefined
- const onAddColumn = snap.editable ? tableEditorSnap.onAddColumn : undefined
- const onImportData = snap.editable ? tableEditorSnap.onImportData : undefined
-
- const canAddNew = onAddRow !== undefined || onAddColumn !== undefined
-
- if (!canAddNew || !canCreateColumns) return null
-
- return (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- data-testid="table-editor-insert-new-row"
- type="primary"
- size="tiny"
- icon={<ChevronDown strokeWidth={1.5} />}
- >
- Insert
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent side="bottom" align="end">
- {[
- ...(onAddRow !== undefined
- ? [
- <DropdownMenuItem key="add-row" className="group space-x-2" onClick={onAddRow}>
- <div className="-mt-2 pr-1.5">
- <div className="border border-foreground-lighter w-[15px] h-[4px]" />
- <div className="border border-foreground-lighter w-[15px] h-[4px] my-[2px]" />
- <div
- className={cn([
- 'border border-foreground-light w-[15px] h-[4px] translate-x-0.5',
- 'transition duration-200 group-data-[highlighted]:border-brand group-data-[highlighted]:translate-x-0',
- ])}
- />
- </div>
- <div>
- <p>Insert row</p>
- <p className="text-foreground-light">Insert a new row into {snap.table.name}</p>
- </div>
- </DropdownMenuItem>,
- ]
- : []),
- ...(onAddColumn !== undefined
- ? [
- <DropdownMenuItem
- key="add-column"
- className="group space-x-2"
- onClick={onAddColumn}
- >
- <div className="flex -mt-2 pr-1.5">
- <div className="border border-foreground-lighter w-[4px] h-[15px]" />
- <div className="border border-foreground-lighter w-[4px] h-[15px] mx-[2px]" />
- <div
- className={cn([
- 'border border-foreground-light w-[4px] h-[15px] -translate-y-0.5',
- 'transition duration-200 group-data-[highlighted]:border-brand group-data-[highlighted]:translate-y-0',
- ])}
- />
- </div>
- <div>
- <p>Insert column</p>
- <p className="text-foreground-light">
- Insert a new column into {snap.table.name}
- </p>
- </div>
- </DropdownMenuItem>,
- ]
- : []),
- ...(onImportData !== undefined
- ? [
- <DropdownMenuItem
- key="import-data"
- className="group space-x-2"
- onClick={() => {
- onImportData()
- sendEvent({
- action: 'import_data_button_clicked',
- properties: { tableType: 'Existing Table' },
- groups: {
- project: projectRef ?? 'Unknown',
- organization: org?.slug ?? 'Unknown',
- },
- })
- }}
- >
- <div className="relative -mt-2">
- <FileText size={18} strokeWidth={1.5} className="-translate-x-[2px]" />
- <ArrowUp
- className={cn(
- 'transition duration-200 absolute bottom-0 right-0 translate-y-1 opacity-0 bg-brand-400 rounded-full',
- 'group-data-[highlighted]:translate-y-0 group-data-[highlighted]:text-brand group-data-[highlighted]:opacity-100'
- )}
- strokeWidth={3}
- size={12}
- />
- </div>
- <div>
- <p>Import data from CSV</p>
- <p className="text-foreground-light">Insert new rows from a CSV</p>
- </div>
- </DropdownMenuItem>,
- ]
- : []),
- ]}
- </DropdownMenuContent>
- </DropdownMenu>
- )
-}
-
-type RowHeaderProps = {
- tableQueriesEnabled?: boolean
-}
-
-const RowHeader = ({ tableQueriesEnabled = true }: RowHeaderProps) => {
- const { id: _id } = useParams()
- const tableId = _id ? Number(_id) : undefined
-
- const { data: project } = useSelectedProjectQuery()
- const tableEditorSnap = useTableEditorStateSnapshot()
- const snap = useTableEditorTableStateSnapshot()
- const { deleteRows } = useTableRowOperations()
-
- const roleImpersonationState = useRoleImpersonationStateSnapshot()
- const isImpersonatingRole = roleImpersonationState.role !== undefined
-
- const filters = snap.filters
- const { sorts } = useTableSort()
-
- const [isExporting, setIsExporting] = useState(false)
- const [showExportModal, setShowExportModal] = useState(false)
-
- const preflightCheck = !tableEditorSnap.tablesToIgnorePreflightCheck.includes(tableId ?? -1)
-
- const { data } = useTableRowsQuery(
- {
- projectRef: project?.ref,
- tableId: snap.table.id,
- sorts,
- filters,
- page: snap.page,
- preflightCheck,
- limit: tableEditorSnap.rowsPerPage,
- roleImpersonationState: roleImpersonationState as RoleImpersonationState,
- },
- { enabled: tableQueriesEnabled }
- )
-
- const { data: countData } = useTableRowsCountQuery(
- {
- projectRef: project?.ref,
- tableId: snap.table.id,
- filters,
- enforceExactCount: snap.enforceExactCount,
- roleImpersonationState: roleImpersonationState as RoleImpersonationState,
- },
- { placeholderData: keepPreviousData, enabled: tableQueriesEnabled }
- )
-
- const allRows = data?.rows ?? []
- const totalRows = countData?.count ?? 0
-
- const onSelectAllRows = () => {
- snap.setSelectedRows(new Set(allRows.map((row) => row.idx)), true)
- }
-
- const onRowsDelete = () => {
- const rowIdxs = Array.from(snap.selectedRows) as number[]
- const rows = allRows.filter((x) => rowIdxs.includes(x.idx))
-
- deleteRows({
- rows,
- table: snap.originalTable,
- allRowsSelected: snap.allRowsSelected,
- totalRows,
- callback: () => {
- snap.resetSelectedRows()
- },
- })
- }
-
- const onCopyRows = (type: 'csv' | 'json' | 'sql') => {
- const rows = allRows.filter((x) => snap.selectedRows.has(x.idx))
-
- if (type === 'csv') {
- const csv = formatRowsForCSV({
- rows,
- columns: snap.table!.columns.map((column) => column.name),
- })
- copyToClipboard(csv)
- } else if (type === 'sql') {
- const sqlStatements = formatTableRowsToSQL(snap.table, rows)
- copyToClipboard(sqlStatements)
- } else if (type === 'json') {
- copyToClipboard(JSON.stringify(rows))
- }
-
- toast.success('Copied rows to clipboard')
- }
-
- const exportParams = snap.allRowsSelected
- ? ({ type: 'fetch_all', filters, sorts } as const)
- : ({
- type: 'provided_rows',
- table: snap.table,
- rows: allRows.filter((x) => snap.selectedRows.has(x.idx)),
- } as const)
-
- const { exportCsv, confirmationModal: exportCsvConfirmationModal } = useExportAllRowsAsCsv(
- project
- ? {
- enabled: true,
- projectRef: project.ref,
- connectionString: project?.connectionString ?? null,
- entity: snap.table,
- totalRows,
- ...exportParams,
- }
- : { enabled: false }
- )
- const onRowsExportCSV = async () => {
- setIsExporting(true)
-
- if (!project) {
- toast.error('Project is required')
- return setIsExporting(false)
- }
-
- exportCsv()
-
- setIsExporting(false)
- }
-
- const { exportSql, confirmationModal: exportSqlConfirmationModal } = useExportAllRowsAsSql(
- project
- ? {
- enabled: true,
- projectRef: project.ref,
- connectionString: project?.connectionString ?? null,
- entity: snap.table,
- ...exportParams,
- }
- : { enabled: false }
- )
- const onRowsExportSQL = async () => {
- setIsExporting(true)
-
- if (!project) {
- toast.error('Project is required')
- return setIsExporting(false)
- }
-
- exportSql()
-
- setIsExporting(false)
- }
-
- const { exportJson, confirmationModal: exportJsonConfirmationModal } = useExportAllRowsAsJson(
- project
- ? {
- enabled: true,
- projectRef: project.ref,
- connectionString: project?.connectionString ?? null,
- entity: snap.table,
- ...exportParams,
- }
- : { enabled: false }
- )
- const onRowsExportJSON = async () => {
- if (!project) {
- return toast.error('Project is required')
- }
-
- setIsExporting(true)
-
- exportJson()
-
- setIsExporting(false)
- }
-
- useSubscribeToImpersonatedRole(() => {
- if (snap.allRowsSelected || snap.selectedRows.size > 0) {
- snap.resetSelectedRows()
- }
- })
-
- return (
- <>
- <div className="flex items-center gap-x-2">
- {snap.editable && (
- <ButtonTooltip
- type="default"
- size="tiny"
- icon={<Trash />}
- onClick={onRowsDelete}
- disabled={snap.allRowsSelected && isImpersonatingRole}
- tooltip={{
- content: {
- side: 'bottom',
- text:
- snap.allRowsSelected && isImpersonatingRole
- ? 'Table truncation is not supported when impersonating a role'
- : undefined,
- },
- }}
- >
- {snap.allRowsSelected
- ? `Delete all rows in table`
- : snap.selectedRows.size > 1
- ? `Delete ${snap.selectedRows.size} rows`
- : `Delete ${snap.selectedRows.size} row`}
- </ButtonTooltip>
- )}
-
- {!snap.allRowsSelected ? (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- type="default"
- size="tiny"
- iconRight={<ChevronDown />}
- loading={isExporting}
- disabled={isExporting}
- >
- Copy
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="w-40">
- <DropdownMenuItem onClick={() => onCopyRows('csv')}>Copy as CSV</DropdownMenuItem>
- <DropdownMenuItem onClick={() => onCopyRows('sql')}>Copy as SQL</DropdownMenuItem>
- <DropdownMenuItem onClick={() => onCopyRows('json')}>Copy as JSON</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- ) : (
- <ButtonTooltip
- disabled
- type="default"
- tooltip={{
- content: {
- side: 'bottom',
- className: 'w-64 text-center',
- text: 'Copy to clipboard is not supported while all rows in the table are selected',
- },
- }}
- >
- Copy
- </ButtonTooltip>
- )}
-
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- type="default"
- size="tiny"
- iconRight={<ChevronDown />}
- loading={isExporting}
- disabled={isExporting}
- >
- Export
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className={snap.allRowsSelected ? 'w-52' : 'w-40'}>
- <DropdownMenuItem onClick={onRowsExportCSV}>Export as CSV</DropdownMenuItem>
- <DropdownMenuItem onClick={onRowsExportSQL}>Export as SQL</DropdownMenuItem>
- {snap.allRowsSelected ? (
- <DropdownMenuItem className="group" onClick={() => setShowExportModal(true)}>
- <div>
- <p className="group-hover:text-foreground">Export via CLI</p>
- <p className="text-foreground-lighter">Recommended for large tables</p>
- </div>
- </DropdownMenuItem>
- ) : (
- <DropdownMenuItem onClick={onRowsExportJSON}>Export as JSON</DropdownMenuItem>
- )}
- </DropdownMenuContent>
- </DropdownMenu>
-
- {!snap.allRowsSelected && totalRows > allRows.length && (
- <>
- <div className="h-6 ml-0.5">
- <Separator orientation="vertical" />
- </div>
- <Button type="text" onClick={() => onSelectAllRows()}>
- Select all rows in table
- </Button>
- </>
- )}
- </div>
-
- <ExportDialog
- table={snap.table}
- filters={filters}
- sorts={sorts}
- open={showExportModal}
- onOpenChange={() => setShowExportModal(false)}
- />
-
- {exportCsvConfirmationModal}
- {exportSqlConfirmationModal}
- {exportJsonConfirmationModal}
- </>
- )
-}
diff --git a/apps/studio/components/grid/components/header/filter/FilterPopover.tsx b/apps/studio/components/grid/components/header/filter/FilterPopover.tsx
deleted file mode 100644
index e8ad05fe4d9..00000000000
--- a/apps/studio/components/grid/components/header/filter/FilterPopover.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useMemo } from 'react'
-
-import { FilterPopoverPrimitive } from './FilterPopoverPrimitive'
-import { useTableFilter } from '@/components/grid/hooks/useTableFilter'
-import { formatFilterURLParams } from '@/components/grid/SupabaseGrid.utils'
-
-export const FilterPopover = () => {
- const { urlFilters, onApplyFilters } = useTableFilter()
-
- // Convert string[] to Filter[]
- const filters = useMemo(() => {
- return formatFilterURLParams(urlFilters ?? [])
- }, [urlFilters])
-
- return <FilterPopoverPrimitive filters={filters} onApplyFilters={onApplyFilters} />
-}
diff --git a/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx b/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx
index 5e863969323..db262c64b04 100644
--- a/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx
+++ b/apps/studio/components/grid/components/header/filter/FilterPopoverNew.tsx
@@ -14,7 +14,7 @@ import {
} from 'ui-patterns'
import { columnToFilterProperty } from './FilterPopoverNew.utils'
-import { useTableFilterNew } from '@/components/grid/hooks/useTableFilterNew'
+import { useTableFilter } from '@/components/grid/hooks/useTableFilter'
import type { Filter } from '@/components/grid/types'
import { useSqlFilterGenerateMutation } from '@/data/ai/sql-filter-mutation'
import { useTableEditorTableStateSnapshot } from '@/state/table-editor-table'
@@ -120,7 +120,7 @@ function serializeFilterProperties(
}
export const FilterPopoverNew = ({ isRefetching = false }: FilterPopoverProps) => {
- const { filters, setFilters } = useTableFilterNew()
+ const { filters, setFilters } = useTableFilter()
const snap = useTableEditorTableStateSnapshot()
const [freeformText, setFreeformText] = useState('')
diff --git a/apps/studio/components/grid/components/menu/RowContextMenu.tsx b/apps/studio/components/grid/components/menu/RowContextMenu.tsx
index ef032e2f2d3..7cd7bde1d8c 100644
--- a/apps/studio/components/grid/components/menu/RowContextMenu.tsx
+++ b/apps/studio/components/grid/components/menu/RowContextMenu.tsx
@@ -8,7 +8,6 @@ import { useTableRowOperations } from '../../hooks/useTableRowOperations'
import { formatClipboardValue } from '../../utils/common'
import { buildFilterFromCellValue, isComplexValue } from '../header/filter/FilterPopoverNew.utils'
import type { SupaRow } from '@/components/grid/types'
-import { useIsTableFilterBarEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { useTableEditorStateSnapshot } from '@/state/table-editor'
import { useTableEditorTableStateSnapshot } from '@/state/table-editor-table'
@@ -19,7 +18,6 @@ type RowContextMenuContentProps = {
export const RowContextMenuContent = ({ row }: RowContextMenuContentProps) => {
const tableEditorSnap = useTableEditorStateSnapshot()
const snap = useTableEditorTableStateSnapshot()
- const isTableFilterBarEnabled = useIsTableFilterBarEnabled()
const { deleteRows } = useTableRowOperations()
const onDeleteRow = useCallback(() => {
@@ -72,13 +70,11 @@ export const RowContextMenuContent = ({ row }: RowContextMenuContentProps) => {
}, [getRowAndColumn, snap])
const isFilterByValueVisible = useCallback(() => {
- if (!isTableFilterBarEnabled) return false
-
const result = getRowAndColumn()
if (!result) return false
return !isComplexValue(result.row[result.column.key])
- }, [isTableFilterBarEnabled, getRowAndColumn])
+ }, [getRowAndColumn])
return (
<ContextMenuContent className="!min-w-36">
diff --git a/apps/studio/components/grid/hooks/useTableFilter.ts b/apps/studio/components/grid/hooks/useTableFilter.ts
index 9fe5be37704..9b82463038b 100644
--- a/apps/studio/components/grid/hooks/useTableFilter.ts
+++ b/apps/studio/components/grid/hooks/useTableFilter.ts
@@ -1,34 +1,38 @@
-import { useCallback } from 'react'
-
-import { filtersToUrlParams, formatFilterURLParams } from '@/components/grid/SupabaseGrid.utils'
-import type { Filter } from '@/components/grid/types'
+import { formatFilterURLParams } from '@/components/grid/SupabaseGrid.utils'
+import { Filter } from '@/components/grid/types'
import { useTableEditorFiltersSort } from '@/hooks/misc/useTableEditorFiltersSort'
+import { useOptionalTableEditorTableStateSnapshot } from '@/state/table-editor-table'
/**
- * Hook for managing table filter URL parameters and saving.
- * NO direct snapshot interaction.
+ * Hook for managing table filters.
+ *
+ * When called inside a TableEditorTableStateContextProvider, reads/writes
+ * filters via the valtio table state. When called outside (e.g. the sidebar),
+ * falls back to reading filters from URL params. Mutations (setFilters,
+ * clearFilters) throw if called outside the provider.
*/
export function useTableFilter() {
- const { filters: urlFilters, setParams } = useTableEditorFiltersSort()
-
- const filters = formatFilterURLParams(urlFilters)
-
- const onApplyFilters = useCallback(
- (appliedFilters: Filter[]) => {
- const newUrlFilters = filtersToUrlParams(appliedFilters)
- setParams((prevParams) => ({ ...prevParams, filter: newUrlFilters }))
- },
- [setParams]
- )
+ const snap = useOptionalTableEditorTableStateSnapshot()
+ const { filters: urlFilters } = useTableEditorFiltersSort()
+ const urlParsedFilters = formatFilterURLParams(urlFilters)
- const clearFilters = useCallback(() => {
- setParams((prevParams) => ({ ...prevParams, filter: [] }))
- }, [setParams])
+ const filters = snap ? snap.filters : urlParsedFilters
return {
- filters, // Formatted Filter[] object array
- urlFilters, // Raw string[] from URL
- onApplyFilters, // Callback to apply changes
- clearFilters, // Callback to clear filters
+ filters,
+ setFilters: (filters: Filter[]) => {
+ if (!snap) {
+ throw new Error('useTableFilter: setFilters requires TableEditorTableStateContextProvider')
+ }
+ snap.setFilters(filters)
+ },
+ clearFilters: () => {
+ if (!snap) {
+ throw new Error(
+ 'useTableFilter: clearFilters requires TableEditorTableStateContextProvider'
+ )
+ }
+ snap.clearFilters()
+ },
}
}
diff --git a/apps/studio/components/grid/hooks/useTableFilterNew.ts b/apps/studio/components/grid/hooks/useTableFilterNew.ts
deleted file mode 100644
index 6dd44bac0aa..00000000000
--- a/apps/studio/components/grid/hooks/useTableFilterNew.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-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/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 4a3420ee54f..6cca0e301a7 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -125,9 +125,6 @@ export const useIsJitDbAccessEnabled = () => {
return jitDbAccessEnabled && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_JIT_DB_ACCESS]
}
-// [Joshen] Temporarily leaving this in, will eventually clean up this flag + old Header component completely
-export const useIsTableFilterBarEnabled = () => true
-
export const useIsFloatingMobileToolbarEnabled = () => {
const { flags } = useFeaturePreviewContext()
const showFloatingMobileToolbar = useFlag('enableFloatingMobileToolbar')
diff --git a/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsx b/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsx
index 7d9a906a17a..f160ac1833f 100644
--- a/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsx
@@ -27,7 +27,7 @@ const DeleteConfirmationDialogs = ({
}: DeleteConfirmationDialogsProps) => {
const { data: project } = useSelectedProjectQuery()
const snap = useTableEditorStateSnapshot()
- const { filters, onApplyFilters } = useTableFilter()
+ const { filters, setFilters } = useTableFilter()
const removeDeletedColumnFromFiltersAndSorts = ({
columnName,
@@ -37,7 +37,7 @@ const DeleteConfirmationDialogs = ({
schema?: string
columnName: string
}) => {
- onApplyFilters(filters.filter((filter) => filter.column !== columnName))
+ setFilters(filters.filter((filter) => filter.column !== columnName))
}
const { mutate: deleteColumn } = useDatabaseColumnDeleteMutation({
diff --git a/apps/studio/state/table-editor-table.tsx b/apps/studio/state/table-editor-table.tsx
index 128e6f2d0f4..99b49e1e40b 100644
--- a/apps/studio/state/table-editor-table.tsx
+++ b/apps/studio/state/table-editor-table.tsx
@@ -15,6 +15,8 @@ import { getInitialGridColumns } from '@/components/grid/utils/column'
import { getGridColumns } from '@/components/grid/utils/gridColumns'
import { Entity } from '@/data/table-editor/table-editor-types'
+const FALLBACK_TABLE_STATE = proxy({}) as TableEditorTableState
+
export const createTableEditorTableState = ({
projectRef,
table: originalTable,
@@ -288,4 +290,15 @@ export const useTableEditorTableStateSnapshot = (options?: Parameters<typeof use
return useSnapshot(state, options) as TableEditorTableState
}
+/**
+ * Same as useTableEditorTableStateSnapshot but returns undefined when called
+ * outside a TableEditorTableStateContextProvider instead of crashing.
+ * Use this for components that may render outside the provider (e.g. sidebar).
+ */
+export const useOptionalTableEditorTableStateSnapshot = (): TableEditorTableState | undefined => {
+ const state = useContext(TableEditorTableStateContext)
+ const snap = useSnapshot(state ?? FALLBACK_TABLE_STATE)
+ return state != undefined ? (snap as TableEditorTableState) : undefined
+}
+
export type TableEditorTableStateSnapshot = ReturnType<typeof useTableEditorTableStateSnapshot>