From 819efd04848fac232cfac7689d33840a2cf1bee1 Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Tue, 23 May 2023 15:29:09 +0300 Subject: [PATCH] chore: display triggers in the `net` schema if they're not webhooks; hide triggers in webhooks if they don't have at least an URL and method specified --- .../components/interfaces/Database/Hooks/HooksList/HookList.tsx | 2 +- studio/data/database-triggers/database-triggers-query.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx b/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx index 7e434e4cef5..4a609ec24e7 100644 --- a/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx +++ b/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx @@ -38,7 +38,7 @@ const HookList: FC = ({ const restUrlTld = new URL(restUrl as string).hostname.split('.').pop() const filteredHooks = (hooks ?? []).filter( - (x: any) => includes(x.name.toLowerCase(), filterString.toLowerCase()) && x.schema === schema + (x: any) => includes(x.name.toLowerCase(), filterString.toLowerCase()) && x.schema === schema && x.function_args.length >= 2 ) const canUpdateWebhook = checkPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE, 'triggers') diff --git a/studio/data/database-triggers/database-triggers-query.ts b/studio/data/database-triggers/database-triggers-query.ts index 42b586f4f26..256c25a6a9e 100644 --- a/studio/data/database-triggers/database-triggers-query.ts +++ b/studio/data/database-triggers/database-triggers-query.ts @@ -45,7 +45,7 @@ export const useDatabaseHooks = ( // @ts-ignore select(data) { return (data as PostgresTrigger[]).filter( - (trigger) => trigger.function_schema === 'supabase_functions' && trigger.schema !== 'net' + (trigger) => trigger.function_schema === 'supabase_functions' && (trigger.schema !== 'net' || trigger.function_args.length === 0) ) }, enabled: