From 8de91649b2b3b3dc64d030dee4eaa87011290c30 Mon Sep 17 00:00:00 2001 From: Paul Cioanca Date: Thu, 18 May 2023 21:13:47 +0300 Subject: [PATCH] fix: switch webhook availability to be conditional based on pg_net existing --- .../components/layouts/DatabaseLayout/DatabaseLayout.tsx | 3 ++- .../layouts/DatabaseLayout/DatabaseMenu.utils.ts | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/studio/components/layouts/DatabaseLayout/DatabaseLayout.tsx b/studio/components/layouts/DatabaseLayout/DatabaseLayout.tsx index deb9fb8ab91..95dbd1011fa 100644 --- a/studio/components/layouts/DatabaseLayout/DatabaseLayout.tsx +++ b/studio/components/layouts/DatabaseLayout/DatabaseLayout.tsx @@ -26,6 +26,7 @@ const DatabaseLayout: FC = ({ title, children }) => { const vaultExtension = meta.extensions.byId('supabase_vault') const isVaultEnabled = vaultExtension !== undefined && vaultExtension.installed_version !== null const foreignDataWrappersEnabled = useFlag('foreignDataWrappers') + const pgNetExtensionExists = meta.extensions.byId('pg_net') !== undefined const [loaded, setLoaded] = useState(isInitialized) @@ -73,7 +74,7 @@ const DatabaseLayout: FC = ({ title, children }) => { isLoading={!loaded} product="Database" productMenu={ - + } >
diff --git a/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts b/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts index cb37f05173e..064d1e70c42 100644 --- a/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts +++ b/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts @@ -4,13 +4,11 @@ import { IS_PLATFORM } from 'lib/constants' export const generateDatabaseMenu = ( project?: Project, - foreignDataWrappersEnabled: boolean = false + foreignDataWrappersEnabled: boolean = false, + pgNetExtensionExists: boolean = false ): ProductMenuGroup[] => { const ref = project?.ref ?? 'default' - const HOOKS_RELEASED = '2021-07-30T15:33:54.383Z' - const showHooksRoute = project?.inserted_at ? project.inserted_at > HOOKS_RELEASED : false - return [ { title: 'Database', @@ -41,7 +39,7 @@ export const generateDatabaseMenu = ( url: `/project/${ref}/database/replication`, items: [], }, - ...(showHooksRoute + ...(pgNetExtensionExists ? [ { name: 'Webhooks',