The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Chore/deprecate use query state with select part 03 (#42734)
Joshen Lime125ad7ff6f3
diff --git a/apps/studio/components/interfaces/Database/EnumeratedTypes/DeleteEnumeratedTypeModal.tsx b/apps/studio/components/interfaces/Database/EnumeratedTypes/DeleteEnumeratedTypeModal.tsxdeleted file mode 100644index 37e3b1ab71d..00000000000--- a/apps/studio/components/interfaces/Database/EnumeratedTypes/DeleteEnumeratedTypeModal.tsx+++ /dev/null@@ -1,75 +0,0 @@-import { toast } from 'sonner'--import { useEnumeratedTypeDeleteMutation } from 'data/enumerated-types/enumerated-type-delete-mutation'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'--interface DeleteEnumeratedTypeModalProps {- visible: boolean- selectedEnumeratedType?: any- onClose: () => void- onDelete?: () => void-}--const DeleteEnumeratedTypeModal = ({- visible,- selectedEnumeratedType,- onClose,- onDelete,-}: DeleteEnumeratedTypeModalProps) => {- const { data: project } = useSelectedProjectQuery()- const { mutate: deleteEnumeratedType, isPending: isDeleting } = useEnumeratedTypeDeleteMutation({- onSuccess: () => {- toast.success(`Successfully deleted "${selectedEnumeratedType.name}"`)- onClose()- },- })-- const onConfirmDeleteType = () => {- if (selectedEnumeratedType === undefined) return console.error('No enumerated type selected')- if (project?.ref === undefined) return console.error('Project ref required')- if (project?.connectionString === undefined)- return console.error('Project connectionString required')-- onDelete?.()- deleteEnumeratedType({- projectRef: project?.ref,- connectionString: project?.connectionString,- name: selectedEnumeratedType.name,- schema: selectedEnumeratedType.schema,- })- }-- return (- <ConfirmationModal- variant={'destructive'}- size="medium"- loading={isDeleting}- visible={visible}- title={- <>- Confirm to delete enumerated type{' '}- <code className="text-sm">{selectedEnumeratedType?.name}</code>- </>- }- confirmLabel="Confirm delete"- confirmLabelLoading="Deleting..."- onCancel={onClose}- onConfirm={() => onConfirmDeleteType()}- alert={{- title: 'This action cannot be undone',- description:- 'You will need to re-create the enumerated type if you want to revert the deletion.',- }}- >- <p className="text-sm">Before deleting this enumerated type, consider:</p>- <ul className="space-y-2 mt-2 text-sm text-foreground-light">- <li className="list-disc ml-6">- This enumerated type is no longer in use in any tables or functions- </li>- </ul>- </ConfirmationModal>- )-}--export default DeleteEnumeratedTypeModaldiff --git a/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypes.tsx b/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypes.tsxindex 6c4243e6e75..4b9acd56602 100644--- a/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypes.tsx+++ b/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypes.tsx@@ -1,16 +1,14 @@-import { Edit, MoreVertical, Search, Trash } from 'lucide-react'-import { parseAsBoolean, useQueryState } from 'nuqs'-import { useRef, useState } from 'react'-import { toast } from 'sonner'-import AlertError from 'components/ui/AlertError'import { DocsButton } from 'components/ui/DocsButton'import SchemaSelector from 'components/ui/SchemaSelector'import { useEnumeratedTypesQuery } from 'data/enumerated-types/enumerated-types-query'-import { handleErrorOnDelete, useQueryStateWithSelect } from 'hooks/misc/useQueryStateWithSelect'import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { useIsProtectedSchema } from 'hooks/useProtectedSchemas'+import { Edit, MoreVertical, Search, Trash } from 'lucide-react'+import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'+import { useEffect, useState } from 'react'+import { toast } from 'sonner'import {Button,Card,@@ -18,7 +16,6 @@ import {DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,- Input,Table,TableBody,TableCell,@@ -26,20 +23,22 @@ import {TableHeader,TableRow,} from 'ui'+import { Input } from 'ui-patterns/DataInputs/Input'+import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'+import { ProtectedSchemaWarning } from '../ProtectedSchemaWarning'import CreateEnumeratedTypeSidePanel from './CreateEnumeratedTypeSidePanel'-import DeleteEnumeratedTypeModal from './DeleteEnumeratedTypeModal'import EditEnumeratedTypeSidePanel from './EditEnumeratedTypeSidePanel'+import { useEnumeratedTypeDeleteMutation } from '@/data/enumerated-types/enumerated-type-delete-mutation'export const EnumeratedTypes = () => {const { data: project } = useSelectedProjectQuery()const [search, setSearch] = useState('')const { selectedSchema, setSelectedSchema } = useQuerySchemaState()- const deletingTypeIdRef = useRef<string | null>(null)const {- data,+ data = [],error,isPending: isLoading,isError,@@ -49,25 +48,27 @@ export const EnumeratedTypes = () => {connectionString: project?.connectionString,})+ const {+ mutate: deleteEnumeratedType,+ isPending: isDeleting,+ isSuccess: isSuccessDelete,+ } = useEnumeratedTypeDeleteMutation({+ onSuccess: (_, vars) => {+ toast.success(`Successfully deleted type "${vars.name}"`)+ setSelectedTypeIdToDelete(null)+ },+ })+const [showCreateTypePanel, setShowCreateTypePanel] = useQueryState('new',- parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true })+ parseAsBoolean.withDefault(false))- const { value: typeToEdit, setValue: setSelectedTypeIdToEdit } = useQueryStateWithSelect({- urlKey: 'edit',- select: (id) => (id ? data?.find((type) => type.id.toString() === id) : undefined),- enabled: !!data,- onError: () => toast.error(`Enumerated Type not found`),- })+ const [selectedTypeIdToEdit, setSelectedTypeIdToEdit] = useQueryState('edit', parseAsString)+ const typeToEdit = data?.find((type) => type.id.toString() === selectedTypeIdToEdit)- const { value: typeToDelete, setValue: setSelectedTypeIdToDelete } = useQueryStateWithSelect({- urlKey: 'delete',- select: (id) => (id ? data?.find((type) => type.id.toString() === id) : undefined),- enabled: !!data,- onError: (_error, selectedId) =>- handleErrorOnDelete(deletingTypeIdRef, selectedId, `Enumerated Type not found`),- })+ const [selectedTypeIdToDelete, setSelectedTypeIdToDelete] = useQueryState('delete', parseAsString)+ const typeToDelete = data?.find((type) => type.id.toString() === selectedTypeIdToDelete)const enumeratedTypes = (data ?? []).filter((type) => type.enums.length > 0)const filteredEnumeratedTypes =@@ -79,6 +80,34 @@ export const EnumeratedTypes = () => {const { isSchemaLocked } = useIsProtectedSchema({ schema: selectedSchema })+ const onConfirmDeleteType = () => {+ if (typeToDelete === undefined) return console.error('No enumerated type selected')+ if (project?.ref === undefined) return console.error('Project ref required')+ if (project?.connectionString === undefined)+ return console.error('Project connectionString required')++ deleteEnumeratedType({+ projectRef: project?.ref,+ connectionString: project?.connectionString,+ name: typeToDelete.name,+ schema: typeToDelete.schema,+ })+ }++ useEffect(() => {+ if (isSuccess && !!selectedTypeIdToEdit && !typeToEdit) {+ toast('Type cannot be found')+ setSelectedTypeIdToEdit(null)+ }+ }, [isSuccess, selectedTypeIdToEdit, setSelectedTypeIdToEdit, typeToEdit])++ useEffect(() => {+ if (isSuccess && !!selectedTypeIdToDelete && !typeToDelete && !isSuccessDelete) {+ toast('Type cannot be found')+ setSelectedTypeIdToDelete(null)+ }+ }, [isSuccess, selectedTypeIdToDelete, setSelectedTypeIdToDelete, typeToDelete, isSuccessDelete])+return (<div className="space-y-4"><div className="flex flex-col lg:flex-row lg:items-center justify-between gap-2 flex-wrap">@@ -212,16 +241,33 @@ export const EnumeratedTypes = () => {onClose={() => setSelectedTypeIdToEdit(null)}/>- <DeleteEnumeratedTypeModal+ <ConfirmationModal+ variant="destructive"+ size="medium"+ loading={isDeleting}visible={!!typeToDelete}- selectedEnumeratedType={typeToDelete}- onClose={() => setSelectedTypeIdToDelete(null)}- onDelete={() => {- if (typeToDelete) {- deletingTypeIdRef.current = typeToDelete.id.toString()- }+ title={+ <>+ Confirm to delete enumerated type <code className="text-sm">{typeToDelete?.name}</code>+ </>+ }+ confirmLabel="Confirm delete"+ confirmLabelLoading="Deleting..."+ onCancel={() => setSelectedTypeIdToDelete(null)}+ onConfirm={() => onConfirmDeleteType()}+ alert={{+ title: 'This action cannot be undone',+ description:+ 'You will need to re-create the enumerated type if you want to revert the deletion.',}}- />+ >+ <p className="text-sm">Before deleting this enumerated type, consider:</p>+ <ul className="space-y-2 mt-2 text-sm text-foreground-light">+ <li className="list-disc ml-6">+ This enumerated type is no longer in use in any tables or functions+ </li>+ </ul>+ </ConfirmationModal></div>)}diff --git a/apps/studio/components/interfaces/Database/Functions/DeleteFunction.tsx b/apps/studio/components/interfaces/Database/Functions/DeleteFunction.tsxdeleted file mode 100644index fcb4c53f8de..00000000000--- a/apps/studio/components/interfaces/Database/Functions/DeleteFunction.tsx+++ /dev/null@@ -1,59 +0,0 @@-import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'-import type { DatabaseFunction } from 'data/database-functions/database-functions-query'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'--interface DeleteFunctionProps {- func?: DatabaseFunction- visible: boolean- setVisible: (value: string | null) => void- onDelete: (params: {- func: DatabaseFunction- projectRef: string- connectionString?: string | null- }) => void- isLoading: boolean-}--export const DeleteFunction = ({- func,- visible,- setVisible,- onDelete,- isLoading,-}: DeleteFunctionProps) => {- const { data: project } = useSelectedProjectQuery()- const { name, schema } = func ?? {}-- async function handleDelete() {- if (!func) return console.error('Function is required')- if (!project) return console.error('Project is required')-- onDelete({- func,- projectRef: project.ref,- connectionString: project.connectionString,- })- }-- return (- <TextConfirmModal- variant={'warning'}- visible={visible}- onCancel={() => setVisible(null)}- onConfirm={handleDelete}- title="Delete this function"- loading={isLoading}- confirmLabel={`Delete function ${name}`}- confirmPlaceholder="Type in name of function"- confirmString={name ?? 'Unknown'}- text={- <>- <span>This will delete the function</span>{' '}- <span className="text-bold text-foreground">{name}</span> <span>from the schema</span>{' '}- <span className="text-bold text-foreground">{schema}</span>- </>- }- alert={{ title: 'You cannot recover this function once deleted.' }}- />- )-}diff --git a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsxindex 57c7a408149..236dcd7bb25 100644--- a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx+++ b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx@@ -1,11 +1,7 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { Search } from 'lucide-react'-import { useRouter } from 'next/router'-import { parseAsBoolean, parseAsJson, useQueryState } from 'nuqs'-import { useRef } from 'react'-import { toast } from 'sonner'-import { useParams } from 'common'+import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'+import { CreateFunction } from 'components/interfaces/Database/Functions/CreateFunction'import {ReportsSelectFilter,selectFilterSchema,@@ -20,30 +16,24 @@ import type { DatabaseFunction } from 'data/database-functions/database-functionimport { useDatabaseFunctionsQuery } from 'data/database-functions/database-functions-query'import { useSchemasQuery } from 'data/database/schemas-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { handleErrorOnDelete, useQueryStateWithSelect } from 'hooks/misc/useQueryStateWithSelect'import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { useIsProtectedSchema } from 'hooks/useProtectedSchemas'+import { Search } from 'lucide-react'+import { useRouter } from 'next/router'+import { parseAsBoolean, parseAsJson, parseAsString, useQueryState } from 'nuqs'+import { useEffect } from 'react'+import { toast } from 'sonner'import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'+import { useEditorPanelStateSnapshot } from 'state/editor-panel-state'import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'-import {- AiIconAnimation,- Card,- Input,- Table,- TableBody,- TableHead,- TableHeader,- TableRow,-} from 'ui'+import { AiIconAnimation, Card, Table, TableBody, TableHead, TableHeader, TableRow } from 'ui'+import { Input } from 'ui-patterns/DataInputs/Input'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'+import { ProtectedSchemaWarning } from '../../ProtectedSchemaWarning'import FunctionList from './FunctionList'--import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'-import { CreateFunction } from 'components/interfaces/Database/Functions/CreateFunction'-import { DeleteFunction } from 'components/interfaces/Database/Functions/DeleteFunction'-import { useEditorPanelStateSnapshot } from 'state/editor-panel-state'+import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'const createFunctionSnippet = `create function function_name()returns void@@ -54,7 +44,7 @@ beginend;$$;`-const FunctionsList = () => {+export const FunctionsList = () => {const router = useRouter()const { search } = useParams()const { data: project } = useSelectedProjectQuery()@@ -68,9 +58,6 @@ const FunctionsList = () => {setInitialPrompt: setEditorPanelInitialPrompt,} = useEditorPanelStateSnapshot()- // Track the ID being deleted to exclude it from error checking- const deletingFunctionIdRef = useRef<string | null>(null)-const createFunction = () => {setSelectedFunctionIdToDuplicate(null)if (isInlineEditorEnabled) {@@ -109,10 +96,6 @@ const FunctionsList = () => {}}- const deleteFunction = (fn: DatabaseFunction) => {- setSelectedFunctionToDelete(fn.id.toString())- }-const filterString = search ?? ''// Filters@@ -149,17 +132,18 @@ const FunctionsList = () => {})const {- data: functions,+ data: functions = [],error,isPending: isLoading,isError,+ isSuccess,} = useDatabaseFunctionsQuery({projectRef: project?.ref,connectionString: project?.connectionString,})// Get unique return types from functions in the selected schema- const schemaFunctions = (functions ?? []).filter((fn) => fn.schema === selectedSchema)+ const schemaFunctions = functions.filter((fn) => fn.schema === selectedSchema)const uniqueReturnTypes = Array.from(new Set(schemaFunctions.map((fn) => fn.return_type))).sort()// Get security options based on what exists in the selected schema@@ -175,44 +159,66 @@ const FunctionsList = () => {parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true }))- const { setValue: setSelectedFunctionToEdit, value: functionToEdit } = useQueryStateWithSelect({- urlKey: 'edit',- select: (id: string) => (id ? functions?.find((fn) => fn.id.toString() === id) : undefined),- enabled: !!functions,- onError: () => toast.error(`Function not found`),+ const [functionIdToEdit, setSelectedFunctionToEdit] = useQueryState('edit', parseAsString)+ const functionToEdit = functions.find((fn) => fn.id.toString() === functionIdToEdit)++ const [functionIdToDuplicate, setSelectedFunctionIdToDuplicate] = useQueryState(+ 'duplicate',+ parseAsString+ )+ const functionToDuplicate = functions.find((fn) => fn.id.toString() === functionIdToDuplicate)++ const [functionIdToDelete, setSelectedFunctionToDelete] = useQueryState('delete', parseAsString)+ const functionToDelete = functions.find((fn) => fn.id.toString() === functionIdToDelete)++ const {+ mutate: deleteDatabaseFunction,+ isPending: isDeletingFunction,+ isSuccess: isSuccessDelete,+ } = useDatabaseFunctionDeleteMutation({+ onSuccess: (_, variables) => {+ toast.success(`Successfully removed function ${variables.func.name}`)+ setSelectedFunctionToDelete(null)+ },})- const { setValue: setSelectedFunctionIdToDuplicate, value: functionToDuplicate } =- useQueryStateWithSelect({- urlKey: 'duplicate',- select: (id: string) => {- if (!id) return undefined- const original = functions?.find((fn) => fn.id.toString() === id)- return original ? { ...original, name: `${original.name}_duplicate` } : undefined- },- enabled: !!functions,- onError: () => toast.error(`Function not found`),- })+ const onDeleteFunction = () => {+ if (!project) return console.error('Project is required')+ if (!functionToDelete) return console.error('Function is required')- const { setValue: setSelectedFunctionToDelete, value: functionToDelete } =- useQueryStateWithSelect({- urlKey: 'delete',- select: (id: string) => (id ? functions?.find((fn) => fn.id.toString() === id) : undefined),- enabled: !!functions,- onError: (_error, selectedId) =>- handleErrorOnDelete(deletingFunctionIdRef, selectedId, `Function not found`),+ deleteDatabaseFunction({+ func: functionToDelete,+ projectRef: project.ref,+ connectionString: project.connectionString,})+ }- const { mutate: deleteDatabaseFunction, isPending: isDeletingFunction } =- useDatabaseFunctionDeleteMutation({- onSuccess: (_, variables) => {- toast.success(`Successfully removed function ${variables.func.name}`)- setSelectedFunctionToDelete(null)- },- onError: () => {- deletingFunctionIdRef.current = null- },- })+ useEffect(() => {+ if (isSuccess && !!functionIdToEdit && !functionToEdit) {+ toast('Function not found')+ setSelectedFunctionToEdit(null)+ }+ }, [functionIdToEdit, functionToEdit, isSuccess, setSelectedFunctionToEdit])++ useEffect(() => {+ if (isSuccess && !!functionIdToDuplicate && !functionToDuplicate) {+ toast('Function not found')+ setSelectedFunctionIdToDuplicate(null)+ }+ }, [functionIdToDuplicate, functionToDuplicate, isSuccess, setSelectedFunctionIdToDuplicate])++ useEffect(() => {+ if (isSuccess && !!functionIdToDelete && !functionToDelete && !isSuccessDelete) {+ toast('Function not found')+ setSelectedFunctionToDelete(null)+ }+ }, [+ functionIdToDelete,+ functionToDelete,+ isSuccess,+ isSuccessDelete,+ setSelectedFunctionToDelete,+ ])if (isLoading) return <GenericSkeletonLoader />if (isError) return <AlertError error={error} subject="Failed to retrieve database functions" />@@ -351,7 +357,7 @@ const FunctionsList = () => {securityFilter={securityFilter ?? []}duplicateFunction={duplicateFunction}editFunction={editFunction}- deleteFunction={deleteFunction}+ deleteFunction={(fn) => setSelectedFunctionToDelete(fn.id.toString())}functions={functions ?? []}/></TableBody>@@ -360,37 +366,37 @@ const FunctionsList = () => {</div>)}- {/* Create Function */}- <CreateFunction- visible={showCreateFunctionForm}- onClose={() => {- setShowCreateFunctionForm(false)- }}- />-- {/* Edit or Duplicate Function */}<CreateFunctionfunc={functionToEdit || functionToDuplicate}- visible={!!functionToEdit || !!functionToDuplicate}+ visible={showCreateFunctionForm || !!functionToEdit || !!functionToDuplicate}onClose={() => {+ setShowCreateFunctionForm(false)setSelectedFunctionToEdit(null)setSelectedFunctionIdToDuplicate(null)}}isDuplicating={!!functionToDuplicate}/>- <DeleteFunction- func={functionToDelete}+ <TextConfirmModal+ variant={'warning'}visible={!!functionToDelete}- setVisible={setSelectedFunctionToDelete}- onDelete={(params: Parameters<typeof deleteDatabaseFunction>[0]) => {- deletingFunctionIdRef.current = params.func.id.toString()- deleteDatabaseFunction(params)- }}- isLoading={isDeletingFunction}+ onCancel={() => setSelectedFunctionToDelete(null)}+ onConfirm={onDeleteFunction}+ title="Delete this function"+ loading={isDeletingFunction}+ confirmLabel={`Delete function ${functionToDelete?.name}`}+ confirmPlaceholder="Type in name of function"+ confirmString={functionToDelete?.name ?? 'Unknown'}+ text={+ <>+ <span>This will delete the function</span>{' '}+ <span className="text-bold text-foreground">{functionToDelete?.name}</span>{' '}+ <span>from the schema</span>{' '}+ <span className="text-bold text-foreground">{functionToDelete?.schema}</span>+ </>+ }+ alert={{ title: 'You cannot recover this function once deleted.' }}/></>)}--export default FunctionsListdiff --git a/apps/studio/components/interfaces/Database/Roles/DeleteRoleModal.tsx b/apps/studio/components/interfaces/Database/Roles/DeleteRoleModal.tsxdeleted file mode 100644index 4bc9d70584d..00000000000--- a/apps/studio/components/interfaces/Database/Roles/DeleteRoleModal.tsx+++ /dev/null@@ -1,54 +0,0 @@-import type { PostgresRole } from '@supabase/postgres-meta'-import { toast } from 'sonner'--import { useDatabaseRoleDeleteMutation } from 'data/database-roles/database-role-delete-mutation'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { Modal } from 'ui'--interface DeleteRoleModalProps {- role: PostgresRole- visible: boolean- onClose: () => void- onDelete?: () => void-}--export const DeleteRoleModal = ({ role, visible, onClose, onDelete }: DeleteRoleModalProps) => {- const { data: project } = useSelectedProjectQuery()-- const { mutate: deleteDatabaseRole, isPending: isDeleting } = useDatabaseRoleDeleteMutation({- onSuccess: () => {- toast.success(`Successfully deleted role: ${role.name}`)- onClose()- },- })-- const deleteRole = async () => {- if (!project) return console.error('Project is required')- if (!role) return console.error('Failed to delete role: role is missing')- onDelete?.()- deleteDatabaseRole({- projectRef: project.ref,- connectionString: project.connectionString,- id: role.id,- })- }-- return (- <Modal- size="small"- alignFooter="right"- visible={visible}- onCancel={onClose}- onConfirm={deleteRole}- header={<h3>Confirm to delete role "{role?.name}"</h3>}- loading={isDeleting}- >- <Modal.Content>- <p className="text-sm">- This will automatically revoke any membership of this role in other roles, and this action- cannot be undone.- </p>- </Modal.Content>- </Modal>- )-}diff --git a/apps/studio/components/interfaces/Database/Roles/RolesList.tsx b/apps/studio/components/interfaces/Database/Roles/RolesList.tsxindex c8cc91ad8a8..70748b7adea 100644--- a/apps/studio/components/interfaces/Database/Roles/RolesList.tsx+++ b/apps/studio/components/interfaces/Database/Roles/RolesList.tsx@@ -1,24 +1,25 @@-import type { PostgresRole } from '@supabase/postgres-meta'import { PermissionAction } from '@supabase/shared-types/out/constants'import { ButtonTooltip } from 'components/ui/ButtonTooltip'import { NoSearchResults } from 'components/ui/NoSearchResults'-import SparkBar from 'components/ui/SparkBar'+import { SparkBar } from 'components/ui/SparkBar'import { useDatabaseRolesQuery } from 'data/database-roles/database-roles-query'import { useMaxConnectionsQuery } from 'data/database/max-connections-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { handleErrorOnDelete, useQueryStateWithSelect } from 'hooks/misc/useQueryStateWithSelect'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { partition, sortBy } from 'lodash'import { Plus, Search, X } from 'lucide-react'-import { parseAsBoolean, useQueryState } from 'nuqs'-import { useRef, useState } from 'react'-import { Badge, Button, Input, Tooltip, TooltipContent, TooltipTrigger } from 'ui'+import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'+import { useEffect, useState } from 'react'+import { toast } from 'sonner'+import { Badge, Button, cn, Tooltip, TooltipContent, TooltipTrigger } from 'ui'+import { Input } from 'ui-patterns/DataInputs/Input'+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'import { CreateRolePanel } from './CreateRolePanel'-import { DeleteRoleModal } from './DeleteRoleModal'import { RoleRow } from './RoleRow'import { RoleRowSkeleton } from './RoleRowSkeleton'import { SUPABASE_ROLES } from './Roles.constants'+import { useDatabaseRoleDeleteMutation } from '@/data/database-roles/database-role-delete-mutation'type SUPABASE_ROLE = (typeof SUPABASE_ROLES)[number]@@ -27,7 +28,6 @@ export const RolesList = () => {const [filterString, setFilterString] = useState('')const [filterType, setFilterType] = useState<'all' | 'active'>('all')- const deletingRoleIdRef = useRef<string | null>(null)const { can: canUpdateRoles } = useAsyncCheckPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE,@@ -40,25 +40,34 @@ export const RolesList = () => {})const maxConnectionLimit = maxConnData?.maxConnections- const { data, isPending: isLoading } = useDatabaseRolesQuery({+ const {+ data,+ isPending: isLoading,+ isSuccess,+ } = useDatabaseRolesQuery({projectRef: project?.ref,connectionString: project?.connectionString,})+ const {+ mutate: deleteDatabaseRole,+ isPending: isDeleting,+ isSuccess: isSuccessDelete,+ } = useDatabaseRoleDeleteMutation({+ onSuccess: () => {+ toast.success(`Successfully deleted role`)+ setSelectedRoleIdToDelete(null)+ },+ })+const [isCreatingRole, setIsCreatingRole] = useQueryState('new',- parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true })+ parseAsBoolean.withDefault(false))- const { setValue: setSelectedRoleIdToDelete, value: roleToDelete } = useQueryStateWithSelect({- urlKey: 'delete',- select: (id: string) => (id ? data?.find((role) => role.id.toString() === id) : undefined),- enabled: !!data,- onError: (_error, selectedId) =>- handleErrorOnDelete(deletingRoleIdRef, selectedId, `Database Role not found`),- })-+ const [selectedRoleIdToDelete, setSelectedRoleIdToDelete] = useQueryState('delete', parseAsString)const roles = sortBy(data ?? [], (r) => r.name.toLocaleLowerCase())+ const roleToDelete = roles?.find((role) => role.id.toString() === selectedRoleIdToDelete)const filteredRoles = (filterType === 'active' ? roles.filter((role) => role.activeConnections > 0) : roles@@ -76,6 +85,23 @@ export const RolesList = () => {(r) => -r.activeConnections)+ const deleteRole = async () => {+ if (!project) return console.error('Project is required')+ if (!roleToDelete) return console.error('Failed to delete role: role is missing')+ deleteDatabaseRole({+ projectRef: project.ref,+ connectionString: project.connectionString,+ id: roleToDelete.id,+ })+ }++ useEffect(() => {+ if (isSuccess && !!selectedRoleIdToDelete && !roleToDelete && !isSuccessDelete) {+ toast('Role cannot be found')+ setSelectedRoleIdToDelete(null)+ }+ }, [isSuccess, selectedRoleIdToDelete, roleToDelete, isSuccessDelete, setSelectedRoleIdToDelete])+return (<><div className="mb-4 flex items-center justify-between gap-2 flex-wrap">@@ -86,7 +112,7 @@ export const RolesList = () => {placeholder="Search for a role"icon={<Search />}value={filterString}- onChange={(event: any) => setFilterString(event.target.value)}+ onChange={(event) => setFilterString(event.target.value)}actions={filterString && (<Button@@ -102,24 +128,24 @@ export const RolesList = () => {/><div className="flex items-center border border-strong rounded-full w-min h-[26px]"><button- className={[+ className={cn('text-xs w-[80px] h-full text-center rounded-l-full flex items-center justify-center transition',filterType === 'all'? 'bg-overlay-hover text-foreground'- : 'hover:bg-surface-200 text-foreground-light',- ].join(' ')}+ : 'hover:bg-surface-200 text-foreground-light'+ )}onClick={() => setFilterType('all')}>All roles</button><div className="h-full w-[1px] border-r border-strong"></div><button- className={[+ className={cn('text-xs w-[80px] h-full text-center rounded-r-full flex items-center justify-center transition',filterType === 'active'? 'bg-overlay-hover text-foreground'- : 'hover:bg-surface-200 text-foreground-light',- ].join(' ')}+ : 'hover:bg-surface-200 text-foreground-light'+ )}onClick={() => setFilterType('active')}>Active roles@@ -227,16 +253,18 @@ export const RolesList = () => {<CreateRolePanel visible={isCreatingRole} onClose={() => setIsCreatingRole(false)} />- <DeleteRoleModal- role={roleToDelete as unknown as PostgresRole}+ <ConfirmationModalvisible={!!roleToDelete}- onClose={() => setSelectedRoleIdToDelete(null)}- onDelete={() => {- if (roleToDelete) {- deletingRoleIdRef.current = roleToDelete.id.toString()- }- }}- />+ loading={isDeleting}+ onCancel={() => setSelectedRoleIdToDelete(null)}+ title={`Confirm to delete role "${roleToDelete?.name}"`}+ onConfirm={deleteRole}+ >+ <p className="text-sm">+ This will automatically revoke any membership of this role in other roles, and this action+ cannot be undone.+ </p>+ </ConfirmationModal></>)}diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsxindex 9860261e3d5..97f10b948ed 100644--- a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx+++ b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx@@ -2,7 +2,6 @@ import type { PostgresTrigger } from '@supabase/postgres-meta'import { PermissionAction } from '@supabase/shared-types/out/constants'import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'import { ProtectedSchemaWarning } from 'components/interfaces/Database/ProtectedSchemaWarning'-import { DeleteTrigger } from 'components/interfaces/Database/Triggers/DeleteTrigger'import { TriggerSheet } from 'components/interfaces/Database/Triggers/TriggerSheet'import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import AlertError from 'components/ui/AlertError'@@ -12,14 +11,13 @@ import { useDatabaseTriggerDeleteMutation } from 'data/database-triggers/databasimport { useDatabaseTriggersQuery } from 'data/database-triggers/database-triggers-query'import { useTablesQuery } from 'data/tables/tables-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { handleErrorOnDelete, useQueryStateWithSelect } from 'hooks/misc/useQueryStateWithSelect'import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { useIsProtectedSchema, useProtectedSchemas } from 'hooks/useProtectedSchemas'import { DOCS_URL } from 'lib/constants'import { DatabaseZap, Search } from 'lucide-react'import { parseAsBoolean, parseAsJson, parseAsString, useQueryState } from 'nuqs'-import { useRef, useState } from 'react'+import { useEffect } from 'react'import { toast } from 'sonner'import { useEditorPanelStateSnapshot } from 'state/editor-panel-state'import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'@@ -34,10 +32,9 @@ import {ReportsSelectFilter,selectFilterSchema,} from '@/components/interfaces/Reports/v2/ReportsSelectFilter'+import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'export const TriggersList = () => {- const [selectedTrigger, setSelectedTrigger] = useState<PostgresTrigger>()- const deletingTriggerIdRef = useRef<string | null>(null)const { data: project } = useSelectedProjectQuery()const { openSidebar } = useSidebarManagerSnapshot()const { selectedSchema, setSelectedSchema } = useQuerySchemaState()@@ -67,9 +64,10 @@ export const TriggersList = () => {data.filter((a) => !protectedSchemas.find((s) => s.name === a.schema)).length > 0const {- data: triggers,+ data: triggers = [],error,isPending,+ isSuccess,isError,} = useDatabaseTriggersQuery({projectRef: project?.ref,@@ -85,42 +83,26 @@ export const TriggersList = () => {'new',parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true }))- const { setValue: setTriggerToEdit, value: triggerToEdit } = useQueryStateWithSelect({- urlKey: 'edit',- select: (id: string) => (id ? triggers?.find((fn) => fn.id.toString() === id) : undefined),- enabled: !!triggers,- onError: () => toast.error(`Trigger not found`),- })- const { setValue: setTriggerToDuplicate, value: triggerToDuplicate } = useQueryStateWithSelect({- urlKey: 'duplicate',- select: (id: string) => {- if (!id) return undefined- const original = triggers?.find((trigger) => trigger.id.toString() === id)- return original ? { ...original, name: `${original.name}_duplicate` } : undefined- },- enabled: !!triggers,- onError: () => toast.error(`Trigger not found`),- })+ const [triggerIdToEdit, setTriggerToEdit] = useQueryState('edit', parseAsString)+ const triggerToEdit = triggers?.find((fn) => fn.id.toString() === triggerIdToEdit)- const { setValue: setTriggerToDelete, value: triggerToDelete } = useQueryStateWithSelect({- urlKey: 'delete',- select: (id: string) => (id ? triggers?.find((fn) => fn.id.toString() === id) : undefined),- enabled: !!triggers,- onError: (_error, selectedId) =>- handleErrorOnDelete(deletingTriggerIdRef, selectedId, `Database Trigger not found`),- })+ const [triggerIdToDuplicate, setTriggerToDuplicate] = useQueryState('duplicate', parseAsString)+ const triggerToDuplicate = triggers?.find((fn) => fn.id.toString() === triggerIdToDuplicate)- const { mutate: deleteDatabaseTrigger, isPending: isDeletingTrigger } =- useDatabaseTriggerDeleteMutation({- onSuccess: (_, variables) => {- toast.success(`Successfully removed ${variables.trigger.name}`)- setTriggerToDelete(null)- },- onError: () => {- deletingTriggerIdRef.current = null- },- })+ const [triggerIdToDelete, setTriggerToDelete] = useQueryState('delete', parseAsString)+ const triggerToDelete = triggers?.find((fn) => fn.id.toString() === triggerIdToDelete)++ const {+ mutate: deleteDatabaseTrigger,+ isPending: isDeletingTrigger,+ isSuccess: isSuccessDelete,+ } = useDatabaseTriggerDeleteMutation({+ onSuccess: (_, variables) => {+ toast.success(`Successfully removed ${variables.trigger.name}`)+ setTriggerToDelete(null)+ },+ })const createTrigger = () => {setTriggerToDuplicate(null)@@ -135,7 +117,6 @@ execute function function_name();`)}openSidebar(SIDEBAR_KEYS.EDITOR_PANEL)} else {- setSelectedTrigger(undefined)setShowCreateTriggerForm(true)}}@@ -165,10 +146,41 @@ execute function function_name();`)}}- const deleteTrigger = (trigger: PostgresTrigger) => {- setTriggerToDelete(trigger.id.toString())+ const onDeleteTrigger = () => {+ if (!project) return console.error('Project is required')+ if (!triggerToDelete) return console.error('Trigger ID is required')++ deleteDatabaseTrigger({+ projectRef: project.ref,+ connectionString: project.connectionString,+ trigger: triggerToDelete,+ })}+ const schemaTriggers = triggers.filter((x) => x.schema === selectedSchema)+ const tables = Array.from(new Set(schemaTriggers.map((x) => x.table))).sort()++ useEffect(() => {+ if (isSuccess && !!triggerIdToEdit && !triggerToEdit) {+ toast('Trigger not found')+ setTriggerToEdit(null)+ }+ }, [isSuccess, setTriggerToEdit, triggerIdToEdit, triggerToEdit])++ useEffect(() => {+ if (isSuccess && !!triggerIdToDuplicate && !triggerToDuplicate) {+ toast('Trigger not found')+ setTriggerToDuplicate(null)+ }+ }, [isSuccess, triggerIdToDuplicate, triggerToDuplicate, setTriggerToDuplicate])++ useEffect(() => {+ if (isSuccess && !!triggerIdToDelete && !triggerToDelete && !isSuccessDelete) {+ toast('Trigger not found')+ setTriggerToDelete(null)+ }+ }, [isSuccess, triggerIdToDelete, triggerToDelete, isSuccessDelete, setTriggerToDelete])+if (isPending) {return <GenericSkeletonLoader />}@@ -177,9 +189,6 @@ execute function function_name();`)return <AlertError error={error} subject="Failed to retrieve database triggers" />}- const schemaTriggers = triggers.filter((x) => x.schema === selectedSchema)- const tables = Array.from(new Set(schemaTriggers.map((x) => x.table))).sort()-return (<><div className="space-y-4">@@ -260,7 +269,7 @@ execute function function_name();`)<TriggerListeditTrigger={editTrigger}duplicateTrigger={duplicateTrigger}- deleteTrigger={deleteTrigger}+ deleteTrigger={(trigger) => setTriggerToDelete(trigger.id.toString())}/></TableBody></Table>@@ -269,34 +278,37 @@ execute function function_name();`))}</div>- <TriggerSheet- selectedTrigger={selectedTrigger}- open={showCreateTriggerForm}- onClose={() => {- setShowCreateTriggerForm(false)- }}- isDuplicatingTrigger={false}- />-<TriggerSheetselectedTrigger={triggerToEdit || triggerToDuplicate}- open={!!triggerToEdit || !!triggerToDuplicate}+ open={showCreateTriggerForm || !!triggerToEdit || !!triggerToDuplicate}onClose={() => {+ setShowCreateTriggerForm(false)setTriggerToEdit(null)setTriggerToDuplicate(null)}}isDuplicatingTrigger={!!triggerToDuplicate}/>- <DeleteTrigger- trigger={triggerToDelete}+ <TextConfirmModal+ variant="warning"visible={!!triggerToDelete}- setVisible={setTriggerToDelete}- onDelete={(params: Parameters<typeof deleteDatabaseTrigger>[0]) => {- deletingTriggerIdRef.current = params.trigger.id.toString()- deleteDatabaseTrigger(params)+ onCancel={() => setTriggerToDelete(null)}+ onConfirm={() => onDeleteTrigger()}+ title="Delete this trigger"+ loading={isDeletingTrigger}+ confirmLabel={`Delete trigger ${triggerToDelete?.name}`}+ confirmPlaceholder="Type in name of trigger"+ confirmString={triggerToDelete?.name ?? ''}+ text={+ <>+ This will delete your trigger called{' '}+ <span className="text-bold text-foreground">{triggerToDelete?.name}</span> of schema{' '}+ <span className="text-bold text-foreground">{triggerToDelete?.schema}</span>+ </>+ }+ alert={{+ title: 'You cannot recover this trigger once deleted.',}}- isLoading={isDeletingTrigger}/></>)diff --git a/apps/studio/components/ui/SparkBar.tsx b/apps/studio/components/ui/SparkBar.tsxindex a6334e44742..af57cc554eb 100644--- a/apps/studio/components/ui/SparkBar.tsx+++ b/apps/studio/components/ui/SparkBar.tsx@@ -13,7 +13,7 @@ interface SparkBarProps {borderClass?: string}-const SparkBar = ({+export const SparkBar = ({max = 100,value = 0,barClass = 'bg-foreground',diff --git a/apps/studio/pages/project/[ref]/database/functions.tsx b/apps/studio/pages/project/[ref]/database/functions.tsxindex e5706d0ba12..18f07bf4076 100644--- a/apps/studio/pages/project/[ref]/database/functions.tsx+++ b/apps/studio/pages/project/[ref]/database/functions.tsx@@ -1,8 +1,7 @@import { PermissionAction } from '@supabase/shared-types/out/constants'--import FunctionsList from 'components/interfaces/Database/Functions/FunctionsList/FunctionsList'+import { FunctionsList } from 'components/interfaces/Database/Functions/FunctionsList/FunctionsList'import DatabaseLayout from 'components/layouts/DatabaseLayout/DatabaseLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import { DocsButton } from 'components/ui/DocsButton'import NoPermission from 'components/ui/NoPermission'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'diff --git a/e2e/studio/features/database.spec.ts b/e2e/studio/features/database.spec.tsindex 01bc77deecf..936f29e68e8 100644--- a/e2e/studio/features/database.spec.ts+++ b/e2e/studio/features/database.spec.ts@@ -644,9 +644,9 @@ test.describe.serial('Database', () => {if (exists) {await page.getByRole('button', { name: databaseRoleName }).getByRole('button').click()await page.getByRole('menuitem', { name: 'Delete' }).click()- await page.getByRole('button', { name: 'Confirm' }).click()+ await page.getByRole('button', { name: 'Submit' }).click()await expect(- page.getByText(`Successfully deleted role: ${databaseRoleName}`),+ page.getByText(`Successfully deleted role`),'Delete confirmation toast should be visible').toBeVisible({ timeout: 50000 })}@@ -667,10 +667,10 @@ test.describe.serial('Database', () => {await page.getByRole('button', { name: databaseRoleName }).getByRole('button').click()await page.getByRole('menuitem', { name: 'Delete' }).click()const roleDeleteWait = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=roles-delete')- await page.getByRole('button', { name: 'Confirm' }).click()+ await page.getByRole('button', { name: 'Submit' }).click()await roleDeleteWaitawait expect(- page.getByText(`Successfully deleted role: ${databaseRoleName}`),+ page.getByText(`Successfully deleted role`),'Delete confirmation toast should be visible').toBeVisible({ timeout: 50000 })})@@ -723,7 +723,7 @@ test.describe.serial('Database Enumerated Types', () => {await page.getByRole('menuitem', { name: 'Delete type' }).click()await page.getByRole('heading', { name: 'Confirm to delete enumerated' }).click()await page.getByRole('button', { name: 'Confirm delete' }).click()- await expect(page.getByText(`Successfully deleted "${databaseEnumName}"`)).toBeVisible()+ await expect(page.getByText(`Successfully deleted type "${databaseEnumName}"`)).toBeVisible()}// create a new enum@@ -758,7 +758,7 @@ test.describe.serial('Database Enumerated Types', () => {await page.getByRole('menuitem', { name: 'Delete type' }).click()await page.getByRole('heading', { name: 'Confirm to delete enumerated' }).click()await page.getByRole('button', { name: 'Confirm delete' }).click()- await expect(page.getByText(`Successfully deleted "${databaseEnumName}"`)).toBeVisible({+ await expect(page.getByText(`Successfully deleted type "${databaseEnumName}"`)).toBeVisible({timeout: 50000,})})