fix main/master

Author: nessie

frontend/src/components/git/BranchSelect.tsx

@@ -19,6 +19,25 @@ interface BranchSelectProps {
   size?: 'small' | 'medium'
 }
 
+const getFallbackBranch = (defaultBranch: string | undefined, branches: string[]): string => {
+  if (branches.length === 0) {
+    return ''
+  }
+  
+  if (branches.includes('main')) {
+    return 'main'
+  }
+  if (branches.includes('master')) {
+    return 'master'
+  }
+
+  if (defaultBranch && branches.includes(defaultBranch)) {
+    return defaultBranch
+  }
+
+  return branches[0]
+}
+
 const BranchSelect: FC<BranchSelectProps> = ({
   repository,
   currentBranch,
@@ -29,6 +48,8 @@ const BranchSelect: FC<BranchSelectProps> = ({
   onNewBranchClick,
   size = 'small',
 }) => {
+  const fallbackBranch = getFallbackBranch(repository?.default_branch, branches)
+
   const handleChange = (value: string) => {
     setCurrentBranch(value)
     if (onBranchChange) {
@@ -48,15 +69,12 @@ const BranchSelect: FC<BranchSelectProps> = ({
           renderValue={(value) => (
             <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
               <GitBranch size={14} />
-              <span>{value || repository?.default_branch || 'main'}</span>
+              <span>{value || fallbackBranch}</span>
             </Box>
           )}
           sx={{ fontWeight: 500 }}
         >
-          <MenuItem value="">
-            {repository?.default_branch || 'main'}
-          </MenuItem>
-          {branches.filter(b => b !== repository?.default_branch).map((branch) => (
+          {branches.map((branch) => (
             <MenuItem key={branch} value={branch}>
               {branch}
             </MenuItem>

frontend/src/components/git/CodeTab.tsx

@@ -44,6 +44,25 @@ import {
 import useSnackbar from '../../hooks/useSnackbar'
 import BranchSelect from './BranchSelect'
 
+const getFallbackBranch = (defaultBranch: string | undefined, branches: string[]): string => {
+  if (branches.length === 0) {
+    return ''
+  }
+  
+  if (branches.includes('main')) {
+    return 'main'
+  }
+  if (branches.includes('master')) {
+    return 'master'
+  }
+
+  if (defaultBranch && branches.includes(defaultBranch)) {
+    return defaultBranch
+  }
+
+  return branches[0]
+}
+
 interface CodeTabProps {
   repository: any
   enrichments: any[]
@@ -132,6 +151,7 @@ const CodeTab: FC<CodeTabProps> = ({
   const createPullRequestMutation = useCreateGitRepositoryPullRequest()
   const { data: pullRequests = [] } = useListRepositoryPullRequests(repository?.id || '')
   const snackbar = useSnackbar()
+  const fallbackBranch = getFallbackBranch(repository?.default_branch, branches)
 
   const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null)
   const openMenu = Boolean(anchorEl)
@@ -166,7 +186,7 @@ const CodeTab: FC<CodeTabProps> = ({
         request: {
           title: `Pull Request from ${currentBranch}`,
           source_branch: currentBranch,
-          target_branch: repository.default_branch || 'main',
+          target_branch: fallbackBranch,
         }
       })
       setCreatePRDialogOpen(false)
@@ -259,7 +279,7 @@ const CodeTab: FC<CodeTabProps> = ({
               >
                 <MenuItem
                   disabled={
-                    currentBranch === (repository?.default_branch || 'main') ||
+                    currentBranch === fallbackBranch ||
                     currentBranch === 'master'
                   }
                   onClick={() => {
@@ -277,7 +297,7 @@ const CodeTab: FC<CodeTabProps> = ({
                   onClick={() => {
                     handleMenuClose()
                     setNewBranchName('')
-                    setNewBranchBase(currentBranch || repository?.default_branch || 'main')
+                    setNewBranchBase(currentBranch || fallbackBranch)
                     setCreateBranchDialogOpen(true)
                   }}
                 >
@@ -578,7 +598,7 @@ const CodeTab: FC<CodeTabProps> = ({
                 Are you sure you want to create a pull request for branch <strong>{currentBranch}</strong>?
               </Typography>
               <Typography variant="body2" color="text.secondary">
-                This will create a pull request to merge changes from <strong>{currentBranch}</strong> into <strong>{repository?.default_branch || 'main'}</strong>.
+                This will create a pull request to merge changes from <strong>{currentBranch}</strong> into <strong>{fallbackBranch}</strong>.
               </Typography>
             </Box>
           )}

frontend/src/pages/GitRepoDetail.tsx

@@ -96,6 +96,25 @@ const getTabName = (name: string | undefined): TabName => {
   return TAB_NAMES[0]
 }
 
+const getFallbackBranch = (defaultBranch: string | undefined, branches: string[]): string => {
+  if (branches.length === 0) {
+    return ''
+  }
+  
+  if (branches.includes('main')) {
+    return 'main'
+  }
+  if (branches.includes('master')) {
+    return 'master'
+  }
+
+  if (defaultBranch && branches.includes(defaultBranch)) {
+    return defaultBranch
+  }
+
+  return branches[0]
+}
+
 const GitRepoDetail: FC = () => {
   const router = useRouter()
   const repoId = router.params.repoId
@@ -229,11 +248,11 @@ const GitRepoDetail: FC = () => {
 
   // Auto-select default branch when repository loads and no branch is specified
   React.useEffect(() => {
-    if (repository && !branchFromQuery) {
-      const defaultBranch = repository.default_branch || 'main'
+    if (repository && !branchFromQuery && branches.length > 0) {
+      const defaultBranch = getFallbackBranch(repository.default_branch, branches)
       setCurrentBranch(defaultBranch)
     }
-  }, [repository, branchFromQuery])
+  }, [repository, branchFromQuery, branches])
 
   // Auto-load README.md when repository loads
   React.useEffect(() => {
@@ -1100,8 +1119,8 @@ const GitRepoDetail: FC = () => {
                     </Box>
                   )}
                 >
-                  <MenuItem value={repository?.default_branch || 'main'}>
-                    {repository?.default_branch || 'main'}
+                  <MenuItem value={getFallbackBranch(repository?.default_branch, branches)}>
+                    {getFallbackBranch(repository?.default_branch, branches)}
                   </MenuItem>
                   {branches.filter(b => b !== repository?.default_branch).map((branch) => (
                     <MenuItem key={branch} value={branch}>