mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 19:35:06 +03:00
## Context If a user switches account without an explicit log out via the dashboard, landing back on `/org` will redirect users to the last visited organization as stored in local storage, in which it can result in the following state if the last visited organization does not exist in the current account <img width="2538" height="1060" alt="image" src="https://github.com/user-attachments/assets/270e482a-3515-48ef-898b-87e76fce80d6" /> ## Changes involved Am opting to scope the last visited organization to the user profile instead - this would be a bit more cleaner than trying to actively clear the last visited org slug from local storage with implicit account changes as there's no deterministic way to track that (afaik) from FE side of things ## To test Can reproduce the problem as such - Ensure that you have 2 accounts to log in with, and one account has an org that the other is not a part of - For the organization that has the "extra" org, ensure that you click into it so that the last visited org slug is saved in local storage - Mimic changing accounts by visiting `/auth/v1/authorize?provider=github` (using the domain for the env that you're testing on - e.g localhost:8000 for local, or green for staging preview) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Unified “last visited organization” handling across the Studio UI with a shared hook, improving consistency for home/dashboard return, cancel/back navigation, and account routing. * **Bug Fixes** * Updated redirects to only route to an organization when a valid last-visited value is available; otherwise users go to the general organizations page. * Kept MFA enrollment and factor delete/leave flows aligned to the unified last-visited organization value. * **Tests** * Updated onboarding and layout tests to match the new last-visited organization storage key format and hook/query success behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
131 lines
5.1 KiB
TypeScript
131 lines
5.1 KiB
TypeScript
import { useBreakpoint, useParams } from 'common'
|
|
import { useRouter } from 'next/router'
|
|
import { PropsWithChildren, useEffect, useState } from 'react'
|
|
import { ResizablePanel, ResizablePanelGroup, SidebarProvider } from 'ui'
|
|
|
|
import { BannerStack } from '../ui/BannerStack/BannerStack'
|
|
import { LayoutHeader } from './Navigation/LayoutHeader/LayoutHeader'
|
|
import MobileNavigationBar from './Navigation/NavigationBar/MobileNavigationBar'
|
|
import { MobileSheetProvider } from './Navigation/NavigationBar/MobileSheetContext'
|
|
import { StudioMobileSheetNav } from './Navigation/NavigationBar/StudioMobileSheetNav'
|
|
import { LayoutSidebar } from './ProjectLayout/LayoutSidebar'
|
|
import { LayoutSidebarProvider } from './ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
|
|
import { ProjectContextProvider } from './ProjectLayout/ProjectContext'
|
|
import { AppBannerWrapper } from '@/components/interfaces/App/AppBannerWrapper'
|
|
import { Sidebar } from '@/components/interfaces/Sidebar'
|
|
import { useLastVisitedOrganization } from '@/hooks/misc/useLastVisitedOrganization'
|
|
import { useCheckLatestDeploy } from '@/hooks/use-check-latest-deploy'
|
|
import { IS_PLATFORM } from '@/lib/constants'
|
|
import { useAppStateSnapshot } from '@/state/app-state'
|
|
|
|
export interface DefaultLayoutProps {
|
|
headerTitle?: string
|
|
hideMobileMenu?: boolean
|
|
}
|
|
|
|
/**
|
|
* Base layout for all project pages in the dashboard, rendered as the first child on all page files within a project.
|
|
*
|
|
* A second layout as the child to this is required, and the layout depends on which section of the dashboard the page is on. (e.g Auth - AuthLayout)
|
|
*
|
|
* The base layout handles rendering the following UI components:
|
|
* - App banner (e.g for notices or incidents)
|
|
* - Mobile navigation bar
|
|
* - First level side navigation bar (e.g For navigating to Table Editor, SQL Editor, Database page, etc)
|
|
*/
|
|
export const DefaultLayout = ({
|
|
children,
|
|
headerTitle,
|
|
hideMobileMenu,
|
|
}: PropsWithChildren<DefaultLayoutProps>) => {
|
|
const { ref } = useParams()
|
|
const router = useRouter()
|
|
const appSnap = useAppStateSnapshot()
|
|
|
|
const { lastVisitedOrganization } = useLastVisitedOrganization()
|
|
|
|
const backToDashboardURL = router.pathname.startsWith('/account')
|
|
? appSnap.lastRouteBeforeVisitingAccountPage.length > 0
|
|
? appSnap.lastRouteBeforeVisitingAccountPage
|
|
: IS_PLATFORM && !!lastVisitedOrganization
|
|
? `/org/${lastVisitedOrganization}`
|
|
: IS_PLATFORM
|
|
? '/organizations'
|
|
: '/project/default'
|
|
: undefined
|
|
|
|
useCheckLatestDeploy()
|
|
|
|
const isMobile = useBreakpoint('md')
|
|
|
|
const contentMinSizePercentage = 50
|
|
const contentMaxSizePercentage = 70
|
|
|
|
const [isMounted, setIsMounted] = useState(false)
|
|
|
|
useEffect(() => {
|
|
setIsMounted(true)
|
|
}, [])
|
|
|
|
// This is required to prevent layout shift when rendering resizable panels (they initially render at 50%, then shift
|
|
// to whatever is specified).
|
|
if (!isMounted) {
|
|
return null
|
|
}
|
|
|
|
return (
|
|
<SidebarProvider defaultOpen={false}>
|
|
<LayoutSidebarProvider>
|
|
<ProjectContextProvider projectRef={ref}>
|
|
<MobileSheetProvider>
|
|
<div className="flex flex-col h-screen w-screen">
|
|
{/* Top Banner */}
|
|
<AppBannerWrapper />
|
|
<div className="shrink-0">
|
|
{isMobile && (
|
|
<MobileNavigationBar
|
|
hideMobileMenu={hideMobileMenu}
|
|
backToDashboardURL={backToDashboardURL}
|
|
/>
|
|
)}
|
|
<LayoutHeader headerTitle={headerTitle} backToDashboardURL={backToDashboardURL} />
|
|
</div>
|
|
{/* Main Content Area */}
|
|
<div className="flex flex-1 w-full overflow-y-hidden">
|
|
{/* Sidebar - Only show for project pages, not account pages */}
|
|
{!router.pathname.startsWith('/account') && <Sidebar />}
|
|
{/* Main Content with Layout Sidebar */}
|
|
<ResizablePanelGroup
|
|
orientation="horizontal"
|
|
className="h-full w-full overflow-x-hidden flex-1 flex flex-row gap-0"
|
|
autoSaveId="default-layout-content"
|
|
>
|
|
<ResizablePanel
|
|
id="panel-content"
|
|
className="w-full"
|
|
minSize={`${contentMinSizePercentage}`}
|
|
maxSize={`${contentMaxSizePercentage}`}
|
|
defaultSize={`${contentMaxSizePercentage}`}
|
|
>
|
|
<div className="h-full overflow-y-auto">{children}</div>
|
|
</ResizablePanel>
|
|
<LayoutSidebar
|
|
minSize={`${100 - contentMaxSizePercentage}`}
|
|
maxSize={`${100 - contentMinSizePercentage}`}
|
|
defaultSize={`${100 - contentMaxSizePercentage}`}
|
|
/>
|
|
</ResizablePanelGroup>
|
|
</div>
|
|
</div>
|
|
|
|
<BannerStack />
|
|
<StudioMobileSheetNav />
|
|
</MobileSheetProvider>
|
|
</ProjectContextProvider>
|
|
</LayoutSidebarProvider>
|
|
</SidebarProvider>
|
|
)
|
|
}
|
|
|
|
export default DefaultLayout
|