mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 17:35:10 +03:00
## Problem platform, v1 and v2 have been already completely migrated and introduced some changes. Some types have been renamed, some outputs and inputs updated. ## Solution - Update the API types - Fix the TS errors ## Update Taking this over to unblock #50134, which needs the new scoped token permission ids from the regenerated types. - Merged `master`. - Regenerated `api-v2.d.ts` from the production spec. The previous files came from a local API that exposed a webhook events endpoint production doesn't have yet. Production has since added standardized 400 error responses on the v2 organization endpoints. `api-v1.d.ts` and `platform.d.ts` already matched production. - Fixed `verify-production-types`. It formatted the regenerated files in a temp directory outside the repository, so Prettier fell back to its defaults and the comparison could never match the committed files. It now passes the repository config explicitly. `pnpm api:verify-types` passes on this branch. - Verified locally: `pnpm typecheck`, `pnpm api:verify-types`, Studio unit tests. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Preserved descriptions when saving, sharing, moving, or unsharing notebooks, reports, SQL snippets, and saved queries. * Improved handling of empty or null values across notebook descriptions, billing usage, pooler settings, and infrastructure fields. * Improved read-replica connection handling, including read-only connection strings. * Updated storage configuration and capability handling to match current settings. * **API and Compatibility** * Updated organization, project, storage, OAuth, billing, and infrastructure data handling to match current API responses. * OAuth app creation and updates now require scopes. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
107 lines
3.0 KiB
TypeScript
107 lines
3.0 KiB
TypeScript
import { useMutation, useQueryClient } from '@tanstack/react-query'
|
|
import type { components } from 'api-types'
|
|
import { toast } from 'sonner'
|
|
|
|
import { handleError, post } from '@/data/fetchers'
|
|
import { organizationKeys } from '@/data/organizations/keys'
|
|
import { castOrganizationResponseToOrganization } from '@/data/organizations/organizations-query'
|
|
import { permissionKeys } from '@/data/permissions/keys'
|
|
import type { ResponseError, UseCustomMutationOptions } from '@/types'
|
|
|
|
export type PendingSubscriptionCreateVariables = {
|
|
payment_intent_id: string
|
|
name: string
|
|
kind?: string
|
|
size?: string
|
|
}
|
|
|
|
export async function confirmPendingSubscriptionCreate({
|
|
payment_intent_id,
|
|
name,
|
|
kind,
|
|
size,
|
|
}: PendingSubscriptionCreateVariables) {
|
|
const { data, error } = await post('/platform/organizations/confirm-subscription', {
|
|
body: {
|
|
payment_intent_id,
|
|
name,
|
|
kind,
|
|
size,
|
|
},
|
|
})
|
|
|
|
if (error) handleError(error)
|
|
return data
|
|
}
|
|
|
|
type PendingSubscriptionCreateData = Awaited<ReturnType<typeof confirmPendingSubscriptionCreate>>
|
|
|
|
export const useConfirmPendingSubscriptionCreateMutation = ({
|
|
onSuccess,
|
|
onError,
|
|
...options
|
|
}: Omit<
|
|
UseCustomMutationOptions<
|
|
PendingSubscriptionCreateData,
|
|
ResponseError,
|
|
PendingSubscriptionCreateVariables
|
|
>,
|
|
'mutationFn'
|
|
> = {}) => {
|
|
const queryClient = useQueryClient()
|
|
|
|
return useMutation<
|
|
PendingSubscriptionCreateData,
|
|
ResponseError,
|
|
PendingSubscriptionCreateVariables
|
|
>({
|
|
mutationFn: (vars) => confirmPendingSubscriptionCreate(vars),
|
|
async onSuccess(data, variables, context) {
|
|
// Handle 202 Accepted - show toast and skip query updates
|
|
if (data && 'message' in data && !('slug' in data)) {
|
|
const pendingResponse = data as components['schemas']['PendingConfirmationResponse']
|
|
toast.success(pendingResponse.message, {
|
|
dismissible: true,
|
|
duration: 10_000,
|
|
})
|
|
return
|
|
}
|
|
|
|
// [Joshen] We're manually updating the query client here as the org's subscription is
|
|
// created async, and the invalidation will happen too quick where the GET organizations
|
|
// endpoint will error out with a 500 since the subscription isn't created yet.
|
|
queryClient.setQueriesData(
|
|
{
|
|
queryKey: organizationKeys.list(),
|
|
exact: true,
|
|
},
|
|
(prev: any) => {
|
|
if (!prev) return prev
|
|
return [
|
|
...prev,
|
|
castOrganizationResponseToOrganization(
|
|
data as components['schemas']['OrganizationResponse_Output']
|
|
),
|
|
]
|
|
}
|
|
)
|
|
|
|
await queryClient.invalidateQueries({ queryKey: permissionKeys.list() })
|
|
|
|
// todo replace plan in org
|
|
await onSuccess?.(data, variables, context)
|
|
},
|
|
async onError(data, variables, context) {
|
|
if (onError === undefined) {
|
|
toast.error(data.message, {
|
|
dismissible: true,
|
|
duration: 10_000,
|
|
})
|
|
} else {
|
|
onError(data, variables, context)
|
|
}
|
|
},
|
|
...options,
|
|
})
|
|
}
|