mirror of
https://github.com/supabase/supabase.git
synced 2026-10-13 21:29:08 +03:00
## Context Related to FE-2461 More refactoring to clean up usage of `useQueryStateWithSelect`, in the following pages - Auth OAuth Apps - Cron Jobs - Vaults Secrets Management - Database Hooks - Wrappers ## To test In each of those pages, verify that - [ ] Clicking the "new" cta updates the URL params, and refreshing should re-open the sheet - [ ] Editing an existing item should update URL params, and refreshing should re-open the sheet with the right item - Verify that if the URL param has the wrong id, page should not open the sheet, show a toast, and reset the URL param - [ ] Deleting an existing item should update URL params, and refreshing should re-open the sheet with the right item - Verify that if the URL param has the wrong id, page should not open the sheet, show a toast, and reset the URL param <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Added "item not found" toasts and clearer feedback after create/update/delete actions; prevent opening create flows when server features are disabled. * **Style** * Standardized button labels, sizes and modal/dialog spacing; refined table column widths and inline code formatting for readability. * **Refactor** * Simplified UI state flows across OAuth Apps, Hooks/Webhooks, Cron Jobs, Vault Secrets, and Wrappers to use consistent URL-driven interactions and centralized modals. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
101 lines
2.9 KiB
TypeScript
101 lines
2.9 KiB
TypeScript
import { Query } from '@supabase/pg-meta/src/query'
|
|
import { useQuery } from '@tanstack/react-query'
|
|
import { UseCustomQueryOptions } from 'types'
|
|
|
|
import { executeSql } from '../sql/execute-sql-query'
|
|
import { vaultSecretsKeys } from './keys'
|
|
|
|
const vaultSecretDecryptedValueQuery = (id: string) => {
|
|
const sql = new Query()
|
|
.from('decrypted_secrets', 'vault')
|
|
.select('decrypted_secret')
|
|
.match({ id })
|
|
.toSql()
|
|
|
|
return sql
|
|
}
|
|
|
|
const vaultSecretDecryptedValuesQuery = (ids: string[]) => {
|
|
const sql = new Query()
|
|
.from('decrypted_secrets', 'vault')
|
|
.select('id,decrypted_secret')
|
|
.filter('id', 'in', ids)
|
|
.toSql()
|
|
|
|
return sql
|
|
}
|
|
|
|
export type VaultSecretsDecryptedValueVariables = {
|
|
projectRef?: string
|
|
connectionString?: string | null
|
|
id?: string
|
|
}
|
|
|
|
export const getDecryptedValue = async (
|
|
{ projectRef, connectionString, id }: VaultSecretsDecryptedValueVariables,
|
|
signal?: AbortSignal
|
|
) => {
|
|
if (!id) throw new Error('ID is required')
|
|
|
|
const sql = vaultSecretDecryptedValueQuery(id)
|
|
const { result } = await executeSql(
|
|
{
|
|
projectRef,
|
|
connectionString,
|
|
sql,
|
|
queryKey: vaultSecretsKeys.getDecryptedValue(projectRef, id),
|
|
},
|
|
signal
|
|
)
|
|
return result as { decrypted_secret: string }[]
|
|
}
|
|
|
|
type getDecryptedValueResult = Awaited<ReturnType<typeof getDecryptedValue>>
|
|
export type VaultSecretsDecryptedValueData = string
|
|
export type VaultSecretsDecryptedValueError = unknown
|
|
|
|
export const useVaultSecretDecryptedValueQuery = <TData = string>(
|
|
{ projectRef, connectionString, id }: VaultSecretsDecryptedValueVariables,
|
|
{
|
|
enabled = true,
|
|
...options
|
|
}: UseCustomQueryOptions<getDecryptedValueResult, VaultSecretsDecryptedValueError, TData> = {}
|
|
) =>
|
|
useQuery<getDecryptedValueResult, VaultSecretsDecryptedValueError, TData>({
|
|
queryKey: vaultSecretsKeys.getDecryptedValue(projectRef, id),
|
|
queryFn: ({ signal }) => getDecryptedValue({ projectRef, connectionString, id }, signal),
|
|
select(data) {
|
|
return (data[0]?.decrypted_secret ?? '') as TData
|
|
},
|
|
enabled: enabled && typeof projectRef !== 'undefined' && typeof id !== 'undefined',
|
|
...options,
|
|
})
|
|
|
|
// [Joshen] Considering to consolidate fetching single and multiple decrypted values by just passing in a string array
|
|
// This is currently used in ImportForeignSchemaDialog, but reckon EditWrapperSheet can use this too to replace the useEffect on L153
|
|
// which fetches all the decrypted secrets
|
|
export const getDecryptedValues = async (
|
|
{
|
|
projectRef,
|
|
connectionString,
|
|
ids,
|
|
}: {
|
|
projectRef?: string
|
|
connectionString?: string | null
|
|
ids: string[]
|
|
},
|
|
signal?: AbortSignal
|
|
) => {
|
|
const sql = vaultSecretDecryptedValuesQuery(ids)
|
|
const { result } = await executeSql<{ id: string; decrypted_secret: string }[]>(
|
|
{ projectRef, connectionString, sql },
|
|
signal
|
|
)
|
|
return result.reduce(
|
|
(a, b) => {
|
|
return { ...a, [b.id]: b.decrypted_secret }
|
|
},
|
|
{} as Record<string, string>
|
|
)
|
|
}
|