mirror of
https://github.com/supabase/supabase.git
synced 2026-10-14 21:59:16 +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>
259 lines
7.1 KiB
TypeScript
259 lines
7.1 KiB
TypeScript
import { isUndefined } from 'lodash'
|
|
import { ArrowUpRight, LogOut } from 'lucide-react'
|
|
import Link from 'next/link'
|
|
import { PropsWithChildren, ReactNode, useState } from 'react'
|
|
import { Badge, cn, Menu } from 'ui'
|
|
import MobileSheetNav from 'ui-patterns/MobileSheetNav/MobileSheetNav'
|
|
import { LayoutHeader } from '../ProjectLayout/LayoutHeader'
|
|
import type { SidebarLink, SidebarSection } from './AccountLayout.types'
|
|
import { useAppStateSnapshot } from 'state/app-state'
|
|
|
|
interface WithSidebarProps {
|
|
title: string
|
|
breadcrumbs: any[]
|
|
sections: SidebarSection[]
|
|
header?: ReactNode
|
|
subitems?: any[]
|
|
subitemsParentKey?: number
|
|
hideSidebar?: boolean
|
|
customSidebarContent?: ReactNode
|
|
}
|
|
|
|
const WithSidebar = ({
|
|
title,
|
|
header,
|
|
breadcrumbs = [],
|
|
children,
|
|
sections,
|
|
subitems,
|
|
subitemsParentKey,
|
|
hideSidebar = false,
|
|
customSidebarContent,
|
|
}: PropsWithChildren<WithSidebarProps>) => {
|
|
const noContent = !sections && !customSidebarContent
|
|
const { mobileMenuOpen, setMobileMenuOpen } = useAppStateSnapshot()
|
|
|
|
return (
|
|
<div className="flex flex-col md:flex-row h-full">
|
|
{!hideSidebar && !noContent && (
|
|
<SidebarContent
|
|
title={title}
|
|
header={header}
|
|
sections={sections}
|
|
subitems={subitems}
|
|
subitemsParentKey={subitemsParentKey}
|
|
customSidebarContent={customSidebarContent}
|
|
className="hidden md:block"
|
|
/>
|
|
)}
|
|
<div className="flex flex-1 flex-col">
|
|
<div className="flex-1 flex-grow overflow-y-auto">{children}</div>
|
|
</div>
|
|
<MobileSheetNav open={mobileMenuOpen} onOpenChange={setMobileMenuOpen}>
|
|
<SidebarContent
|
|
title={title}
|
|
header={header}
|
|
sections={sections}
|
|
subitems={subitems}
|
|
subitemsParentKey={subitemsParentKey}
|
|
customSidebarContent={customSidebarContent}
|
|
/>
|
|
</MobileSheetNav>
|
|
</div>
|
|
)
|
|
}
|
|
export default WithSidebar
|
|
|
|
export const SidebarContent = ({
|
|
title,
|
|
header,
|
|
sections,
|
|
subitems,
|
|
subitemsParentKey,
|
|
customSidebarContent,
|
|
className,
|
|
}: PropsWithChildren<Omit<WithSidebarProps, 'breadcrumbs'>> & { className?: string }) => {
|
|
return (
|
|
<>
|
|
<div
|
|
id="with-sidebar"
|
|
className={cn(
|
|
'h-full bg-dash-sidebar',
|
|
'hide-scrollbar w-full md:w-64 overflow-auto md:border-r border-default',
|
|
className
|
|
)}
|
|
>
|
|
{title && (
|
|
<div className="block mb-2">
|
|
<div className="flex h-12 max-h-12 items-center border-b px-6 border-default">
|
|
<h4 className="mb-0 text-lg truncate" title={title}>
|
|
{title}
|
|
</h4>
|
|
</div>
|
|
</div>
|
|
)}
|
|
{header && header}
|
|
<div className="-mt-1">
|
|
<Menu>
|
|
{customSidebarContent}
|
|
{sections.map((section) => {
|
|
return Boolean(section.heading) ? (
|
|
<SectionWithHeaders
|
|
key={section.key}
|
|
section={section}
|
|
subitems={subitems}
|
|
subitemsParentKey={subitemsParentKey}
|
|
/>
|
|
) : (
|
|
<div className="border-b py-5 px-6 border-default" key={section.key}>
|
|
<SidebarItem
|
|
links={section.links}
|
|
subitems={subitems}
|
|
subitemsParentKey={subitemsParentKey}
|
|
/>
|
|
</div>
|
|
)
|
|
})}
|
|
</Menu>
|
|
</div>
|
|
</div>
|
|
</>
|
|
)
|
|
}
|
|
|
|
interface SectionWithHeadersProps {
|
|
section: SidebarSection
|
|
subitems?: any[]
|
|
subitemsParentKey?: number
|
|
}
|
|
|
|
const SectionWithHeaders = ({ section, subitems, subitemsParentKey }: SectionWithHeadersProps) => (
|
|
<div key={section.heading} className="border-b py-5 px-6 border-default">
|
|
{section.heading && <Menu.Group title={section.heading} />}
|
|
{section.versionLabel && (
|
|
<div className="mb-1 px-3">
|
|
<Badge variant="warning">{section.versionLabel}</Badge>
|
|
</div>
|
|
)}
|
|
{
|
|
<SidebarItem
|
|
links={section.links}
|
|
subitems={subitems}
|
|
subitemsParentKey={subitemsParentKey}
|
|
/>
|
|
}
|
|
</div>
|
|
)
|
|
interface SidebarItemProps {
|
|
links: SidebarLink[]
|
|
subitems?: any[]
|
|
subitemsParentKey?: number
|
|
}
|
|
|
|
const SidebarItem = ({ links, subitems, subitemsParentKey }: SidebarItemProps) => {
|
|
return (
|
|
<ul className="space-y-1">
|
|
{links.map((link, i: number) => {
|
|
// disable active state for link with subitems
|
|
const isActive = link.isActive && !subitems
|
|
|
|
let render: any = (
|
|
<SidebarLinkItem
|
|
key={`${link.key}-${i}-sidebarItem`}
|
|
id={`${link.key}-${i}`}
|
|
isActive={isActive}
|
|
label={link.label}
|
|
href={link.href}
|
|
onClick={link.onClick}
|
|
isExternal={link.isExternal || false}
|
|
icon={link.icon}
|
|
/>
|
|
)
|
|
|
|
if (subitems && link.subitemsKey === subitemsParentKey) {
|
|
const subItemsRender = subitems.map((y: any, i: number) => (
|
|
<SidebarLinkItem
|
|
key={`${y.key || y.as}-${i}-sidebarItem`}
|
|
id={`${y.key || y.as}-${i}`}
|
|
isSubitem={true}
|
|
label={y.label}
|
|
onClick={y.onClick}
|
|
isExternal={link.isExternal || false}
|
|
icon={link.icon}
|
|
/>
|
|
))
|
|
render = [render, ...subItemsRender]
|
|
}
|
|
|
|
return render
|
|
})}
|
|
</ul>
|
|
)
|
|
}
|
|
|
|
interface SidebarLinkProps extends SidebarLink {
|
|
id: string
|
|
isSubitem?: boolean
|
|
}
|
|
|
|
const SidebarLinkItem = ({
|
|
id,
|
|
label,
|
|
href,
|
|
isActive,
|
|
isSubitem,
|
|
isExternal,
|
|
onClick,
|
|
icon,
|
|
}: SidebarLinkProps) => {
|
|
if (isUndefined(href)) {
|
|
let icon
|
|
if (isExternal) {
|
|
icon = <ArrowUpRight size={14} />
|
|
}
|
|
|
|
if (label === 'Log out') {
|
|
icon = <LogOut size={14} />
|
|
}
|
|
|
|
return (
|
|
<Menu.Item
|
|
rounded
|
|
key={id}
|
|
style={{
|
|
marginLeft: isSubitem ? '.5rem' : '0rem',
|
|
}}
|
|
active={isActive}
|
|
onClick={onClick || (() => {})}
|
|
icon={icon}
|
|
>
|
|
{isSubitem ? <p className="text-sm">{label}</p> : label}
|
|
</Menu.Item>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<Link href={href || ''} className="block" target={isExternal ? '_blank' : '_self'}>
|
|
<span className="group flex max-w-full cursor-pointer items-center space-x-2 border-default py-1 font-normal outline-none ring-foreground focus-visible:z-10 focus-visible:ring-1 group-hover:border-foreground-muted">
|
|
{isExternal && (
|
|
<span className="truncate text-sm text-foreground-lighter transition group-hover:text-foreground-light">
|
|
<ArrowUpRight size={14} />
|
|
</span>
|
|
)}
|
|
<div className="flex items-center gap-1.5 flex-shrink-0">
|
|
<span
|
|
title={label}
|
|
className={cn(
|
|
'w-full truncate text-sm transition',
|
|
isActive ? 'text-foreground' : 'text-foreground-light group-hover:text-foreground'
|
|
)}
|
|
>
|
|
{isSubitem ? <p>{label}</p> : label}
|
|
</span>
|
|
{icon}
|
|
</div>
|
|
</span>
|
|
</Link>
|
|
)
|
|
}
|