From a58eafdb6acf19d459b2b594321debda8b548adf Mon Sep 17 00:00:00 2001 From: Francesco Sansalvadore Date: Fri, 20 Mar 2026 17:30:57 +0100 Subject: [PATCH] format --- apps/studio/app/layout.tsx | 6 +---- apps/studio/app/v2/V2ParamsContext.tsx | 4 +-- .../app/v2/[orgSlug]/[projectRef]/layout.tsx | 1 - .../app/v2/[orgSlug]/[projectRef]/page.tsx | 1 - .../app/v2/project/[projectRef]/layout.tsx | 6 +---- .../v2/project/_/[[...routeSlug]]/page.tsx | 5 ++-- .../components/interfaces/UserDropdown.tsx | 2 +- apps/studio/components/v2/BrowserPanel.tsx | 2 +- apps/studio/components/v2/EditorFrame.tsx | 27 +++++++++---------- .../Navigation/ProjectBranchSelector.utils.ts | 2 +- .../ProjectBranchSelectorPopover.tsx | 7 ++--- apps/studio/components/v2/Shell.tsx | 14 ++++++++-- .../components/v2/V2LayoutSidebarProvider.tsx | 5 +--- .../v2/data/StudioDataWorkspace.tsx | 1 - apps/studio/components/v2/useV2DataCounts.ts | 5 +--- .../v2/views/V2AuthSettingsView.tsx | 14 +++------- .../v2/views/V2ComputeSettingsView.tsx | 1 - .../v2/views/V2GeneralSettingsView.tsx | 1 - apps/studio/stores/v2-dashboard.tsx | 7 +++-- .../hooks/RouteParamsOverrideContext.tsx | 1 - 20 files changed, 44 insertions(+), 68 deletions(-) diff --git a/apps/studio/app/layout.tsx b/apps/studio/app/layout.tsx index 6f7fe9e284f..fc92ae4104d 100644 --- a/apps/studio/app/layout.tsx +++ b/apps/studio/app/layout.tsx @@ -31,11 +31,7 @@ export const metadata: Metadata = { icons: genFaviconData(BASE_PATH), } -export default function RootLayout({ - children, -}: { - children: React.ReactNode -}) { +export default function RootLayout({ children }: { children: React.ReactNode }) { return ( diff --git a/apps/studio/app/v2/V2ParamsContext.tsx b/apps/studio/app/v2/V2ParamsContext.tsx index 0ac8e901c54..f08b0e2d2e0 100644 --- a/apps/studio/app/v2/V2ParamsContext.tsx +++ b/apps/studio/app/v2/V2ParamsContext.tsx @@ -24,9 +24,7 @@ export function V2ParamsProvider({ orgSlug: string | undefined }) { return ( - - {children} - + {children} ) } diff --git a/apps/studio/app/v2/[orgSlug]/[projectRef]/layout.tsx b/apps/studio/app/v2/[orgSlug]/[projectRef]/layout.tsx index b0b19d8bfb4..f8c96740361 100644 --- a/apps/studio/app/v2/[orgSlug]/[projectRef]/layout.tsx +++ b/apps/studio/app/v2/[orgSlug]/[projectRef]/layout.tsx @@ -17,4 +17,3 @@ export default function V2HomeLayout({ children }: { children: ReactNode }) { ) } - diff --git a/apps/studio/app/v2/[orgSlug]/[projectRef]/page.tsx b/apps/studio/app/v2/[orgSlug]/[projectRef]/page.tsx index badefaed740..4dbe7d174f3 100644 --- a/apps/studio/app/v2/[orgSlug]/[projectRef]/page.tsx +++ b/apps/studio/app/v2/[orgSlug]/[projectRef]/page.tsx @@ -8,4 +8,3 @@ export default async function V2OrgProjectPage({ const { projectRef } = await params redirect(`/v2/project/${projectRef}`) } - diff --git a/apps/studio/app/v2/project/[projectRef]/layout.tsx b/apps/studio/app/v2/project/[projectRef]/layout.tsx index 99d16fa2341..5c567315352 100644 --- a/apps/studio/app/v2/project/[projectRef]/layout.tsx +++ b/apps/studio/app/v2/project/[projectRef]/layout.tsx @@ -1,9 +1,5 @@ import { ProjectShell } from './ProjectShell' -export default function ProjectLayout({ - children, -}: { - children: React.ReactNode -}) { +export default function ProjectLayout({ children }: { children: React.ReactNode }) { return {children} } diff --git a/apps/studio/app/v2/project/_/[[...routeSlug]]/page.tsx b/apps/studio/app/v2/project/_/[[...routeSlug]]/page.tsx index b0d1aa89e87..089c32d7bb0 100644 --- a/apps/studio/app/v2/project/_/[[...routeSlug]]/page.tsx +++ b/apps/studio/app/v2/project/_/[[...routeSlug]]/page.tsx @@ -25,8 +25,7 @@ export default function V2ProjectDisambiguationPage() { const { data: organizations = [], isPending: isLoadingOrgs } = useOrganizationsQuery() const [selectedOrgSlug, setSelectedOrgSlug] = useState(undefined) - const activeOrg = - organizations.find((o) => o.slug === selectedOrgSlug) ?? organizations[0] + const activeOrg = organizations.find((o) => o.slug === selectedOrgSlug) ?? organizations[0] const [search, setSearch] = useState('') @@ -65,7 +64,7 @@ export default function V2ProjectDisambiguationPage() { ) : ( organizations.map((org) => { - const isActive = org.slug === (activeOrg?.slug) + const isActive = org.slug === activeOrg?.slug return ( - Expand panel + + Expand panel + )} diff --git a/apps/studio/components/v2/V2LayoutSidebarProvider.tsx b/apps/studio/components/v2/V2LayoutSidebarProvider.tsx index 6c9f70cc33f..9f5827a5c8c 100644 --- a/apps/studio/components/v2/V2LayoutSidebarProvider.tsx +++ b/apps/studio/components/v2/V2LayoutSidebarProvider.tsx @@ -18,9 +18,7 @@ const AdvisorPanel = dynamic(() => const AIAssistant = dynamic(() => import('components/ui/AIAssistantPanel/AIAssistant').then((m) => m.AIAssistant) ) -const SqlPanel = dynamic(() => - import('components/v2/SqlPanel').then((m) => m.SqlPanel) -) +const SqlPanel = dynamic(() => import('components/v2/SqlPanel').then((m) => m.SqlPanel)) export const V2LayoutSidebarProvider = ({ children }: PropsWithChildren) => { const { projectRef } = useV2Params() @@ -49,4 +47,3 @@ export const V2LayoutSidebarProvider = ({ children }: PropsWithChildren) => { return <>{children} } - diff --git a/apps/studio/components/v2/data/StudioDataWorkspace.tsx b/apps/studio/components/v2/data/StudioDataWorkspace.tsx index 6c57176574f..f6f9de556fc 100644 --- a/apps/studio/components/v2/data/StudioDataWorkspace.tsx +++ b/apps/studio/components/v2/data/StudioDataWorkspace.tsx @@ -37,4 +37,3 @@ export function StudioDataWorkspace({ return {children} } - diff --git a/apps/studio/components/v2/useV2DataCounts.ts b/apps/studio/components/v2/useV2DataCounts.ts index 2a95e388f9b..5d5e5612993 100644 --- a/apps/studio/components/v2/useV2DataCounts.ts +++ b/apps/studio/components/v2/useV2DataCounts.ts @@ -22,10 +22,7 @@ export function useV2DataCounts(projectRef: string | undefined) { { projectRef, connectionString: conn, schema: 'public' }, { enabled: Boolean(projectRef) } ) - const { data: usersCount } = useUsersCountQuery( - { projectRef }, - { enabled: Boolean(projectRef) } - ) + const { data: usersCount } = useUsersCountQuery({ projectRef }, { enabled: Boolean(projectRef) }) const { data: bucketsPages } = usePaginatedBucketsQuery( { projectRef }, { enabled: Boolean(projectRef) } diff --git a/apps/studio/components/v2/views/V2AuthSettingsView.tsx b/apps/studio/components/v2/views/V2AuthSettingsView.tsx index 7a9d00cfaa9..45dc139a347 100644 --- a/apps/studio/components/v2/views/V2AuthSettingsView.tsx +++ b/apps/studio/components/v2/views/V2AuthSettingsView.tsx @@ -2,12 +2,7 @@ import { useMemo } from 'react' import { usePathname, useRouter, useSearchParams } from 'next/navigation' -import { - Tabs_Shadcn_, - TabsContent_Shadcn_, - TabsList_Shadcn_, - TabsTrigger_Shadcn_, -} from 'ui' +import { Tabs_Shadcn_, TabsContent_Shadcn_, TabsList_Shadcn_, TabsTrigger_Shadcn_ } from 'ui' import { useV2Params } from '@/app/v2/V2ParamsContext' import { StudioDataWorkspace } from '@/components/v2/data/StudioDataWorkspace' @@ -41,7 +36,7 @@ const TABS: Array<{ key: string; label: string; content: NextPageWithLayout }> = { key: 'oauth-server', label: 'OAuth server', content: OAuthServerPage }, { key: 'audit-logs', label: 'Audit logs', content: AuditLogsPage }, { key: 'performance', label: 'Performance', content: PerformancePage }, -] +] const DEFAULT_TAB = TABS[0].key @@ -52,7 +47,7 @@ export function V2AuthSettingsView() { const { projectRef } = useV2Params() const tabParam = searchParams?.get('tab') - const activeTab = TABS.some((t) => t.key === tabParam) ? tabParam ?? DEFAULT_TAB : DEFAULT_TAB + const activeTab = TABS.some((t) => t.key === tabParam) ? (tabParam ?? DEFAULT_TAB) : DEFAULT_TAB const currentQuery = useMemo( () => new URLSearchParams(searchParams?.toString() ?? ''), @@ -86,7 +81,7 @@ export function V2AuthSettingsView() { return (
- + ) })} @@ -95,4 +90,3 @@ export function V2AuthSettingsView() { ) } - diff --git a/apps/studio/components/v2/views/V2ComputeSettingsView.tsx b/apps/studio/components/v2/views/V2ComputeSettingsView.tsx index c672308f99d..1b055205839 100644 --- a/apps/studio/components/v2/views/V2ComputeSettingsView.tsx +++ b/apps/studio/components/v2/views/V2ComputeSettingsView.tsx @@ -13,4 +13,3 @@ export function V2ComputeSettingsView() { ) } - diff --git a/apps/studio/components/v2/views/V2GeneralSettingsView.tsx b/apps/studio/components/v2/views/V2GeneralSettingsView.tsx index a7abe3447c3..a8392f194bd 100644 --- a/apps/studio/components/v2/views/V2GeneralSettingsView.tsx +++ b/apps/studio/components/v2/views/V2GeneralSettingsView.tsx @@ -70,4 +70,3 @@ export function V2GeneralSettingsView() { ) } - diff --git a/apps/studio/stores/v2-dashboard.tsx b/apps/studio/stores/v2-dashboard.tsx index 547044dc489..ed5ef699ec9 100644 --- a/apps/studio/stores/v2-dashboard.tsx +++ b/apps/studio/stores/v2-dashboard.tsx @@ -97,7 +97,8 @@ const V2DashboardContext = createContext(null) export function V2DashboardProvider({ children }: { children: ReactNode }) { const [dataTabs, setDataTabs] = useState([]) - const [expandedGroups, setExpandedGroups] = useState>(defaultExpandedGroups) + const [expandedGroups, setExpandedGroups] = + useState>(defaultExpandedGroups) const [rightPanel, setRightPanel] = useState(null) const [recentItems, setRecentItems] = useState([]) @@ -114,9 +115,7 @@ export function V2DashboardProvider({ children }: { children: ReactNode }) { .map((x) => x as Partial) .filter( (x) => - typeof x.id === 'string' && - typeof x.label === 'string' && - typeof x.path === 'string' + typeof x.id === 'string' && typeof x.label === 'string' && typeof x.path === 'string' ) .map((x) => ({ id: x.id as string, diff --git a/packages/common/hooks/RouteParamsOverrideContext.tsx b/packages/common/hooks/RouteParamsOverrideContext.tsx index 616b38dcc44..20967ac9233 100644 --- a/packages/common/hooks/RouteParamsOverrideContext.tsx +++ b/packages/common/hooks/RouteParamsOverrideContext.tsx @@ -23,4 +23,3 @@ export function RouteParamsOverrideProvider({ export function useRouteParamsOverride() { return useContext(RouteParamsOverrideContext) } -