Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

let inline error callers own mutation failures (#48640)

Danny White840127cd6962
diff --git a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.tsx b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.tsx
index 42fababc170..fcd26bfb2e1 100644
--- a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.tsx
+++ b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceOnboarding.tsx
@@ -77,7 +77,6 @@ export const AwsMarketplaceOnboardingScreen = ({ buyerId }: { buyerId?: string }
onSuccess: (_, variables) => {
setLinkedOrgSlug(variables.slug)
},
- onError: () => undefined,
})
const linkError = linkOrganizationError
? `Failed to link organization: ${linkOrganizationError.message}`
diff --git a/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx b/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx
index 7d129542db9..c19aa0349c8 100644
--- a/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx
+++ b/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx
@@ -34,7 +34,7 @@ export const ProjectClaimConfirm = ({
const { invalidateProjectsQuery } = useInvalidateProjectsInfiniteQuery()
const { mutateAsync: approveRequest, isPending: isApproving } =
- useApiAuthorizationApproveMutation({ onError: () => {} })
+ useApiAuthorizationApproveMutation()
const { mutateAsync: claimProject, isPending: isClaiming } = useOrganizationProjectClaimMutation()
diff --git a/apps/studio/components/interfaces/OrganizationInvite/OrganizationInvite.tsx b/apps/studio/components/interfaces/OrganizationInvite/OrganizationInvite.tsx
index bdd1c39c301..a5a92456a55 100644
--- a/apps/studio/components/interfaces/OrganizationInvite/OrganizationInvite.tsx
+++ b/apps/studio/components/interfaces/OrganizationInvite/OrganizationInvite.tsx
@@ -78,8 +78,6 @@ export const OrganizationInvite = () => {
onSuccess: () => {
router.push('/organizations')
},
- // [Joshen] Silence the default toast handler
- onError: () => {},
})
async function handleJoinOrganization() {
diff --git a/apps/studio/data/api-authorization/api-authorization-approve-mutation.ts b/apps/studio/data/api-authorization/api-authorization-approve-mutation.ts
index d4011184bb9..968b75ef7b2 100644
--- a/apps/studio/data/api-authorization/api-authorization-approve-mutation.ts
+++ b/apps/studio/data/api-authorization/api-authorization-approve-mutation.ts
@@ -1,5 +1,4 @@
import { useMutation } from '@tanstack/react-query'
-import { toast } from 'sonner'
import { handleError, post } from '@/data/fetchers'
import type { ResponseError, UseCustomMutationOptions } from '@/types'
@@ -29,26 +28,18 @@ export async function approveApiAuthorization({ id, slug }: ApiAuthorizationAppr
type ApiAuthorizationApproveData = Awaited<ReturnType<typeof approveApiAuthorization>>
-export const useApiAuthorizationApproveMutation = ({
- onError,
- ...options
-}: Omit<
- UseCustomMutationOptions<
- ApiAuthorizationApproveData,
- ResponseError,
- ApiAuthorizationApproveVariables
- >,
- 'mutationFn'
-> = {}) => {
+export const useApiAuthorizationApproveMutation = (
+ options: Omit<
+ UseCustomMutationOptions<
+ ApiAuthorizationApproveData,
+ ResponseError,
+ ApiAuthorizationApproveVariables
+ >,
+ 'mutationFn'
+ > = {}
+) => {
return useMutation<ApiAuthorizationApproveData, ResponseError, ApiAuthorizationApproveVariables>({
mutationFn: (vars) => approveApiAuthorization(vars),
- async onError(data, variables, context) {
- if (onError === undefined) {
- toast.error(`Failed to approve authorization request: ${data.message}`)
- } else {
- onError(data, variables, context)
- }
- },
...options,
})
}
diff --git a/apps/studio/data/api-authorization/api-authorization-decline-mutation.ts b/apps/studio/data/api-authorization/api-authorization-decline-mutation.ts
index 8cc02eb7a4a..9450af30677 100644
--- a/apps/studio/data/api-authorization/api-authorization-decline-mutation.ts
+++ b/apps/studio/data/api-authorization/api-authorization-decline-mutation.ts
@@ -1,5 +1,4 @@
import { useMutation } from '@tanstack/react-query'
-import { toast } from 'sonner'
import { del, handleError } from '@/data/fetchers'
import type { ResponseError, UseCustomMutationOptions } from '@/types'
@@ -28,26 +27,18 @@ export async function declineApiAuthorization({ id, slug }: ApiAuthorizationDecl
type ApiAuthorizationDeclineData = Awaited<ReturnType<typeof declineApiAuthorization>>
-export const useApiAuthorizationDeclineMutation = ({
- onError,
- ...options
-}: Omit<
- UseCustomMutationOptions<
- ApiAuthorizationDeclineData,
- ResponseError,
- ApiAuthorizationDeclineVariables
- >,
- 'mutationFn'
-> = {}) => {
+export const useApiAuthorizationDeclineMutation = (
+ options: Omit<
+ UseCustomMutationOptions<
+ ApiAuthorizationDeclineData,
+ ResponseError,
+ ApiAuthorizationDeclineVariables
+ >,
+ 'mutationFn'
+ > = {}
+) => {
return useMutation<ApiAuthorizationDeclineData, ResponseError, ApiAuthorizationDeclineVariables>({
mutationFn: (vars) => declineApiAuthorization(vars),
- async onError(data, variables, context) {
- if (onError === undefined) {
- toast.error(`Failed to decline authorization request: ${data.message}`)
- } else {
- onError(data, variables, context)
- }
- },
...options,
})
}
diff --git a/apps/studio/data/organization-members/organization-invitation-accept-mutation.ts b/apps/studio/data/organization-members/organization-invitation-accept-mutation.ts
index ccd70b2cd29..017dfc11e2a 100644
--- a/apps/studio/data/organization-members/organization-invitation-accept-mutation.ts
+++ b/apps/studio/data/organization-members/organization-invitation-accept-mutation.ts
@@ -1,5 +1,4 @@
import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { toast } from 'sonner'
import { handleError, post } from '@/data/fetchers'
import { invalidateOrganizationsQuery } from '@/data/organizations/organizations-query'
@@ -28,7 +27,6 @@ type OrganizationMemberUpdateData = Awaited<ReturnType<typeof acceptOrganization
export const useOrganizationAcceptInvitationMutation = ({
onSuccess,
- onError,
...options
}: Omit<
UseCustomMutationOptions<
@@ -55,13 +53,6 @@ export const useOrganizationAcceptInvitationMutation = ({
])
await onSuccess?.(data, variables, context)
},
- async onError(data, variables, context) {
- if (onError === undefined) {
- toast.error(`Failed to accept invitation: ${data.message}`)
- } else {
- onError(data, variables, context)
- }
- },
...options,
})
}
diff --git a/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.ts b/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.ts
index 481ed87d549..0b5bf38c7a6 100644
--- a/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.ts
+++ b/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.ts
@@ -1,5 +1,4 @@
import { useMutation } from '@tanstack/react-query'
-import { toast } from 'sonner'
import { handleError, put } from '@/data/fetchers'
import type { ResponseError, UseCustomMutationOptions } from '@/types'
@@ -26,7 +25,6 @@ type LinkOrganizationData = Awaited<ReturnType<typeof linkOrganization>>
export const useOrganizationLinkAwsMarketplaceMutation = ({
onSuccess,
- onError,
...options
}: Omit<
UseCustomMutationOptions<
@@ -41,13 +39,6 @@ export const useOrganizationLinkAwsMarketplaceMutation = ({
async onSuccess(data, variables, context) {
await onSuccess?.(data, variables, context)
},
- async onError(data, variables, context) {
- if (onError === undefined) {
- toast.error(`Failed to link organization to AWS Marketplace: ${data.message}`)
- } else {
- onError(data, variables, context)
- }
- },
...options,
})
}
diff --git a/apps/studio/data/partners/stripe-projects-confirm-mutation.ts b/apps/studio/data/partners/stripe-projects-confirm-mutation.ts
index faf93f77d7f..d1ceef39a4f 100644
--- a/apps/studio/data/partners/stripe-projects-confirm-mutation.ts
+++ b/apps/studio/data/partners/stripe-projects-confirm-mutation.ts
@@ -1,5 +1,4 @@
import { useMutation } from '@tanstack/react-query'
-import { toast } from 'sonner'
import { handleError, post } from '@/data/fetchers'
import type { ResponseError, UseCustomMutationOptions } from '@/types'
@@ -24,7 +23,6 @@ type ConfirmAccountRequestData = Awaited<ReturnType<typeof confirmAccountRequest
export const useConfirmAccountRequestMutation = ({
onSuccess,
- onError,
...options
}: Omit<
UseCustomMutationOptions<
@@ -39,13 +37,6 @@ export const useConfirmAccountRequestMutation = ({
async onSuccess(data, variables, context) {
await onSuccess?.(data, variables, context)
},
- async onError(data, variables, context) {
- if (onError === undefined) {
- toast.error(`Failed to confirm account request: ${data.message}`)
- } else {
- onError(data, variables, context)
- }
- },
...options,
})
}
diff --git a/apps/studio/pages/partners/stripe/projects/login.tsx b/apps/studio/pages/partners/stripe/projects/login.tsx
index dd19e0ca54a..37ae262f3d4 100644
--- a/apps/studio/pages/partners/stripe/projects/login.tsx
+++ b/apps/studio/pages/partners/stripe/projects/login.tsx
@@ -51,9 +51,7 @@ export const StripeProjectsLoginPage: NextPageWithLayout = () => {
isSuccess: isConfirmationSuccess,
error: confirmationMutationError,
reset: resetConfirmationError,
- } = useConfirmAccountRequestMutation({
- onError: () => undefined,
- })
+ } = useConfirmAccountRequestMutation()
const confirmationError = confirmationMutationError
? `Failed to authorize Stripe Projects: ${confirmationMutationError.message}`
: undefined