The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): derive switch-to-preview refs from the branch (FE-4219) (#49320)
Ali Waseem5d3b84945ea5
diff --git a/apps/studio/components/interfaces/BranchManagement/SwitchToPreviewModal.test.tsx b/apps/studio/components/interfaces/BranchManagement/SwitchToPreviewModal.test.tsxnew file mode 100644index 00000000000..c935c186525--- /dev/null+++ b/apps/studio/components/interfaces/BranchManagement/SwitchToPreviewModal.test.tsx@@ -0,0 +1,103 @@+import { screen, waitFor } from '@testing-library/react'+import userEvent from '@testing-library/user-event'+import { mockAnimationsApi } from 'jsdom-testing-mocks'+import { HttpResponse } from 'msw'+import { toast } from 'sonner'+import { describe, expect, test, vi } from 'vitest'++import { SwitchToPreviewModal } from './SwitchToPreviewModal'+import type { components } from '@/data/api'+import type { Branch } from '@/data/branches/branches-query'+import { customRender } from '@/tests/lib/custom-render'+import { addAPIMock, type APIErrorBody } from '@/tests/lib/msw'++mockAnimationsApi()++vi.mock('sonner', () => ({+ toast: { success: vi.fn(), error: vi.fn() },+}))++type BranchUpdateResponse = components['schemas']['BranchUpdateResponse']++const PARENT_PROJECT_REF = 'parent-project-ref'+const BRANCH_PROJECT_REF = 'branch-project-ref'++const BRANCH: Branch = {+ created_at: '2026-01-01T00:00:00.000Z',+ id: '00000000-0000-0000-0000-000000000001',+ is_default: false,+ name: 'docs-local-staging',+ parent_project_ref: PARENT_PROJECT_REF,+ persistent: true,+ project_ref: BRANCH_PROJECT_REF,+ status: 'MIGRATIONS_PASSED',+ updated_at: '2026-01-01T00:00:00.000Z',+ with_data: false,+}++const mockBranchUpdate = () => {+ const requests: Array<{ branchRef: string | undefined; body: unknown }> = []++ addAPIMock({+ method: 'patch',+ path: '/v1/branches/:branch_id_or_ref',+ response: async ({ request, params }) => {+ requests.push({+ branchRef: params.branch_id_or_ref as string | undefined,+ body: await request.json(),+ })+ return HttpResponse.json<BranchUpdateResponse>({+ message: 'ok',+ workflow_run_id: 'workflow-run-1',+ })+ },+ })++ return requests+}++const renderModal = (overrides: { branch?: Branch; onClose?: () => void } = {}) => {+ const onClose = overrides.onClose ?? vi.fn()+ customRender(<SwitchToPreviewModal open branch={overrides.branch} onClose={onClose} />)+ return { onClose }+}++describe('SwitchToPreviewModal', () => {+ test('switches the branch to preview using the refs on the branch', async () => {+ const requests = mockBranchUpdate()++ const { onClose } = renderModal({ branch: BRANCH })++ await userEvent.click(await screen.findByRole('button', { name: 'Switch to preview' }))++ await waitFor(() => expect(onClose).toHaveBeenCalledOnce())+ expect(requests).toEqual([{ branchRef: BRANCH_PROJECT_REF, body: { persistent: false } }])+ expect(toast.success).toHaveBeenCalledWith('Successfully updated branch')+ })++ test('surfaces the error and keeps the modal open when the update fails', async () => {+ addAPIMock({+ method: 'patch',+ path: '/v1/branches/:branch_id_or_ref',+ response: () =>+ HttpResponse.json<APIErrorBody>({ message: 'Something exploded' }, { status: 500 }),+ })++ const { onClose } = renderModal({ branch: BRANCH })++ const confirm = await screen.findByRole('button', { name: 'Switch to preview' })+ await userEvent.click(confirm)++ await waitFor(() =>+ expect(toast.error).toHaveBeenCalledWith('Failed to update branch: Something exploded')+ )+ expect(onClose).not.toHaveBeenCalled()+ expect(confirm).toBeEnabled()+ })++ test('disables the confirm button while the branch is unavailable', async () => {+ renderModal()++ expect(await screen.findByRole('button', { name: 'Switch to preview' })).toBeDisabled()+ })+})diff --git a/apps/studio/components/interfaces/BranchManagement/SwitchToPreviewModal.tsx b/apps/studio/components/interfaces/BranchManagement/SwitchToPreviewModal.tsxindex d86c42a8389..d4644777982 100644--- a/apps/studio/components/interfaces/BranchManagement/SwitchToPreviewModal.tsx+++ b/apps/studio/components/interfaces/BranchManagement/SwitchToPreviewModal.tsx@@ -3,7 +3,6 @@ import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'import { type Branch } from '@/data/branches/branches-query'-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'interface SwitchToPreviewModalProps {open: boolean@@ -12,11 +11,6 @@ interface SwitchToPreviewModalProps {}export const SwitchToPreviewModal = ({ open, branch, onClose }: SwitchToPreviewModalProps) => {- const { data: project } = useSelectedProjectQuery()-- const branchRef = project?.ref- const projectRef = project?.parent_project_ref-const { mutate: updateBranch, isPending: isUpdatingBranch } = useBranchUpdateMutation({onSuccess() {toast.success('Successfully updated branch')@@ -24,11 +18,13 @@ export const SwitchToPreviewModal = ({ open, branch, onClose }: SwitchToPreviewM},})- const onTogglePersistent = () => {- if (branchRef === undefined || projectRef === undefined || branch === undefined) {- return console.error('Branch metadata is required')- }- updateBranch({ branchRef, projectRef, persistent: !branch.persistent })+ const onSwitchToPreview = () => {+ if (branch === undefined) return+ updateBranch({+ branchRef: branch.project_ref,+ projectRef: branch.parent_project_ref,+ persistent: false,+ })}return (@@ -38,8 +34,9 @@ export const SwitchToPreviewModal = ({ open, branch, onClose }: SwitchToPreviewMconfirmLabel="Switch to preview"title="Switch branch to preview before deleting"loading={isUpdatingBranch}+ disabled={branch === undefined}onCancel={() => onClose()}- onConfirm={onTogglePersistent}+ onConfirm={onSwitchToPreview}><p className="text-sm text-foreground-light">You must switch the branch "{branch?.name}" to preview before deleting it.