Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix: foreign key shortcut (#45761)

Vaibhavff3f733dd1dc
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
index 45ab3f84d1d..1f45bc1543d 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
@@ -98,6 +98,7 @@ export const ColumnEditor = ({
const [errors, setErrors] = useState<{ [key: string]: string }>({})
const [columnFields, setColumnFields] = useState<ColumnField>()
const [fkRelations, setFkRelations] = useState<ForeignKey[]>([])
+ const [foreignKeySelectorOpen, setForeignKeySelectorOpen] = useState(false)
const [createMore, setCreateMore] = useState(false)
const [placeholder, setPlaceholder] = useState(
getPlaceholderText(columnFields?.format, columnFields?.name)
@@ -141,6 +142,7 @@ export const ColumnEditor = ({
useEffect(() => {
if (visible) {
setErrors({})
+ setForeignKeySelectorOpen(false)
const columnFields = isNewRecord
? generateColumnField({ schema: selectedTable.schema, table: selectedTable.name })
: generateColumnFieldFromPostgresColumn(column, selectedTable, foreignKeyMeta)
@@ -402,6 +404,7 @@ export const ColumnEditor = ({
onUpdateField({ format })
}
}}
+ onOpenChange={setForeignKeySelectorOpen}
onUpdateFkRelations={setFkRelations}
/>
</FormSectionContent>
@@ -500,7 +503,7 @@ export const ColumnEditor = ({
applyButtonLabel="Save"
closePanel={closePanel}
applyFunction={(resolve: () => void) => onSaveChanges(resolve)}
- visible={visible}
+ visible={visible && !foreignKeySelectorOpen}
>
{isNewRecord && (
<div className="flex items-center gap-x-2">
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx
index 48b5e1cd974..00dffd37e90 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx
@@ -1,5 +1,5 @@
import { useParams } from 'common'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
import { Button } from 'ui'
import { ForeignKeySelector } from '../ForeignKeySelector/ForeignKeySelector'
@@ -16,6 +16,7 @@ interface ColumnForeignKeyProps {
column: ColumnField
relations: ForeignKey[]
closePanel: () => void
+ onOpenChange?: (open: boolean) => void
onUpdateColumnType: (type: string) => void
onUpdateFkRelations: (fks: ForeignKey[]) => void
}
@@ -25,6 +26,7 @@ const ColumnForeignKey = ({
column,
relations,
closePanel,
+ onOpenChange,
onUpdateColumnType,
onUpdateFkRelations,
}: ColumnForeignKeyProps) => {
@@ -44,6 +46,7 @@ const ColumnForeignKey = ({
connectionString: project?.connectionString,
id: tableId ?? id,
})
+ useEffect(() => onOpenChange?.(open), [open, onOpenChange])
const formattedColumnsForFkSelector = (table?.columns ?? []).map((c) => {
return {
id: c.id,