The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Joshen/fe 2621 show custom domain on dashboard and connect modal (#43233)
Joshen Lim90d3b56db0c4
diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsxindex daf0e8bbe13..594b16b7d37 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx@@ -1,11 +1,4 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { Check } from 'lucide-react'-import { useTheme } from 'next-themes'-import { useQueryState } from 'nuqs'-import { useEffect, useState } from 'react'-import ReactMarkdown from 'react-markdown'-import { toast } from 'sonner'-import { useParams } from 'common'import { Markdown } from 'components/interfaces/Markdown'import { ButtonTooltip } from 'components/ui/ButtonTooltip'@@ -13,17 +6,23 @@ import { DocsButton } from 'components/ui/DocsButton'import { ResourceItem } from 'components/ui/Resource/ResourceItem'import type { components } from 'data/api'import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutation'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'-import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { BASE_PATH } from 'lib/constants'+import { Check } from 'lucide-react'+import { useTheme } from 'next-themes'+import { useQueryState } from 'nuqs'+import { useEffect, useState } from 'react'+import ReactMarkdown from 'react-markdown'+import { toast } from 'sonner'import { Button, Form, Input, Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from 'ui'import { Admonition } from 'ui-patterns'+import { NO_REQUIRED_CHARACTERS } from '../Auth.constants'import { AuthAlert } from './AuthAlert'import type { Provider } from './AuthProvidersForm.types'import FormField from './FormField'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'interface ProviderFormProps {config: components['schemas']['GoTrueConfigResponse']@@ -42,6 +41,8 @@ export const ProviderForm = ({ config, provider, isActive }: ProviderFormProps)const [open, setOpen] = useState(false)const { mutate: updateAuthConfig, isPending: isUpdatingConfig } = useAuthConfigUpdateMutation()+ const { data: endpoint } = useProjectApiUrl({ projectRef })+const { can: canUpdateConfig } = useAsyncCheckPermissions(PermissionAction.UPDATE,'custom_config_gotrue'@@ -67,12 +68,6 @@ export const ProviderForm = ({ config, provider, isActive }: ProviderFormProps)}const isFreePlan = organization?.plan.id === 'free'- const { data: settings } = useProjectSettingsV2Query({ projectRef })- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint- const apiUrl = `${protocol}://${endpoint}`-- const { data: customDomainData } = useCustomDomainsQuery({ projectRef })const INITIAL_VALUES = (() => {const initialValues: { [x: string]: string | boolean } = {}@@ -247,11 +242,7 @@ export const ProviderForm = ({ config, provider, isActive }: ProviderFormProps)readOnlydisabledlabel="Callback URL (for OAuth)"- value={- customDomainData?.customDomain?.status === 'active'- ? `https://${customDomainData.customDomain?.hostname}/auth/v1/callback`- : `${apiUrl}/auth/v1/callback`- }+ value={`${endpoint}/auth/v1/callback`}descriptionText={<Markdowncontent={provider.misc.helper}diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsxindex 3c690d92f97..a1212e54c68 100644--- a/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx+++ b/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx@@ -7,7 +7,7 @@ import type {import { useParams } from 'common'import { InlineLink } from 'components/ui/InlineLink'import Panel from 'components/ui/Panel'-import { useProjectEndpointQuery } from 'data/config/project-endpoint-query'+import { useProjectApiUrl } from 'data/config/project-endpoint-query'import { useOAuthServerAppCreateMutation } from 'data/oauth-server-apps/oauth-server-app-create-mutation'import { useOAuthServerAppRegenerateSecretMutation } from 'data/oauth-server-apps/oauth-server-app-regenerate-secret-mutation'import { useOAuthServerAppUpdateMutation } from 'data/oauth-server-apps/oauth-server-app-update-mutation'@@ -111,7 +111,7 @@ export const CreateOrUpdateOAuthAppSheet = ({control: form.control,})- const { data: endpointData } = useProjectEndpointQuery({ projectRef })+ const { hostEndpoint: clientEndpoint } = useProjectApiUrl({ projectRef })const { mutate: createOAuthApp, isPending: isCreating } = useOAuthServerAppCreateMutation({onSuccess: (data) => {@@ -201,8 +201,8 @@ export const CreateOrUpdateOAuthAppSheet = ({updateOAuthApp({projectRef,+ clientEndpoint,clientId: appToEdit.client_id,- clientEndpoint: endpointData?.endpoint,...payload,})} else {@@ -216,7 +216,7 @@ export const CreateOrUpdateOAuthAppSheet = ({createOAuthApp({projectRef,- clientEndpoint: endpointData?.endpoint,+ clientEndpoint,...payload,})}@@ -234,8 +234,8 @@ export const CreateOrUpdateOAuthAppSheet = ({const handleConfirmRegenerate = () => {regenerateSecret({projectRef,+ clientEndpoint,clientId: appToEdit?.client_id,- clientEndpoint: endpointData?.endpoint,})}diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/DeleteOAuthAppModal.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/DeleteOAuthAppModal.tsxindex df996225bd9..76a8818cb90 100644--- a/apps/studio/components/interfaces/Auth/OAuthApps/DeleteOAuthAppModal.tsx+++ b/apps/studio/components/interfaces/Auth/OAuthApps/DeleteOAuthAppModal.tsx@@ -1,6 +1,6 @@import type { OAuthClient } from '@supabase/supabase-js'import { useParams } from 'common'-import { useProjectEndpointQuery } from 'data/config/project-endpoint-query'+import { useProjectApiUrl } from 'data/config/project-endpoint-query'import type { OAuthServerAppDeleteVariables } from 'data/oauth-server-apps/oauth-server-app-delete-mutation'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'@@ -21,12 +21,13 @@ export const DeleteOAuthAppModal = ({}: DeleteOAuthAppModalProps) => {const { ref: projectRef } = useParams()- const { data: endpointData } = useProjectEndpointQuery({ projectRef })+ const { hostEndpoint: clientEndpoint } = useProjectApiUrl({ projectRef })+const onConfirmDeleteApp = () => {onDelete({projectRef,+ clientEndpoint,clientId: selectedApp?.client_id,- clientEndpoint: endpointData?.endpoint,})}diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsxindex 817103165eb..902b259d075 100644--- a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsx+++ b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsx@@ -4,7 +4,7 @@ import AlertError from 'components/ui/AlertError'import { ButtonTooltip } from 'components/ui/ButtonTooltip'import { FilterPopover } from 'components/ui/FilterPopover'import { useAuthConfigQuery } from 'data/auth/auth-config-query'-import { useProjectEndpointQuery } from 'data/config/project-endpoint-query'+import { useProjectApiUrl } from 'data/config/project-endpoint-query'import { useOAuthServerAppDeleteMutation } from 'data/oauth-server-apps/oauth-server-app-delete-mutation'import { useOAuthServerAppRegenerateSecretMutation } from 'data/oauth-server-apps/oauth-server-app-regenerate-secret-mutation'import { useOAuthServerAppsQuery } from 'data/oauth-server-apps/oauth-server-apps-query'@@ -75,7 +75,7 @@ export const OAuthAppsList = () => {const [filteredClientTypes, setFilteredClientTypes] = useState<string[]>([])const [filterString, setFilterString] = useState<string>('')- const { data: endpointData } = useProjectEndpointQuery({ projectRef })+ const { hostEndpoint: clientEndpoint } = useProjectApiUrl({ projectRef })const {data,error,@@ -457,8 +457,8 @@ export const OAuthAppsList = () => {onConfirm={() => {regenerateSecret({projectRef,+ clientEndpoint,clientId: selectedApp?.client_id,- clientEndpoint: endpointData?.endpoint,})setShowRegenerateDialog(false)}}diff --git a/apps/studio/components/interfaces/Connect/ApiKeysTabContent.tsx b/apps/studio/components/interfaces/Connect/ApiKeysTabContent.tsxindex e1a486efbb8..78232db1ca6 100644--- a/apps/studio/components/interfaces/Connect/ApiKeysTabContent.tsx+++ b/apps/studio/components/interfaces/Connect/ApiKeysTabContent.tsx@@ -1,12 +1,12 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'+import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { AlertCircle, ExternalLink, Loader2 } from 'lucide-react'import Link from 'next/link'import type { ReactNode } from 'react'--import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { Button } from 'ui'import { Input } from 'ui-patterns/DataInputs/Input'+import type { projectKeys } from './Connect.types'function KeyRow({ label, value }: { label: ReactNode; value: string }) {@@ -63,7 +63,6 @@ export function ApiKeysTabContent({ projectKeys }: { projectKeys: projectKeys })value={projectKeys.anonKey ?? ''}/>- {/* Footer */}<div className="gap-5 lg:grid lg:grid-cols-12"><div className="col-start-5 col-span-8 pl-2 flex items-center justify-between"><p className="text-xs text-foreground-lighter">For secret keys, see API settings.</p>diff --git a/apps/studio/components/interfaces/Connect/Connect.tsx b/apps/studio/components/interfaces/Connect/Connect.tsxindex e2e91db0874..9ccd9c8d47d 100644--- a/apps/studio/components/interfaces/Connect/Connect.tsx+++ b/apps/studio/components/interfaces/Connect/Connect.tsx@@ -5,7 +5,6 @@ import { DatabaseConnectionString } from 'components/interfaces/Connect/Databaseimport { McpTabContent } from 'components/interfaces/Connect/McpTabContent'import Panel from 'components/ui/Panel'import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { BASE_PATH } from 'lib/constants'@@ -35,6 +34,7 @@ import { CONNECTION_TYPES, ConnectionType, FRAMEWORKS, MOBILES, ORMS } from './Cimport { getContentFilePath, inferConnectTabFromParentKey } from './Connect.utils'import { ConnectDropdown } from './ConnectDropdown'import { ConnectTabContent } from './ConnectTabContent'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'export const Connect = () => {const router = useRouter()@@ -97,7 +97,8 @@ export const Connect = () => {?.children.find((child) => child.key === selectedChild)?.children[0]?.key || '')- const { data: settings } = useProjectSettingsV2Query({ projectRef }, { enabled: open })+ const { data: resolvedEndpoint } = useProjectApiUrl({ projectRef })+const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.READ,'service_api_keys'@@ -216,22 +217,12 @@ export const Connect = () => {: { anonKey: null, publishableKey: null }const projectKeys = useMemo(() => {- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint ?? ''- const apiHost = canReadAPIKeys ? `${protocol}://${endpoint ?? '-'}` : ''-return {- apiUrl: apiHost ?? null,+ apiUrl: resolvedEndpoint ?? null,anonKey: anonKey?.api_key ?? null,publishableKey: publishableKey?.api_key ?? null,}- }, [- settings?.app_config?.protocol,- settings?.app_config?.endpoint,- canReadAPIKeys,- anonKey?.api_key,- publishableKey?.api_key,- ])+ }, [resolvedEndpoint, anonKey?.api_key, publishableKey?.api_key])const filePath = getContentFilePath({connectionObject,diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsxindex 60d3d1f5e94..02f605fc838 100644--- a/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx@@ -1,7 +1,6 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'import { useMemo } from 'react'@@ -11,9 +10,12 @@ import type { ProjectKeys } from './Connect.types'import { ConnectConfigSection, ModeSelector } from './ConnectConfigSection'import { ConnectStepsSection } from './ConnectStepsSection'import { useConnectState } from './useConnectState'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'export const ConnectSheet = () => {+ const { ref: projectRef } = useParams()+const {projectConnectionShowAppFrameworks: showAppFrameworks,projectConnectionShowMobileFrameworks: showMobileFrameworks,@@ -40,9 +42,8 @@ export const ConnectSheet = () => {const { state, activeFields, resolvedSteps, schema, getFieldOptions, setMode, updateField } =useConnectState()- // Project keys for step components- const { ref: projectRef } = useParams()- const { data: settings } = useProjectSettingsV2Query({ projectRef }, { enabled: showConnect })+ const { data: endpoint = '' } = useProjectApiUrl({ projectRef }, { enabled: showConnect })+const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.READ,'service_api_keys'@@ -53,22 +54,12 @@ export const ConnectSheet = () => {: { anonKey: null, publishableKey: null }const projectKeys: ProjectKeys = useMemo(() => {- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint ?? ''- const apiHost = canReadAPIKeys ? `${protocol}://${endpoint ?? '-'}` : ''-return {- apiUrl: apiHost ?? null,+ apiUrl: endpoint,anonKey: anonKey?.api_key ?? null,publishableKey: publishableKey?.api_key ?? null,}- }, [- settings?.app_config?.protocol,- settings?.app_config?.endpoint,- canReadAPIKeys,- anonKey?.api_key,- publishableKey?.api_key,- ])+ }, [endpoint, anonKey?.api_key, publishableKey?.api_key])const availableModeIds = useMemo(() => {const modes: string[] = []diff --git a/apps/studio/components/interfaces/Docs/ResourceContent.tsx b/apps/studio/components/interfaces/Docs/ResourceContent.tsxindex f5f58076ab5..fd4093974e0 100644--- a/apps/studio/components/interfaces/Docs/ResourceContent.tsx+++ b/apps/studio/components/interfaces/Docs/ResourceContent.tsx@@ -7,13 +7,12 @@ import Description from '@/components/interfaces/Docs/Description'import Param from '@/components/interfaces/Docs/Param'import Snippets from '@/components/interfaces/Docs/Snippets'import { InlineLink } from '@/components/ui/InlineLink'-import { useCustomDomainsQuery } from '@/data/custom-domains/custom-domains-query'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { useProjectJsonSchemaQuery } from '@/data/docs/project-json-schema-query'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { DOCS_URL } from '@/lib/constants'interface ResourceContentProps {- apiEndpoint: stringresourceId: stringresources: { [key: string]: { id: string; displayName: string; camelCase: string } }selectedLang: 'bash' | 'js'@@ -22,7 +21,6 @@ interface ResourceContentProps {}export const ResourceContent = ({- apiEndpoint,resourceId,resources,selectedLang,@@ -30,16 +28,12 @@ export const ResourceContent = ({refreshDocs,}: ResourceContentProps) => {const { ref } = useParams()- const { data: customDomainData } = useCustomDomainsQuery({ projectRef: ref })const { realtimeAll: realtimeEnabled } = useIsFeatureEnabled(['realtime:all'])const { data: jsonSchema } = useProjectJsonSchemaQuery({ projectRef: ref })const { paths, definitions } = jsonSchema || {}- const endpoint =- customDomainData?.customDomain?.status === 'active'- ? `https://${customDomainData.customDomain.hostname}`- : apiEndpoint+ const { data: endpoint = '' } = useProjectApiUrl({ projectRef: ref })const keyToShow = !!showApiKey ? showApiKey : 'SUPABASE_KEY'const resourcePaths = paths?.[`/${resourceId}`]diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsxindex 40f8fd83fa0..3da5c1a0ada 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx@@ -9,29 +9,30 @@ import { useEffect, useMemo, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {+ Alert_Shadcn_,AlertDescription_Shadcn_,AlertTitle_Shadcn_,- Alert_Shadcn_,Button,Card,CardContent,CardFooter,+ cn,CodeBlock,+ copyToClipboard,CriticalIcon,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Form_Shadcn_,Switch,Tabs_Shadcn_ as Tabs,TabsContent_Shadcn_ as TabsContent,TabsList_Shadcn_ as TabsList,TabsTrigger_Shadcn_ as TabsTrigger,- cn,- copyToClipboard,} from 'ui'import { GenericSkeletonLoader } from 'ui-patterns'import { Input } from 'ui-patterns/DataInputs/Input'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { PageContainer } from 'ui-patterns/PageContainer'import {PageSection,@@ -40,7 +41,6 @@ import {PageSectionSummary,PageSectionTitle,} from 'ui-patterns/PageSection'-import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'import CommandRender from '../CommandRender'@@ -48,8 +48,7 @@ import { INVOCATION_TABS } from './EdgeFunctionDetails.constants'import { generateCLICommands } from './EdgeFunctionDetails.utils'import AlertError from '@/components/ui/AlertError'import { getKeys, useAPIKeysQuery } from '@/data/api-keys/api-keys-query'-import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'-import { useCustomDomainsQuery } from '@/data/custom-domains/custom-domains-query'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'import { useEdgeFunctionDeleteMutation } from '@/data/edge-functions/edge-functions-delete-mutation'import { useEdgeFunctionUpdateMutation } from '@/data/edge-functions/edge-functions-update-mutation'@@ -86,24 +85,18 @@ export const EdgeFunctionDetails = () => {const canUpdateEdgeFunction = IS_PLATFORM && canUpdateEdgeFunctionPermissionconst { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')- const { data: apiKeys } = useAPIKeysQuery(- {- projectRef,- },- { enabled: canReadAPIKeys }- )- const { data: settings } = useProjectSettingsV2Query({ projectRef })- const { data: customDomainData } = useCustomDomainsQuery({ projectRef })+ const { data: apiKeys } = useAPIKeysQuery({ projectRef }, { enabled: canReadAPIKeys })+const {data: selectedFunction,error,isPending: isLoading,isError,isSuccess,- } = useEdgeFunctionQuery({- projectRef,- slug: functionSlug,- })+ } = useEdgeFunctionQuery({ projectRef, slug: functionSlug })++ const { data: endpoint } = useProjectApiUrl({ projectRef })+ const functionUrl = `${endpoint}/functions/v1/${selectedFunction?.slug}`const { mutate: updateEdgeFunction, isPending: isUpdating } = useEdgeFunctionUpdateMutation()const { mutate: deleteEdgeFunction, isPending: isDeleting } = useEdgeFunctionDeleteMutation({@@ -121,12 +114,6 @@ export const EdgeFunctionDetails = () => {const { anonKey, publishableKey } = getKeys(apiKeys)const apiKey = publishableKey?.api_key ?? anonKey?.api_key ?? '[YOUR ANON KEY]'- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint ?? ''- const functionUrl =- customDomainData?.customDomain?.status === 'active'- ? `https://${customDomainData.customDomain.hostname}/functions/v1/${selectedFunction?.slug}`- : `${protocol}://${endpoint}/functions/v1/${selectedFunction?.slug}`const hasImportMap = useMemo(() => selectedFunction?.import_map || selectedFunction?.import_map_path,[selectedFunction]diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionsListItem.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionsListItem.tsxindex 359948879a7..910d4f41948 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionsListItem.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionsListItem.tsx@@ -4,11 +4,10 @@ import dayjs from 'dayjs'import { Check, Copy } from 'lucide-react'import { useRouter } from 'next/router'import { useState } from 'react'-import { TableCell, TableRow, copyToClipboard } from 'ui'+import { copyToClipboard, TableCell, TableRow } from 'ui'import { TimestampInfo } from 'ui-patterns'-import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'-import { useCustomDomainsQuery } from '@/data/custom-domains/custom-domains-query'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import type { EdgeFunctionsResponse } from '@/data/edge-functions/edge-functions-query'import { createNavigationHandler } from '@/lib/navigation'@@ -21,15 +20,8 @@ export const EdgeFunctionsListItem = ({ function: item }: EdgeFunctionsListItemPconst { ref } = useParams()const [isCopied, setIsCopied] = useState(false)- const { data: settings } = useProjectSettingsV2Query({ projectRef: ref })- const { data: customDomainData } = useCustomDomainsQuery({ projectRef: ref })-- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint ?? ''- const functionUrl =- customDomainData?.customDomain?.status === 'active'- ? `https://${customDomainData.customDomain.hostname}/functions/v1/${item.slug}`- : `${protocol}://${endpoint}/functions/v1/${item.slug}`+ const { data: endpoint } = useProjectApiUrl({ projectRef: ref })+ const functionUrl = `${endpoint}/functions/v1/${item.slug}`const handleNavigation = createNavigationHandler(`/project/${ref}/functions/${item.slug}${IS_PLATFORM ? '' : `/details`}`,diff --git a/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx b/apps/studio/components/interfaces/Functions/TerminalInstructions.tsxindex 79e77e112b0..f4d82bb4c02 100644--- a/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx+++ b/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx@@ -1,24 +1,23 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { ExternalLink, Maximize2, Minimize2, Terminal } from 'lucide-react'-import { useRouter } from 'next/router'-import { ComponentPropsWithoutRef, ElementRef, forwardRef, useState } from 'react'-import { useParams } from 'common'import CommandRender from 'components/interfaces/Functions/CommandRender'import { DocsButton } from 'components/ui/DocsButton'import { useAccessTokensQuery } from 'data/access-tokens/access-tokens-query'import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'-import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { DOCS_URL } from 'lib/constants'+import { ExternalLink, Maximize2, Minimize2, Terminal } from 'lucide-react'+import { useRouter } from 'next/router'+import { ComponentPropsWithoutRef, ElementRef, forwardRef, useState } from 'react'import {Button,+ Collapsible_Shadcn_,CollapsibleContent_Shadcn_,CollapsibleTrigger_Shadcn_,- Collapsible_Shadcn_,} from 'ui'+import type { Commands } from './Functions.types'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'interface TerminalInstructionsProps extends ComponentPropsWithoutRef<typeof Collapsible_Shadcn_> {closable?: boolean@@ -36,19 +35,13 @@ export const TerminalInstructions = forwardRef<const { data: tokens } = useAccessTokensQuery()const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')const { data: apiKeys } = useAPIKeysQuery({ projectRef }, { enabled: canReadAPIKeys })- const { data: settings } = useProjectSettingsV2Query({ projectRef })- const { data: customDomainData } = useCustomDomainsQuery({ projectRef })++ const { data: endpoint } = useProjectApiUrl({ projectRef })+ const functionsEndpoint = `${endpoint}/functions/v1`const { anonKey, publishableKey } = getKeys(apiKeys)const apiKey = publishableKey?.api_key ?? anonKey?.api_key ?? '[YOUR ANON KEY]'- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint ?? ''- const functionsEndpoint =- customDomainData?.customDomain?.status === 'active'- ? `https://${customDomainData.customDomain.hostname}/functions/v1`- : `${protocol}://${endpoint}/functions/v1`-// get the .co or .net TLD from the restUrlconst restUrl = `https://${endpoint}`const restUrlTld = !!endpoint ? new URL(restUrl).hostname.split('.').pop() : 'co'diff --git a/apps/studio/components/interfaces/HomeNew/ProjectConnectionHoverCard.tsx b/apps/studio/components/interfaces/HomeNew/ProjectConnectionHoverCard.tsxindex 91aa79824e5..82c8e4bdf8f 100644--- a/apps/studio/components/interfaces/HomeNew/ProjectConnectionHoverCard.tsx+++ b/apps/studio/components/interfaces/HomeNew/ProjectConnectionHoverCard.tsx@@ -2,7 +2,6 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'import { Label } from '@ui/components/shadcn/ui/label'import { getConnectionStrings } from 'components/interfaces/Connect/DatabaseSettings.utils'import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { pluckObjectFields } from 'lib/helpers'@@ -10,8 +9,11 @@ import { Plug } from 'lucide-react'import { parseAsBoolean, useQueryState } from 'nuqs'import { useMemo, useState, type ReactNode } from 'react'import { Button, HoverCard, HoverCardContent, HoverCardTrigger } from 'ui'+import { ShimmeringLoader } from 'ui-patterns'import { Input } from 'ui-patterns/DataInputs/Input'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'+const DB_FIELDS = ['db_host', 'db_name', 'db_port', 'db_user'] as constconst EMPTY_CONNECTION_INFO = {db_user: '',@@ -37,32 +39,23 @@ export const ProjectConnectionHoverCard = ({ projectRef }: ProjectConnectionHoveconst [open, setOpen] = useState(false)const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))- const { data: settings, isPending: isLoadingSettings } = useProjectSettingsV2Query(- { projectRef },- { enabled: !!projectRef }- )-- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint- const projectUrl = endpoint ? `${protocol}://${endpoint}` : undefined-const { isLoading: isLoadingPermissions, can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.READ,'service_api_keys')+ const { data: projectUrl, isPending: isLoadingApiUrl } = useProjectApiUrl({ projectRef })+const { data: apiKeys, isLoading: isLoadingKeys } = useAPIKeysQuery({ projectRef },{ enabled: open && canReadAPIKeys })-const { publishableKey } = canReadAPIKeys ? getKeys(apiKeys) : { publishableKey: null }const { data: databases, isLoading: isLoadingDatabases } = useReadReplicasQuery({ projectRef },{ enabled: open && !!projectRef })-const primaryDatabase = databases?.find((db) => db.identifier === projectRef)const directConnectionString = useMemo(() => {@@ -81,9 +74,6 @@ export const ProjectConnectionHoverCard = ({ projectRef }: ProjectConnectionHove}).direct.uri}, [primaryDatabase, projectRef])- const projectUrlLabel =- projectUrl ?? (isLoadingSettings ? 'Loading project URL...' : 'Project URL unavailable')-return (<HoverCard openDelay={250} closeDelay={100} open={open} onOpenChange={setOpen}><HoverCardTrigger asChild>@@ -91,9 +81,13 @@ export const ProjectConnectionHoverCard = ({ projectRef }: ProjectConnectionHove<div className=" transition w-8 h-8 rounded-md bg-surface-75 group-hover:bg-muted border flex items-center justify-center"><Plug strokeWidth={1.5} size={16} className="text-foreground-light rotate-90" /></div>- <span className="transition text-foreground-light group-hover:text-foreground underline decoration-dotted decoration-foreground-muted underline-offset-4 max-w-[320px] text-left">- {projectUrlLabel}- </span>+ {isLoadingApiUrl ? (+ <ShimmeringLoader className="w-32" />+ ) : (+ <span className="transition text-foreground-light group-hover:text-foreground underline decoration-dotted decoration-foreground-muted underline-offset-4 max-w-[320px] text-left">+ {projectUrl ?? 'Project URL unavailable'}+ </span>+ )}</button></HoverCardTrigger><HoverCardContent side="bottom" align="start" className="w-[420px] p-0">diff --git a/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.test.ts b/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.test.tsindex 838bc0f7233..f39388b27dc 100644--- a/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.test.ts+++ b/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.test.ts@@ -1,28 +1,10 @@import { describe, expect, it } from 'vitest'-import { buildEntityMaps, getApiEndpoint, getProjectApiEndpoint } from './DataApi.utils'-import type { ProjectSettings } from '@/data/config/project-settings-v2-query'-import type {- CustomDomainResponse,- CustomDomainsData,-} from '@/data/custom-domains/custom-domains-query'+import { buildEntityMaps, getApiEndpoint } from './DataApi.utils'import type { ProjectJsonSchemaPaths } from '@/data/docs/project-json-schema-query'import type { LoadBalancer } from '@/data/read-replicas/load-balancers-query'import type { Database } from '@/data/read-replicas/replicas-query'-const makeCustomDomainData = (hostname: string): CustomDomainsData => ({- customDomain: {- id: '',- ssl: {} as CustomDomainResponse['ssl'],- hostname,- status: 'active',- created_at: '',- custom_metadata: null,- custom_origin_server: '',- },- status: '5_services_reconfigured',-})-const makeDatabase = (identifier: string,restUrl: string@@ -30,71 +12,13 @@ const makeDatabase = (const makeLoadBalancer = (endpoint: string): Pick<LoadBalancer, 'endpoint'> => ({ endpoint })-describe('getProjectApiEndpoint', () => {- it('returns custom domain URL when custom domain is active', () => {- expect(- getProjectApiEndpoint({- settings: undefined,- customDomainData: makeCustomDomainData('api.example.com'),- })- ).toBe('https://api.example.com')- })-- it('returns settings-based URL when no custom domain', () => {- expect(- getProjectApiEndpoint({- settings: {- app_config: { protocol: 'https', endpoint: 'abc.supabase.co' },- } as ProjectSettings,- customDomainData: undefined,- })- ).toBe('https://abc.supabase.co')- })-- it('respects protocol from settings', () => {- expect(- getProjectApiEndpoint({- settings: {- app_config: { protocol: 'http', endpoint: 'localhost:54321' },- } as ProjectSettings,- customDomainData: undefined,- })- ).toBe('http://localhost:54321')- })-- it('returns placeholder when settings are undefined', () => {- expect(- getProjectApiEndpoint({- settings: undefined,- customDomainData: undefined,- })- ).toBe('https://-')- })-- it('ignores inactive custom domain', () => {- const inactiveCustomDomain: CustomDomainsData = {- customDomain: null,- status: '0_no_hostname_configured',- }-- expect(- getProjectApiEndpoint({- settings: {- app_config: { protocol: 'https', endpoint: 'abc.supabase.co' },- } as ProjectSettings,- customDomainData: inactiveCustomDomain,- })- ).toBe('https://abc.supabase.co')- })-})-describe('getApiEndpoint', () => {it('returns custom domain URL when custom domain is active and primary database is selected', () => {expect(getApiEndpoint({selectedDatabaseId: 'project-ref',projectRef: 'project-ref',- customDomainData: makeCustomDomainData('api.example.com'),+ resolvedEndpoint: 'https://api.example.com',loadBalancers: undefined,selectedDatabase: makeDatabase('project-ref',@@ -109,7 +33,7 @@ describe('getApiEndpoint', () => {getApiEndpoint({selectedDatabaseId: 'replica-1',projectRef: 'project-ref',- customDomainData: makeCustomDomainData('api.example.com'),+ resolvedEndpoint: 'https://api.example.com',loadBalancers: undefined,selectedDatabase: makeDatabase('replica-1',@@ -124,7 +48,7 @@ describe('getApiEndpoint', () => {getApiEndpoint({selectedDatabaseId: 'load-balancer',projectRef: 'project-ref',- customDomainData: undefined,+ resolvedEndpoint: 'https://project-ref.supabase.co',loadBalancers: [makeLoadBalancer('https://lb.supabase.co') as LoadBalancer],selectedDatabase: undefined,})@@ -136,46 +60,26 @@ describe('getApiEndpoint', () => {getApiEndpoint({selectedDatabaseId: 'load-balancer',projectRef: 'project-ref',- customDomainData: undefined,+ resolvedEndpoint: 'https://project-ref.supabase.co',loadBalancers: undefined,selectedDatabase: undefined,})).toBe('')})- it('returns database restUrl for a normal database selection', () => {+ it('returns database restUrl for a replica database selection', () => {expect(getApiEndpoint({- selectedDatabaseId: 'project-ref',+ selectedDatabaseId: 'replica-2',projectRef: 'project-ref',- customDomainData: undefined,+ resolvedEndpoint: 'https://project-ref.supabase.co',loadBalancers: undefined,selectedDatabase: makeDatabase(- 'project-ref',- 'https://project-ref.supabase.co/rest/v1'- ) as Database,- })- ).toBe('https://project-ref.supabase.co/rest/v1')- })-- it('ignores custom domain when it is not active', () => {- const inactiveCustomDomain: CustomDomainsData = {- customDomain: null,- status: '0_no_hostname_configured',- }-- expect(- getApiEndpoint({- selectedDatabaseId: 'project-ref',- projectRef: 'project-ref',- customDomainData: inactiveCustomDomain,- loadBalancers: undefined,- selectedDatabase: makeDatabase(- 'project-ref',- 'https://project-ref.supabase.co/rest/v1'+ 'replica-2',+ 'https://replica-2.supabase.co/rest/v1') as Database,})- ).toBe('https://project-ref.supabase.co/rest/v1')+ ).toBe('https://replica-2.supabase.co/rest/v1')})})diff --git a/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.ts b/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.tsindex 61990329ea5..da0fd5d6be1 100644--- a/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.ts+++ b/apps/studio/components/interfaces/Integrations/DataApi/DataApi.utils.ts@@ -1,29 +1,8 @@-import type { ProjectSettings } from '@/data/config/project-settings-v2-query'-import type { CustomDomainsData } from '@/data/custom-domains/custom-domains-query'import type { ProjectJsonSchemaPaths } from '@/data/docs/project-json-schema-query'import type { LoadBalancer } from '@/data/read-replicas/load-balancers-query'import type { Database } from '@/data/read-replicas/replicas-query'import { snakeToCamel } from '@/lib/helpers'-/**- * Resolves the primary project API endpoint, respecting custom domains.- */-export function getProjectApiEndpoint({- settings,- customDomainData,-}: {- settings: ProjectSettings | undefined- customDomainData: CustomDomainsData | undefined-}): string {- if (customDomainData?.customDomain?.status === 'active') {- return `https://${customDomainData.customDomain.hostname}`- }-- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint- return `${protocol}://${endpoint ?? '-'}`-}-/*** Resolves the API endpoint URL based on the selected database, custom domain* status, and load balancer configuration.@@ -31,21 +10,20 @@ export function getProjectApiEndpoint({export function getApiEndpoint({selectedDatabaseId,projectRef,- customDomainData,+ resolvedEndpoint,loadBalancers,selectedDatabase,}: {selectedDatabaseId: string | undefinedprojectRef: string | undefined- customDomainData: CustomDomainsData | undefined+ resolvedEndpoint: string | undefinedloadBalancers: Array<LoadBalancer> | undefinedselectedDatabase: Database | undefined}): string {- const isCustomDomainActive = customDomainData?.customDomain?.status === 'active'const loadBalancerSelected = selectedDatabaseId === 'load-balancer'- if (isCustomDomainActive && selectedDatabaseId === projectRef) {- return `https://${customDomainData.customDomain.hostname}`+ if (selectedDatabaseId === projectRef && !!resolvedEndpoint) {+ return resolvedEndpoint}if (loadBalancerSelected) {diff --git a/apps/studio/components/interfaces/Integrations/DataApi/DocView.tsx b/apps/studio/components/interfaces/Integrations/DataApi/DocView.tsxindex 7316245f00e..8950db2a349 100644--- a/apps/studio/components/interfaces/Integrations/DataApi/DocView.tsx+++ b/apps/studio/components/interfaces/Integrations/DataApi/DocView.tsx@@ -4,14 +4,10 @@ import type { ShowApiKey } from '../../Docs/Docs.types'import { GeneralContent } from '@/components/interfaces/Docs/GeneralContent'import { ResourceContent } from '@/components/interfaces/Docs/ResourceContent'import { RpcContent } from '@/components/interfaces/Docs/RpcContent'-import {- buildEntityMaps,- getProjectApiEndpoint,-} from '@/components/interfaces/Integrations/DataApi/DataApi.utils'+import { buildEntityMaps } from '@/components/interfaces/Integrations/DataApi/DataApi.utils'import { DocViewError } from '@/components/interfaces/Integrations/DataApi/DocViewError'import { DocViewLoading } from '@/components/interfaces/Integrations/DataApi/DocViewLoading'import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'-import { useCustomDomainsQuery } from '@/data/custom-domains/custom-domains-query'import { useProjectJsonSchemaQuery } from '@/data/docs/project-json-schema-query'interface DocViewProps {@@ -29,9 +25,6 @@ export const DocView = ({ selectedLang, selectedApiKey }: DocViewProps) => {isPending: isLoading,refetch,} = useProjectJsonSchemaQuery({ projectRef })- const { data: customDomainData } = useCustomDomainsQuery({ projectRef })-- const endpoint = getProjectApiEndpoint({ settings, customDomainData })const { paths } = jsonSchema || {}const PAGE_KEY = resource || rpc || page || 'index'@@ -51,7 +44,6 @@ export const DocView = ({ selectedLang, selectedApiKey }: DocViewProps) => {<div className="flex-1 flex flex-col">{resource ? (<ResourceContent- apiEndpoint={endpoint}selectedLang={selectedLang}resourceId={resource}resources={resources}diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsxindex 55b2a4054c4..6ab7cd4cfb6 100644--- a/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsx+++ b/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsx@@ -1,13 +1,11 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { useState } from 'react'-import { Button, SidePanel } from 'ui'-import { useParams } from 'common'import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'-import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'+import { useState } from 'react'import { useAppStateSnapshot } from 'state/app-state'+import { Button, SidePanel } from 'ui'+import { Bucket } from './Content/Bucket'import { EdgeFunction } from './Content/EdgeFunction'import { EdgeFunctions } from './Content/EdgeFunctions'@@ -22,6 +20,7 @@ import { UserManagement } from './Content/UserManagement'import { FirstLevelNav } from './FirstLevelNav'import LanguageSelector from './LanguageSelector'import { SecondLevelNav } from './SecondLevelNav'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'/*** [Joshen] Reminder: when we choose to release this as a main feature@@ -50,11 +49,8 @@ export const ProjectAPIDocs = () => {{ projectRef: ref },{ enabled: snap.showProjectApiDocs && canReadAPIKeys })- const { data: settings } = useProjectSettingsV2Query(- { projectRef: ref },- { enabled: snap.showProjectApiDocs }- )- const { data: customDomainData } = useCustomDomainsQuery(++ const { data: endpoint } = useProjectApiUrl({ projectRef: ref },{ enabled: snap.showProjectApiDocs })@@ -63,12 +59,6 @@ export const ProjectAPIDocs = () => {const apikey = showKeys? anonKey?.api_key ?? 'SUPABASE_CLIENT_ANON_KEY': 'SUPABASE_CLIENT_ANON_KEY'- const protocol = settings?.app_config?.protocol ?? 'https'- const hostEndpoint = settings?.app_config?.endpoint- const endpoint =- customDomainData?.customDomain?.status === 'active'- ? `https://${customDomainData.customDomain?.hostname}`- : `${protocol}://${hostEndpoint ?? ''}`return (<SidePaneldiff --git a/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsx b/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsxindex 698832d1afe..d70ff35b079 100644--- a/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsx+++ b/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsx@@ -15,14 +15,14 @@ import {import { Input } from 'ui-patterns/DataInputs/Input'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { getApiEndpoint } from '@/components/interfaces/Integrations/DataApi/DataApi.utils'import { DatabaseSelector } from '@/components/ui/DatabaseSelector'-import { useCustomDomainsQuery } from '@/data/custom-domains/custom-domains-query'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { useLoadBalancersQuery } from '@/data/read-replicas/load-balancers-query'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'-import { getApiEndpoint } from '@/components/interfaces/Integrations/DataApi/DataApi.utils'export const DataApiProjectUrlCard = () => {const { isPending: isLoading } = useSelectedProjectQuery()@@ -31,7 +31,7 @@ export const DataApiProjectUrlCard = () => {const [querySource, setQuerySource] = useQueryState('source', parseAsString)- const { data: customDomainData } = useCustomDomainsQuery({ projectRef })+ const { data: resolvedEndpoint } = useProjectApiUrl({ projectRef })const {data: databases,isError,@@ -55,7 +55,7 @@ export const DataApiProjectUrlCard = () => {const endpoint = getApiEndpoint({selectedDatabaseId: state.selectedDatabaseId,projectRef,- customDomainData,+ resolvedEndpoint,loadBalancers,selectedDatabase,})diff --git a/apps/studio/components/interfaces/Settings/Addons/Addons.tsx b/apps/studio/components/interfaces/Settings/Addons/Addons.tsxindex 68dca08580a..66bcbd2b07a 100644--- a/apps/studio/components/interfaces/Settings/Addons/Addons.tsx+++ b/apps/studio/components/interfaces/Settings/Addons/Addons.tsx@@ -418,7 +418,9 @@ export const Addons = () => {!isProjectActive || projectUpdateDisabled || !(canUpdateIPv4 || ipv4)}>- Change dedicated IPv4 address+ {!!ipv4+ ? 'Toggle dedicated IPv4 address'+ : 'Enable dedicated IPv4 address'}</Button></ProjectUpdateDisabledTooltip></div>@@ -528,7 +530,7 @@ export const Addons = () => {},}}>- Change point in time recovery+ Enable point in time recovery</ButtonTooltip>) : (<ProjectUpdateDisabledTooltip@@ -546,7 +548,7 @@ export const Addons = () => {hasHipaaAddon}>- Change point in time recovery+ {!!pitr ? 'Change recovery duration' : 'Enable point in time recovery'}</Button></ProjectUpdateDisabledTooltip>)}@@ -608,19 +610,28 @@ export const Addons = () => {? 'Custom domain is enabled': 'Custom domain is not enabled'}</p>- <ProjectUpdateDisabledTooltip- projectUpdateDisabled={projectUpdateDisabled}- projectNotActive={!isProjectActive}- >- <Button- type="default"- className="mt-2 pointer-events-auto"- onClick={() => setPanel('customDomain')}- disabled={!isProjectActive || projectUpdateDisabled}+ <div className="mt-2 flex items-center gap-x-2">+ <ProjectUpdateDisabledTooltip+ projectUpdateDisabled={projectUpdateDisabled}+ projectNotActive={!isProjectActive}>- Change custom domain- </Button>- </ProjectUpdateDisabledTooltip>+ <Button+ type="default"+ className="pointer-events-auto"+ onClick={() => setPanel('customDomain')}+ disabled={!isProjectActive || projectUpdateDisabled}+ >+ {!!customDomain ? 'Toggle custom domain' : 'Enable custom domain'}+ </Button>+ </ProjectUpdateDisabledTooltip>+ {!!customDomain && (+ <Button asChild type="outline">+ <Link href={`/project/${projectRef}/settings/general#custom-domains`}>+ Edit custom domain+ </Link>+ </Button>+ )}+ </div></div></div></ScaffoldSectionContent>diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsxindex 7ae49487102..0b35de91316 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx@@ -1,6 +1,3 @@-import { useState } from 'react'-import { toast } from 'sonner'-import { DocsButton } from 'components/ui/DocsButton'import Panel from 'components/ui/Panel'import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'@@ -9,16 +6,18 @@ import { useCustomDomainActivateMutation } from 'data/custom-domains/custom-domaimport { useCustomDomainDeleteMutation } from 'data/custom-domains/custom-domains-delete-mutation'import type { CustomDomainResponse } from 'data/custom-domains/custom-domains-query'import { DOCS_URL } from 'lib/constants'+import { useState } from 'react'+import { toast } from 'sonner'import { Button } from 'ui'-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { Admonition } from 'ui-patterns/admonition'+import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'export type CustomDomainActivateProps = {projectRef?: stringcustomDomain: CustomDomainResponse}-const CustomDomainActivate = ({ projectRef, customDomain }: CustomDomainActivateProps) => {+export const CustomDomainActivate = ({ projectRef, customDomain }: CustomDomainActivateProps) => {const [isActivateConfirmModalVisible, setIsActivateConfirmModalVisible] = useState(false)const { data: settings } = useProjectSettingsV2Query({ projectRef })@@ -134,5 +133,3 @@ const CustomDomainActivate = ({ projectRef, customDomain }: CustomDomainActivate</>)}--export default CustomDomainActivatediff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsxindex bf3c82fc730..5edd3a16d38 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx@@ -1,5 +1,3 @@-import { AlertCircle } from 'lucide-react'-import { SupportCategories } from '@supabase/shared-types/out/constants'import { useFlag, useParams } from 'common'import { SupportLink } from 'components/interfaces/Support/SupportLink'@@ -11,6 +9,7 @@ import {} from 'data/custom-domains/custom-domains-query'import { useProjectAddonsQuery } from 'data/subscriptions/project-addons-query'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'+import { AlertCircle } from 'lucide-react'import { Card, CardContent } from 'ui'import {PageSection,@@ -20,11 +19,12 @@ import {PageSectionSummary,PageSectionTitle,} from 'ui-patterns/PageSection'-import CustomDomainActivate from './CustomDomainActivate'-import CustomDomainDelete from './CustomDomainDelete'-import CustomDomainVerify from './CustomDomainVerify'-import CustomDomainsConfigureHostname from './CustomDomainsConfigureHostname'-import CustomDomainsShimmerLoader from './CustomDomainsShimmerLoader'++import { CustomDomainActivate } from './CustomDomainActivate'+import { CustomDomainDelete } from './CustomDomainDelete'+import { CustomDomainsConfigureHostname } from './CustomDomainsConfigureHostname'+import { CustomDomainsShimmerLoader } from './CustomDomainsShimmerLoader'+import { CustomDomainVerify } from './CustomDomainVerify'export const CustomDomainConfig = () => {const { ref } = useParams()diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsxindex c0e128e9fd4..da82b6dc828 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsx@@ -1,12 +1,11 @@-import { useState } from 'react'-import { toast } from 'sonner'-import { DocsButton } from 'components/ui/DocsButton'import Panel from 'components/ui/Panel'import { useCustomDomainDeleteMutation } from 'data/custom-domains/custom-domains-delete-mutation'import type { CustomDomainResponse } from 'data/custom-domains/custom-domains-query'import { DOCS_URL } from 'lib/constants'import { Trash } from 'lucide-react'+import { useState } from 'react'+import { toast } from 'sonner'import { Button } from 'ui'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'@@ -15,7 +14,7 @@ export type CustomDomainDeleteProps = {customDomain: CustomDomainResponse}-const CustomDomainDelete = ({ projectRef, customDomain }: CustomDomainDeleteProps) => {+export const CustomDomainDelete = ({ projectRef, customDomain }: CustomDomainDeleteProps) => {const [isDeleteConfirmModalVisible, setIsDeleteConfirmModalVisible] = useState(false)const { mutate: deleteCustomDomain, isPending: isDeletingCustomDomain } =useCustomDomainDeleteMutation({@@ -85,5 +84,3 @@ const CustomDomainDelete = ({ projectRef, customDomain }: CustomDomainDeleteProp</>)}--export default CustomDomainDeletediff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsxindex 943ac726035..0303780c275 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx@@ -1,6 +1,3 @@-import { AlertCircle, RefreshCw } from 'lucide-react'-import { toast } from 'sonner'-import { useParams } from 'common'import { DocsButton } from 'components/ui/DocsButton'import { InlineLink } from 'components/ui/InlineLink'@@ -10,19 +7,22 @@ import { useCustomDomainDeleteMutation } from 'data/custom-domains/custom-domainimport { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'import { useCustomDomainReverifyQuery } from 'data/custom-domains/custom-domains-reverify-query'import { DOCS_URL } from 'lib/constants'+import { AlertCircle, RefreshCw } from 'lucide-react'import { useEffect } from 'react'+import { toast } from 'sonner'import {+ Alert_Shadcn_,AlertDescription_Shadcn_,AlertTitle_Shadcn_,- Alert_Shadcn_,Button,WarningIcon,} from 'ui'import { Admonition } from 'ui-patterns/admonition'+import DNSRecord from './DNSRecord'import { DNSTableHeaders } from './DNSTableHeaders'-const CustomDomainVerify = () => {+export const CustomDomainVerify = () => {const { ref: projectRef } = useParams()const { data: settings } = useProjectSettingsV2Query({ projectRef })@@ -208,5 +208,3 @@ const CustomDomainVerify = () => {</>)}--export default CustomDomainVerifydiff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsxindex cd0ad8a982d..5555efc79f6 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx@@ -1,8 +1,5 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'-import { useForm } from 'react-hook-form'-import { z } from 'zod'-import { useParams } from 'common'import { DocsButton } from 'components/ui/DocsButton'import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'@@ -11,6 +8,7 @@ import { useCustomDomainCreateMutation } from 'data/custom-domains/custom-domainimport { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { DOCS_URL } from 'lib/constants'+import { useForm } from 'react-hook-form'import {Button,Card,@@ -18,19 +16,19 @@ import {CardFooter,CardHeader,CardTitle,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- FormMessage_Shadcn_,- Form_Shadcn_,Input_Shadcn_,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import { z } from 'zod'const schema = z.object({domain: z.string().trim().min(1, 'A value for your custom domain is required'),})-const CustomDomainsConfigureHostname = () => {+export const CustomDomainsConfigureHostname = () => {const { ref } = useParams()const { data: project } = useSelectedProjectQuery()@@ -102,7 +100,6 @@ const CustomDomainsConfigureHostname = () => {autoComplete="off"/></FormControl_Shadcn_>- <FormMessage_Shadcn_ /></FormItemLayout>)}/>@@ -154,5 +151,3 @@ const CustomDomainsConfigureHostname = () => {</Form_Shadcn_>)}--export default CustomDomainsConfigureHostnamediff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsShimmerLoader.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsShimmerLoader.tsxindex c4f5af2aeb3..c942e8e48f9 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsShimmerLoader.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsShimmerLoader.tsx@@ -1,4 +1,4 @@-const CustomDomainsShimmerLoader = () => {+export const CustomDomainsShimmerLoader = () => {return (<div className="grid grid-cols-12 gap-6 px-8 py-8"><div className="col-span-12 lg:col-span-5">@@ -11,5 +11,3 @@ const CustomDomainsShimmerLoader = () => {</div>)}--export default CustomDomainsShimmerLoaderdiff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/useCopyUrl.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/useCopyUrl.tsxindex ed94cfbddcc..c6c70036a01 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/useCopyUrl.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/useCopyUrl.tsx@@ -1,22 +1,18 @@import { useCallback } from 'react'import { toast } from 'sonner'--import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'-import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'import { useStorageExplorerStateSnapshot } from 'state/storage-explorer'import { copyToClipboard } from 'ui'+import { URL_EXPIRY_DURATION } from '../Storage.constants'import { getPathAlongOpenedFolders } from './StorageExplorer.utils'import { fetchFileUrl } from './useFetchFileUrlQuery'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'export const useCopyUrl = () => {const { projectRef, selectedBucket, openedFolders } = useStorageExplorerStateSnapshot()- const { data: customDomainData } = useCustomDomainsQuery({ projectRef: projectRef })- const { data: settings } = useProjectSettingsV2Query({ projectRef: projectRef })- const protocol = settings?.app_config?.protocol ?? 'https'- const endpoint = settings?.app_config?.endpoint- const apiUrl = `${protocol}://${endpoint ?? '-'}`+ const { hostEndpoint, customEndpoint } = useProjectApiUrl({ projectRef })+ const isCustomDomainActive = !!customEndpointconst getFileUrl = useCallback((fileName: string, expiresIn?: URL_EXPIRY_DURATION) => {@@ -37,8 +33,8 @@ export const useCopyUrl = () => {const onCopyUrl = useCallback((name: string, expiresIn?: URL_EXPIRY_DURATION) => {const formattedUrl = getFileUrl(name, expiresIn).then((url) => {- return customDomainData?.customDomain?.status === 'active'- ? url.replace(apiUrl, `https://${customDomainData.customDomain.hostname}`)+ return isCustomDomainActive && hostEndpoint+ ? url.replace(hostEndpoint, customEndpoint): url})@@ -46,12 +42,7 @@ export const useCopyUrl = () => {toast.success(`Copied URL for ${name} to clipboard.`)})},- [- apiUrl,- customDomainData?.customDomain?.hostname,- customDomainData?.customDomain?.status,- getFileUrl,- ]+ [customEndpoint, getFileUrl, hostEndpoint, isCustomDomainActive])return { onCopyUrl }diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ApiAccessToggle.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ApiAccessToggle.tsxindex 5083475f832..38665560712 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ApiAccessToggle.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ApiAccessToggle.tsx@@ -1,3 +1,8 @@+import { useLoadBalancersQuery } from 'data/read-replicas/load-balancers-query'+import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'+import { useIsSchemaExposed } from 'hooks/misc/useIsSchemaExposed'+import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { Settings } from 'lucide-react'import Link from 'next/link'import {@@ -10,7 +15,19 @@ import {type SetStateAction,} from 'react'import { usePreviousDistinct } from 'react-use'+import { Button, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_, Switch } from 'ui'+import { Admonition } from 'ui-patterns'+import { Input } from 'ui-patterns/DataInputs/Input'+import { InfoTooltip } from 'ui-patterns/info-tooltip'+import {+ MultiSelector,+ MultiSelectorContent,+ MultiSelectorItem,+ MultiSelectorList,+ MultiSelectorTrigger,+} from 'ui-patterns/multi-select'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { useTableApiAccessQuery } from '@/data/privileges/table-api-access-query'import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'import {@@ -25,23 +42,6 @@ import {} from '@/lib/data-api-types'import type { DeepReadonly, Prettify } from '@/lib/type-helpers'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'-import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'-import { useLoadBalancersQuery } from 'data/read-replicas/load-balancers-query'-import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'-import { useIsSchemaExposed } from 'hooks/misc/useIsSchemaExposed'-import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { Button, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_, Switch } from 'ui'-import { Admonition } from 'ui-patterns'-import { Input } from 'ui-patterns/DataInputs/Input'-import { InfoTooltip } from 'ui-patterns/info-tooltip'-import {- MultiSelector,- MultiSelectorContent,- MultiSelectorItem,- MultiSelectorList,- MultiSelectorTrigger,-} from 'ui-patterns/multi-select'const ROLE_LABELS: Record<ApiAccessRole, string> = {anon: 'Anonymous (anon)',@@ -390,6 +390,7 @@ export const ApiAccessToggle = ({</div></div></div>+<SchemaExposureOptionsprojectRef={projectRef}schemaName={schemaName}@@ -422,14 +423,13 @@ const SchemaExposureOptions = ({}): ReactNode => {const { selectedDatabaseId } = useDatabaseSelectorStateSnapshot()- const { data: customDomainData } = useCustomDomainsQuery({ projectRef })+ const { data: endpoint } = useProjectApiUrl({ projectRef })const { data: loadBalancers } = useLoadBalancersQuery({ projectRef })const { data: databases } = useReadReplicasQuery({ projectRef })const apiEndpoint = useMemo(() => {- const isCustomDomainActive = customDomainData?.customDomain?.status === 'active'- if (isCustomDomainActive && selectedDatabaseId === projectRef) {- return `https://${customDomainData.customDomain.hostname}`+ if (selectedDatabaseId === projectRef) {+ return endpoint}const loadBalancerSelected = selectedDatabaseId === 'load-balancer'@@ -439,14 +439,8 @@ const SchemaExposureOptions = ({const selectedDatabase = databases?.find((db) => db.identifier === selectedDatabaseId)return selectedDatabase?.restUrl- }, [- projectRef,- databases,- selectedDatabaseId,- customDomainData?.customDomain?.status,- customDomainData?.customDomain?.hostname,- loadBalancers,- ])+ }, [selectedDatabaseId, projectRef, databases, endpoint, loadBalancers])+const apiBaseUrl = useMemo(() => {if (!apiEndpoint) return undefinedreturn apiEndpoint.endsWith('/') ? apiEndpoint.slice(0, -1) : apiEndpointdiff --git a/apps/studio/data/config/project-endpoint-query.ts b/apps/studio/data/config/project-endpoint-query.tsindex 4f4445e5213..d1a7c1bd028 100644--- a/apps/studio/data/config/project-endpoint-query.ts+++ b/apps/studio/data/config/project-endpoint-query.ts@@ -1,21 +1,53 @@import { IS_PLATFORM } from 'common'-import { ProjectSettingsVariables, useProjectSettingsV2Query } from './project-settings-v2-query'+import { useProjectSettingsV2Query } from './project-settings-v2-query'+import { useCustomDomainsQuery } from '@/data/custom-domains/custom-domains-query'+import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'-export const useProjectEndpointQuery = ({ projectRef }: ProjectSettingsVariables) => {- return useProjectSettingsV2Query(- { projectRef },- {- select: (data) => {- const protocol = data?.app_config?.protocol ?? 'https'- const endpoint = data?.app_config?.endpoint- const clientEndpoint = `${IS_PLATFORM ? 'https' : protocol}://${endpoint}`- const storageEndpoint = data?.app_config?.storage_endpoint- ? `${IS_PLATFORM ? 'https' : protocol}://${data?.app_config?.storage_endpoint}`- : undefined+export const useProjectApiUrl = (+ { projectRef }: { projectRef?: string },+ { enabled = true }: { enabled?: boolean } = {}+) => {+ const { data } = useProjectAddonsQuery({ projectRef })+ const hasCustomDomainsAddon = !!data?.selected_addons.find((x) => x.type === 'custom_domain')- return { endpoint: clientEndpoint, storageEndpoint }- },- }- )+ const {+ data: customDomainData,+ error: customDomainsError,+ isPending: isLoadingCustomDomains,+ isSuccess: isSuccessCustomDomains,+ isError: isErrorCustomDomains,+ } = useCustomDomainsQuery({ projectRef }, { enabled })+ const isCustomDomainsActive = customDomainData?.customDomain?.status === 'active'+ const customEndpoint =+ hasCustomDomainsAddon && isCustomDomainsActive+ ? `https://${customDomainData?.customDomain?.hostname}`+ : undefined++ const {+ data: settings,+ error: projectSettingsError,+ isPending: isLoadingProjectSettings,+ isSuccess: isSuccessProjectSettings,+ isError: isErrorProjectSettings,+ } = useProjectSettingsV2Query({ projectRef }, { enabled })+ const protocol = settings?.app_config?.protocol ?? 'https'+ const endpoint = settings?.app_config?.endpoint++ const hostEndpoint = isSuccessProjectSettings ? `${protocol}://${endpoint}` : undefined+ const resolvedEndpoint = isCustomDomainsActive ? customEndpoint : hostEndpoint+ const storageEndpoint = settings?.app_config?.storage_endpoint+ ? `${IS_PLATFORM ? 'https' : protocol}://${settings?.app_config?.storage_endpoint}`+ : undefined++ return {+ data: resolvedEndpoint,+ customEndpoint,+ hostEndpoint,+ storageEndpoint,+ error: projectSettingsError || (hasCustomDomainsAddon ? customDomainsError : undefined),+ isPending: isLoadingProjectSettings || (hasCustomDomainsAddon && isLoadingCustomDomains),+ isSuccess: isSuccessProjectSettings && (!hasCustomDomainsAddon || isSuccessCustomDomains),+ isError: isErrorProjectSettings || (hasCustomDomainsAddon && isErrorCustomDomains),+ }}diff --git a/apps/studio/data/custom-domains/custom-domains-query.ts b/apps/studio/data/custom-domains/custom-domains-query.tsindex db502694a7a..bbfbb4eb76e 100644--- a/apps/studio/data/custom-domains/custom-domains-query.ts+++ b/apps/studio/data/custom-domains/custom-domains-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'import { useProjectAddonsQuery } from 'data/subscriptions/project-addons-query'import { IS_PLATFORM } from 'lib/constants'import type { ResponseError, UseCustomQueryOptions } from 'types'+import { customDomainKeys } from './keys'export type CustomDomainsVariables = {diff --git a/apps/studio/data/oauth-server-apps/oauth-server-apps-query.ts b/apps/studio/data/oauth-server-apps/oauth-server-apps-query.tsindex 83e1962b335..20d75cdb457 100644--- a/apps/studio/data/oauth-server-apps/oauth-server-apps-query.ts+++ b/apps/studio/data/oauth-server-apps/oauth-server-apps-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { useProjectEndpointQuery } from 'data/config/project-endpoint-query'+import { useProjectApiUrl } from 'data/config/project-endpoint-query'import { handleError } from 'data/fetchers'import { createProjectSupabaseClient } from 'lib/project-supabase-client'import type { ResponseError, UseCustomQueryOptions } from 'types'+import { useAuthConfigQuery } from '../auth/auth-config-query'import { oauthServerAppKeys } from './keys'@@ -46,9 +46,7 @@ export const useOAuthServerAppsQuery = <TData = OAuthServerAppsData>(...options}: UseCustomQueryOptions<OAuthServerAppsData, OAuthServerAppsError, TData> = {}) => {- const { data: endpointData } = useProjectEndpointQuery({ projectRef })- const clientEndpoint = endpointData?.endpoint-+ const { hostEndpoint: clientEndpoint } = useProjectApiUrl({ projectRef })const { data: authConfig, isSuccess: isSuccessConfig } = useAuthConfigQuery({ projectRef })const isOAuthServerEnabled = !!authConfig?.OAUTH_SERVER_ENABLEDdiff --git a/apps/studio/state/storage-explorer.tsx b/apps/studio/state/storage-explorer.tsxindex e4fcede7007..807585de246 100644--- a/apps/studio/state/storage-explorer.tsx+++ b/apps/studio/state/storage-explorer.tsx@@ -29,7 +29,6 @@ import {formatTime,getFilesDataTransferItems,getPathAlongFoldersToIndex,- getPathAlongOpenedFolders,sanitizeNameForDuplicateInColumn,validateFolderName,} from '@/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils'@@ -37,7 +36,7 @@ import { convertFromBytes } from '@/components/interfaces/Storage/StorageSettingimport { InlineLink } from '@/components/ui/InlineLink'import { getOrRefreshTemporaryApiKey } from '@/data/api-keys/temp-api-keys-utils'import { configKeys } from '@/data/config/keys'-import { useProjectEndpointQuery } from '@/data/config/project-endpoint-query'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import type { ProjectStorageConfigResponse } from '@/data/config/project-storage-config-query'import { getQueryClient } from '@/data/query-client'import { deleteBucketObject } from '@/data/storage/bucket-object-delete-mutation'@@ -1870,9 +1869,11 @@ export const StorageExplorerStateContextProvider = ({ children }: PropsWithChildconst [state, setState] = useState(() => createStorageExplorerState(DEFAULT_STATE_CONFIG))const stateRef = useLatest(state)- const { data: endpointData, isSuccess: isSuccessSettings } = useProjectEndpointQuery({- projectRef: project?.ref,- })+ const {+ storageEndpoint,+ hostEndpoint,+ isSuccess: isSuccessSettings,+ } = useProjectApiUrl({ projectRef: project?.ref })// [Joshen] JFYI opting with the useEffect here as the storage explorer state was being loaded// before the project details were ready, hence the store kept returning project ref as undefined@@ -1884,7 +1885,7 @@ export const StorageExplorerStateContextProvider = ({ children }: PropsWithChildconst storeAlreadyLoaded = state.projectRef === project?.refif (!isPaused && hasDataReady && !storeAlreadyLoaded && isSuccessSettings) {- const clientEndpoint = endpointData.storageEndpoint ?? endpointData.endpoint+ const clientEndpoint = storageEndpoint ?? hostEndpoint ?? ''const resumableUploadUrl = `${clientEndpoint}/storage/v1/upload/resumable`setState(createStorageExplorerState({@@ -1901,8 +1902,8 @@ export const StorageExplorerStateContextProvider = ({ children }: PropsWithChildproject?.connectionString,stateRef,isPaused,- endpointData?.endpoint,- endpointData?.storageEndpoint,+ hostEndpoint,+ storageEndpoint,isSuccessSettings,])