From 792e2316f05f5163f623f485bd24e9ee573e502f Mon Sep 17 00:00:00 2001
From: Jordi Enric <37541088+jordienr@users.noreply.github.com>
Date: Tue, 3 Jun 2025 13:56:13 +0200
Subject: [PATCH] fix schema selector in create fn sheet (#36141)

* fix schema selector in create fn sheet

* fix schemaselctor in auth hook

* add portal false to schemaselector in sqlfunction for cronjobs

* Fix schema selector in function sheet

---------

Co-authored-by: Terry Sutton <saltcod@gmail.com>
---
 .../components/interfaces/Auth/Hooks/CreateHookSheet.tsx      | 1 +
 .../interfaces/Database/Functions/CreateFunction/index.tsx    | 1 +
 .../interfaces/Integrations/CronJobs/SqlFunctionSection.tsx   | 1 +
 apps/studio/components/ui/SchemaSelector.tsx                  | 4 +++-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx b/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx
index 03919ee7c35..78ac5b91c6d 100644
--- a/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx
+++ b/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx
@@ -367,6 +367,7 @@ export const CreateHookSheet = ({
                         >
                           <FormControl_Shadcn_>
                             <SchemaSelector
+                              portal={false}
                               size="small"
                               showError={false}
                               selectedSchemaName={field.value}
diff --git a/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx b/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx
index bcbbb48bfe2..d32e9aaae95 100644
--- a/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx
@@ -202,6 +202,7 @@ const CreateFunction = ({ func, visible, setVisible }: CreateFunctionProps) => {
                     >
                       <FormControl_Shadcn_>
                         <SchemaSelector
+                          portal={false}
                           selectedSchemaName={field.value}
                           excludedSchemas={PROTECTED_SCHEMAS}
                           size="small"
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/SqlFunctionSection.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/SqlFunctionSection.tsx
index 8884afb637d..ffbbc7d720b 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/SqlFunctionSection.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/SqlFunctionSection.tsx
@@ -21,6 +21,7 @@ export const SqlFunctionSection = ({ form }: SqlFunctionSectionProps) => {
         render={({ field }) => (
           <FormItemLayout label="Schema" className="gap-1">
             <SchemaSelector
+              portal={false}
               size="small"
               className="w-56 2xl:w-full"
               selectedSchemaName={field.value}
diff --git a/apps/studio/components/ui/SchemaSelector.tsx b/apps/studio/components/ui/SchemaSelector.tsx
index 7a0293ca219..2d17e6dc51e 100644
--- a/apps/studio/components/ui/SchemaSelector.tsx
+++ b/apps/studio/components/ui/SchemaSelector.tsx
@@ -34,6 +34,7 @@ interface SchemaSelectorProps {
   excludedSchemas?: string[]
   onSelectSchema: (name: string) => void
   onSelectCreateSchema?: () => void
+  portal?: boolean
 }
 
 const SchemaSelector = ({
@@ -46,6 +47,7 @@ const SchemaSelector = ({
   excludedSchemas = [],
   onSelectSchema,
   onSelectCreateSchema,
+  portal = true,
 }: SchemaSelectorProps) => {
   const [open, setOpen] = useState(false)
   const canCreateSchemas = useCheckPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE, 'schemas')
@@ -126,7 +128,7 @@ const SchemaSelector = ({
             className="p-0 min-w-[200px] pointer-events-auto"
             side="bottom"
             align="start"
-            portal={true}
+            portal={portal}
             sameWidthAsTrigger
           >
             <Command_Shadcn_>