mirror of
https://github.com/supabase/supabase.git
synced 2026-10-10 20:05:06 +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>
201 lines
7.0 KiB
TypeScript
201 lines
7.0 KiB
TypeScript
import { Box, Check, ChevronsUpDown, Plus } from 'lucide-react'
|
|
import Link from 'next/link'
|
|
import { useRouter } from 'next/router'
|
|
import { ParsedUrlQuery } from 'querystring'
|
|
import { useState } from 'react'
|
|
|
|
import { useParams } from 'common'
|
|
import { useNewLayout } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
|
|
import ShimmeringLoader from 'components/ui/ShimmeringLoader'
|
|
import { ProjectInfo, useProjectsQuery } from 'data/projects/projects-query'
|
|
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
|
|
import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
|
|
import { useSelectedProject } from 'hooks/misc/useSelectedProject'
|
|
import { IS_PLATFORM } from 'lib/constants'
|
|
import type { Organization } from 'types'
|
|
import {
|
|
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'
|
|
|
|
// [Fran] the idea is to let users change projects without losing the current page,
|
|
// but at the same time we need to redirect correctly between urls that might be
|
|
// unique to a project e.g. '/project/projectRef/editor/tableId'
|
|
// Right now, I'm gonna assume that any router query after the projectId,
|
|
// is a unique project id/marker so we'll redirect the user to the
|
|
// highest common route with just projectRef in the router queries.
|
|
|
|
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
|
|
}
|
|
}
|
|
|
|
const ProjectLink = ({
|
|
project,
|
|
setOpen,
|
|
}: {
|
|
project: ProjectInfo
|
|
organization?: Organization
|
|
setOpen: (value: boolean) => void
|
|
}) => {
|
|
const router = useRouter()
|
|
const { ref } = useParams()
|
|
const sanitizedRoute = sanitizeRoute(router.route, router.query)
|
|
|
|
// [Joshen] Temp while we're interim between v1 and v2 billing
|
|
let href = sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`
|
|
|
|
return (
|
|
<CommandItem_Shadcn_
|
|
key={project.ref}
|
|
value={`${project.name.replaceAll('"', '')}-${project.ref}`}
|
|
className="cursor-pointer w-full"
|
|
onSelect={() => {
|
|
router.push(href)
|
|
setOpen(false)
|
|
}}
|
|
onClick={() => setOpen(false)}
|
|
>
|
|
<Link href={href} className="w-full flex items-center justify-between">
|
|
{project.name}
|
|
{project.ref === ref && <Check size={16} />}
|
|
</Link>
|
|
</CommandItem_Shadcn_>
|
|
)
|
|
}
|
|
|
|
interface ProjectDropdownProps {
|
|
isNewNav?: boolean
|
|
}
|
|
|
|
const ProjectDropdown = ({ isNewNav = true }: ProjectDropdownProps) => {
|
|
const newLayoutPreview = useNewLayout()
|
|
|
|
const router = useRouter()
|
|
const { ref } = useParams()
|
|
const projectDetails = useSelectedProject()
|
|
const selectedOrganization = useSelectedOrganization()
|
|
const project = useSelectedProject()
|
|
const { data: allProjects, isLoading: isLoadingProjects } = useProjectsQuery()
|
|
|
|
const projectCreationEnabled = useIsFeatureEnabled('projects:create')
|
|
|
|
const isBranch = projectDetails?.parentRef !== projectDetails?.ref
|
|
|
|
const projects = allProjects
|
|
?.filter((x) => x.organization_id === selectedOrganization?.id)
|
|
.sort((a, b) => a.name.localeCompare(b.name))
|
|
const selectedProject = isBranch
|
|
? projects?.find((project) => project.ref === projectDetails?.parentRef)
|
|
: projects?.find((project) => project.ref === ref)
|
|
|
|
const [open, setOpen] = useState(false)
|
|
|
|
if (isLoadingProjects || !selectedProject) {
|
|
return <ShimmeringLoader className="w-[90px]" />
|
|
}
|
|
|
|
return IS_PLATFORM ? (
|
|
<>
|
|
{newLayoutPreview && (
|
|
<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 className="text-foreground max-w-32 lg:max-w-none truncate">{project?.name}</span>
|
|
</Link>
|
|
)}
|
|
<Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
|
|
<PopoverTrigger_Shadcn_ asChild>
|
|
{newLayoutPreview ? (
|
|
<Button
|
|
type="text"
|
|
size="tiny"
|
|
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={isNewNav ? 'text-sm' : 'text-xs'}>{selectedProject?.name}</p>
|
|
</div>
|
|
</Button>
|
|
)}
|
|
</PopoverTrigger_Shadcn_>
|
|
<PopoverContent_Shadcn_ className="p-0" side="bottom" align="start">
|
|
<Command_Shadcn_>
|
|
<CommandInput_Shadcn_ placeholder="Find project..." />
|
|
<CommandList_Shadcn_>
|
|
<CommandEmpty_Shadcn_>No projects found</CommandEmpty_Shadcn_>
|
|
<CommandGroup_Shadcn_>
|
|
<ScrollArea className={(projects || []).length > 7 ? 'h-[210px]' : ''}>
|
|
{projects?.map((project) => (
|
|
<ProjectLink key={project.ref} project={project} setOpen={setOpen} />
|
|
))}
|
|
</ScrollArea>
|
|
</CommandGroup_Shadcn_>
|
|
{projectCreationEnabled && (
|
|
<>
|
|
<CommandSeparator_Shadcn_ />
|
|
<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_>
|
|
</>
|
|
)}
|
|
</CommandList_Shadcn_>
|
|
</Command_Shadcn_>
|
|
</PopoverContent_Shadcn_>
|
|
</Popover_Shadcn_>
|
|
</>
|
|
) : (
|
|
<Button type="text">
|
|
<span className={isNewNav ? 'text-sm' : 'text-xs'}>{selectedProject?.name}</span>
|
|
</Button>
|
|
)
|
|
}
|
|
|
|
export default ProjectDropdown
|