mirror of
https://github.com/supabase/supabase.git
synced 2026-05-08 09:50:33 -04:00
90d3b56db0
## Context Main fix is to adjust the new home page + connect dialog (and connect sheet) to render the project's custom domain if available <img width="471" height="255" alt="image" src="https://github.com/user-attachments/assets/3a208b2e-bdeb-43f5-a2e7-3495881dbaaa" /> <img width="1065" height="233" alt="image" src="https://github.com/user-attachments/assets/2a7b8f81-8c0b-4803-bf0a-fc16a2f1e0e1" /> ## Changes involved - Created a `useProjectApiUrl` hook that will return the API URL depending if custom domains is available, otherwise default to default project API URL - Refactored all the other places that were manually deriving the project's endpoint - Storage Explorer -> copy URL - Edge Functions - Integrations -> Data API + API Docs - Auth Providers -> Callback URL - Also updated the copy CTA for the addons page - Instead of just "Change xxx", make it a bit more actionable - For add ons with binary states (Custom domains, IPv4) - If not enabled yet, "Enable xxx", otherwise "Toggle xxx" - For PITR - If not enabled yet, "Enable PITR", otherwise "Change recovery duration" - Also added "Edit custom domain" CTA if enabled <img width="1144" height="518" alt="image" src="https://github.com/user-attachments/assets/4f152ea5-0cc7-412c-95e8-ad5bb37c19c3" /> ## To test - [ ] Verify that for a project with custom domain set up, all the affected UI mentioned in the above section look correct
69 lines
2.3 KiB
TypeScript
69 lines
2.3 KiB
TypeScript
import { useParams } from 'common'
|
|
|
|
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 } 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 { useProjectJsonSchemaQuery } from '@/data/docs/project-json-schema-query'
|
|
|
|
interface DocViewProps {
|
|
selectedLang: 'js' | 'bash'
|
|
selectedApiKey: ShowApiKey
|
|
}
|
|
|
|
export const DocView = ({ selectedLang, selectedApiKey }: DocViewProps) => {
|
|
const { ref: projectRef, page, resource, rpc } = useParams()
|
|
|
|
const { data: settings, error: settingsError } = useProjectSettingsV2Query({ projectRef })
|
|
const {
|
|
data: jsonSchema,
|
|
error: jsonSchemaError,
|
|
isPending: isLoading,
|
|
refetch,
|
|
} = useProjectJsonSchemaQuery({ projectRef })
|
|
|
|
const { paths } = jsonSchema || {}
|
|
const PAGE_KEY = resource || rpc || page || 'index'
|
|
|
|
const { resources, rpcs } = buildEntityMaps(paths)
|
|
|
|
if (settingsError || jsonSchemaError) {
|
|
return <DocViewError error={settingsError || jsonSchemaError} />
|
|
}
|
|
|
|
if (isLoading || !settings || !jsonSchema) {
|
|
return <DocViewLoading />
|
|
}
|
|
|
|
return (
|
|
<div className="w-full h-full overflow-y-auto flex flex-col" key={PAGE_KEY}>
|
|
<div className="flex-1 flex flex-col">
|
|
{resource ? (
|
|
<ResourceContent
|
|
selectedLang={selectedLang}
|
|
resourceId={resource}
|
|
resources={resources}
|
|
showApiKey={selectedApiKey.key}
|
|
refreshDocs={refetch}
|
|
/>
|
|
) : rpc ? (
|
|
<RpcContent
|
|
selectedLang={selectedLang}
|
|
rpcId={rpc}
|
|
paths={paths}
|
|
rpcs={rpcs}
|
|
showApiKey={selectedApiKey.key}
|
|
refreshDocs={refetch}
|
|
/>
|
|
) : (
|
|
<GeneralContent selectedLang={selectedLang} showApiKey={selectedApiKey.key} page={page} />
|
|
)}
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|