mirror of
https://github.com/supabase/supabase.git
synced 2026-10-15 22:29:11 +03:00
* update test * move back button, fix width issues on sidebar * update sidebar logic * Update ProjectLayout.tsx * lots of updates. layouts now streamlined. localstorage for tabs in use * moar * bunch of new tab logic * fix empty tab issue * Update tabs.ts * layouts switched * new pages now have fixed layouts * fix tabs * fix code bg * add tabs support for multiple project refs * intialization issue * update ID handling * fixed isOpened state for SQL snippets * remove old assistant because its bugging up panels * preview style works in sql editor * fix border * removes preview tab if there is one * fix background of loading skeleton * lots of issues with types/icons/redirect * new tab cards * snippets in empty state now work * moar stuff * tabs now in feature flags * Update tabs.ts * Update tabs.ts * moar * add feature previews * remove code not needed * Update next-env.d.ts * Delete FeaturePreviewModal.tsx * fix typescript errors. remove more explorer stuff * remove explorer files * fixed issues with templates and quickstarts tab * fixed active state when tabs are not opted in * logic error * fix open/highlight issue when opted out of tabs * templates/quickstarts now displayed with new cards * Update recent-items.tsx * Update new-tab.tsx * add icon back in * add old empty state back in * recent items updated to respect project ref * localstorage cleanup on deletion * moar * overflow tabs now working * correct tab names used for new sql templates/quickstarts * ongoing queries fix * cleanup * update images * Update RouteValidationWrapper.tsx * Update AppLayout.tsx * Update NavigationBar.tsx * add headers back into side panels * improve writing * tabs now drag and drop a billion times better * Update tabs.tsx * Update tabs.tsx * init issues on stores, which caused a race condition. * fix hydration error * init * init sidebars * init * Update app-default-navigation.tsx * user dropdown updates * moar layouts * init * moar * moar * updat * reverse top bar * some banners * moar * start adding account page * change styling of dropdowns * Update sidebar.tsx * fix new tab issue in sql * Update ProjectLayout.tsx * Update pnpm-lock.yaml * latest * Update pnpm-lock.yaml * moar layouts on account * getLayout updates * more fixes * force a cache build * moar * Update app-default-navigation.tsx * fix AI button animation * moar layout * account pages refactored * Update user-dropdown.tsx * Update new-tab.tsx * move EditorMenuListSkeleton * Fix type issues * fixes: DESIGN-87 fixes: DESIGN-87 * refactor sort/filter components * Update rules-set-button-text.tsx * remove discussions for now * small styling fixes * Update FeaturePreviewModal.tsx * Update FeaturePreviewModal.tsx * Update RouteValidationWrapper.tsx * revert * revert * revert * revert * revert * more revert * Update collapse-button.tsx * Update SQLEditorTreeViewItem.tsx * revert * Update SchemaGraph.tsx * Delete new-upcoming.tsx * revert * Update ProjectLayout.tsx * fix home link * Update table-editor.spec.ts * test update * Update projects.tsx * remove * Delete sidebar-open-top-banner.tsx * add organizations page * Update table-editor.spec.ts * Fix the playwright tests. * layout fixes * layout fix * revert sort/filter * Update LastSignInWrapper.tsx * revert * revert * remove * update file names * revert * revert * revert * advisor lint page tabs revert * revert * revert * revert * revert * revert * revert tabs * remove packages * add sidebar * sidebar docs added * add sidebar * fixed issues * fix mobile * fixes * add org side bar in * redirect updated * fix more layouts * move settings icon back down * remove old stuff * Delete SideBar.tsx * use ProfileImage component * spelling * Update ThemeSettings.tsx * Update ThemeSettings.tsx * Update Sidebar.tsx * layout udpate * Update Sidebar.tsx * fixes * Minor lints * Update Sidebar.tsx * create a alt user dropdown for self hosting and local * add fragment back in * Adds Theme Selector for local/self hosting * Update UserDropdown.tsx * fix theme selector for local self host * Update index.ts * Update DefaultLayout.tsx * now supports feature preview * remove old files * rename files * revert * Update LayoutHeader.tsx * clean * revert * revert * Update resource-banner.tsx * remove redundant side bar stuff * organizations action bar updated. removed hardcoded value * fix type errors * fix tests * Undo test changes * Fix account pages for when feature preview is off * Bug fixes 1 * Missing key in map of EmailTemplates * Fix missing border in StorageExplorer * fix missing header in performance advisor * Final clean up * Fix DefaultLayout re-rendering issue on auth pages * A couple of fixes * Redirect to /organizations if land on /projects with feature preview on * Route back to /projects if toggling preview off on /organizations * Add HomePageActions to /org/slug * make re-routing nicer * Moar fixes * Fix logging in redirect to /organizations irregardless of feature preview * Fix missing withAuth in OrganizationLayout * Minor clean upo * Fix branch dropdown not aligned * Add feature preview for update layout * update dropdowns to only be chevron triggered in new layout * Update content-query.ts * Update entity-types-infinite-query.ts * add IS_PLATFORM for org dropdown * Add IS_PLATFORM check for EnableBranchingDropdown in LayoutHeader * Midway fixing mobile nav * Mobile nav fixes * Address feedbacks --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com> Co-authored-by: Alaister Young <a@alaisteryoung.com> Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com> Co-authored-by: Jordi Enric <jordi.err@gmail.com>
214 lines
7.7 KiB
TypeScript
214 lines
7.7 KiB
TypeScript
import { AlertCircle, Check, ChevronsUpDown, ListTree, MessageCircle, Shield } from 'lucide-react'
|
|
import Link from 'next/link'
|
|
import { useRouter } from 'next/router'
|
|
import { useState } from 'react'
|
|
|
|
import { useParams } from 'common'
|
|
import { useNewLayout } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
|
|
import ShimmeringLoader from 'components/ui/ShimmeringLoader'
|
|
import { Branch, useBranchesQuery } from 'data/branches/branches-query'
|
|
import { useSelectedProject } from 'hooks/misc/useSelectedProject'
|
|
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 { sanitizeRoute } from './ProjectDropdown'
|
|
|
|
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>
|
|
)
|
|
}
|
|
|
|
const BranchDropdown = () => {
|
|
const newLayoutPreview = useNewLayout()
|
|
|
|
const router = useRouter()
|
|
const { ref } = useParams()
|
|
const projectDetails = useSelectedProject()
|
|
|
|
const isBranch = projectDetails?.parent_project_ref !== undefined
|
|
const projectRef =
|
|
projectDetails !== undefined ? (isBranch ? projectDetails.parent_project_ref : ref) : undefined
|
|
const { data: branches, isLoading, isError, isSuccess } = useBranchesQuery({ projectRef })
|
|
|
|
const [open, setOpen] = useState(false)
|
|
const selectedBranch = branches?.find((branch) => branch.project_ref === ref)
|
|
|
|
const mainBranch = branches?.find((branch) => branch.is_default)
|
|
const restOfBranches = branches
|
|
?.filter((branch) => !branch.is_default)
|
|
.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())
|
|
|
|
const sortedBranches = mainBranch
|
|
? [mainBranch].concat(restOfBranches ?? [])
|
|
: restOfBranches ?? []
|
|
|
|
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 && branches.length > 0 && (
|
|
<>
|
|
{newLayoutPreview && (
|
|
<Link
|
|
href={`/project/${ref}`}
|
|
className="flex items-center gap-2 flex-shrink-0 text-sm"
|
|
>
|
|
<span className="text-foreground max-w-32 lg:max-w-none truncate">
|
|
{selectedBranch?.name}
|
|
</span>
|
|
{selectedBranch?.is_default ? (
|
|
<Badge variant="warning">Production</Badge>
|
|
) : (
|
|
<Badge variant="brand">Preview Branch</Badge>
|
|
)}
|
|
</Link>
|
|
)}
|
|
<Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
|
|
<PopoverTrigger_Shadcn_ asChild>
|
|
{newLayoutPreview ? (
|
|
<Button
|
|
type="text"
|
|
className={cn('px-0.25 [&_svg]:w-5 [&_svg]:h-5 ml-1')}
|
|
iconRight={<ChevronsUpDown strokeWidth={1.5} />}
|
|
/>
|
|
) : (
|
|
<Button type="text" className="pr-2" iconRight={<ChevronsUpDown />}>
|
|
<div className="flex items-center space-x-2">
|
|
<p className={'text-xs'}>{selectedBranch?.name}</p>
|
|
{selectedBranch?.is_default ? (
|
|
<Badge variant="warning">Production</Badge>
|
|
) : (
|
|
<Badge variant="brand">Preview Branch</Badge>
|
|
)}
|
|
</div>
|
|
</Button>
|
|
)}
|
|
</PopoverTrigger_Shadcn_>
|
|
<PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">
|
|
<Command_Shadcn_>
|
|
<CommandInput_Shadcn_ placeholder="Find branch..." />
|
|
<CommandList_Shadcn_>
|
|
<CommandEmpty_Shadcn_>No branches found</CommandEmpty_Shadcn_>
|
|
<CommandGroup_Shadcn_>
|
|
<ScrollArea className="max-h-[210px] overflow-y-auto">
|
|
{sortedBranches?.map((branch) => (
|
|
<BranchLink
|
|
key={branch.id}
|
|
branch={branch}
|
|
isSelected={branch.id === selectedBranch?.id}
|
|
setOpen={setOpen}
|
|
/>
|
|
))}
|
|
</ScrollArea>
|
|
</CommandGroup_Shadcn_>
|
|
<CommandSeparator_Shadcn_ />
|
|
<CommandGroup_Shadcn_>
|
|
<CommandItem_Shadcn_
|
|
className="cursor-pointer w-full"
|
|
onSelect={(e) => {
|
|
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_>
|
|
<CommandSeparator_Shadcn_ />
|
|
<CommandGroup_Shadcn_>
|
|
<CommandItem_Shadcn_
|
|
className="cursor-pointer w-full"
|
|
onSelect={() => {
|
|
setOpen(false)
|
|
window?.open(BRANCHING_GITHUB_DISCUSSION_LINK, '_blank')?.focus()
|
|
}}
|
|
onClick={() => setOpen(false)}
|
|
>
|
|
<Link
|
|
href={BRANCHING_GITHUB_DISCUSSION_LINK}
|
|
target="_blank"
|
|
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>
|
|
</Link>
|
|
</CommandItem_Shadcn_>
|
|
</CommandGroup_Shadcn_>
|
|
</CommandList_Shadcn_>
|
|
</Command_Shadcn_>
|
|
</PopoverContent_Shadcn_>
|
|
</Popover_Shadcn_>
|
|
</>
|
|
)}
|
|
</>
|
|
)
|
|
}
|
|
|
|
export default BranchDropdown
|