Skip to content

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

Fix filter button in table editor (#47867)

Joshen Lim503bdb5a6f10
diff --git a/apps/studio/components/interfaces/Database/Tables/TableList.tsx b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
index 55f6cc664d0..ef278a0171b 100644
--- a/apps/studio/components/interfaces/Database/Tables/TableList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
@@ -2,7 +2,18 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useDebounce, useIntersectionObserver } from '@uidotdev/usehooks'
import { useParams } from 'common'
import { noop } from 'lodash'
-import { Check, Copy, Edit, Eye, Filter, MoreVertical, Plus, Search, Trash, X } from 'lucide-react'
+import {
+ Check,
+ ChevronDown,
+ Copy,
+ Edit,
+ Eye,
+ MoreVertical,
+ Plus,
+ Search,
+ Trash,
+ X,
+} from 'lucide-react'
import Link from 'next/link'
import { useRouter } from 'next/router'
import { parseAsString, useQueryState } from 'nuqs'
@@ -232,6 +243,8 @@ export const TableList = ({
const isSuccess =
isSuccessTables && isSuccessViews && isSuccessMaterializedViews && isSuccessForeignTables
+ const hasFiltersApplied = visibleTypes.length !== 5
+
const formatTooltipText = (entityType: string) => {
const text =
Object.entries(ENTITY_TYPE)
@@ -246,116 +259,108 @@ export const TableList = ({
return (
<div className="flex flex-col gap-y-4">
<div className="flex flex-col lg:flex-row lg:items-center gap-2 flex-wrap">
- <div className="flex gap-2 items-center">
- <Shortcut
- id={SHORTCUT_IDS.LIST_PAGE_FOCUS_SCHEMA}
- onTrigger={() => setSchemaSelectorOpen(true)}
- side="bottom"
- tooltipOpen={schemaSelectorOpen ? false : undefined}
- >
- <SchemaSelector
- className="grow lg:grow-0 w-[180px]"
+ <Shortcut
+ id={SHORTCUT_IDS.LIST_PAGE_FOCUS_SCHEMA}
+ onTrigger={() => setSchemaSelectorOpen(true)}
+ side="bottom"
+ tooltipOpen={schemaSelectorOpen ? false : undefined}
+ >
+ <SchemaSelector
+ className="grow lg:grow-0 w-[180px]"
+ size="tiny"
+ showError={false}
+ selectedSchemaName={selectedSchema}
+ onSelectSchema={setSelectedSchema}
+ open={schemaSelectorOpen}
+ onOpenChange={setSchemaSelectorOpen}
+ />
+ </Shortcut>
+ <Input
+ ref={searchInputRef}
+ size="tiny"
+ containerClassName="grow lg:grow-0 w-52"
+ placeholder="Search for a table"
+ value={filterString}
+ onChange={(e) => setFilterString(e.target.value)}
+ onKeyDown={onSearchInputEscape(filterString, setFilterString)}
+ icon={<Search />}
+ />
+
+ <Popover>
+ <PopoverTrigger asChild>
+ <Button
size="tiny"
- showError={false}
- selectedSchemaName={selectedSchema}
- onSelectSchema={setSelectedSchema}
- open={schemaSelectorOpen}
- onOpenChange={setSchemaSelectorOpen}
- />
- </Shortcut>
- <Popover>
- <PopoverTrigger asChild>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- size="tiny"
- variant={visibleTypes.length !== 5 ? 'default' : 'dashed'}
- className="px-1"
- icon={<Filter />}
- aria-label="Filter"
- />
- </TooltipTrigger>
- <TooltipContent>Filter</TooltipContent>
- </Tooltip>
- </PopoverTrigger>
- <PopoverContent className="p-0 w-56" side="bottom" align="center">
- <div className="px-3 pt-3 pb-2 flex flex-col gap-y-2">
- <p className="text-xs">Show entity types</p>
- <div className="flex flex-col">
- {Object.entries(ENTITY_TYPE).map(([key, value]) => (
- <div key={key} className="group flex items-center justify-between py-0.5">
- <div className="flex items-center gap-x-2">
- <Checkbox
- id={key}
- name={key}
- checked={visibleTypes.includes(value)}
- onCheckedChange={() => {
- if (visibleTypes.includes(value)) {
- setVisibleTypes(visibleTypes.filter((y) => y !== value))
- } else {
- setVisibleTypes(visibleTypes.concat([value]))
- }
- }}
- />
- <Label htmlFor={key} className="capitalize text-xs">
- {key.toLowerCase().replace('_', ' ')}
- </Label>
- </div>
- <Button
- size="tiny"
- variant="default"
- onClick={() => setVisibleTypes([value])}
- className="transition opacity-0 group-hover:opacity-100 h-auto px-1 py-0.5"
- >
- Select only
- </Button>
+ variant={hasFiltersApplied ? 'default' : 'dashed'}
+ iconRight={<ChevronDown />}
+ >
+ Entity Type
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="p-0 w-60" side="bottom" align="center">
+ <div className="px-3 pt-3 pb-2 flex flex-col gap-y-2">
+ <p className="text-xs">Show entity types</p>
+ <div className="flex flex-col">
+ {Object.entries(ENTITY_TYPE).map(([key, value]) => (
+ <div key={key} className="group flex items-center justify-between py-0.5">
+ <div className="flex items-center gap-x-2">
+ <Checkbox
+ id={key}
+ name={key}
+ checked={visibleTypes.includes(value)}
+ onCheckedChange={() => {
+ if (visibleTypes.includes(value)) {
+ setVisibleTypes(visibleTypes.filter((y) => y !== value))
+ } else {
+ setVisibleTypes(visibleTypes.concat([value]))
+ }
+ }}
+ />
+ <Label htmlFor={key} className="capitalize text-xs">
+ {key.toLowerCase().replace('_', ' ')}
+ </Label>
</div>
- ))}
- </div>
+ <Button
+ size="tiny"
+ variant="default"
+ onClick={() => setVisibleTypes([value])}
+ className="transition opacity-0 group-hover:opacity-100 h-auto px-1 py-0.5"
+ >
+ Select only
+ </Button>
+ </div>
+ ))}
</div>
- </PopoverContent>
- </Popover>
- </div>
- <div className="flex grow justify-between gap-2 items-center">
- <Input
- ref={searchInputRef}
- size="tiny"
- containerClassName="grow lg:grow-0 w-52"
- placeholder="Search for a table"
- value={filterString}
- onChange={(e) => setFilterString(e.target.value)}
- onKeyDown={onSearchInputEscape(filterString, setFilterString)}
- icon={<Search />}
- />
+ </div>
+ </PopoverContent>
+ </Popover>
- {!isSchemaLocked &&
- (canAddTables ? (
- <Shortcut
- id={SHORTCUT_IDS.LIST_PAGE_NEW_ITEM}
- label="Create new table"
- onTrigger={() => onAddTable()}
- side="bottom"
- >
- <Button className="w-auto ml-auto" icon={<Plus />} onClick={() => onAddTable()}>
- New table
- </Button>
- </Shortcut>
- ) : (
- <ButtonTooltip
- className="w-auto ml-auto"
- icon={<Plus />}
- disabled
- tooltip={{
- content: {
- side: 'bottom',
- text: 'You need additional permissions to create tables',
- },
- }}
- >
+ {!isSchemaLocked &&
+ (canAddTables ? (
+ <Shortcut
+ id={SHORTCUT_IDS.LIST_PAGE_NEW_ITEM}
+ label="Create new table"
+ onTrigger={() => onAddTable()}
+ side="bottom"
+ >
+ <Button className="w-auto ml-auto" icon={<Plus />} onClick={() => onAddTable()}>
New table
- </ButtonTooltip>
- ))}
- </div>
+ </Button>
+ </Shortcut>
+ ) : (
+ <ButtonTooltip
+ className="w-auto ml-auto"
+ icon={<Plus />}
+ disabled
+ tooltip={{
+ content: {
+ side: 'bottom',
+ text: 'You need additional permissions to create tables',
+ },
+ }}
+ >
+ New table
+ </ButtonTooltip>
+ ))}
</div>
{isSchemaLocked && <ProtectedSchemaWarning schema={selectedSchema} entity="tables" />}
diff --git a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
index 688fc9cea21..80710c92136 100644
--- a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
+++ b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
@@ -15,6 +15,7 @@ import {
import { useTableEditorTabsCleanUp } from '../Tabs/Tabs.utils'
import { EntityListItem } from './EntityListItem'
import { TableMenuEmptyState } from './TableMenuEmptyState'
+import { TableMenuFilterEmptyState } from './TableMenuFilterEmptyState'
import { ExportDialog } from '@/components/grid/components/header/ExportDialog'
import { parseSupaTable } from '@/components/grid/SupabaseGrid.utils'
import { SupaTable } from '@/components/grid/types'
@@ -38,6 +39,8 @@ import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
import { useTableEditorStateSnapshot } from '@/state/table-editor'
+type Sort = 'alphabetical' | 'grouped-alphabetical'
+
export const TableEditorMenu = () => {
const { id: _id, ref: projectRef } = useParams()
const id = _id ? Number(_id) : undefined
@@ -48,10 +51,7 @@ export const TableEditorMenu = () => {
const [isSchemaDropdownOpen, setIsSchemaDropdownOpen] = useState(false)
const [tableToExport, setTableToExport] = useState<SupaTable>()
const [visibleTypes, setVisibleTypes] = useState<string[]>(Object.values(ENTITY_TYPE))
- const [sort, setSort] = useLocalStorage<'alphabetical' | 'grouped-alphabetical'>(
- 'table-editor-sort',
- 'alphabetical'
- )
+ const [sort, setSort] = useLocalStorage<Sort>('table-editor-sort', 'alphabetical')
const { data: project } = useSelectedProjectQuery()
const {
@@ -73,6 +73,7 @@ export const TableEditorMenu = () => {
filterTypes: visibleTypes,
},
{
+ enabled: visibleTypes.length > 0,
placeholderData: Boolean(searchText) ? keepPreviousData : undefined,
}
)
@@ -148,6 +149,8 @@ export const TableEditorMenu = () => {
[project?.ref, id, isSchemaLocked, onSelectExportCLI, apiAccessByTableName]
)
+ const hasFiltersApplied = visibleTypes.length !== 5
+
useEffect(() => {
// Clean up tabs + recent items for any tables that might have been removed outside of the dashboard session
if (entityTypes && !searchText) {
@@ -221,7 +224,7 @@ export const TableEditorMenu = () => {
>
<InnerSideBarFilterSortDropdown
value={sort}
- onValueChange={(value: any) => setSort(value)}
+ onValueChange={(value) => setSort(value as Sort)}
>
<InnerSideBarFilterSortDropdownItem
key="alphabetical"
@@ -238,11 +241,12 @@ export const TableEditorMenu = () => {
</InnerSideBarFilterSortDropdownItem>
</InnerSideBarFilterSortDropdown>
</InnerSideBarFilterSearchInput>
+
<Popover>
<PopoverTrigger asChild>
<ButtonTooltip
- variant={visibleTypes.length !== 5 ? 'default' : 'dashed'}
className="h-[32px] md:h-[28px] px-1.5"
+ variant={hasFiltersApplied ? 'default' : 'dashed'}
icon={<Filter />}
aria-label="Filter"
tooltip={{ content: { side: 'bottom', text: 'Filter' } }}
@@ -287,6 +291,12 @@ export const TableEditorMenu = () => {
</Popover>
</InnerSideBarFilters>
+ {visibleTypes.length === 0 && (
+ <TableMenuFilterEmptyState
+ onResetFilters={() => setVisibleTypes(Object.values(ENTITY_TYPE))}
+ />
+ )}
+
{isLoading && <EditorMenuListSkeleton />}
{isError && (
diff --git a/apps/studio/components/layouts/TableEditorLayout/TableMenuFilterEmptyState.tsx b/apps/studio/components/layouts/TableEditorLayout/TableMenuFilterEmptyState.tsx
new file mode 100644
index 00000000000..0860ce12fb2
--- /dev/null
+++ b/apps/studio/components/layouts/TableEditorLayout/TableMenuFilterEmptyState.tsx
@@ -0,0 +1,16 @@
+import { Button } from 'ui'
+import { InnerSideBarEmptyPanel } from 'ui-patterns/InnerSideMenu'
+
+export const TableMenuFilterEmptyState = ({ onResetFilters }: { onResetFilters: () => void }) => {
+ return (
+ <InnerSideBarEmptyPanel
+ title="No results based on filters"
+ description="All entity types are hidden."
+ className="mx-4"
+ >
+ <Button variant="default" onClick={onResetFilters} className="mt-2">
+ Reset filters
+ </Button>
+ </InnerSideBarEmptyPanel>
+ )
+}