Files
supabase/apps/studio/components/interfaces/BranchManagement/Branch.Commands.tsx
ea38c6d153 Review and merge branch (#36795)
* allow creating branching without git

* update branching modals

* add account connections

* edit branch

* copy

* update copy

* enable branch modal changes

* add gitless branching flag

* update account connections

* merge page

* merge experiment

* update merge

* update pull requests empty state

* use diff query

* branch diffing

* diff query

* Clean up

* refinements to gitless branching

* branching merge and status

* link

* branch function diffing

* update styling

* refactor

* remove hook

* error handling

* move

* remove enable branching modal

* re-add github linker

* abstract away enable and disable

* toggle fixes

* update logic to lean on connection status

* update form logic

* sheet layout

* gitless flag

* style and workflow updates

* fix side panel size

* fix duplicate onerror

* copy changes

* refetch

* merge mutation copy

* remove import

* add cost

* allow connection details on create

* initial queries

* push button

* merge cleanup

* Fix TS issues

* Fix TS issues

* Couple of clean ups

* Revert hardcode in useFlag

* Fix TS

* layout issues and github check

* refactor

* refactor to use new field

* cleanup

* style

* failed merge

* error positioning

* refactoring merge

* workflow refactor

* hook move

* clarification with github integration

* replace branch dropdown button

* update repo picker

* updates

* remove modal

* fix small nits

* change defaults

* clean up

* disable if not gitless and no connection

* clean up

* always show workflow run id

* optimistic

* fix branch query

* fix issues

* fetch edge diff

* confirm merge

* update edge functions key

---------

Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
Co-authored-by: Kevin Grüneberg <k.grueneberg1994@gmail.com>
Co-authored-by: Alaister Young <a@alaisteryoung.com>
2025-07-04 14:57:59 +10:00

64 lines
1.8 KiB
TypeScript

import { Forward, GitBranch } from 'lucide-react'
import { useBranchesQuery } from 'data/branches/branches-query'
import { useSelectedProject } from 'hooks/misc/useSelectedProject'
import { PageType, useRegisterCommands, useRegisterPage, useSetPage } from 'ui-patterns/CommandMenu'
import { COMMAND_MENU_SECTIONS } from '../App/CommandMenu/CommandMenu.utils'
import { orderCommandSectionsByPriority } from '../App/CommandMenu/ordering'
const SWITCH_BRANCH_PAGE_NAME = 'Switch branch'
const EMPTY_ARRAY = [] as Array<any>
export function useBranchCommands() {
const setPage = useSetPage()
const selectedProject = useSelectedProject()
const isBranchingEnabled = selectedProject?.is_branch_enabled === true
let { data: branches } = useBranchesQuery(
{
projectRef: selectedProject?.parent_project_ref || selectedProject?.ref,
},
{ enabled: isBranchingEnabled }
)
branches ??= EMPTY_ARRAY
useRegisterPage(
SWITCH_BRANCH_PAGE_NAME,
{
type: PageType.Commands,
sections: [
{
id: 'switch-branch',
name: 'Switch branch',
commands: branches.map((branch) => ({
id: `branch-${branch.id}`,
name: branch.name,
route: `/project/${branch.project_ref}`,
icon: () => <Forward />,
})),
},
],
},
{ enabled: isBranchingEnabled && branches.length > 0, deps: [branches] }
)
useRegisterCommands(
COMMAND_MENU_SECTIONS.ACTIONS,
[
{
id: 'switch-branch',
name: 'Switch branch',
value: 'Switch branch, Change branch, Select branch',
action: () => setPage(SWITCH_BRANCH_PAGE_NAME),
icon: () => <GitBranch />,
},
],
{
enabled: isBranchingEnabled && branches.length > 0,
orderSection: orderCommandSectionsByPriority,
sectionMeta: { priority: 3 },
}
)
}