mirror of
https://github.com/supabase/supabase.git
synced 2026-10-17 15:19:08 +03:00
* Update the design of the sonner toasts. Add the close button by default. * Migrate studio and www apps to use the SonnerToaster. * Migrate all toasts from studio. * Migrate all leftover toasts in studio. * Add a new toast component with progress. Use it in studio. * Migrate the design-system app. * Refactor the consent toast to use sonner. * Switch docs to use the new sonner toasts. * Remove toast examples from the design-system app. * Remove all toast-related components and old code. * Fix the progress bar in the toast progress component. Also make the bottom components vertically centered. * Fix the width of the toast progress. * Use text-foreground-lighter instead of muted for ToastProgress text * Rename ToastProgress to SonnerProgress. * Shorten the text in sonner progress. * Use the correct classes for the close button. Add a const var for the default toast duration. Remove the custom width class from sonner. * Set the position for all progress toasts to bottom right. Set the duration for all toasts to the default (when reusing a toast id from loading/progress toast, the duration is set to infinity). * Fix the playwright tests. * Refactor imports to use ui instead of @ui. * Change all imports of react-hot-toast with sonner. These components were merged since the last commit to this branch. * Remove react-hot-toast lib. --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com> Co-authored-by: Jonathan Summers-Muir <MildTomato@users.noreply.github.com>
96 lines
2.9 KiB
TypeScript
96 lines
2.9 KiB
TypeScript
import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
|
|
import { toast } from 'sonner'
|
|
|
|
import type { WrapperMeta } from 'components/interfaces/Database/Wrappers/Wrappers.types'
|
|
import { entityTypeKeys } from 'data/entity-types/keys'
|
|
import { pgSodiumKeys } from 'data/pg-sodium-keys/keys'
|
|
import { executeSql } from 'data/sql/execute-sql-query'
|
|
import { sqlKeys } from 'data/sql/keys'
|
|
import { wrapWithTransaction } from 'data/sql/utils/transaction'
|
|
import { vaultSecretsKeys } from 'data/vault/keys'
|
|
import type { ResponseError } from 'types'
|
|
import { FDW } from './fdws-query'
|
|
|
|
export type FDWDeleteVariables = {
|
|
projectRef: string
|
|
connectionString?: string
|
|
wrapper: FDW
|
|
wrapperMeta: WrapperMeta
|
|
}
|
|
|
|
export const getDeleteFDWSql = ({
|
|
wrapper,
|
|
wrapperMeta,
|
|
}: Pick<FDWDeleteVariables, 'wrapper' | 'wrapperMeta'>) => {
|
|
const encryptedOptions = wrapperMeta.server.options.filter((option) => option.encrypted)
|
|
|
|
const deleteEncryptedSecretsSqlArray = encryptedOptions.map((option) => {
|
|
const key = `${wrapper.name}_${option.name}`
|
|
|
|
return /* SQL */ `
|
|
delete from vault.secrets where key_id = (select id from pgsodium.valid_key where name = '${key}');
|
|
|
|
delete from pgsodium.key where name = '${key}';
|
|
`
|
|
})
|
|
|
|
const deleteEncryptedSecretsSql = deleteEncryptedSecretsSqlArray.join('\n')
|
|
|
|
const sql = /* SQL */ `
|
|
drop foreign data wrapper if exists ${wrapper.name} cascade;
|
|
|
|
${deleteEncryptedSecretsSql}
|
|
`
|
|
|
|
return sql
|
|
}
|
|
|
|
export async function deleteFDW({
|
|
projectRef,
|
|
connectionString,
|
|
wrapper,
|
|
wrapperMeta,
|
|
}: FDWDeleteVariables) {
|
|
const sql = wrapWithTransaction(getDeleteFDWSql({ wrapper, wrapperMeta }))
|
|
const { result } = await executeSql({ projectRef, connectionString, sql })
|
|
return result
|
|
}
|
|
|
|
type FDWDeleteData = Awaited<ReturnType<typeof deleteFDW>>
|
|
|
|
export const useFDWDeleteMutation = ({
|
|
onSuccess,
|
|
onError,
|
|
...options
|
|
}: Omit<
|
|
UseMutationOptions<FDWDeleteData, ResponseError, FDWDeleteVariables>,
|
|
'mutationFn'
|
|
> = {}) => {
|
|
const queryClient = useQueryClient()
|
|
|
|
return useMutation<FDWDeleteData, ResponseError, FDWDeleteVariables>((vars) => deleteFDW(vars), {
|
|
async onSuccess(data, variables, context) {
|
|
const { projectRef } = variables
|
|
|
|
await Promise.all([
|
|
queryClient.invalidateQueries(entityTypeKeys.list(projectRef)),
|
|
queryClient.invalidateQueries(sqlKeys.query(projectRef, ['fdws'])),
|
|
queryClient.invalidateQueries(pgSodiumKeys.list(projectRef)),
|
|
queryClient.invalidateQueries(sqlKeys.query(projectRef, vaultSecretsKeys.list(projectRef))),
|
|
])
|
|
|
|
await onSuccess?.(data, variables, context)
|
|
},
|
|
async onError(data, variables, context) {
|
|
if (onError === undefined) {
|
|
toast.error(
|
|
`Failed to disable ${variables.wrapper.name} foreign data wrapper: ${data.message}`
|
|
)
|
|
} else {
|
|
onError(data, variables, context)
|
|
}
|
|
},
|
|
...options,
|
|
})
|
|
}
|