From b3975d5e499a8f97e7059cb8f573ad59e0da0c75 Mon Sep 17 00:00:00 2001 From: Alaister Young Date: Mon, 29 Jan 2024 15:21:35 +1100 Subject: [PATCH 01/61] fix: remove supavisor_enabled in resolvesToIpV6 (#20812) --- .../interfaces/Settings/Database/UsePoolerCheckbox.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/studio/components/interfaces/Settings/Database/UsePoolerCheckbox.tsx b/apps/studio/components/interfaces/Settings/Database/UsePoolerCheckbox.tsx index d58276b092f..743ecab44ee 100644 --- a/apps/studio/components/interfaces/Settings/Database/UsePoolerCheckbox.tsx +++ b/apps/studio/components/interfaces/Settings/Database/UsePoolerCheckbox.tsx @@ -40,7 +40,7 @@ export const UsePoolerCheckbox = ({ const { data, isLoading, isSuccess } = usePoolingConfigurationQuery({ projectRef }) const { data: settings, isSuccess: isSuccessSettings } = useProjectSettingsQuery({ projectRef }) - const resolvesToIpV6 = !data?.supavisor_enabled && settings?.project.db_ip_addr_config === 'ipv6' + const resolvesToIpV6 = settings?.project.db_ip_addr_config === 'ipv6' return ( <> From d016f562095cb353826e21576ac534b958302136 Mon Sep 17 00:00:00 2001 From: Inian Date: Mon, 29 Jan 2024 14:47:04 +0800 Subject: [PATCH 02/61] clarify network restrictions interaction with functions (#20815) * clarify network restrictions interaction with functions * supavisor supports network restrictions * update --- apps/docs/pages/guides/platform/network-restrictions.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/docs/pages/guides/platform/network-restrictions.mdx b/apps/docs/pages/guides/platform/network-restrictions.mdx index e46e9b85225..9ffbb95e96d 100644 --- a/apps/docs/pages/guides/platform/network-restrictions.mdx +++ b/apps/docs/pages/guides/platform/network-restrictions.mdx @@ -77,8 +77,7 @@ Restrictions applied successfully: true ## Limitations - The current iteration of Network Restrictions applies to connections to Postgres and the database pooler; it doesn't currently apply to APIs offered over HTTPS (e.g., PostgREST, Storage, and Auth). This includes using Supabase client libraries like [supabase-js](https://supabase.com/docs/reference/javascript). -- Network Restrictions should not be used if you need to connect to your Postgres database using Edge Functions. -- [Supavisor](https://github.com/supabase/supavisor/) does not currently support Network Restrictions. Network restrictions support will be enabled from 24th January 2024. Any changes to the network restrictions configuration will apply to both Supavisor and direct connections to Postgres after this date. +- If network restrictions are enabled, direct access to your database from Edge Functions will always be blocked. Using the Supabase client library [supabase-js](https://supabase.com/docs/reference/javascript) is recommended to connect to a database with network restrictions from Edge Functions. export const Page = ({ children }) => From 026d7ee2f30d8e6f99699d7bf336d2a8e8943cf9 Mon Sep 17 00:00:00 2001 From: Alaister Young Date: Mon, 29 Jan 2024 20:56:52 +1100 Subject: [PATCH 03/61] fix: refetch project detail while project is coming up (#20819) * fix: refetch project detail while project is not healthy * switch to only refetching while coming up --- apps/studio/data/projects/project-detail-query.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/studio/data/projects/project-detail-query.ts b/apps/studio/data/projects/project-detail-query.ts index fa9537f94af..659a2d37f30 100644 --- a/apps/studio/data/projects/project-detail-query.ts +++ b/apps/studio/data/projects/project-detail-query.ts @@ -44,6 +44,13 @@ export const useProjectDetailQuery = ( { enabled: enabled && typeof ref !== 'undefined', staleTime: 30 * 1000, // 30 seconds + refetchInterval(data) { + if (data && (data as unknown as ProjectDetailData).status === 'COMING_UP') { + return 5 * 1000 // 5 seconds + } + + return false + }, ...options, } ) From eb45884cdd18afb2cdfe13a0526f6d1b73b7ae01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Mon, 29 Jan 2024 12:44:38 +0100 Subject: [PATCH 04/61] ref: Use installation source for vercel integration (#20826) --- .../pages/integrations/vercel/install.tsx | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/apps/studio/pages/integrations/vercel/install.tsx b/apps/studio/pages/integrations/vercel/install.tsx index abcd2e657fc..f2c707c4117 100644 --- a/apps/studio/pages/integrations/vercel/install.tsx +++ b/apps/studio/pages/integrations/vercel/install.tsx @@ -87,22 +87,35 @@ const VercelIntegration: NextPageWithLayout = () => { /** * Handle the correct route change based on whether the vercel integration - * is following the 'marketplace' flow or 'deploy button' flow. - * + * is following the 'marketplace/external' flow or 'deploy button' flow. + * See: + * - https://vercel.com/docs/integrations/create-integration/submit-integration#query-parameters-for-marketplace + * - https://vercel.com/docs/integrations/create-integration/submit-integration#query-parameters-for-external-flow + * - https://vercel.com/docs/integrations/create-integration/submit-integration#query-parameters-for-deploy-button */ function handleRouteChange() { const orgSlug = selectedOrg?.slug - if (externalId) { - router.push({ - pathname: `/integrations/vercel/${orgSlug}/deploy-button/new-project`, - query: router.query, - }) - } else { - router.push({ - pathname: `/integrations/vercel/${orgSlug}/marketplace/choose-project`, - query: router.query, - }) + switch (source) { + case 'deploy-button': { + router.push({ + pathname: `/integrations/vercel/${orgSlug}/deploy-button/new-project`, + query: router.query, + }) + break + } + case 'marketplace': + case 'external': { + router.push({ + pathname: `/integrations/vercel/${orgSlug}/marketplace/choose-project`, + query: router.query, + }) + break + } + default: + toast.error( + `Unsupported Vercel installation source: ${source}. Please contact support if this error persists.` + ) } } From 2409b0b89882d032a29924277cc1e896dca05e92 Mon Sep 17 00:00:00 2001 From: Virgil Nilson Date: Mon, 29 Jan 2024 07:09:51 -0500 Subject: [PATCH 05/61] fix typo (#20801) --- apps/docs/pages/guides/getting-started/quickstarts/laravel.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/docs/pages/guides/getting-started/quickstarts/laravel.mdx b/apps/docs/pages/guides/getting-started/quickstarts/laravel.mdx index 258dd3071e8..84ad9a05cab 100644 --- a/apps/docs/pages/guides/getting-started/quickstarts/laravel.mdx +++ b/apps/docs/pages/guides/getting-started/quickstarts/laravel.mdx @@ -123,7 +123,7 @@ export const meta = { - Run the development server. Go to http://127.0.0.1:8000 in a browser to see your application. You can also nvaigate to http://127.0.0.1:8000/register and http://127.0.0.1:8000/login to register and log in users. + Run the development server. Go to http://127.0.0.1:8000 in a browser to see your application. You can also navigate to http://127.0.0.1:8000/register and http://127.0.0.1:8000/login to register and log in users. From 5bba831e01028505909dfbf8d1c6186fd0ad29eb Mon Sep 17 00:00:00 2001 From: Jordi Enric <37541088+jordienr@users.noreply.github.com> Date: Mon, 29 Jan 2024 14:29:45 +0100 Subject: [PATCH 06/61] Fix: make banner clickable (#20823) change padding for margin so top banner is clickable --- apps/studio/components/layouts/SignInLayout/SignInLayout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx b/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx index df6534d20cd..881bd27fee9 100644 --- a/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx +++ b/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx @@ -91,7 +91,7 @@ const SignInLayout = ({