Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix view a referencing row in grid not updating schema if FK is in another schema #21212

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Fix view a referencing row in grid not updating schema if FK is in another schema #21212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Button, IconArrowRight } from 'ui'
import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
import { useTableQuery } from 'data/tables/table-query'
import { useTablesQuery } from 'data/tables/tables-query'
import { useTableEditorStateSnapshot } from 'state/table-editor'
import { SupaRow } from '../../types'
import { NullValue } from '../common'

Expand All @@ -17,6 +18,8 @@ interface Props extends PropsWithChildren<RenderCellProps<SupaRow, unknown>> {

export const ForeignKeyFormatter = (props: Props) => {
const { project } = useProjectContext()
const snap = useTableEditorStateSnapshot()

const { projectRef, tableId, row, column } = props
const id = tableId ? Number(tableId) : undefined

Expand Down Expand Up @@ -62,6 +65,7 @@ export const ForeignKeyFormatter = (props: Props) => {
>
<Link
href={`/project/${projectRef}/editor/${targetTable?.id}?filter=${relationship?.target_column_name}%3Aeq%3A${value}`}
onClick={() => snap.setSelectedSchemaName(relationship.target_table_schema)}
>
<IconArrowRight size="tiny" />
</Link>
Expand Down
24 changes: 12 additions & 12 deletions apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,8 @@ import * as Tooltip from '@radix-ui/react-tooltip'
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { partition } from 'lodash'
import { useRouter } from 'next/router'
import { useMemo, useState } from 'react'

import { ProtectedSchemaModal } from 'components/interfaces/Database/ProtectedSchemaWarning'
import AlertError from 'components/ui/AlertError'
import InfiniteList from 'components/ui/InfiniteList'
import SchemaSelector from 'components/ui/SchemaSelector'
import ShimmeringLoader from 'components/ui/ShimmeringLoader'
import { useSchemasQuery } from 'data/database/schemas-query'
import { useEntityTypesQuery } from 'data/entity-types/entity-types-infinite-query'
import { useCheckPermissions, useLocalStorage } from 'hooks'
import { EXCLUDED_SCHEMAS } from 'lib/constants/schemas'
import { useTableEditorStateSnapshot } from 'state/table-editor'
import {
AlertDescription_Shadcn_,
AlertTitle_Shadcn_,
Expand All @@ -32,9 +22,19 @@ import {
IconX,
Input,
} from 'ui'

import { ProtectedSchemaModal } from 'components/interfaces/Database/ProtectedSchemaWarning'
import AlertError from 'components/ui/AlertError'
import InfiniteList from 'components/ui/InfiniteList'
import SchemaSelector from 'components/ui/SchemaSelector'
import ShimmeringLoader from 'components/ui/ShimmeringLoader'
import { useSchemasQuery } from 'data/database/schemas-query'
import { useEntityTypesQuery } from 'data/entity-types/entity-types-infinite-query'
import { useCheckPermissions, useLocalStorage } from 'hooks'
import { EXCLUDED_SCHEMAS } from 'lib/constants/schemas'
import { useTableEditorStateSnapshot } from 'state/table-editor'
import { useProjectContext } from '../ProjectLayout/ProjectContext'
import EntityListItem from './EntityListItem'
import { useRouter } from 'next/router'

const TableEditorMenu = () => {
const router = useRouter()
Expand Down