Skip to content

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

Add table filter for database triggers (#42679)

Joshen Lim749fbdd296d5
diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
index ca5e231a6b1..655eb68ea64 100644
--- a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
@@ -1,15 +1,15 @@
import { PostgresTrigger } from '@supabase/postgres-meta'
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { includes, sortBy } from 'lodash'
-import { Check, Copy, Edit, Edit2, MoreVertical, Trash, X } from 'lucide-react'
-import Link from 'next/link'
-
import { useParams } from 'common'
import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import { useDatabaseTriggersQuery } from 'data/database-triggers/database-triggers-query'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
+import { includes, sortBy } from 'lodash'
+import { Check, Copy, Edit, Edit2, MoreVertical, Trash, X } from 'lucide-react'
+import Link from 'next/link'
+import { parseAsJson, parseAsString, useQueryState } from 'nuqs'
import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
import {
@@ -23,25 +23,19 @@ import {
TableCell,
TableRow,
} from 'ui'
+
import { generateTriggerCreateSQL } from './TriggerList.utils'
+import { selectFilterSchema } from '@/components/interfaces/Reports/v2/ReportsSelectFilter'
+import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
+import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
interface TriggerListProps {
- schema: string
- filterString: string
- isLocked: boolean
editTrigger: (trigger: PostgresTrigger) => void
duplicateTrigger: (trigger: PostgresTrigger) => void
deleteTrigger: (trigger: PostgresTrigger) => void
}
-export const TriggerList = ({
- schema,
- filterString,
- isLocked,
- editTrigger,
- duplicateTrigger,
- deleteTrigger,
-}: TriggerListProps) => {
+export const TriggerList = ({ editTrigger, duplicateTrigger, deleteTrigger }: TriggerListProps) => {
const { ref: projectRef } = useParams()
const { data: project } = useSelectedProjectQuery()
const aiSnap = useAiAssistantStateSnapshot()
@@ -52,15 +46,27 @@ export const TriggerList = ({
'triggers'
)
+ const { selectedSchema: schema } = useQuerySchemaState()
+ const { isSchemaLocked: isLocked } = useIsProtectedSchema({ schema })
+ const [filterString] = useQueryState('search', parseAsString.withDefault(''))
+ const [tablesFilter] = useQueryState(
+ 'tables',
+ parseAsJson(selectFilterSchema.parse).withDefault([])
+ )
+
const { data: triggers } = useDatabaseTriggersQuery({
projectRef: project?.ref,
connectionString: project?.connectionString,
})
- const filteredTriggers = (triggers ?? []).filter(
- (x) =>
- includes(x.name.toLowerCase(), filterString.toLowerCase()) ||
- (x.function_name && includes(x.function_name.toLowerCase(), filterString.toLowerCase()))
- )
+ const filteredTriggers = (triggers ?? []).filter((x) => {
+ const search = filterString?.toLowerCase()
+ const matchesSearch =
+ !search ||
+ x.name.toLowerCase().includes(search) ||
+ (!!x.function_name && includes(x.function_name.toLowerCase(), search))
+ const matchesTables = !tablesFilter?.length || tablesFilter.includes(x.table)
+ return matchesSearch && matchesTables
+ })
const _triggers = sortBy(
filteredTriggers.filter((x) => x.schema == schema),
(trigger) => trigger.name.toLocaleLowerCase()
diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
index 44566dee8b9..9860261e3d5 100644
--- a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
@@ -1,17 +1,12 @@
import type { PostgresTrigger } from '@supabase/postgres-meta'
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { DatabaseZap, Search } from 'lucide-react'
-import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
-import { useRef, useState } from 'react'
-import { toast } from 'sonner'
-
import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'
import { ProtectedSchemaWarning } from 'components/interfaces/Database/ProtectedSchemaWarning'
import { DeleteTrigger } from 'components/interfaces/Database/Triggers/DeleteTrigger'
import { TriggerSheet } from 'components/interfaces/Database/Triggers/TriggerSheet'
import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
-
import AlertError from 'components/ui/AlertError'
+import { DocsButton } from 'components/ui/DocsButton'
import SchemaSelector from 'components/ui/SchemaSelector'
import { useDatabaseTriggerDeleteMutation } from 'data/database-triggers/database-trigger-delete-mutation'
import { useDatabaseTriggersQuery } from 'data/database-triggers/database-triggers-query'
@@ -22,28 +17,35 @@ import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { useIsProtectedSchema, useProtectedSchemas } from 'hooks/useProtectedSchemas'
import { DOCS_URL } from 'lib/constants'
-import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { DatabaseZap, Search } from 'lucide-react'
+import { parseAsBoolean, parseAsJson, parseAsString, useQueryState } from 'nuqs'
+import { useRef, useState } from 'react'
+import { toast } from 'sonner'
import { useEditorPanelStateSnapshot } from 'state/editor-panel-state'
import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
import { Card, Input, Table, TableBody, TableHead, TableHeader, TableRow } from 'ui'
import { EmptyStatePresentational } from 'ui-patterns'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
-import { DocsButton } from 'components/ui/DocsButton'
+
import { CreateTriggerButtons } from './CreateTriggerButtons'
import { TriggerList } from './TriggerList'
import { generateTriggerCreateSQL } from './TriggerList.utils'
+import {
+ ReportsSelectFilter,
+ selectFilterSchema,
+} from '@/components/interfaces/Reports/v2/ReportsSelectFilter'
export const TriggersList = () => {
const [selectedTrigger, setSelectedTrigger] = useState<PostgresTrigger>()
const deletingTriggerIdRef = useRef<string | null>(null)
const { data: project } = useSelectedProjectQuery()
- const aiSnap = useAiAssistantStateSnapshot()
const { openSidebar } = useSidebarManagerSnapshot()
const { selectedSchema, setSelectedSchema } = useQuerySchemaState()
- const [filterString, setFilterString] = useQueryState(
- 'search',
- parseAsString.withDefault('').withOptions({ history: 'replace', clearOnDefault: true })
+ const [filterString, setFilterString] = useQueryState('search', parseAsString.withDefault(''))
+ const [tablesFilter, setTablesFilter] = useQueryState(
+ 'tables',
+ parseAsJson(selectFilterSchema.parse).withDefault([])
)
const isInlineEditorEnabled = useIsInlineEditorEnabled()
@@ -176,6 +178,7 @@ execute function function_name();`)
}
const schemaTriggers = triggers.filter((x) => x.schema === selectedSchema)
+ const tables = Array.from(new Set(schemaTriggers.map((x) => x.table))).sort()
return (
<>
@@ -197,6 +200,13 @@ execute function function_name();`)
className="w-full lg:w-52"
onChange={(e) => setFilterString(e.target.value)}
/>
+ <ReportsSelectFilter
+ label="Table"
+ options={tables.map((type) => ({ label: type, value: type }))}
+ value={tablesFilter ?? []}
+ onChange={setTablesFilter}
+ showSearch
+ />
</div>
<div className="flex items-center gap-2">
<DocsButton href={`${DOCS_URL}/guides/database/postgres/triggers`} />
@@ -248,9 +258,6 @@ execute function function_name();`)
</TableHeader>
<TableBody>
<TriggerList
- schema={selectedSchema}
- filterString={filterString}
- isLocked={isSchemaLocked}
editTrigger={editTrigger}
duplicateTrigger={duplicateTrigger}
deleteTrigger={deleteTrigger}
diff --git a/apps/studio/hooks/useProtectedSchemas.ts b/apps/studio/hooks/useProtectedSchemas.ts
index 1bd1271be31..6597028711b 100644
--- a/apps/studio/hooks/useProtectedSchemas.ts
+++ b/apps/studio/hooks/useProtectedSchemas.ts
@@ -1,6 +1,3 @@
-import { uniq, uniqBy } from 'lodash'
-import { useMemo } from 'react'
-
import {
SUPABASE_TARGET_SCHEMA_OPTION,
WRAPPERS,
@@ -9,9 +6,12 @@ import {
convertKVStringArrayToJson,
wrapperMetaComparator,
} from 'components/interfaces/Integrations/Wrappers/Wrappers.utils'
-import { QUEUES_SCHEMA } from 'data/database-queues/database-queues-toggle-postgrest-mutation'
import { useFDWsQuery } from 'data/fdw/fdws-query'
+import { uniq, uniqBy } from 'lodash'
+import { useMemo } from 'react'
+
import { useSelectedProjectQuery } from './misc/useSelectedProject'
+import { QUEUES_SCHEMA } from '@/data/database-queues/database-queues-toggle-postgrest-mutation'
/**
* A list of system schemas that users should not interact with
@@ -27,6 +27,7 @@ export const INTERNAL_SCHEMAS = [
'pgsodium_masks',
'pgbouncer',
'pgtle',
+ 'pgmq',
'realtime',
'storage',
'supabase_functions',