Files
Aaron ByrneandAli Waseem fcdff89e13 fix(studio):Synced Git Branch now shows error message (#42790)
## I have read the
[CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md)
file.

YES

## What kind of change does this PR introduce?

Bug fix

## What is the current behavior?

<img width="300" height="300" alt="image"
src="https://github.com/user-attachments/assets/dd39485d-0c04-43c9-bed4-bd21db0ebdcd"
/>

It allows you to attempt to create a branch even when that branch is
used.

We then get a vague error that the branch creation has failed.
<img width="200" height="50" alt="image"
src="https://github.com/user-attachments/assets/7d7c9d1f-93d1-4278-ac88-766bb02c5aa3"
/>


## What is the new behavior?
<img width="350" height="400" alt="image"
src="https://github.com/user-attachments/assets/fc0562cb-4478-417b-9a1b-f192ba24076a"
/>


## Additional context

Add any other context or screenshots.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Bug Fixes**
* Prevented users from linking the same GitHub branch to multiple local
branches, with clear error messages shown during both branch creation
and editing.
* Enhanced validation checks to ensure branch linkage uniqueness and
provide real-time feedback on invalid selections.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Co-authored-by: Ali Waseem <waseema393@gmail.com>
2026-02-19 09:20:39 +00:00

358 lines
13 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { useDebounce } from '@uidotdev/usehooks'
import { Check, Github, Loader2 } from 'lucide-react'
import Image from 'next/image'
import { useRouter } from 'next/router'
import { useCallback, useEffect, useState } from 'react'
import { useForm, useWatch } from 'react-hook-form'
import { toast } from 'sonner'
import * as z from 'zod'
import { InlineLink } from '@/components/ui/InlineLink'
import { useParams } from 'common'
import { useIsBranching2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { AlertError } from 'components/ui/AlertError'
import { useBranchUpdateMutation } from 'data/branches/branch-update-mutation'
import { Branch, useBranchesQuery } from 'data/branches/branches-query'
import { useCheckGithubBranchValidity } from 'data/integrations/github-branch-check-query'
import { useGitHubConnectionsQuery } from 'data/integrations/github-connections-query'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { BASE_PATH } from 'lib/constants'
import {
Badge,
Button,
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
FormControl_Shadcn_,
FormField_Shadcn_,
Form_Shadcn_,
Input_Shadcn_,
Label_Shadcn_ as Label,
cn,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
interface EditBranchModalProps {
branch?: Branch
visible: boolean
onClose: () => void
}
export const EditBranchModal = ({ branch, visible, onClose }: EditBranchModalProps) => {
const { ref } = useParams()
const router = useRouter()
const { data: projectDetails } = useSelectedProjectQuery()
const { data: selectedOrg } = useSelectedOrganizationQuery()
const gitlessBranching = useIsBranching2Enabled()
const [isGitBranchValid, setIsGitBranchValid] = useState(false)
const isBranch = projectDetails?.parent_project_ref !== undefined
const projectRef =
projectDetails !== undefined ? (isBranch ? projectDetails.parent_project_ref : ref) : undefined
const {
data: connections,
error: connectionsError,
isPending: isLoadingConnections,
isSuccess: isSuccessConnections,
isError: isErrorConnections,
} = useGitHubConnectionsQuery({
organizationId: selectedOrg?.id,
})
const { data: branches } = useBranchesQuery({ projectRef })
const { mutate: checkGithubBranchValidity, isPending: isChecking } = useCheckGithubBranchValidity(
{ onError: () => {} }
)
const { mutate: updateBranch, isPending: isUpdating } = useBranchUpdateMutation({
onSuccess: (data) => {
toast.success(`Successfully updated branch "${data.name}"`)
onClose()
},
onError: (error) => {
toast.error(`Failed to update branch: ${error.message}`)
},
})
const githubConnection = connections?.find((connection) => connection.project.ref === projectRef)
const [repoOwner, repoName] = githubConnection?.repository.name.split('/') ?? []
const formId = 'edit-branch-form'
const FormSchema = z.object({
branchName: z
.string()
.min(1, 'Branch name cannot be empty')
.refine(
(val) => /^[a-zA-Z0-9\-_]+$/.test(val),
'Branch name can only contain alphanumeric characters, hyphens, and underscores.'
)
.refine(
(val) =>
// Allow the current branch name during edit
val === branch?.name || (branches ?? []).every((b) => b.name !== val),
'A branch with this name already exists'
),
gitBranchName: z
.string()
.refine(
(val) => gitlessBranching || !githubConnection || (val && val.length > 0),
'Git branch name is required when GitHub is connected'
),
})
const form = useForm<z.infer<typeof FormSchema>>({
mode: 'onChange',
reValidateMode: 'onChange',
resolver: zodResolver(FormSchema),
defaultValues: { branchName: '', gitBranchName: '' },
})
const gitBranchName = useWatch({ control: form.control, name: 'gitBranchName' })
const debouncedGitBranchName = useDebounce(gitBranchName, 500)
const isFormValid = form.formState.isValid && (!gitBranchName || isGitBranchValid)
const canSubmit = isFormValid && !isUpdating && !isChecking
const openLinkerPanel = () => {
onClose()
if (projectRef) {
router.push(`/project/${projectRef}/settings/integrations`)
}
}
const onSubmit = (data: z.infer<typeof FormSchema>) => {
if (!projectRef) return console.error('Project ref is required')
if (!branch?.project_ref) return console.error('Branch ref is required')
const payload: {
branchRef: string
projectRef: string
branchName: string
gitBranch?: string
} = {
branchRef: branch.project_ref,
projectRef,
branchName: data.branchName,
}
// Only add gitBranch to the payload if it is present and valid
// If gitBranchName is empty or invalid, gitBranch remains undefined in the payload
if (data.gitBranchName && isGitBranchValid) {
payload.gitBranch = data.gitBranchName
}
updateBranch(payload)
}
const validateGitBranchName = useCallback(
(branchName: string) => {
if (!githubConnection)
return console.error(
'[EditBranchModal > validateGitBranchName] GitHub Connection is missing'
)
const repositoryId = githubConnection.repository.id
const requested = branchName
checkGithubBranchValidity(
{ repositoryId, branchName },
{
onSuccess: () => {
if (form.getValues('gitBranchName') !== requested) return
// Check if another branch is already linked to this git branch
const existingBranch = (branches ?? []).find(
(b) => b.git_branch === branchName && b.id !== branch?.id
)
if (existingBranch) {
setIsGitBranchValid(false)
form.setError('gitBranchName', {
message: `Branch "${existingBranch.name}" is already linked to git branch "${branchName}"`,
})
return
}
setIsGitBranchValid(true)
form.clearErrors('gitBranchName')
},
onError: (error) => {
if (form.getValues('gitBranchName') !== requested) return
setIsGitBranchValid(false)
form.setError('gitBranchName', {
...error,
message: `Unable to find branch "${branchName}" in ${repoOwner}/${repoName}`,
})
},
}
)
},
[githubConnection, form, checkGithubBranchValidity, repoOwner, repoName, branches, branch]
)
// Pre-fill form when the modal becomes visible and branch data is available
useEffect(() => {
if (visible && branch) {
setIsGitBranchValid(!!branch.git_branch || gitlessBranching) // Initial validity based on existing link or gitless branching
form.reset({
branchName: branch.name ?? '',
gitBranchName: branch.git_branch ?? '',
})
}
}, [branch, visible, form, gitlessBranching])
useEffect(() => {
if (!githubConnection || !debouncedGitBranchName) {
setIsGitBranchValid(gitlessBranching)
form.clearErrors('gitBranchName')
return
}
form.clearErrors('gitBranchName')
validateGitBranchName(debouncedGitBranchName)
}, [debouncedGitBranchName, validateGitBranchName, form, githubConnection, gitlessBranching])
return (
<Dialog open={visible} onOpenChange={(open) => !open && onClose()}>
<DialogContent size="large" hideClose>
<DialogHeader padding="small">
<DialogTitle>Edit branch "{branch?.name}"</DialogTitle>
</DialogHeader>
<DialogSectionSeparator />
<Form_Shadcn_ {...form}>
<form id={formId} onSubmit={form.handleSubmit(onSubmit)}>
<DialogSection padding="medium" className="space-y-4">
<FormField_Shadcn_
control={form.control}
name="branchName"
render={({ field }) => (
<FormItemLayout label="Preview branch name">
<FormControl_Shadcn_>
<Input_Shadcn_
{...field}
placeholder="e.g. staging, dev-feature-x"
autoComplete="off"
/>
</FormControl_Shadcn_>
</FormItemLayout>
)}
/>
{githubConnection && (
<FormField_Shadcn_
control={form.control}
name="gitBranchName"
render={({ field }) => (
<FormItemLayout
label={
<div className="flex items-center justify-between w-full gap-4">
<span className="flex-1">
Sync with Git branch {gitlessBranching ? '(optional)' : ''}
</span>
<div className="flex items-center gap-2 text-sm">
<Image
className={cn('dark:invert')}
src={`${BASE_PATH}/img/icons/github-icon.svg`}
width={16}
height={16}
alt={`GitHub icon`}
/>
<InlineLink href={`https://github.com/${repoOwner}/${repoName}`}>
{repoOwner}/{repoName}
</InlineLink>
</div>
</div>
}
description={
gitlessBranching
? 'Automatically deploy changes on every commit'
: 'If linked, migrations from this Git branch will be automatically deployed.'
}
>
<div className="relative">
<FormControl_Shadcn_>
<Input_Shadcn_
{...field}
placeholder="e.g. main, feat/some-feature"
autoComplete="off"
onChange={(e) => {
field.onChange(e)
setIsGitBranchValid(false)
}}
/>
</FormControl_Shadcn_>
<div className="absolute top-2.5 right-3 flex items-center gap-2">
{field.value ? (
isChecking ? (
<Loader2 size={14} className="animate-spin" />
) : isGitBranchValid ? (
<Check size={14} className="text-brand" strokeWidth={2} />
) : null
) : null}
</div>
</div>
</FormItemLayout>
)}
/>
)}
{isLoadingConnections && <GenericSkeletonLoader />}
{isErrorConnections && (
<AlertError
error={connectionsError}
subject="Failed to retrieve GitHub connection information"
/>
)}
{isSuccessConnections && !githubConnection && (
<div className="flex items-center gap-2 justify-between">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<Label>Sync with a GitHub branch</Label>
{!gitlessBranching && <Badge variant="warning">Required</Badge>}
</div>
<p className="text-sm text-foreground-light">
{gitlessBranching
? 'Optionally connect to a GitHub repository to manage migrations automatically for this branch.'
: 'Keep this preview branch in sync with a chosen GitHub branch'}
</p>
</div>
<Button type="default" icon={<Github />} onClick={openLinkerPanel}>
{gitlessBranching ? 'Connect to GitHub' : 'Configure'}
</Button>
</div>
)}
</DialogSection>
<DialogFooter padding="medium">
<Button disabled={isUpdating} type="default" onClick={onClose}>
Cancel
</Button>
<Button
form={formId}
disabled={
!isSuccessConnections ||
isUpdating ||
!canSubmit ||
isChecking ||
(!gitlessBranching && !githubConnection)
}
loading={isUpdating}
type="primary"
htmlType="submit"
>
Update branch
</Button>
</DialogFooter>
</form>
</Form_Shadcn_>
</DialogContent>
</Dialog>
)
}