The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat(studio): org project branch mobile selector (#43238)
Francesco Sansalvadoreb997b7fb13a7
diff --git a/apps/studio/components/interfaces/ConnectButton/ConnectButton.tsx b/apps/studio/components/interfaces/ConnectButton/ConnectButton.tsxindex ac2351c5f47..4e1cf5fbc16 100644--- a/apps/studio/components/interfaces/ConnectButton/ConnectButton.tsx+++ b/apps/studio/components/interfaces/ConnectButton/ConnectButton.tsx@@ -3,15 +3,16 @@ import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { Plug } from 'lucide-react'import { parseAsBoolean, useQueryState } from 'nuqs'import { ComponentProps } from 'react'-import { Button } from 'ui'+import { Button, cn } from 'ui'import { PROJECT_STATUS } from '@/lib/constants'interface ConnectButtonProps {buttonType?: ComponentProps<typeof Button>['type']+ className?: string}-export const ConnectButton = ({ buttonType = 'default' }: ConnectButtonProps) => {+export const ConnectButton = ({ buttonType = 'default', className }: ConnectButtonProps) => {const { data: selectedProject } = useSelectedProjectQuery()const isActiveHealthy = selectedProject?.status === PROJECT_STATUS.ACTIVE_HEALTHY@@ -21,7 +22,7 @@ export const ConnectButton = ({ buttonType = 'default' }: ConnectButtonProps) =><ButtonTooltiptype={buttonType}disabled={!isActiveHealthy}- className="rounded-full"+ className={cn('rounded-full', className)}icon={<Plug className="rotate-90" />}onClick={() => setShowConnect(true)}tooltip={{diff --git a/apps/studio/components/interfaces/LocalDropdown.tsx b/apps/studio/components/interfaces/LocalDropdown.tsxindex a335bb2b807..774e78c9093 100644--- a/apps/studio/components/interfaces/LocalDropdown.tsx+++ b/apps/studio/components/interfaces/LocalDropdown.tsx@@ -3,6 +3,7 @@ import { Command, FlaskConical } from 'lucide-react'import { useTheme } from 'next-themes'import {Button,+ cn,DropdownMenu,DropdownMenuContent,DropdownMenuGroup,@@ -19,14 +20,20 @@ import { useSetCommandMenuOpen } from 'ui-patterns'import { useFeaturePreviewModal } from './App/FeaturePreview/FeaturePreviewContext'-export const LocalDropdown = () => {+export const LocalDropdown = ({+ triggerClassName,+ contentClassName,+}: {+ triggerClassName?: string+ contentClassName?: string+}) => {const { theme, setTheme } = useTheme()const setCommandMenuOpen = useSetCommandMenuOpen()const { toggleFeaturePreviewModal } = useFeaturePreviewModal()return (<DropdownMenu>- <DropdownMenuTrigger className="border flex-shrink-0 px-3" asChild>+ <DropdownMenuTrigger className={cn('border flex-shrink-0 px-3', triggerClassName)} asChild><Buttontype="default"className="[&>span]:flex px-0 py-0 rounded-full overflow-hidden h-8 w-8"@@ -34,7 +41,7 @@ export const LocalDropdown = () => {<ProfileImage className="w-8 h-8 rounded-md" /></Button></DropdownMenuTrigger>- <DropdownMenuContent side="bottom" align="end" className="w-44">+ <DropdownMenuContent side="bottom" align="end" className={cn('w-44', contentClassName)}><DropdownMenuItemclassName="flex gap-2 cursor-pointer"onClick={() => toggleFeaturePreviewModal(true)}diff --git a/apps/studio/components/interfaces/UserDropdown.tsx b/apps/studio/components/interfaces/UserDropdown.tsxindex 1ea0f01e959..bac26dca6f8 100644--- a/apps/studio/components/interfaces/UserDropdown.tsx+++ b/apps/studio/components/interfaces/UserDropdown.tsx@@ -9,6 +9,7 @@ import { useRouter } from 'next/router'import { useAppStateSnapshot } from 'state/app-state'import {Button,+ cn,DropdownMenu,DropdownMenuContent,DropdownMenuGroup,@@ -24,7 +25,13 @@ import {import { useFeaturePreviewModal } from './App/FeaturePreview/FeaturePreviewContext'-export function UserDropdown() {+export function UserDropdown({+ triggerClassName,+ contentClassName,+}: {+ triggerClassName?: string+ contentClassName?: string+}) {const router = useRouter()const { theme, setTheme } = useTheme()const appStateSnapshot = useAppStateSnapshot()@@ -35,7 +42,7 @@ export function UserDropdown() {return (<DropdownMenu>- <DropdownMenuTrigger asChild className="border flex-shrink-0 px-3">+ <DropdownMenuTrigger asChild className={cn('border flex-shrink-0 px-3', triggerClassName)}><Buttontype="default"className="[&>span]:flex px-0 py-0 rounded-full overflow-hidden h-8 w-8"@@ -50,7 +57,7 @@ export function UserDropdown() {</Button></DropdownMenuTrigger>- <DropdownMenuContent side="bottom" align="end">+ <DropdownMenuContent side="bottom" align="end" className={contentClassName}>{IS_PLATFORM && (<><div className="px-2 py-1 flex flex-col gap-0 text-sm">diff --git a/apps/studio/components/layouts/AppLayout/AppLayoutDropdown.tsx b/apps/studio/components/layouts/AppLayout/AppLayoutDropdown.tsxnew file mode 100644index 00000000000..dd603b84db3--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/AppLayoutDropdown.tsx@@ -0,0 +1,73 @@+import { AlertCircle, ChevronsUpDown } from 'lucide-react'+import Link from 'next/link'+import { forwardRef, type ReactNode } from 'react'+import { Button, cn, Popover_Shadcn_, PopoverContent_Shadcn_, PopoverTrigger_Shadcn_ } from 'ui'++interface AppLayoutDropdownErrorProps {+ message: string+}++export function AppLayoutDropdownError({ message }: AppLayoutDropdownErrorProps) {+ return (+ <div className="flex items-center space-x-2 text-amber-900">+ <AlertCircle size={16} strokeWidth={1.5} />+ <p className="text-sm">{message}</p>+ </div>+ )+}++interface AppLayoutDropdownTriggerButtonProps+ extends React.ButtonHTMLAttributes<HTMLButtonElement> {+ className?: string+}++export const AppLayoutDropdownTriggerButton = forwardRef<+ HTMLButtonElement,+ AppLayoutDropdownTriggerButtonProps+>(({ className, ...props }, ref) => (+ <Button+ ref={ref}+ size="tiny"+ className={cn('px-1.5 py-4 [&_svg]:w-5 [&_svg]:h-5 ml-1', className)}+ iconRight={<ChevronsUpDown strokeWidth={1.5} />}+ {...props}+ type="text"+ />+))+AppLayoutDropdownTriggerButton.displayName = 'AppLayoutDropdownTriggerButton'++export interface AppLayoutDropdownWithPopoverProps {+ linkHref: string+ linkContent: ReactNode+ linkClassName?: string+ commandContent: ReactNode+ open: boolean+ onOpenChange: (open: boolean) => void+ triggerButtonClassName?: string+}++export function AppLayoutDropdownWithPopover({+ linkHref,+ linkContent,+ linkClassName = 'flex items-center gap-2 flex-shrink-0 text-sm',+ commandContent,+ open,+ onOpenChange,+ triggerButtonClassName,+}: AppLayoutDropdownWithPopoverProps) {+ return (+ <Popover_Shadcn_ open={open} onOpenChange={onOpenChange} modal={false}>+ <div className="flex items-center flex-shrink-0">+ <Link href={linkHref} className={linkClassName}>+ {linkContent}+ </Link>+ <PopoverTrigger_Shadcn_ asChild>+ <AppLayoutDropdownTriggerButton className={triggerButtonClassName} />+ </PopoverTrigger_Shadcn_>+ </div>+ <PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">+ {commandContent}+ </PopoverContent_Shadcn_>+ </Popover_Shadcn_>+ )+}diff --git a/apps/studio/components/layouts/AppLayout/BranchBadge.tsx b/apps/studio/components/layouts/AppLayout/BranchBadge.tsxnew file mode 100644index 00000000000..06147aa8d32--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/BranchBadge.tsx@@ -0,0 +1,39 @@+import type { Branch } from 'data/branches/branches-query'+import { Badge } from 'ui'++interface BranchBadgeProps {+ branch: Branch | undefined+ isBranchingEnabled: boolean+}++export function BranchBadge({ branch, isBranchingEnabled }: BranchBadgeProps) {+ if (!isBranchingEnabled) {+ return (+ <Badge variant="warning" className="mt-[1px]">+ Production+ </Badge>+ )+ }++ if (branch?.is_default) {+ return (+ <Badge variant="warning" className="mt-[1px]">+ Production+ </Badge>+ )+ }++ if (branch?.persistent) {+ return (+ <Badge variant="success" className="mt-[1px]">+ Persistent+ </Badge>+ )+ }++ return (+ <Badge variant="success" className="mt-[1px]">+ Preview+ </Badge>+ )+}diff --git a/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx b/apps/studio/components/layouts/AppLayout/BranchDropdown.tsxindex 8bf383693e8..3f372fcf57a 100644--- a/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx+++ b/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx@@ -1,83 +1,33 @@import { useParams } from 'common'-import { Branch, useBranchesQuery } from 'data/branches/branches-query'+import { useBranchesQuery } from 'data/branches/branches-query'+import type { Branch } from 'data/branches/branches-query'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import {- AlertCircle,- Check,- ChevronsUpDown,- ListTree,- MessageCircle,- Plus,- Shield,-} from 'lucide-react'-import Link from 'next/link'-import { useRouter } from 'next/router'import { useState } from 'react'import { useAppStateSnapshot } from 'state/app-state'-import {- Badge,- Button,- cn,- Command_Shadcn_,- CommandEmpty_Shadcn_,- CommandGroup_Shadcn_,- CommandInput_Shadcn_,- CommandItem_Shadcn_,- CommandList_Shadcn_,- CommandSeparator_Shadcn_,- Popover_Shadcn_,- PopoverContent_Shadcn_,- PopoverTrigger_Shadcn_,- ScrollArea,-} from 'ui'-import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { GenericSkeletonLoader } from 'ui-patterns'-import { sanitizeRoute } from './ProjectDropdown'+import { AppLayoutDropdownError, AppLayoutDropdownWithPopover } from './AppLayoutDropdown'+import { BranchBadge } from './BranchBadge'+import { BranchDropdownCommandContent } from './BranchDropdownCommandContent'+import { useEmbeddedCloseHandler } from './useEmbeddedCloseHandler'-const BranchLink = ({- branch,- isSelected,- setOpen,-}: {- branch: Branch- isSelected: boolean- setOpen: (value: boolean) => void-}) => {- const router = useRouter()- const sanitizedRoute = sanitizeRoute(router.route, router.query)- const href =- sanitizedRoute?.replace('[ref]', branch.project_ref) ?? `/project/${branch.project_ref}`-- return (- <Link passHref href={href}>- <CommandItem_Shadcn_- value={branch.name.replaceAll('"', '')}- className="cursor-pointer w-full flex items-center justify-between"- onSelect={() => {- setOpen(false)- router.push(href)- }}- onClick={() => {- setOpen(false)- }}- >- <p className="truncate w-60 flex items-center gap-1" title={branch.name}>- {branch.is_default && <Shield size={14} className="text-amber-900" />}- {branch.name}- </p>- {isSelected && <Check size={14} strokeWidth={1.5} />}- </CommandItem_Shadcn_>- </Link>- )+interface BranchDropdownProps {+ embedded?: boolean+ className?: string+ onClose?: () => void}-export const BranchDropdown = () => {- const router = useRouter()+export const BranchDropdown = ({+ embedded = false,+ className,+ onClose,+}: BranchDropdownProps = {}) => {const { ref } = useParams()const snap = useAppStateSnapshot()const { data: projectDetails } = useSelectedProjectQuery()const [open, setOpen] = useState(false)+ const close = useEmbeddedCloseHandler(embedded, onClose, setOpen)const projectRef = projectDetails?.parent_project_ref || ref@@ -111,147 +61,46 @@ export const BranchDropdown = () => {: [defaultMainBranch]const branchList = isBranchingEnabled ? sortedBranches ?? [] : [defaultMainBranch]- const BRANCHING_GITHUB_DISCUSSION_LINK = 'https://github.com/orgs/supabase/discussions/18937'-- return (- <>- {isLoading && <ShimmeringLoader className="w-[90px]" />}-- {isError && (- <div className="flex items-center space-x-2 text-amber-900">- <AlertCircle size={16} strokeWidth={2} />- <p className="text-sm">Failed to load branches</p>- </div>- )}-- {isSuccess && (- <>- <Link href={`/project/${ref}`} className="flex items-center gap-2 flex-shrink-0 ">- <span- title={isBranchingEnabled ? selectedBranch?.name : 'main'}- className="text-sm text-foreground max-w-32 lg:max-w-64 truncate"- >- {isBranchingEnabled ? selectedBranch?.name : 'main'}- </span>- {isBranchingEnabled ? (- selectedBranch?.is_default ? (- <Badge variant="warning" className="mt-[1px]">- Production- </Badge>- ) : selectedBranch?.persistent ? (- <Badge variant="success" className="mt-[1px]">- Persistent- </Badge>- ) : (- <Badge variant="success" className="mt-[1px]">- Preview- </Badge>- )- ) : (- <Badge variant="warning" className="mt-[1px]">- Production- </Badge>- )}- </Link>- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>- <PopoverTrigger_Shadcn_ asChild>- <Button- type="text"- size="tiny"- className={cn('px-1.5 py-4 [&_svg]:w-5 [&_svg]:h-5 ml-1')}- iconRight={<ChevronsUpDown strokeWidth={1.5} />}- />- </PopoverTrigger_Shadcn_>- <PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">- <Command_Shadcn_>- {isBranchingEnabled && <CommandInput_Shadcn_ placeholder="Find branch..." />}- <CommandList_Shadcn_>- {isBranchingEnabled && (- <CommandEmpty_Shadcn_>No branches found</CommandEmpty_Shadcn_>- )}+ const commandContent = (+ <BranchDropdownCommandContent+ embedded={embedded}+ className={className}+ branchList={branchList}+ selectedBranch={selectedBranch}+ branchesCount={branches?.length ?? 0}+ isBranchingEnabled={isBranchingEnabled}+ projectRef={ref}+ onClose={close}+ onCreateBranch={() => snap.setShowCreateBranchModal(true)}+ />+ )- <CommandGroup_Shadcn_>- <ScrollArea className="max-h-[210px] overflow-y-auto">- {branchList.map((branch) => (- <BranchLink- key={branch.id}- branch={branch}- isSelected={branch.id === selectedBranch?.id || branches?.length === 0}- setOpen={setOpen}- />- ))}- </ScrollArea>- </CommandGroup_Shadcn_>+ if (isLoading) return <GenericSkeletonLoader className="p-2" />- <CommandSeparator_Shadcn_ />+ if (isError) return <AppLayoutDropdownError message="Failed to load branches" />- <CommandGroup_Shadcn_>- <CommandItem_Shadcn_- className="cursor-pointer w-full"- onSelect={() => {- setOpen(false)- snap.setShowCreateBranchModal(true)- }}- onClick={() => {- setOpen(false)- snap.setShowCreateBranchModal(true)- }}- >- <div className="w-full flex items-center gap-2">- <Plus size={14} strokeWidth={1.5} />- <p>Create branch</p>- </div>- </CommandItem_Shadcn_>- <CommandItem_Shadcn_- className="cursor-pointer w-full"- onSelect={() => {- setOpen(false)- router.push(`/project/${ref}/branches`)- }}- onClick={() => setOpen(false)}- >- <Link- href={`/project/${ref}/branches`}- className="w-full flex items-center gap-2"- >- <ListTree size={14} strokeWidth={1.5} />- <p>Manage branches</p>- </Link>- </CommandItem_Shadcn_>- </CommandGroup_Shadcn_>+ if (!isSuccess) return null- <CommandSeparator_Shadcn_ />+ if (embedded) return commandContent- <CommandGroup_Shadcn_>- <CommandItem_Shadcn_- className="cursor-pointer w-full"- onSelect={() => {- setOpen(false)- window?.open(BRANCHING_GITHUB_DISCUSSION_LINK, '_blank')?.focus()- }}- onClick={() => setOpen(false)}- >- <a- target="_blank"- rel="noreferrer noopener"- href={BRANCHING_GITHUB_DISCUSSION_LINK}- onClick={() => setOpen(false)}- className="w-full flex gap-2"- >- <MessageCircle size={14} strokeWidth={1} className="text-muted mt-0.5" />- <div>- <p>Branching feedback</p>- <p className="text-lighter">Join GitHub Discussion</p>- </div>- </a>- </CommandItem_Shadcn_>- </CommandGroup_Shadcn_>- </CommandList_Shadcn_>- </Command_Shadcn_>- </PopoverContent_Shadcn_>- </Popover_Shadcn_>+ return (+ <AppLayoutDropdownWithPopover+ linkHref={`/project/${ref}`}+ linkContent={+ <>+ <span+ title={isBranchingEnabled ? selectedBranch?.name : 'main'}+ className="text-sm text-foreground max-w-32 lg:max-w-64 truncate"+ >+ {isBranchingEnabled ? selectedBranch?.name : 'main'}+ </span>+ <BranchBadge branch={selectedBranch} isBranchingEnabled={isBranchingEnabled} /></>- )}- </>+ }+ linkClassName="flex items-center gap-2 flex-shrink-0"+ commandContent={commandContent}+ open={open}+ onOpenChange={setOpen}+ />)}diff --git a/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsx b/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsxnew file mode 100644index 00000000000..e60a50d2f55--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsx@@ -0,0 +1,198 @@+import type { Branch } from 'data/branches/branches-query'+import { useTrack } from 'lib/telemetry/track'+import { ListTree, MessageCircle, Plus } from 'lucide-react'+import Link from 'next/link'+import {+ Button,+ cn,+ Command_Shadcn_,+ CommandEmpty_Shadcn_,+ CommandGroup_Shadcn_,+ CommandInput_Shadcn_,+ CommandItem_Shadcn_,+ CommandList_Shadcn_,+ CommandSeparator_Shadcn_,+ ScrollArea,+} from 'ui'++import { BranchLink } from './BranchLink'++const BRANCHING_GITHUB_DISCUSSION_LINK = 'https://github.com/orgs/supabase/discussions/18937'++export interface BranchDropdownCommandContentProps {+ embedded: boolean+ className?: string+ branchList: Branch[]+ selectedBranch: Branch | undefined+ branchesCount: number+ isBranchingEnabled: boolean+ projectRef: string | undefined+ onClose: () => void+ onCreateBranch: () => void+}++export function BranchDropdownCommandContent({+ embedded,+ className,+ branchList,+ selectedBranch,+ branchesCount,+ isBranchingEnabled,+ projectRef,+ onClose,+ onCreateBranch,+}: BranchDropdownCommandContentProps) {+ const track = useTrack()++ if (embedded) {+ return (+ <Command_Shadcn_ className={cn(className, 'flex flex-col flex-1 min-h-0 overflow-hidden')}>+ <div className="grid grid-cols-2 gap-2 shrink-0 p-2 border-b">+ <Button+ type="text"+ size="small"+ asChild+ block+ icon={<ListTree size={14} strokeWidth={1.5} />}+ >+ <Link+ href={`/project/${projectRef}/branches`}+ className="text-xs text-foreground-light hover:text-foreground"+ onClick={onClose}+ >+ Manage branches+ </Link>+ </Button>+ <Button+ type="text"+ size="small"+ asChild+ block+ icon={<MessageCircle size={14} strokeWidth={1.5} />}+ >+ <a+ target="_blank"+ rel="noreferrer noopener"+ href={BRANCHING_GITHUB_DISCUSSION_LINK}+ onClick={onClose}+ className="text-xs text-foreground-light hover:text-foreground"+ >+ Branching feedback+ </a>+ </Button>+ <Button+ type="default"+ size="small"+ block+ className="col-span-full text-xs text-foreground-light hover:text-foreground"+ onClick={() => {+ track('branch_selector_create_clicked')+ onClose()+ onCreateBranch()+ }}+ icon={<Plus size={14} strokeWidth={1.5} />}+ >+ Create branch+ </Button>+ </div>+ {isBranchingEnabled && (+ <CommandInput_Shadcn_ placeholder="Find branch..." wrapperClassName="shrink-0 border-b" />+ )}+ <CommandList_Shadcn_ className="flex flex-col flex-1 p-1 min-h-0 overflow-y-auto !max-h-none">+ {isBranchingEnabled && <CommandEmpty_Shadcn_>No branches found</CommandEmpty_Shadcn_>}+ <CommandGroup_Shadcn_ className="min-h-0">+ {branchList.map((branch) => (+ <BranchLink+ key={branch.id}+ branch={branch}+ isSelected={branch.id === selectedBranch?.id || branchesCount === 0}+ onClose={onClose}+ />+ ))}+ </CommandGroup_Shadcn_>+ </CommandList_Shadcn_>+ </Command_Shadcn_>+ )+ }++ return (+ <Command_Shadcn_ className={className}>+ {isBranchingEnabled && <CommandInput_Shadcn_ placeholder="Find branch..." />}+ <CommandList_Shadcn_>+ {isBranchingEnabled && <CommandEmpty_Shadcn_>No branches found</CommandEmpty_Shadcn_>}+ <CommandGroup_Shadcn_>+ <ScrollArea className="max-h-[210px] overflow-y-auto">+ {branchList.map((branch) => (+ <BranchLink+ key={branch.id}+ branch={branch}+ isSelected={branch.id === selectedBranch?.id || branchesCount === 0}+ onClose={onClose}+ />+ ))}+ </ScrollArea>+ </CommandGroup_Shadcn_>++ <CommandSeparator_Shadcn_ />++ <CommandGroup_Shadcn_>+ <CommandItem_Shadcn_+ className="cursor-pointer w-full"+ onSelect={() => {+ track('branch_selector_create_clicked')+ onClose()+ onCreateBranch()+ }}+ >+ <div className="w-full flex items-center gap-2">+ <Plus size={14} strokeWidth={1.5} />+ <p>Create branch</p>+ </div>+ </CommandItem_Shadcn_>+ <CommandItem_Shadcn_+ className="cursor-pointer w-full"+ onSelect={() => {+ track('branch_selector_manage_clicked')+ onClose()+ }}+ >+ <Link+ href={`/project/${projectRef}/branches`}+ className="w-full flex items-center gap-2"+ >+ <ListTree size={14} strokeWidth={1.5} />+ <p>Manage branches</p>+ </Link>+ </CommandItem_Shadcn_>+ </CommandGroup_Shadcn_>++ <CommandSeparator_Shadcn_ />++ <CommandGroup_Shadcn_>+ <CommandItem_Shadcn_+ className="cursor-pointer w-full"+ onSelect={() => {+ onClose()+ window?.open(BRANCHING_GITHUB_DISCUSSION_LINK, '_blank')?.focus()+ }}+ onClick={onClose}+ >+ <a+ target="_blank"+ rel="noreferrer noopener"+ href={BRANCHING_GITHUB_DISCUSSION_LINK}+ onClick={onClose}+ className="w-full flex gap-2"+ >+ <MessageCircle size={14} strokeWidth={1} className="mt-0.5" />+ <div>+ <p>Branching feedback</p>+ <p className="text-lighter">Join GitHub Discussion</p>+ </div>+ </a>+ </CommandItem_Shadcn_>+ </CommandGroup_Shadcn_>+ </CommandList_Shadcn_>+ </Command_Shadcn_>+ )+}diff --git a/apps/studio/components/layouts/AppLayout/BranchLink.tsx b/apps/studio/components/layouts/AppLayout/BranchLink.tsxnew file mode 100644index 00000000000..24035756563--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/BranchLink.tsx@@ -0,0 +1,44 @@+import type { Branch } from 'data/branches/branches-query'+import { useTrack } from 'lib/telemetry/track'+import { Check, Shield } from 'lucide-react'+import Link from 'next/link'+import { useRouter } from 'next/router'+import { CommandItem_Shadcn_ } from 'ui'++import { sanitizeRoute } from './ProjectDropdown.utils'++export interface BranchLinkProps {+ branch: Branch+ isSelected: boolean+ onClose: () => void+}++export function BranchLink({ branch, isSelected, onClose }: BranchLinkProps) {+ const track = useTrack()+ const router = useRouter()+ const sanitizedRoute = sanitizeRoute(router.route, router.query)+ const href =+ sanitizedRoute?.replace('[ref]', branch.project_ref) ?? `/project/${branch.project_ref}`++ return (+ <Link passHref href={href}>+ <CommandItem_Shadcn_+ value={branch.name.replaceAll('"', '')}+ className="cursor-pointer w-full flex items-center justify-between text-sm md:text-xs p-2 md:py-1.5 md:px-2"+ onSelect={() => {+ track('branch_selector_branch_clicked', {+ branchId: branch.id,+ branchName: branch.name,+ })+ onClose()+ }}+ >+ <p className="truncate w-60 flex items-center gap-1" title={branch.name}>+ {branch.is_default && <Shield size={14} className="text-amber-900" />}+ {branch.name}+ </p>+ {isSelected && <Check size={14} strokeWidth={1.5} />}+ </CommandItem_Shadcn_>+ </Link>+ )+}diff --git a/apps/studio/components/layouts/AppLayout/OrgCommandItem.tsx b/apps/studio/components/layouts/AppLayout/OrgCommandItem.tsxnew file mode 100644index 00000000000..fed9165495b--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/OrgCommandItem.tsx@@ -0,0 +1,48 @@+import PartnerIcon from 'components/ui/PartnerIcon'+import { Check } from 'lucide-react'+import Link from 'next/link'+import type { Organization } from 'types'+import { cn, CommandItem_Shadcn_ } from 'ui'++export interface OrgCommandItemProps {+ org: Organization+ selectedSlug: string | undefined+ routePathname: string+ hasRouteSlug: boolean+ onClose: () => void+ compactPadding?: boolean+}++export function OrgCommandItem({+ org,+ selectedSlug,+ routePathname,+ hasRouteSlug,+ onClose,+ compactPadding = false,+}: OrgCommandItemProps) {+ const href = hasRouteSlug ? routePathname.replace('[slug]', org.slug) : `/org/${org.slug}`++ return (+ <CommandItem_Shadcn_+ key={org.slug}+ value={`${org.name.replaceAll('"', '')} - ${org.slug}`}+ className="cursor-pointer w-full"+ onSelect={() => onClose()}+ >+ <Link+ href={href}+ className={cn(+ 'w-full flex items-center justify-between text-sm md:text-xs',+ !compactPadding && 'p-0.5'+ )}+ >+ <div className="flex items-center gap-2">+ <span>{org.name}</span>+ <PartnerIcon organization={org} />+ </div>+ {org.slug === selectedSlug && <Check size={16} />}+ </Link>+ </CommandItem_Shadcn_>+ )+}diff --git a/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsx b/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsxindex 588ddfffd29..2207ce84136 100644--- a/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsx+++ b/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsx@@ -1,36 +1,36 @@-import { Boxes, Check, ChevronsUpDown, Plus } from 'lucide-react'-import Link from 'next/link'-import { useRouter } from 'next/router'-import { useState } from 'react'-import { useParams } from 'common'-import PartnerIcon from 'components/ui/PartnerIcon'import { useOrganizationsQuery } from 'data/organizations/organizations-query'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'-import {- Badge,- Button,- CommandEmpty_Shadcn_,- CommandGroup_Shadcn_,- CommandInput_Shadcn_,- CommandItem_Shadcn_,- CommandList_Shadcn_,- CommandSeparator_Shadcn_,- Command_Shadcn_,- PopoverContent_Shadcn_,- PopoverTrigger_Shadcn_,- Popover_Shadcn_,- ScrollArea,- cn,-} from 'ui'-import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { Boxes } from 'lucide-react'+import { useRouter } from 'next/router'+import { useState } from 'react'+import { Badge, cn } from 'ui'+import { GenericSkeletonLoader } from 'ui-patterns'++import { AppLayoutDropdownError, AppLayoutDropdownWithPopover } from './AppLayoutDropdown'+import { OrganizationDropdownCommandContent } from './OrganizationDropdownCommandContent'+import { useEmbeddedCloseHandler } from './useEmbeddedCloseHandler'-export const OrganizationDropdown = () => {+interface OrganizationDropdownProps {+ embedded?: boolean+ className?: string+ onClose?: () => void+}++export const OrganizationDropdown = ({+ embedded = false,+ className,+ onClose,+}: OrganizationDropdownProps = {}) => {const router = useRouter()const { slug: routeSlug } = useParams()const { data: selectedOrganization } = useSelectedOrganizationQuery()- const { data: organizations, isPending: isLoadingOrganizations } = useOrganizationsQuery()+ const {+ data: organizations,+ isPending: isLoadingOrganizations,+ isError,+ } = useOrganizationsQuery()const organizationCreationEnabled = useIsFeatureEnabled('organizations:create')@@ -38,112 +38,50 @@ export const OrganizationDropdown = () => {const orgName = selectedOrganization?.nameconst [open, setOpen] = useState(false)+ const close = useEmbeddedCloseHandler(embedded, onClose, setOpen)++ if (isLoadingOrganizations && !embedded) return <GenericSkeletonLoader className="p-2 w-[90px]" />++ if (isError) return <AppLayoutDropdownError message="Failed to load organizations" />- if (isLoadingOrganizations) {- return <ShimmeringLoader className="w-[90px]" />- }+ const commandContent = (+ <OrganizationDropdownCommandContent+ embedded={embedded}+ className={className}+ organizations={organizations ?? []}+ selectedSlug={slug}+ routePathname={router.pathname}+ hasRouteSlug={!!routeSlug}+ organizationCreationEnabled={organizationCreationEnabled}+ onClose={close}+ />+ )++ if (embedded)+ return isLoadingOrganizations ? <GenericSkeletonLoader className="p-2" /> : commandContentreturn (- <>- <Link- href={slug ? `/org/${slug}` : '/organizations'}- className="flex items-center gap-2 flex-shrink-0 text-sm"- >- <Boxes size={14} strokeWidth={1.5} className="text-foreground-lighter" />- <span- className={cn(- 'max-w-32 lg:max-w-none truncate hidden md:block',- !!selectedOrganization ? 'text-foreground' : 'text-foreground-lighter'+ <AppLayoutDropdownWithPopover+ linkHref={slug ? `/org/${slug}` : '/organizations'}+ linkContent={+ <>+ <Boxes size={14} strokeWidth={1.5} className="text-foreground-lighter" />+ <span+ className={cn(+ 'md:max-w-32 lg:max-w-none truncate hidden md:block',+ !!selectedOrganization ? 'text-foreground' : 'text-foreground-lighter'+ )}+ >+ {orgName ?? 'Select an organization'}+ </span>+ {!!selectedOrganization && (+ <Badge variant="default">{selectedOrganization?.plan.name}</Badge>)}- >- {orgName ?? 'Select an organization'}- </span>- {!!selectedOrganization && (- <Badge variant="default">{selectedOrganization?.plan.name}</Badge>- )}- </Link>- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>- <PopoverTrigger_Shadcn_ asChild>- <Button- type="text"- className={cn('px-1.5 py-4 [&_svg]:w-5 [&_svg]:h-5 ml-1')}- iconRight={<ChevronsUpDown strokeWidth={1.5} />}- />- </PopoverTrigger_Shadcn_>- <PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">- <Command_Shadcn_>- <CommandInput_Shadcn_ placeholder="Find organization..." />- <CommandList_Shadcn_>- <CommandEmpty_Shadcn_>No organizations found</CommandEmpty_Shadcn_>- <CommandGroup_Shadcn_>- <ScrollArea className={(organizations || []).length > 7 ? 'h-[210px]' : ''}>- {organizations?.map((org) => {- const href = !!routeSlug- ? router.pathname.replace('[slug]', org.slug)- : `/org/${org.slug}`-- return (- <CommandItem_Shadcn_- key={org.slug}- value={`${org.name.replaceAll('"', '')} - ${org.slug}`}- className="cursor-pointer w-full"- onSelect={() => {- setOpen(false)- router.push(href)- }}- onClick={() => setOpen(false)}- >- <Link href={href} className="w-full flex items-center justify-between">- <div className="flex items-center gap-2">- <span>{org.name}</span>- <PartnerIcon organization={org} />- </div>- {org.slug === slug && <Check size={16} />}- </Link>- </CommandItem_Shadcn_>- )- })}- </ScrollArea>- </CommandGroup_Shadcn_>- <CommandSeparator_Shadcn_ />- <CommandGroup_Shadcn_>- <CommandItem_Shadcn_- className="cursor-pointer w-full"- onSelect={(e) => {- setOpen(false)- router.push(`/organizations`)- }}- onClick={() => setOpen(false)}- >- <Link href="/organizations" className="flex items-center gap-2 w-full">- <p>All Organizations</p>- </Link>- </CommandItem_Shadcn_>- </CommandGroup_Shadcn_>- {organizationCreationEnabled && (- <>- <CommandSeparator_Shadcn_ />- <CommandGroup_Shadcn_>- <CommandItem_Shadcn_- className="cursor-pointer w-full"- onSelect={(e) => {- setOpen(false)- router.push(`/new`)- }}- onClick={() => setOpen(false)}- >- <Link href="/new" className="flex items-center gap-2 w-full">- <Plus size={14} strokeWidth={1.5} />- <p>New organization</p>- </Link>- </CommandItem_Shadcn_>- </CommandGroup_Shadcn_>- </>- )}- </CommandList_Shadcn_>- </Command_Shadcn_>- </PopoverContent_Shadcn_>- </Popover_Shadcn_>- </>+ </>+ }+ commandContent={commandContent}+ open={open}+ onOpenChange={setOpen}+ />)}diff --git a/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.tsx b/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.tsxnew file mode 100644index 00000000000..5644eaded72--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.tsx@@ -0,0 +1,135 @@+import PartnerIcon from 'components/ui/PartnerIcon'+import { Plus } from 'lucide-react'+import Link from 'next/link'+import type { Organization } from 'types'+import {+ Button,+ cn,+ Command_Shadcn_,+ CommandEmpty_Shadcn_,+ CommandGroup_Shadcn_,+ CommandInput_Shadcn_,+ CommandItem_Shadcn_,+ CommandList_Shadcn_,+ CommandSeparator_Shadcn_,+ ScrollArea,+} from 'ui'++import { OrgCommandItem } from './OrgCommandItem'++export interface OrganizationDropdownCommandContentProps {+ embedded: boolean+ className?: string+ organizations: Organization[]+ selectedSlug: string | undefined+ routePathname: string+ hasRouteSlug: boolean+ organizationCreationEnabled: boolean+ onClose: () => void+}++export function OrganizationDropdownCommandContent({+ embedded,+ className,+ organizations,+ selectedSlug,+ routePathname,+ hasRouteSlug,+ organizationCreationEnabled,+ onClose,+}: OrganizationDropdownCommandContentProps) {+ const orgList = (+ <>+ {organizations?.map((org) => (+ <OrgCommandItem+ key={org.slug}+ org={org}+ selectedSlug={selectedSlug}+ routePathname={routePathname}+ hasRouteSlug={hasRouteSlug}+ onClose={onClose}+ compactPadding={!embedded}+ />+ ))}+ </>+ )++ if (embedded) {+ return (+ <Command_Shadcn_ className={cn(className, 'flex flex-col flex-1 min-h-0 overflow-hidden')}>+ <div className="flex items-center gap-2 shrink-0 border-b p-2">+ <Button type="text" block size="small" asChild>+ <Link+ href="/organizations"+ className="text-xs text-foreground-light hover:text-foreground"+ onClick={onClose}+ >+ All Organizations+ </Link>+ </Button>+ {organizationCreationEnabled && (+ <Button+ type="default"+ block+ size="small"+ asChild+ icon={<Plus size={14} strokeWidth={1.5} />}+ >+ <Link+ href="/new"+ className="text-xs text-foreground-light hover:text-foreground"+ onClick={onClose}+ >+ New organization+ </Link>+ </Button>+ )}+ </div>+ <CommandInput_Shadcn_+ placeholder="Find organization..."+ wrapperClassName="shrink-0"+ className="text-base sm:text-sm"+ />+ <CommandList_Shadcn_ className="flex flex-col flex-1 min-h-0 overflow-y-auto p-1 !max-h-none">+ <CommandEmpty_Shadcn_>No organizations found</CommandEmpty_Shadcn_>+ <CommandGroup_Shadcn_ className="min-h-0">{orgList}</CommandGroup_Shadcn_>+ </CommandList_Shadcn_>+ </Command_Shadcn_>+ )+ }++ return (+ <Command_Shadcn_ className={className}>+ <CommandInput_Shadcn_ placeholder="Find organization..." />+ <CommandList_Shadcn_>+ <CommandEmpty_Shadcn_>No organizations found</CommandEmpty_Shadcn_>+ <CommandGroup_Shadcn_>+ <ScrollArea className={(organizations || []).length > 7 ? 'md:h-[210px]' : ''}>+ {orgList}+ </ScrollArea>+ </CommandGroup_Shadcn_>+ <CommandSeparator_Shadcn_ />+ <CommandGroup_Shadcn_>+ <CommandItem_Shadcn_ className="cursor-pointer w-full" onSelect={() => onClose()}>+ <Link href="/organizations" className="flex items-center gap-2 w-full">+ All Organizations+ </Link>+ </CommandItem_Shadcn_>+ </CommandGroup_Shadcn_>+ {organizationCreationEnabled && (+ <>+ <CommandSeparator_Shadcn_ />+ <CommandGroup_Shadcn_>+ <CommandItem_Shadcn_ className="cursor-pointer w-full" onSelect={() => onClose()}>+ <Link href="/new" className="flex items-center gap-2 w-full">+ <Plus size={14} strokeWidth={1.5} />+ <p>New organization</p>+ </Link>+ </CommandItem_Shadcn_>+ </CommandGroup_Shadcn_>+ </>+ )}+ </CommandList_Shadcn_>+ </Command_Shadcn_>+ )+}diff --git a/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx b/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsxindex 0cdc1850dcc..a2bc4ecc492 100644--- a/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx+++ b/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx@@ -1,4 +1,3 @@-import { ParsedUrlQuery } from 'querystring'import { useParams } from 'common'import { OrganizationProjectSelector } from 'components/ui/OrganizationProjectSelector'import { useProjectDetailQuery } from 'data/projects/project-detail-query'@@ -6,32 +5,124 @@ import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { IS_PLATFORM } from 'lib/constants'-import { Box, Check, ChevronsUpDown, Plus } from 'lucide-react'+import { Box, Plus } from 'lucide-react'import Link from 'next/link'import { useRouter } from 'next/router'import { useState } from 'react'-import { Badge, Button, cn, CommandGroup_Shadcn_, CommandItem_Shadcn_ } from 'ui'-import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'--export const sanitizeRoute = (route: string, routerQueries: ParsedUrlQuery) => {- const queryArray = Object.entries(routerQueries)-- if (queryArray.length > 1) {- // [Joshen] Ideally we shouldn't use hard coded numbers, but temp workaround- // for storage bucket route since its longer- const isStorageBucketRoute = 'bucketId' in routerQueries- const isSecurityAdvisorRoute = 'preset' in routerQueries-- return route- .split('/')- .slice(0, isStorageBucketRoute || isSecurityAdvisorRoute ? 5 : 4)- .join('/')- } else {- return route+import type { ComponentProps } from 'react'+import { Button, CommandGroup_Shadcn_, CommandItem_Shadcn_ } from 'ui'+import { GenericSkeletonLoader } from 'ui-patterns'++import { AppLayoutDropdownTriggerButton } from './AppLayoutDropdown'+import { sanitizeRoute } from './ProjectDropdown.utils'+import { ProjectRowLink } from './ProjectRowLink'+import { useEmbeddedCloseHandler } from './useEmbeddedCloseHandler'++// --- Sub-components ---++interface ProjectDropdownNewProjectActionsProps {+ organizationSlug: string | undefined+ embedded: boolean+ onClose: () => void+ onNavigate: (href: string) => void+}++function ProjectDropdownNewProjectActions({+ organizationSlug,+ embedded,+ onClose,+ onNavigate,+}: ProjectDropdownNewProjectActionsProps) {+ const href = `/new/${organizationSlug}`++ if (embedded) {+ return (+ <Button type="default" block size="small" asChild icon={<Plus size={14} strokeWidth={1.5} />}>+ <Link+ href={href}+ onClick={onClose}+ className="text-xs text-foreground-light hover:text-foreground"+ >+ New project+ </Link>+ </Button>+ )}++ return (+ <CommandGroup_Shadcn_>+ <CommandItem_Shadcn_+ className="cursor-pointer w-full"+ onSelect={() => {+ onClose()+ onNavigate(href)+ }}+ onClick={onClose}+ >+ <Link href={href} onClick={onClose} className="w-full flex items-center gap-2">+ <Plus size={14} strokeWidth={1.5} />+ <p>New project</p>+ </Link>+ </CommandItem_Shadcn_>+ </CommandGroup_Shadcn_>+ )+}++function ProjectDropdownNonPlatformView({ projectName }: { projectName: string }) {+ return (+ <Button type="text">+ <span className="text-sm">{projectName}</span>+ </Button>+ )}-export const ProjectDropdown = () => {+interface ProjectDropdownPlatformViewProps {+ projectRef: string | undefined+ projectName: string+ selectorProps: Omit<+ ComponentProps<typeof OrganizationProjectSelector>,+ 'renderTrigger' | 'embedded'+ >+}++function ProjectDropdownPlatformView({+ projectRef,+ projectName,+ selectorProps,+}: ProjectDropdownPlatformViewProps) {+ return (+ <div className="flex items-center flex-shrink-0">+ <Link+ href={`/project/${projectRef}`}+ className="flex items-center gap-2 flex-shrink-0 text-sm"+ >+ <Box size={14} strokeWidth={1.5} className="text-foreground-lighter" />+ <span title={projectName} className="text-foreground max-w-32 lg:max-w-64 truncate">+ {projectName}+ </span>+ </Link>++ <OrganizationProjectSelector+ {...selectorProps}+ renderTrigger={() => <AppLayoutDropdownTriggerButton className="flex-shrink-0" />}+ />+ </div>+ )+}++// --- Main component ---++interface ProjectDropdownProps {+ embedded?: boolean+ className?: string+ onClose?: () => void+}++export const ProjectDropdown = ({+ embedded = false,+ className,+ onClose,+}: ProjectDropdownProps = {}) => {const router = useRouter()const { ref } = useParams()const { data: project, isPending: isLoadingProject } = useSelectedProjectQuery()@@ -47,92 +138,55 @@ export const ProjectDropdown = () => {const projectCreationEnabled = useIsFeatureEnabled('projects:create')const [open, setOpen] = useState(false)+ const close = useEmbeddedCloseHandler(embedded, onClose, setOpen)if (isLoadingProject || (isBranch && isLoadingParentProject) || !selectedProject) {- return <ShimmeringLoader className="w-[90px]" />+ if (!embedded) return <GenericSkeletonLoader className="p-2" />}- return IS_PLATFORM ? (- <>- <Link- href={`/project/${project?.ref}`}- className="flex items-center gap-2 flex-shrink-0 text-sm"- >- <Box size={14} strokeWidth={1.5} className="text-foreground-lighter" />- <span- title={selectedProject.name}- className="text-foreground max-w-32 lg:max-w-64 truncate"- >- {selectedProject.name}- </span>- </Link>+ const handleSetOpen = embedded ? (_value: boolean) => onClose?.() : setOpen- <OrganizationProjectSelector- open={open}- setOpen={setOpen}+ const selectorProps = {+ open,+ setOpen: handleSetOpen,+ selectedRef: ref,+ onSelect: (project: { ref: string }) => {+ const sanitizedRoute = sanitizeRoute(router.route, router.query)+ const href = sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`+ close()+ router.push(href)+ },+ renderRow: (project: { ref: string; name: string; status?: string }) => (+ <ProjectRowLink+ project={project}selectedRef={ref}- onSelect={(project) => {- const sanitizedRoute = sanitizeRoute(router.route, router.query)- const href = sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`- router.push(href)- }}- renderTrigger={() => (- <Button- type="text"- size="tiny"- className={cn('px-1.5 py-4 [&_svg]:w-5 [&_svg]:h-5 ml-1')}- iconRight={<ChevronsUpDown strokeWidth={1.5} />}- />- )}- renderRow={(project) => {- // [Joshen] Temp while we're interim between v1 and v2 billing- const sanitizedRoute = sanitizeRoute(router.route, router.query)- const href = sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`- const isSelected = project.ref === ref- const isPaused = project.status === 'INACTIVE'-- return (- <Link href={href} className="w-full flex items-center justify-between">- <span className={cn('truncate', isSelected ? 'max-w-60' : 'max-w-64')}>- {project.name}- {isPaused && <Badge className="ml-2">Paused</Badge>}- </span>- {isSelected && <Check size={16} />}- </Link>- )- }}- renderActions={() => {- return (- projectCreationEnabled && (- <CommandGroup_Shadcn_>- <CommandItem_Shadcn_- className="cursor-pointer w-full"- onSelect={() => {- setOpen(false)- router.push(`/new/${selectedOrganization?.slug}`)- }}- onClick={() => setOpen(false)}- >- <Link- href={`/new/${selectedOrganization?.slug}`}- onClick={() => {- setOpen(false)- }}- className="w-full flex items-center gap-2"- >- <Plus size={14} strokeWidth={1.5} />- <p>New project</p>- </Link>- </CommandItem_Shadcn_>- </CommandGroup_Shadcn_>- )- )- }}+ route={router.route}+ routerQueries={router.query}/>- </>+ ),+ renderActions: (_setOpen: (value: boolean) => void, options?: { embedded?: boolean }) =>+ projectCreationEnabled ? (+ <ProjectDropdownNewProjectActions+ organizationSlug={selectedOrganization?.slug}+ embedded={options?.embedded ?? false}+ onClose={close}+ onNavigate={(href) => router.push(href)}+ />+ ) : null,+ }++ if (embedded)+ return (+ <OrganizationProjectSelector {...selectorProps} embedded className={className} fetchOnMount />+ )++ return IS_PLATFORM ? (+ <ProjectDropdownPlatformView+ projectRef={project?.ref}+ projectName={selectedProject?.name ?? ''}+ selectorProps={selectorProps}+ />) : (- <Button type="text">- <span className="text-sm">{selectedProject?.name}</span>- </Button>+ <ProjectDropdownNonPlatformView projectName={selectedProject?.name ?? ''} />)}diff --git a/apps/studio/components/layouts/AppLayout/ProjectDropdown.utils.ts b/apps/studio/components/layouts/AppLayout/ProjectDropdown.utils.tsnew file mode 100644index 00000000000..333a104b1e1--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/ProjectDropdown.utils.ts@@ -0,0 +1,24 @@+import type { ParsedUrlQuery } from 'querystring'++/**+ * Sanitizes a route for project navigation (e.g. when building href for project switch).+ * Truncates to avoid carrying project-specific dynamic path segments.+ * Uses route segments (not query params) to determine truncation, so non-path query keys+ * (e.g. sort, filter) do not incorrectly trigger or affect truncation.+ */+export function sanitizeRoute(_route: string, _routerQueries: ParsedUrlQuery): string {+ const routeSegments = _route.split('/')++ const hasStorageBucketSegment = routeSegments.includes('[bucketId]')+ const hasSecurityAdvisorSegment = routeSegments.includes('[preset]')+ const hasOtherDynamicSegment = routeSegments.some(+ (s) => s.startsWith('[') && s.endsWith(']') && s !== '[ref]'+ )++ const needsTruncation =+ hasStorageBucketSegment || hasSecurityAdvisorSegment || hasOtherDynamicSegment+ if (!needsTruncation) return _route++ const sliceLength = hasStorageBucketSegment || hasSecurityAdvisorSegment ? 5 : 4+ return routeSegments.slice(0, sliceLength).join('/')+}diff --git a/apps/studio/components/layouts/AppLayout/ProjectRowLink.tsx b/apps/studio/components/layouts/AppLayout/ProjectRowLink.tsxnew file mode 100644index 00000000000..8d6c8d78058--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/ProjectRowLink.tsx@@ -0,0 +1,38 @@+import { ParsedUrlQuery } from 'querystring'+import { Check } from 'lucide-react'+import Link from 'next/link'+import { Badge, cn } from 'ui'++import { sanitizeRoute } from './ProjectDropdown.utils'++export interface ProjectRowLinkProps {+ project: { ref: string; name: string; status?: string }+ selectedRef: string | undefined+ route: string+ routerQueries: ParsedUrlQuery+}++export function ProjectRowLink({+ project,+ selectedRef,+ route,+ routerQueries,+}: ProjectRowLinkProps) {+ const sanitizedRoute = sanitizeRoute(route, routerQueries)+ const href = sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`+ const isSelected = project.ref === selectedRef+ const isPaused = project.status === 'INACTIVE'++ return (+ <Link+ href={href}+ className="w-full flex items-center justify-between p-0.5 md:p-0 text-sm md:text-xs"+ >+ <span className={cn('truncate', isSelected ? 'md:max-w-60' : 'md:max-w-64')}>+ {project.name}+ {isPaused && <Badge className="ml-2">Paused</Badge>}+ </span>+ {isSelected && <Check size={16} />}+ </Link>+ )+}diff --git a/apps/studio/components/layouts/AppLayout/useEmbeddedCloseHandler.ts b/apps/studio/components/layouts/AppLayout/useEmbeddedCloseHandler.tsnew file mode 100644index 00000000000..7aca445f1b0--- /dev/null+++ b/apps/studio/components/layouts/AppLayout/useEmbeddedCloseHandler.ts@@ -0,0 +1,20 @@+import { useCallback } from 'react'++/**+ * Returns a close handler for embedded vs standalone dropdown/sheet usage.+ * When embedded, uses the provided onClose callback (or no-op if not provided).+ * When standalone, returns a function that calls setOpen(false).+ */+export function useEmbeddedCloseHandler(+ embedded: boolean,+ onClose?: () => void,+ setOpen?: (open: boolean) => void+): () => void {+ return useCallback(() => {+ if (embedded) {+ onClose?.()+ } else {+ setOpen?.(false)+ }+ }, [embedded, onClose, setOpen])+}diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HomeIcon.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HomeIcon.tsxindex 95e7abe28a9..2613ab8be7d 100644--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HomeIcon.tsx+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HomeIcon.tsx@@ -1,14 +1,14 @@-import Link from 'next/link'-import { useRouter } from 'next/router'-import { LOCAL_STORAGE_KEYS } from 'common'import { useOrganizationsQuery } from 'data/organizations/organizations-query'+import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { IS_PLATFORM } from 'lib/constants'-import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'+import Link from 'next/link'+import { useRouter } from 'next/router'+import { cn } from 'ui'-export const HomeIcon = () => {+export const HomeIcon = ({ className }: { className?: string }) => {const { data: selectedOrganization } = useSelectedOrganizationQuery()const { data: organizations } = useOrganizationsQuery()@@ -30,7 +30,7 @@ export const HomeIcon = () => {const href = IS_PLATFORM ? getDefaultOrgRedirect() : '/project/default'return (- <Link href={href} className="items-center justify-center flex-shrink-0 hidden md:flex">+ <Link href={href} className={cn('items-center justify-center flex-shrink-0 flex', className)}><imgalt="Supabase"src={`${router.basePath}/img/supabase-logo.svg`}diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsxindex 7bfb9f88c7b..08fcbf376d3 100644--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx@@ -47,6 +47,7 @@ const LayoutHeaderDivider = ({ className, ...props }: React.HTMLProps<HTMLSpanElstrokeLinejoin="round"fill="none"shapeRendering="geometricPrecision"+ aria-hidden={true}><path d="M16 3.549L7.12 20.600" /></svg>@@ -101,7 +102,7 @@ export const LayoutHeader = ({return (<>- <header className={cn('flex h-12 items-center flex-shrink-0 border-b')}>+ <header className="flex h-11 md:h-12 items-center flex-shrink-0 border-b">{backToDashboardURL && isAccountPage && (<div className="flex items-center justify-center border-r flex-0 md:hidden h-full aspect-square"><Link@@ -117,7 +118,26 @@ export const LayoutHeader = ({'flex items-center justify-between h-full pr-3 flex-1 overflow-x-auto gap-x-8 pl-4')}>- <div className="flex items-center text-sm">+ <div className="flex md:hidden items-center text-sm not-sr-only">+ <AnimatePresence>+ {headerTitle && (+ <motion.div+ className="flex items-center -ml-1"+ initial={{ opacity: 0, x: -20 }}+ animate={{ opacity: 1, x: 0 }}+ exit={{ opacity: 0, x: -20 }}+ transition={{+ duration: 0.15,+ ease: 'easeOut',+ }}+ >+ <LayoutHeaderDivider />+ <span className="text-foreground">{headerTitle}</span>+ </motion.div>+ )}+ </AnimatePresence>+ </div>+ <div className="hidden md:flex items-center text-sm"><HomeIcon /><div className="flex items-center md:pl-2">{showOrgSelection && IS_PLATFORM ? (@@ -138,7 +158,7 @@ export const LayoutHeader = ({ease: 'easeOut',}}>- <LayoutHeaderDivider />+ {IS_PLATFORM && <LayoutHeaderDivider />}<ProjectDropdown />{exceedingLimits && (@@ -149,34 +169,33 @@ export const LayoutHeader = ({</div>)}- {selectedProject && (+ {selectedProject && IS_PLATFORM && (<><LayoutHeaderDivider />- {IS_PLATFORM && <BranchDropdown />}+ <BranchDropdown /></>)}</motion.div>)}</AnimatePresence>-- <AnimatePresence>- {headerTitle && (- <motion.div- className="flex items-center"- initial={{ opacity: 0, x: -20 }}- animate={{ opacity: 1, x: 0 }}- exit={{ opacity: 0, x: -20 }}- transition={{- duration: 0.15,- ease: 'easeOut',- }}- >- <LayoutHeaderDivider />- <span className="text-foreground">{headerTitle}</span>- </motion.div>- )}- </AnimatePresence></div>+ <AnimatePresence>+ {headerTitle && (+ <motion.div+ className="flex items-center"+ initial={{ opacity: 0, x: -20 }}+ animate={{ opacity: 1, x: 0 }}+ exit={{ opacity: 0, x: -20 }}+ transition={{+ duration: 0.15,+ ease: 'easeOut',+ }}+ >+ <LayoutHeaderDivider />+ <span className="text-foreground">{headerTitle}</span>+ </motion.div>+ )}+ </AnimatePresence><AnimatePresence>{projectRef && (@@ -204,7 +223,7 @@ export const LayoutHeader = ({<DevToolbarTrigger /><FeedbackDropdown />- <div className="flex items-center gap-2">+ <div className="flex items-center gap-1 md:gap-2"><CommandMenuTriggerInputshowShortcut={commandMenuEnabled}placeholder="Search..."@@ -227,12 +246,12 @@ export const LayoutHeader = ({)}</AnimatePresence></div>- <UserDropdown />+ <UserDropdown triggerClassName="hidden md:flex" /></>) : (<><LocalVersionPopover />- <div className="flex items-center gap-2">+ <div className="flex items-center gap-1 md:gap-2"><CommandMenuTriggerInputplaceholder="Search..."className="hidden md:flex md:min-w-32 xl:min-w-32 rounded-full bg-transparent@@ -253,7 +272,7 @@ export const LayoutHeader = ({)}</AnimatePresence></div>- <LocalDropdown />+ <LocalDropdown triggerClassName="hidden md:flex" /></>)}</div>diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsxindex 58031a0440f..71baec35d12 100644--- a/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsx+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsx@@ -1,42 +1,48 @@import { useParams } from 'common'+import { ConnectButton } from 'components/interfaces/ConnectButton/ConnectButton'+import { UserDropdown } from 'components/interfaces/UserDropdown'+import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { IS_PLATFORM } from 'lib/constants'import { Menu, Search } from 'lucide-react'-import Link from 'next/link'-import { useRouter } from 'next/router'import { Button, cn } from 'ui'import { CommandMenuTrigger } from 'ui-patterns'+import { HomeIcon } from '../LayoutHeader/HomeIcon'import { useMobileSheet } from './MobileSheetContext'--export const ICON_SIZE = 20-export const ICON_STROKE_WIDTH = 1.5+import { OrgSelector } from './OrgSelector'+import { ProjectBranchSelector } from './ProjectBranchSelector'const MobileNavigationBar = ({ hideMobileMenu }: { hideMobileMenu?: boolean }) => {- const router = useRouter()+ const { ref: projectRef, slug } = useParams()+ const { data: selectedOrganization } = useSelectedOrganizationQuery()+ const isProjectScope = !!projectRef+ const showOrgSelection = slug || (selectedOrganization && projectRef)const { openMenu } = useMobileSheet()- const { ref: projectRef } = useParams()return (- <div className="h-14 w-full flex flex-row md:hidden">+ <div className="w-full flex flex-row md:hidden"><navclassName={cn(- 'group px-4 z-10 w-full h-14',+ 'group pr-3 pl-2 z-10 w-full h-12 gap-2','border-b bg-dash-sidebar border-default shadow-xl','transition-width duration-200','hide-scrollbar flex flex-row items-center justify-between overflow-x-auto')}>- <Link- href={IS_PLATFORM ? '/organizations' : `/project/${projectRef}`}- className="flex items-center h-[26px] w-[26px] min-w-[26px]"- >- <img- alt="Supabase"- src={`${router.basePath}/img/supabase-logo.svg`}- className="absolute h-[26px] w-[26px] cursor-pointer rounded"- />- </Link>- <div className="flex gap-2">+ <div className={cn('flex min-w-0 flex-shrink items-center gap-2', !IS_PLATFORM && 'pl-2')}>+ {!IS_PLATFORM && <HomeIcon />}+ {isProjectScope ? (+ <>+ <ProjectBranchSelector />+ <ConnectButton className="[&_span]:hidden h-8 w-8" />+ </>+ ) : IS_PLATFORM && showOrgSelection ? (+ <OrgSelector />+ ) : (+ <HomeIcon className="ml-1" />+ )}+ </div>+ <div className="flex flex-shrink-0 gap-2"><CommandMenuTrigger><buttontype="button"@@ -54,6 +60,7 @@ const MobileNavigationBar = ({ hideMobileMenu }: { hideMobileMenu?: boolean }) =<Search size={18} strokeWidth={2} /></button></CommandMenuTrigger>+ <UserDropdown />{!hideMobileMenu && (<Buttontitle="Menu dropdown button"diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/OrgSelector.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/OrgSelector.tsxnew file mode 100644index 00000000000..4537cec62d8--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/OrgSelector.tsx@@ -0,0 +1,175 @@+import { useBreakpoint, useParams } from 'common'+import { useOrganizationsQuery } from 'data/organizations/organizations-query'+import { useOrgProjectsInfiniteQuery } from 'data/projects/org-projects-infinite-query'+import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'+import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'+import { Boxes, ChevronsUpDown, Plus } from 'lucide-react'+import Link from 'next/link'+import { useRouter } from 'next/router'+import { useState } from 'react'+import {+ Command_Shadcn_,+ CommandEmpty_Shadcn_,+ CommandGroup_Shadcn_,+ CommandInput_Shadcn_,+ CommandItem_Shadcn_,+ CommandList_Shadcn_,+ CommandSeparator_Shadcn_,+ Popover_Shadcn_,+ PopoverContent_Shadcn_,+ PopoverTrigger_Shadcn_,+ ScrollArea,+ SidebarMenu,+ SidebarMenuButton,+ SidebarMenuItem,+} from 'ui'+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'++import { OrgCommandItem } from 'components/layouts/AppLayout/OrgCommandItem'++import { OrgSelectorSheet } from './OrgSelectorSheet'++export function OrgSelector() {+ const router = useRouter()+ const { slug: routeSlug } = useParams()+ const { data: selectedOrganization } = useSelectedOrganizationQuery()+ const { data: organizations, isPending: isLoadingOrganizations } = useOrganizationsQuery()+ const organizationCreationEnabled = useIsFeatureEnabled('organizations:create')++ const [open, setOpen] = useState(false)++ const slug = selectedOrganization?.slug+ const selectedOrgInitial = selectedOrganization?.name?.trim().charAt(0).toUpperCase() || 'O'+ const { data: projects } = useOrgProjectsInfiniteQuery(+ { slug, limit: 1 },+ { enabled: Boolean(slug) }+ )++ const numProjects = projects?.pages[0]?.pagination.count+ const projectsLabel =+ typeof numProjects === 'number'+ ? `${numProjects} project${numProjects === 1 ? '' : 's'}`+ : 'No projects'++ const isMobile = useBreakpoint('md')++ if (isLoadingOrganizations) {+ return (+ <div className="px-2 py-2">+ <ShimmeringLoader className="w-full py-3" />+ </div>+ )+ }++ const triggerButton = (+ <SidebarMenuButton+ size="lg"+ className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground gap-2 h-auto text-left group px-1.5 py-1 touch-manipulation"+ onClick={isMobile ? () => setOpen(true) : undefined}+ >+ <span className="flex w-8 aspect-square shrink-0 items-center justify-center rounded border bg-surface-100 text-xs font-medium text-foreground-lighter">+ {selectedOrgInitial}+ </span>+ <div className="flex min-w-0 flex-1 flex-col text-left -mb-0.5">+ <div className="truncate text-foreground font-medium leading-tight min-w-[100px] max-w-[250px]">+ {selectedOrganization?.name ?? 'Select organization'}+ </div>+ {selectedOrganization && (+ <div className="flex items-center gap-1 truncate text-foreground-light leading-tight text-xs">+ <Boxes className="shrink-0 size-3" strokeWidth={1.5} />+ <span>{projectsLabel}</span>+ </div>+ )}+ </div>+ <ChevronsUpDown+ strokeWidth={1}+ className="ml-auto text-foreground-light md:hidden md:group-hover:block !w-4 !h-4"+ />+ </SidebarMenuButton>+ )++ if (isMobile) {+ return (+ <>+ <SidebarMenu className="flex-shrink">+ <SidebarMenuItem>{triggerButton}</SidebarMenuItem>+ </SidebarMenu>+ <OrgSelectorSheet+ open={open}+ onOpenChange={setOpen}+ onClose={() => setOpen(false)}+ selectedOrganization={selectedOrganization ?? null}+ />+ </>+ )+ }++ return (+ <SidebarMenu>+ <SidebarMenuItem>+ <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>+ <PopoverTrigger_Shadcn_ asChild>{triggerButton}</PopoverTrigger_Shadcn_>+ <PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">+ <Command_Shadcn_>+ <CommandInput_Shadcn_ placeholder="Find organization..." />+ <CommandList_Shadcn_>+ <CommandEmpty_Shadcn_>No organizations found</CommandEmpty_Shadcn_>+ <CommandGroup_Shadcn_>+ <ScrollArea+ className={(organizations || []).length > 7 ? 'h-full md:h-[210px]' : ''}+ >+ {organizations?.map((org) => (+ <OrgCommandItem+ key={org.slug}+ org={org}+ selectedSlug={slug}+ routePathname={router.pathname}+ hasRouteSlug={!!routeSlug}+ onClose={() => setOpen(false)}+ />+ ))}+ </ScrollArea>+ </CommandGroup_Shadcn_>+ <CommandSeparator_Shadcn_ />+ <CommandGroup_Shadcn_>+ <CommandItem_Shadcn_+ className="cursor-pointer w-full"+ onSelect={() => {+ setOpen(false)+ router.push('/organizations')+ }}+ onClick={() => setOpen(false)}+ >+ <Link href="/organizations" className="flex items-center gap-2 w-full">+ <p>All Organizations</p>+ </Link>+ </CommandItem_Shadcn_>+ </CommandGroup_Shadcn_>+ {organizationCreationEnabled && (+ <>+ <CommandSeparator_Shadcn_ />+ <CommandGroup_Shadcn_>+ <CommandItem_Shadcn_+ className="cursor-pointer w-full"+ onSelect={() => {+ setOpen(false)+ router.push('/new')+ }}+ onClick={() => setOpen(false)}+ >+ <Link href="/new" className="flex items-center gap-2 w-full">+ <Plus size={14} strokeWidth={1.5} />+ <p>New organization</p>+ </Link>+ </CommandItem_Shadcn_>+ </CommandGroup_Shadcn_>+ </>+ )}+ </CommandList_Shadcn_>+ </Command_Shadcn_>+ </PopoverContent_Shadcn_>+ </Popover_Shadcn_>+ </SidebarMenuItem>+ </SidebarMenu>+ )+}diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/OrgSelectorSheet.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/OrgSelectorSheet.tsxnew file mode 100644index 00000000000..998ac1d3910--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/OrgSelectorSheet.tsx@@ -0,0 +1,67 @@+import { OrganizationDropdown } from 'components/layouts/AppLayout/OrganizationDropdown'+import { Boxes } from 'lucide-react'+import type { Organization } from 'types'+import {+ SheetHeader,+ SheetTitle,+ Tabs_Shadcn_,+ TabsContent_Shadcn_,+ TabsList_Shadcn_,+ TabsTrigger_Shadcn_,+} from 'ui'+import MobileSheetNav from 'ui-patterns/MobileSheetNav/MobileSheetNav'++const embeddedClassName =+ 'bg-transparent border-0 shadow-none min-h-0 flex-1 flex flex-col overflow-hidden rounded-none'++export interface OrgSelectorSheetProps {+ open: boolean+ onOpenChange: (open: boolean) => void+ onClose: () => void+ selectedOrganization?: Organization | null+ selectedOrganizationName?: string | null+}++export function OrgSelectorSheet({+ open,+ onOpenChange,+ onClose,+ selectedOrganization,+ selectedOrganizationName,+}: OrgSelectorSheetProps) {+ const orgLabel = selectedOrganizationName ?? selectedOrganization?.name ?? 'Select organization'++ return (+ <MobileSheetNav+ open={open}+ onOpenChange={onOpenChange}+ className="flex flex-col overflow-hidden h-[85dvh] md:max-h-[500px]"+ >+ <Tabs_Shadcn_+ defaultValue="organization"+ className="flex flex-col flex-1 min-h-0 overflow-hidden p-0"+ >+ <SheetHeader className="border-0 border-default p-0 shrink-0">+ <SheetTitle className="sr-only">Switch organization</SheetTitle>+ <TabsList_Shadcn_ className="w-full grid grid-cols-1 shrink-0">+ <TabsTrigger_Shadcn_+ value="organization"+ className="text-xs flex flex-col items-center gap-1.5 px-4 py-3 data-[state=active]:border-0"+ >+ <Boxes className="shrink-0" size={16} strokeWidth={1.5} />+ <span className="truncate max-w-full text-xs leading-tight" title={orgLabel}>+ {orgLabel}+ </span>+ </TabsTrigger_Shadcn_>+ </TabsList_Shadcn_>+ </SheetHeader>+ <TabsContent_Shadcn_+ value="organization"+ className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 p-0 data-[state=inactive]:hidden"+ >+ <OrganizationDropdown embedded className={embeddedClassName} onClose={onClose} />+ </TabsContent_Shadcn_>+ </Tabs_Shadcn_>+ </MobileSheetNav>+ )+}diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.tsxnew file mode 100644index 00000000000..9e87eb3a214--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.tsx@@ -0,0 +1,124 @@+import { useBreakpoint, useParams } from 'common'+import { useBranchesQuery } from 'data/branches/branches-query'+import { useProjectDetailQuery } from 'data/projects/project-detail-query'+import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'+import { IS_PLATFORM } from 'lib/constants'+import { useRouter } from 'next/router'+import { useState } from 'react'+import {+ Popover_Shadcn_,+ PopoverContent_Shadcn_,+ PopoverTrigger_Shadcn_,+ SidebarMenu,+ SidebarMenuButton,+ SidebarMenuItem,+} from 'ui'+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'++import { getProjectBranchSelectorState } from './ProjectBranchSelector.utils'+import { ProjectBranchSelectorPopover } from './ProjectBranchSelectorPopover'+import { ProjectBranchSelectorSheet } from './ProjectBranchSelectorSheet'+import { ProjectBranchSelectorTrigger } from './ProjectBranchSelectorTrigger'++export function ProjectBranchSelector() {+ const router = useRouter()+ const { ref } = useParams()+ const { data: selectedOrganization } = useSelectedOrganizationQuery()+ const { data: project, isPending: isLoadingProject } = useSelectedProjectQuery()++ const isBranch = project?.parentRef !== project?.ref+ const isProductionBranch = !isBranch+ const { data: parentProject } = useProjectDetailQuery(+ { ref: project?.parent_project_ref },+ { enabled: isBranch }+ )+ const displayProject = parentProject ?? project++ const [open, setOpen] = useState(false)++ const isBranchingEnabled = project?.is_branch_enabled === true+ const { data: branches } = useBranchesQuery(+ { projectRef: project?.parent_project_ref || ref },+ { enabled: open && Boolean(project) }+ )++ const selectedBranch = branches?.find((b) => b.project_ref === ref)+ const { isMainBranch, branchDisplayName, selectedOrgInitial, organizationHref } =+ getProjectBranchSelectorState({+ selectedBranch,+ isBranchingEnabled,+ selectedOrganization: selectedOrganization ?? undefined,+ })++ const goToOrganization = () => {+ setOpen(false)+ router.push(organizationHref)+ }++ const isMobile = useBreakpoint('md')++ if (isLoadingProject || !displayProject) {+ return (+ <SidebarMenu>+ <SidebarMenuItem>+ <ShimmeringLoader className="w-full py-3" />+ </SidebarMenuItem>+ </SidebarMenu>+ )+ }++ if (!IS_PLATFORM) {+ return (+ <SidebarMenu>+ <SidebarMenuItem>+ <SidebarMenuButton className="grid flex-1 text-left text-sm leading-tight text-foreground">+ <span className="truncate">{displayProject.name}</span>+ </SidebarMenuButton>+ </SidebarMenuItem>+ </SidebarMenu>+ )+ }++ const triggerProps = {+ displayProjectName: displayProject.name,+ selectedOrgInitial,+ isBranch,+ isProductionBranch,+ branchDisplayName,+ onGoToOrganization: goToOrganization,+ }++ if (isMobile) {+ return (+ <>+ <ProjectBranchSelectorTrigger {...triggerProps} onClick={() => setOpen(true)} />+ <ProjectBranchSelectorSheet+ open={open}+ onOpenChange={setOpen}+ selectedRef={ref}+ onClose={() => setOpen(false)}+ selectedOrganization={selectedOrganization ?? null}+ displayProject={displayProject ?? null}+ selectedBranch={selectedBranch ?? null}+ isMainBranch={isMainBranch}+ />+ </>+ )+ }++ return (+ <SidebarMenu>+ <SidebarMenuItem>+ <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>+ <PopoverTrigger_Shadcn_ asChild>+ <ProjectBranchSelectorTrigger {...triggerProps} />+ </PopoverTrigger_Shadcn_>+ <PopoverContent_Shadcn_ className="p-0 w-[780px]" side="bottom" align="start">+ <ProjectBranchSelectorPopover onClose={() => setOpen(false)} />+ </PopoverContent_Shadcn_>+ </Popover_Shadcn_>+ </SidebarMenuItem>+ </SidebarMenu>+ )+}diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.utils.test.ts b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.utils.test.tsnew file mode 100644index 00000000000..6c352baa8db--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.utils.test.ts@@ -0,0 +1,85 @@+import { describe, expect, it } from 'vitest'++import { getProjectBranchSelectorState } from './ProjectBranchSelector.utils'++describe('getProjectBranchSelectorState', () => {+ it('returns main branch when branching disabled', () => {+ const result = getProjectBranchSelectorState({+ selectedBranch: undefined,+ isBranchingEnabled: false,+ selectedOrganization: undefined,+ })+ expect(result.isMainBranch).toBe(true)+ expect(result.branchDisplayName).toBe('main')+ })++ it('returns main when branching enabled and selected branch is default', () => {+ const result = getProjectBranchSelectorState({+ selectedBranch: {+ id: '1',+ name: 'main',+ project_ref: 'ref',+ is_default: true,+ created_at: '',+ } as any,+ isBranchingEnabled: true,+ selectedOrganization: undefined,+ })+ expect(result.isMainBranch).toBe(true)+ expect(result.branchDisplayName).toBe('main')+ })++ it('returns non-main when branching enabled and selected branch is not default', () => {+ const result = getProjectBranchSelectorState({+ selectedBranch: {+ id: '2',+ name: 'feature-x',+ project_ref: 'ref-2',+ is_default: false,+ created_at: '',+ } as any,+ isBranchingEnabled: true,+ selectedOrganization: undefined,+ })+ expect(result.isMainBranch).toBe(false)+ expect(result.branchDisplayName).toBe('feature-x')+ })++ it('returns main when selected branch undefined and branching enabled', () => {+ const result = getProjectBranchSelectorState({+ selectedBranch: undefined,+ isBranchingEnabled: true,+ selectedOrganization: undefined,+ })+ expect(result.branchDisplayName).toBe('main')+ })++ it('returns organization href when org has slug', () => {+ const result = getProjectBranchSelectorState({+ selectedBranch: undefined,+ isBranchingEnabled: false,+ selectedOrganization: { slug: 'my-org', name: 'My Org' } as any,+ })+ expect(result.organizationHref).toBe('/org/my-org')+ expect(result.selectedOrgInitial).toBe('M')+ })++ it('returns organizations fallback when no org slug', () => {+ const result = getProjectBranchSelectorState({+ selectedBranch: undefined,+ isBranchingEnabled: false,+ selectedOrganization: undefined,+ })+ expect(result.organizationHref).toBe('/organizations')+ expect(result.selectedOrgInitial).toBe('O')+ })++ it('handles org name with leading/trailing spaces for initial', () => {+ const result = getProjectBranchSelectorState({+ selectedBranch: undefined,+ isBranchingEnabled: false,+ selectedOrganization: { slug: 'x', name: ' Acme ' } as any,+ })+ expect(result.selectedOrgInitial).toBe('A')+ })+})diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.utils.ts b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.utils.tsnew file mode 100644index 00000000000..3aac3cf2469--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelector.utils.ts@@ -0,0 +1,33 @@+import type { Branch } from 'data/branches/branches-query'+import type { Organization } from 'types'++export interface ProjectBranchSelectorState {+ selectedBranch: Branch | undefined+ isMainBranch: boolean+ branchDisplayName: string+ selectedOrgInitial: string+ organizationHref: string+}++export function getProjectBranchSelectorState(params: {+ selectedBranch: Branch | undefined+ isBranchingEnabled: boolean+ selectedOrganization: Organization | undefined+}): ProjectBranchSelectorState {+ const { selectedBranch, isBranchingEnabled, selectedOrganization } = params++ const isMainBranch = !isBranchingEnabled || selectedBranch?.is_default === true+ const branchDisplayName = isBranchingEnabled ? selectedBranch?.name ?? 'main' : 'main'+ const selectedOrgInitial = selectedOrganization?.name?.trim().charAt(0).toUpperCase() ?? 'O'+ const organizationHref = selectedOrganization?.slug+ ? `/org/${selectedOrganization.slug}`+ : '/organizations'++ return {+ selectedBranch,+ isMainBranch,+ branchDisplayName,+ selectedOrgInitial,+ organizationHref,+ }+}diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorPopover.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorPopover.tsxnew file mode 100644index 00000000000..c3e5f514a74--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorPopover.tsx@@ -0,0 +1,19 @@+import { BranchDropdown } from 'components/layouts/AppLayout/BranchDropdown'+import { OrganizationDropdown } from 'components/layouts/AppLayout/OrganizationDropdown'+import { ProjectDropdown } from 'components/layouts/AppLayout/ProjectDropdown'++const embeddedClassName = 'bg-transparent border-0 shadow-none min-h-0 flex-1'++export interface ProjectBranchSelectorPopoverProps {+ onClose: () => void+}++export function ProjectBranchSelectorPopover({ onClose }: ProjectBranchSelectorPopoverProps) {+ return (+ <div className="flex divide-x h-[320px]">+ <OrganizationDropdown embedded className={embeddedClassName} onClose={onClose} />+ <ProjectDropdown embedded className={embeddedClassName} onClose={onClose} />+ <BranchDropdown embedded className={embeddedClassName} onClose={onClose} />+ </div>+ )+}diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorSheet.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorSheet.tsxnew file mode 100644index 00000000000..fce94a529ab--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorSheet.tsx@@ -0,0 +1,143 @@+import { BranchDropdown } from 'components/layouts/AppLayout/BranchDropdown'+import { OrganizationDropdown } from 'components/layouts/AppLayout/OrganizationDropdown'+import { ProjectDropdown } from 'components/layouts/AppLayout/ProjectDropdown'+import type { Branch } from 'data/branches/branches-query'+import type { ProjectDetail } from 'data/projects/project-detail-query'+import { Box, Boxes, GitBranch } from 'lucide-react'+import type { Organization } from 'types'+import {+ cn,+ SheetHeader,+ SheetTitle,+ Tabs_Shadcn_,+ TabsContent_Shadcn_,+ TabsList_Shadcn_,+} from 'ui'+import MobileSheetNav from 'ui-patterns/MobileSheetNav/MobileSheetNav'++import { ProjectBranchSelectorSheetTabTrigger } from './ProjectBranchSelectorSheetTabTrigger'++const EMBEDDED_CLASSNAME =+ 'bg-transparent border-0 shadow-none min-h-0 flex-1 flex flex-col overflow-hidden rounded-none'++export interface ProjectBranchSelectorSheetProps {+ open: boolean+ onOpenChange: (open: boolean) => void+ selectedRef: string | undefined+ onClose: () => void+ selectedOrganization?: Organization | null+ displayProject?: ProjectDetail | null+ selectedBranch?: Branch | null+ selectedOrganizationName?: string | null+ selectedProjectName?: string | null+ selectedBranchName?: string | null+ isMainBranch?: boolean+}++export function ProjectBranchSelectorSheet({+ open,+ onOpenChange,+ selectedRef,+ onClose,+ selectedOrganization,+ displayProject,+ selectedBranch,+ selectedOrganizationName,+ selectedProjectName,+ selectedBranchName,+ isMainBranch,+}: ProjectBranchSelectorSheetProps) {+ const orgLabel = selectedOrganizationName ?? selectedOrganization?.name+ const projectLabel = selectedProjectName ?? displayProject?.name+ const branchLabel = selectedBranchName ?? selectedBranch?.name ?? 'main'++ const tabs = [+ orgLabel && {+ value: 'organization' as const,+ label: orgLabel,+ icon: Boxes,+ },+ projectLabel && {+ value: 'project' as const,+ label: projectLabel,+ icon: Box,+ },+ branchLabel && {+ value: 'branch' as const,+ label: branchLabel,+ icon: GitBranch,+ },+ ].filter(Boolean) as Array<{+ value: 'organization' | 'project' | 'branch'+ label: string+ icon: typeof Boxes+ }>++ const defaultTab =+ (selectedRef && tabs.some((t) => t.value === 'project') ? 'project' : tabs[0]?.value) ??+ 'organization'++ if (tabs.length === 0) {+ return null+ }++ return (+ <MobileSheetNav+ open={open}+ onOpenChange={onOpenChange}+ className="flex flex-col overflow-hidden h-[85dvh] md:max-h-[500px]"+ >+ <Tabs_Shadcn_+ defaultValue={defaultTab}+ className="flex flex-col flex-1 min-h-0 overflow-hidden p-0"+ >+ <SheetHeader className="border-0 border-default p-0 shrink-0">+ <SheetTitle className="sr-only">Switch organization, project or branch</SheetTitle>+ <TabsList_Shadcn_+ className={cn(+ 'w-full grid gap-0 shrink-0',+ tabs.length === 1 && 'grid-cols-1',+ tabs.length === 2 && 'grid-cols-2',+ tabs.length === 3 && 'grid-cols-3'+ )}+ >+ {tabs.map(({ value, label, icon }, index) => (+ <ProjectBranchSelectorSheetTabTrigger+ key={value}+ value={value}+ label={label}+ icon={icon}+ isMainBranch={value === 'branch' ? isMainBranch : undefined}+ isLast={index === tabs.length - 1}+ />+ ))}+ </TabsList_Shadcn_>+ </SheetHeader>+ {tabs.some((t) => t.value === 'organization') && (+ <TabsContent_Shadcn_+ value="organization"+ className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 p-0 data-[state=inactive]:hidden"+ >+ <OrganizationDropdown embedded className={EMBEDDED_CLASSNAME} onClose={onClose} />+ </TabsContent_Shadcn_>+ )}+ {tabs.some((t) => t.value === 'project') && (+ <TabsContent_Shadcn_+ value="project"+ className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 py-0 data-[state=inactive]:hidden"+ >+ <ProjectDropdown embedded className={EMBEDDED_CLASSNAME} onClose={onClose} />+ </TabsContent_Shadcn_>+ )}+ {tabs.some((t) => t.value === 'branch') && (+ <TabsContent_Shadcn_+ value="branch"+ className="flex-1 min-h-0 overflow-hidden flex flex-col mt-0 p-0 data-[state=inactive]:hidden"+ >+ <BranchDropdown embedded className={EMBEDDED_CLASSNAME} onClose={onClose} />+ </TabsContent_Shadcn_>+ )}+ </Tabs_Shadcn_>+ </MobileSheetNav>+ )+}diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorSheetTabTrigger.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorSheetTabTrigger.tsxnew file mode 100644index 00000000000..43382c07717--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorSheetTabTrigger.tsx@@ -0,0 +1,55 @@+import type { LucideIcon } from 'lucide-react'+import { cn, TabsTrigger_Shadcn_ } from 'ui'++export interface ProjectBranchSelectorSheetTabTriggerProps {+ value: 'organization' | 'project' | 'branch'+ label: string+ icon: LucideIcon+ isMainBranch?: boolean+ isLast: boolean+}++export function ProjectBranchSelectorSheetTabTrigger({+ value,+ label,+ icon: Icon,+ isMainBranch = false,+ isLast,+}: ProjectBranchSelectorSheetTabTriggerProps) {+ const isBranch = value === 'branch'+ const isProductionBranch = isBranch && isMainBranch++ return (+ <TabsTrigger_Shadcn_+ value={value}+ className={cn(+ 'group relative text-xs flex flex-col items-center gap-1.5 px-4 py-3 data-[state=active]:bg-surface-200 data-[state=active]:border-foreground-light border-b duration-0',+ isProductionBranch &&+ 'text-warning data-[state=active]:text-warning hover:text-warning hover:opacity-70'+ )}+ >+ <Icon className="shrink-0" size={16} strokeWidth={1.5} />+ <span className="truncate max-w-full text-xs leading-tight" title={label}>+ {label}+ </span>++ {!isLast && (+ <svg+ aria-hidden="true"+ width="100%"+ height="100%"+ viewBox="0 0 6 63"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+ className="absolute duration-0 bottom-0 top-0 -right-2 w-3 h-full z-10"+ >+ <path+ d="M5.49365 31L0.493652 0V62L5.49365 31Z"+ className="fill-[hsl(var(--background-dash-sidebar))] group-data-[state=active]:fill-[hsl(var(--background-surface-200))]"+ />+ <path d="M0.493652 0L5.49365 31L0.493652 62" stroke="hsl(var(--border-default))" />+ </svg>+ )}+ </TabsTrigger_Shadcn_>+ )+}diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorTrigger.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorTrigger.tsxnew file mode 100644index 00000000000..17456664064--- /dev/null+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/ProjectBranchSelectorTrigger.tsx@@ -0,0 +1,51 @@+import { ChevronsUpDown, GitBranch } from 'lucide-react'+import { cn, SidebarMenuButton } from 'ui'++export interface ProjectBranchSelectorTriggerProps {+ displayProjectName: string+ selectedOrgInitial: string+ isBranch: boolean+ isProductionBranch: boolean+ branchDisplayName: string+ onGoToOrganization: () => void+ onClick?: () => void+}++export function ProjectBranchSelectorTrigger({+ displayProjectName,+ selectedOrgInitial,+ isBranch,+ branchDisplayName,+ onClick,+}: ProjectBranchSelectorTriggerProps) {+ return (+ <SidebarMenuButton+ size="lg"+ className="group py-1 gap-1.5 w-full flex h-auto text-left data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground touch-manipulation"+ onClick={onClick}+ >+ <div className="relative flex h-8 aspect-square shrink-0 items-center bg-background-muted group-hover:border-stronger justify-center rounded border border-strong text-xs">+ {selectedOrgInitial}+ </div>+ <div className="text-left flex-grow min-w-0">+ <div className="w-full truncate text-foreground leading-tight max-w-[250px]">+ {displayProjectName}+ </div>+ <div+ className={cn(+ 'flex items-center gap-0.5',+ isBranch ? 'text-foreground-lighter' : 'text-warning'+ )}+ >+ <GitBranch className="shrink-0 size-3" strokeWidth={1.5} />+ <span className="truncate min-w-0 leading-tight text-xs">{branchDisplayName}</span>+ </div>+ </div>++ <ChevronsUpDown+ strokeWidth={1.5}+ className="ml-auto text-foreground-lighter !w-4 !h-4 md:hidden md:group-hover:flex"+ />+ </SidebarMenuButton>+ )+}diff --git a/apps/studio/components/ui/OrganizationProjectSelector.tsx b/apps/studio/components/ui/OrganizationProjectSelector.tsxindex d030f245549..7cf498e0c77 100644--- a/apps/studio/components/ui/OrganizationProjectSelector.tsx+++ b/apps/studio/components/ui/OrganizationProjectSelector.tsx@@ -2,7 +2,7 @@ import { keepPreviousData } from '@tanstack/react-query'import { useDebounce, useIntersectionObserver } from '@uidotdev/usehooks'import { OrgProject, useOrgProjectsInfiniteQuery } from 'data/projects/org-projects-infinite-query'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'-import { Check, ChevronsUpDown, HelpCircle } from 'lucide-react'+import { ChevronsUpDown, HelpCircle } from 'lucide-react'import { ReactNode, useEffect, useId, useMemo, useRef, useState } from 'react'import {Button,@@ -10,7 +10,6 @@ import {Command_Shadcn_,CommandGroup_Shadcn_,CommandInput_Shadcn_,- CommandItem_Shadcn_,CommandList_Shadcn_,Popover_Shadcn_,PopoverContent_Shadcn_,@@ -22,6 +21,9 @@ import {} from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { EmbeddedProjectList } from './OrganizationProjectSelector/EmbeddedProjectList'+import { ProjectCommandItem } from './OrganizationProjectSelector/ProjectCommandItem'+interface OrganizationProjectSelectorSelectorProps {slug?: stringopen?: boolean@@ -42,12 +44,15 @@ interface OrganizationProjectSelectorSelectorProps {listboxId: stringopen: boolean}) => ReactNode- renderActions?: (setOpen: (value: boolean) => void) => ReactNode+ renderActions?: (setOpen: (value: boolean) => void, options?: { embedded?: boolean }) => ReactNodeonSelect?: (project: OrgProject) => voidonInitialLoad?: (projects: OrgProject[]) => voidisOptionDisabled?: (project: OrgProject) => booleanfetchOnMount?: booleanmodal?: boolean+ /** When true, render only the command list (no popover/trigger). For use inside sheet or popover. */+ embedded?: boolean+ className?: string}export const OrganizationProjectSelector = ({@@ -66,6 +71,8 @@ export const OrganizationProjectSelector = ({isOptionDisabled,fetchOnMount = false,modal = false,+ embedded = false,+ className,}: OrganizationProjectSelectorSelectorProps) => {const { data: organization } = useSelectedOrganizationQuery()const slug = _slug ?? organization?.slug@@ -131,6 +138,124 @@ export const OrganizationProjectSelector = ({// eslint-disable-next-line react-hooks/exhaustive-deps}, [isLoadingProjects, isSuccessProjects])+ function renderListContent() {+ if (isLoadingProjects) {+ return (+ <>+ <div className="px-2 py-1">+ <ShimmeringLoader className="py-2" />+ </div>+ <div className="px-2 py-1 w-4/5">+ <ShimmeringLoader className="py-2" />+ </div>+ </>+ )+ }+ if (isErrorProjects) {+ return (+ <div className="flex items-center gap-x-2 py-3 justify-center">+ <p className="text-xs text-foreground-lighter">Failed to retrieve projects</p>+ <Tooltip>+ <TooltipTrigger>+ <HelpCircle size={14} />+ </TooltipTrigger>+ <TooltipContent side="bottom">Error: {projectsError?.message}</TooltipContent>+ </Tooltip>+ </div>+ )+ }+ if (search.length > 0 && projects.length === 0) {+ return (+ <p className="text-xs text-center text-foreground-lighter py-3">+ No projects found based on your search+ </p>+ )+ }+ if (projects.length === 0) {+ return <p className="text-xs text-center text-foreground-lighter py-3">No projects found</p>+ }+ if (embedded) {+ return (+ <EmbeddedProjectList+ projects={projects}+ selectedRef={selectedRef ?? undefined}+ onSelect={onSelect}+ onClose={() => setOpen(false)}+ renderRow={renderRow}+ checkPosition={checkPosition}+ isOptionDisabled={isOptionDisabled}+ sentinelRef={sentinelRef}+ hasNextPage={!!hasNextPage}+ />+ )+ }+ return (+ <ScrollArea className={(projects || []).length > 7 ? 'h-full md:h-[210px]' : ''}>+ {projects?.map((project) => (+ <ProjectCommandItem+ key={project.ref}+ project={project}+ selectedRef={selectedRef ?? undefined}+ onSelect={onSelect}+ onClose={() => setOpen(false)}+ renderRow={renderRow}+ checkPosition={checkPosition}+ isOptionDisabled={isOptionDisabled}+ />+ ))}+ <div ref={sentinelRef} className="h-1 -mt-1" />+ {hasNextPage && (+ <div className="px-2 py-1">+ <ShimmeringLoader className="py-2" />+ </div>+ )}+ </ScrollArea>+ )+ }++ const commandContent = (+ <Command_Shadcn_+ shouldFilter={false}+ className={cn(className, embedded && 'flex flex-col flex-1 min-h-0 overflow-hidden')}+ >+ {embedded && !!renderActions && (+ <div className="flex items-center gap-2 shrink-0 border-b p-2">+ {renderActions(setOpen, { embedded: true })}+ </div>+ )}+ <CommandInput_Shadcn_+ showResetIcon+ value={search}+ onValueChange={setSearch}+ placeholder={searchPlaceholder}+ handleReset={() => setSearch('')}+ wrapperClassName={embedded ? 'shrink-0 border-b' : undefined}+ className="text-base sm:text-sm"+ />+ <CommandList_Shadcn_+ className={+ embedded+ ? 'flex-1 min-h-0 overflow-y-auto overflow-x-hidden !max-h-none'+ : 'max-h-none md:max-h-[300px] overflow-y-auto overflow-x-hidden'+ }+ >+ <CommandGroup_Shadcn_ className={embedded ? 'flex-1 min-h-0 overflow-hidden' : ''}>+ {renderListContent()}+ </CommandGroup_Shadcn_>+ {!!renderActions && !embedded && (+ <>+ <div className="h-px bg-border-overlay -mx-1 shrink-0" />+ {renderActions(setOpen)}+ </>+ )}+ </CommandList_Shadcn_>+ </Command_Shadcn_>+ )++ if (embedded) {+ return commandContent+ }+return (<Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={modal}><PopoverTrigger_Shadcn_ asChild>@@ -167,95 +292,7 @@ export const OrganizationProjectSelector = ({side="bottom"align="start">- <Command_Shadcn_ shouldFilter={false}>- <CommandInput_Shadcn_- showResetIcon- value={search}- onValueChange={setSearch}- placeholder={searchPlaceholder}- handleReset={() => setSearch('')}- />- <CommandList_Shadcn_>- <CommandGroup_Shadcn_>- {isLoadingProjects ? (- <>- <div className="px-2 py-1">- <ShimmeringLoader className="py-2" />- </div>- <div className="px-2 py-1 w-4/5">- <ShimmeringLoader className="py-2" />- </div>- </>- ) : isErrorProjects ? (- <div className="flex items-center gap-x-2 py-3 justify-center">- <p className="text-xs text-foreground-lighter">Failed to retrieve projects</p>- <Tooltip>- <TooltipTrigger>- <HelpCircle size={14} />- </TooltipTrigger>- <TooltipContent side="bottom">Error: {projectsError?.message}</TooltipContent>- </Tooltip>- </div>- ) : (- <>- {search.length > 0 && projects.length === 0 && (- <p className="text-xs text-center text-foreground-lighter py-3">- No projects found based on your search- </p>- )}- <ScrollArea className={(projects || []).length > 7 ? 'h-[210px]' : ''}>- {projects?.map((project) => (- <CommandItem_Shadcn_- key={project.ref}- value={`${project.name.replaceAll('"', '')}-${project.ref}`}- className="cursor-pointer w-full"- onSelect={() => {- onSelect?.(project)- setOpen(false)- }}- onClick={() => setOpen(false)}- disabled={!!isOptionDisabled ? isOptionDisabled(project) : false}- >- {!!renderRow ? (- renderRow(project)- ) : (- <div- className={cn(- 'w-full flex items-center',- checkPosition === 'left' ? 'gap-x-2' : 'justify-between',- project.ref !== selectedRef && checkPosition === 'left' && 'ml-6'- )}- >- {checkPosition === 'left' && project.ref === selectedRef && (- <Check size={16} />- )}- {project.name}- {checkPosition === 'right' && project.ref === selectedRef && (- <Check size={16} />- )}- </div>- )}- </CommandItem_Shadcn_>- ))}- <div ref={sentinelRef} className="h-1 -mt-1" />- {hasNextPage && (- <div className="px-2 py-1">- <ShimmeringLoader className="py-2" />- </div>- )}- </ScrollArea>- </>- )}- </CommandGroup_Shadcn_>- {!!renderActions && (- <>- {/* [Joshen] Not using CommandSeparator to persist this while searching */}- <div className="h-px bg-border-overlay -mx-1" />- {renderActions(setOpen)}- </>- )}- </CommandList_Shadcn_>- </Command_Shadcn_>+ {commandContent}</PopoverContent_Shadcn_></Popover_Shadcn_>)diff --git a/apps/studio/components/ui/OrganizationProjectSelector/EmbeddedProjectList.tsx b/apps/studio/components/ui/OrganizationProjectSelector/EmbeddedProjectList.tsxnew file mode 100644index 00000000000..adf75e1f901--- /dev/null+++ b/apps/studio/components/ui/OrganizationProjectSelector/EmbeddedProjectList.tsx@@ -0,0 +1,52 @@+import type { OrgProject } from 'data/projects/org-projects-infinite-query'+import type { ReactNode } from 'react'+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'++import { ProjectCommandItem } from './ProjectCommandItem'++export interface EmbeddedProjectListProps {+ projects: OrgProject[]+ selectedRef: string | undefined+ onSelect?: (project: OrgProject) => void+ onClose: () => void+ renderRow?: (project: OrgProject) => ReactNode+ checkPosition?: 'right' | 'left'+ isOptionDisabled?: (project: OrgProject) => boolean+ sentinelRef: (node: Element | null) => void+ hasNextPage: boolean+}++export function EmbeddedProjectList({+ projects,+ selectedRef,+ onSelect,+ onClose,+ renderRow,+ checkPosition,+ isOptionDisabled,+ sentinelRef,+ hasNextPage,+}: EmbeddedProjectListProps) {+ return (+ <div className="min-h-0 p-1">+ {projects.map((project) => (+ <ProjectCommandItem+ key={project.ref}+ project={project}+ selectedRef={selectedRef}+ onSelect={onSelect}+ onClose={onClose}+ renderRow={renderRow}+ checkPosition={checkPosition}+ isOptionDisabled={isOptionDisabled}+ />+ ))}+ <div ref={sentinelRef} className="h-1 -mt-1" />+ {hasNextPage && (+ <div className="px-2 py-1">+ <ShimmeringLoader className="py-2" />+ </div>+ )}+ </div>+ )+}diff --git a/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.tsx b/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.tsxnew file mode 100644index 00000000000..2a6ecad8f5f--- /dev/null+++ b/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.tsx@@ -0,0 +1,57 @@+import type { OrgProject } from 'data/projects/org-projects-infinite-query'+import { Check } from 'lucide-react'+import { ReactNode } from 'react'+import { cn, CommandItem_Shadcn_ } from 'ui'++export interface ProjectCommandItemProps {+ project: OrgProject+ selectedRef: string | undefined+ onSelect?: (project: OrgProject) => void+ onClose: () => void+ renderRow?: (project: OrgProject) => ReactNode+ checkPosition?: 'right' | 'left'+ isOptionDisabled?: (project: OrgProject) => boolean+}++export function ProjectCommandItem({+ project,+ selectedRef,+ onSelect,+ onClose,+ renderRow,+ checkPosition = 'right',+ isOptionDisabled,+}: ProjectCommandItemProps) {+ const handleSelect = () => {+ onSelect?.(project)+ onClose()+ }++ const disabled = isOptionDisabled?.(project) ?? false++ return (+ <CommandItem_Shadcn_+ key={project.ref}+ value={`${project.name.replaceAll('"', '')}-${project.ref}`}+ className="cursor-pointer w-full"+ onSelect={handleSelect}+ disabled={disabled}+ >+ {renderRow ? (+ renderRow(project)+ ) : (+ <div+ className={cn(+ 'w-full flex items-center',+ checkPosition === 'left' ? 'gap-x-2' : 'justify-between',+ project.ref !== selectedRef && checkPosition === 'left' && 'ml-6'+ )}+ >+ {checkPosition === 'left' && project.ref === selectedRef && <Check size={16} />}+ {project.name}+ {checkPosition === 'right' && project.ref === selectedRef && <Check size={16} />}+ </div>+ )}+ </CommandItem_Shadcn_>+ )+}diff --git a/apps/studio/tests/components/ProjectDropdown.test.ts b/apps/studio/tests/components/ProjectDropdown.test.tsindex 66156018469..2871400fd56 100644--- a/apps/studio/tests/components/ProjectDropdown.test.ts+++ b/apps/studio/tests/components/ProjectDropdown.test.ts@@ -1,5 +1,5 @@-import { sanitizeRoute } from 'components/layouts/AppLayout/ProjectDropdown'-import { test, expect } from 'vitest'+import { sanitizeRoute } from 'components/layouts/AppLayout/ProjectDropdown.utils'+import { expect, test } from 'vitest'test('Should sanitize project routes correctly when switching projects by removing project specific parameters', () => {expect(sanitizeRoute('/project/[ref]', { ref: 'abc' })).toBe('/project/[ref]')@@ -17,4 +17,7 @@ test('Should sanitize project routes correctly when switching projects by removiexpect(sanitizeRoute('/project/[ref]/logs/explorer?q=select', { ref: 'abc' })).toBe('/project/[ref]/logs/explorer?q=select')+ expect(+ sanitizeRoute('/project/[ref]/advisors/security/[preset]', { ref: 'abc', preset: 'auth' })+ ).toBe('/project/[ref]/advisors/security')})diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.tsindex 12bbc76bfad..7fb2dfaea4b 100644--- a/packages/common/telemetry-constants.ts+++ b/packages/common/telemetry-constants.ts@@ -1656,6 +1656,46 @@ export interface BranchReviewWithAssistantClickedEvent {groups: TelemetryGroups}+/**+ * Triggered when a user selects a branch from the branch selector dropdown.+ *+ * @group Events+ * @source studio+ * @page branch selector (header / sheet / popover)+ */+export interface BranchSelectorBranchClickedEvent {+ action: 'branch_selector_branch_clicked'+ properties: {+ branchId: string+ branchName: string+ }+ groups: TelemetryGroups+}++/**+ * Triggered when a user clicks "Create branch" in the branch selector dropdown.+ *+ * @group Events+ * @source studio+ * @page branch selector (header / sheet / popover)+ */+export interface BranchSelectorCreateClickedEvent {+ action: 'branch_selector_create_clicked'+ groups: TelemetryGroups+}++/**+ * Triggered when a user clicks "Manage branches" in the branch selector dropdown.+ *+ * @group Events+ * @source studio+ * @page branch selector (header / sheet / popover)+ */+export interface BranchSelectorManageClickedEvent {+ action: 'branch_selector_manage_clicked'+ groups: TelemetryGroups+}+/*** User clicked on a DPA PDF link to open it.*@@ -2867,6 +2907,9 @@ export type TelemetryEvent =| BranchMergeFailedEvent| BranchUpdatedEvent| BranchReviewWithAssistantClickedEvent+ | BranchSelectorBranchClickedEvent+ | BranchSelectorCreateClickedEvent+ | BranchSelectorManageClickedEvent| DpaPdfOpenedEvent| HomeGettingStartedWorkflowClickedEvent| HomeGettingStartedStepClickedEventdiff --git a/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsx b/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsxindex 45f2caafef9..d683197688b 100644--- a/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsx+++ b/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsx@@ -44,6 +44,7 @@ const MobileSheetNav: React.FC<{<Sheet open={open} onOpenChange={onOpenChange}><SheetContentid="mobile-sheet-content"+ aria-describedby={undefined}showClose={false}size="full"side="bottom"