The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Studio: prevent organization deletion without explicit project confirmation (#43898)
Monica Khouryd91b3474fdde
diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.ListAck.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.ListAck.tsxnew file mode 100644index 00000000000..b2803331563--- /dev/null+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.ListAck.tsx@@ -0,0 +1,53 @@+import { getComputeSize } from 'data/projects/org-projects-infinite-query'+import type { OrgProject } from 'data/projects/org-projects-infinite-query'+import { Checkbox_Shadcn_ } from 'ui'++type Props = {+ projects: OrgProject[]+ checkedProjects: Record<string, boolean>+ toggleProject: (ref: string, checked: boolean | 'indeterminate') => void+}++export const DeleteOrganizationButtonListAck = ({+ projects,+ checkedProjects,+ toggleProject,+}: Props) => {+ return (+ <>+ <p className="mb-2 text-sm text-foreground-lighter">+ Acknowledge each project that will be deleted:+ </p>++ <div className="mt-4 overflow-hidden rounded-md border border-default">+ {projects.map((project, i) => {+ const isChecked = !!checkedProjects[project.ref]++ return (+ <div+ key={project.ref}+ className={`flex cursor-pointer items-center gap-3 px-3 py-2 text-sm hover:bg-surface-200 ${+ i !== projects.length - 1 ? 'border-b border-default' : ''+ }`}+ onClick={() => toggleProject(project.ref, !isChecked)}+ >+ <Checkbox_Shadcn_+ className="mt-[2px]"+ checked={isChecked}+ onCheckedChange={(nextChecked) => toggleProject(project.ref, nextChecked)}+ onClick={(e) => e.stopPropagation()}+ />++ <div className="flex flex-1 items-center justify-between">+ <span className="text-foreground">{project.name}</span>+ <span className="text-xs text-foreground-lighter">+ {getComputeSize(project) ?? 'Unknown'}+ </span>+ </div>+ </div>+ )+ })}+ </div>+ </>+ )+}diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.SingleAck.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.SingleAck.tsxnew file mode 100644index 00000000000..86c23c6adeb--- /dev/null+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.SingleAck.tsx@@ -0,0 +1,33 @@+import { Checkbox_Shadcn_ } from 'ui'++type Props = {+ acknowledgedAll: boolean+ setAcknowledgedAll: (value: boolean) => void+ max: number+}++export const DeleteOrganizationButtonSingleAck = ({+ acknowledgedAll,+ setAcknowledgedAll,+ max,+}: Props) => {+ return (+ <div className="mt-2 rounded-md border border-warning bg-warning/5 px-3 py-3">+ <p className="text-sm text-foreground">+ This organization contains more than {max} projects.+ </p>++ <div+ className="mt-3 flex cursor-pointer items-center gap-2 text-sm text-foreground"+ onClick={() => setAcknowledgedAll(!acknowledgedAll)}+ >+ <Checkbox_Shadcn_+ checked={acknowledgedAll}+ onCheckedChange={(checked) => setAcknowledgedAll(checked === true)}+ onClick={(e) => e.stopPropagation()}+ />+ I understand that all projects will be permanently deleted.+ </div>+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsxindex 0ab8ff62e2d..182858bdb8b 100644--- a/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsx+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsx@@ -1,23 +1,95 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { LOCAL_STORAGE_KEYS } from 'common'import { useRouter } from 'next/router'-import { useState } from 'react'+import { useEffect, useState } from 'react'import { toast } from 'sonner'+import { DeleteOrganizationButtonListAck } from './DeleteOrganizationButton.ListAck'+import { DeleteOrganizationButtonSingleAck } from './DeleteOrganizationButton.SingleAck'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'import { useOrganizationDeleteMutation } from '@/data/organizations/organization-delete-mutation'+import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+const MAX_PROJECT_ACKNOWLEDGEMENTS = 10+export const DeleteOrganizationButton = () => {const router = useRouter()+const { data: selectedOrganization } = useSelectedOrganizationQuery()const { slug: orgSlug, name: orgName } = selectedOrganization ?? {}+ const [checkedProjects, setCheckedProjects] = useState<Record<string, boolean>>({})+ const [acknowledgedAll, setAcknowledgedAll] = useState(false)const [isOpen, setIsOpen] = useState(false)+ useEffect(() => {+ setCheckedProjects({})+ setAcknowledgedAll(false)+ }, [orgSlug])++ const {+ data: projectsData,+ isLoading,+ isFetching,+ isError,+ } = useOrgProjectsInfiniteQuery(+ {+ slug: orgSlug,+ limit: MAX_PROJECT_ACKNOWLEDGEMENTS + 1,+ },+ {+ enabled: isOpen,+ refetchOnMount: 'always',+ }+ )++ // When an organization slug is present but the projects query has not yet+ // produced any data (and hasn't errored), treat this as a "pending" state+ // rather than as "no projects". This avoids interpreting lack of data as+ // an empty list, which could allow deletion to proceed without any project+ // acknowledgement.+ const isProjectsDataPending = orgSlug !== undefined && projectsData === undefined && !isError++ const projects =+ !isProjectsDataPending && projectsData !== undefined+ ? projectsData.pages.flatMap((page) => page.projects ?? [])+ : undefined++ const shouldRenderChecklist =+ projects !== undefined && projects.length > 0 && projects.length <= MAX_PROJECT_ACKNOWLEDGEMENTS++ const exceedsLimit = projects !== undefined && projects.length > MAX_PROJECT_ACKNOWLEDGEMENTS++ const toggleProject = (ref: string, checked?: boolean | 'indeterminate') => {+ setCheckedProjects((prev) => ({+ ...prev,+ [ref]: checked === undefined ? !prev[ref] : checked === true,+ }))+ }++ const isDeletionConfirmed = () => {+ // While project data is pending or unavailable, treat deletion as not confirmed+ if (!projects) return false++ if (projects.length === 0) return true++ if (shouldRenderChecklist) {+ return projects.every((p) => checkedProjects[p.ref])+ }++ if (exceedsLimit) {+ return acknowledgedAll+ }++ return false+ }++ const allChecked = isDeletionConfirmed()+const [_, setLastVisitedOrganization] = useLocalStorageQuery(LOCAL_STORAGE_KEYS.LAST_VISITED_ORGANIZATION,''@@ -41,10 +113,27 @@ export const DeleteOrganizationButton = () => {toast.error('You do not have permission to delete this organization')return}+if (!orgSlug) {console.error('Org slug is required')return}++ if (isLoading || isFetching || isProjectsDataPending) {+ toast.error('Projects are still loading, please wait')+ return+ }++ if (isError) {+ toast.error('Failed to load projects')+ return+ }++ if (!allChecked) {+ toast.error('Please acknowledge all projects before deleting the organization')+ return+ }+deleteOrganization({ slug: orgSlug })}@@ -55,7 +144,11 @@ export const DeleteOrganizationButton = () => {type="danger"disabled={!canDeleteOrganization || !orgSlug}loading={!orgSlug}- onClick={() => setIsOpen(true)}+ onClick={() => {+ setCheckedProjects({})+ setAcknowledgedAll(false)+ setIsOpen(true)+ }}tooltip={{content: {side: 'bottom',@@ -68,6 +161,7 @@ export const DeleteOrganizationButton = () => {Delete organization</ButtonTooltip></div>+<TextConfirmModalvisible={isOpen}size="small"@@ -80,7 +174,28 @@ export const DeleteOrganizationButton = () => {onConfirm={onConfirmDelete}onCancel={() => setIsOpen(false)}>- <p className="text-sm text-foreground-lighter">+ {/* ≤ MAX → checklist */}+ {shouldRenderChecklist && (+ <DeleteOrganizationButtonListAck+ projects={projects}+ checkedProjects={checkedProjects}+ toggleProject={toggleProject}+ />+ )}++ {/* > MAX → single confirmation */}+ {exceedsLimit && (+ <DeleteOrganizationButtonSingleAck+ acknowledgedAll={acknowledgedAll}+ setAcknowledgedAll={setAcknowledgedAll}+ max={MAX_PROJECT_ACKNOWLEDGEMENTS}+ />+ )}++ {/* Final warning */}+ <p+ className={`text-sm text-foreground-lighter ${(projects?.length ?? 0) > 0 ? 'mt-4' : ''}`}+ >This action <span className="text-foreground">cannot</span> be undone. This willpermanently delete the <span className="text-foreground">{orgName}</span> organization andremove all of its projects.