The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Joshen/debug 123 row dropdown appears outside of details panel (#46462)
Joshen Limef613f2068e1
diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsxindex 903846c8ba8..8dce7856b6a 100644--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx@@ -9,7 +9,6 @@ import { postgresDetailsFields, postgresPrimaryFields } from '../../config/serviimport { BlockFieldConfig } from '../../types'import { DetailRow } from '../shared/DetailRow'import { DetailSectionHeader } from '../shared/DetailSection'-import { FieldValue } from '../shared/FieldValue'import { DataTableFilterField } from '@/components/ui/DataTable/DataTable.types'interface PostgresFlowDetailProps {@@ -44,14 +43,13 @@ const FieldDetailRow = ({return (<DetailRow- label={config.label}- value={<FieldValue config={config} value={value} wrap={config.wrap} level={data?.level} />}- filterId={config.id}+ config={config}+ level={data.level}+ value={value}filterValue={typeof value === 'string' || typeof value === 'number' ? value : undefined}filterFields={filterFields}table={table}isLoading={showSkeleton}- wrap={config.wrap}/>)}@@ -79,7 +77,7 @@ export const PostgresFlowDetail = memo(function PostgresFlowDetail({/><Collapsible defaultOpen>- <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180!">+ <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180! transition hover:bg-surface-100"><DetailSectionHeader title="Postgres" icon={Database} /><ChevronDown className="transition-transform duration-200" strokeWidth={1.5} size={14} /></CollapsibleTrigger>@@ -99,7 +97,7 @@ export const PostgresFlowDetail = memo(function PostgresFlowDetail({</Collapsible><Collapsible defaultOpen>- <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180!">+ <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180! transition hover:bg-surface-100"><DetailSectionHeader title="Connection & Session Details" icon={Cable} /><ChevronDown className="transition-transform duration-200" strokeWidth={1.5} size={14} /></CollapsibleTrigger>diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsxindex 81155269732..cc6550ea09d 100644--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx@@ -6,7 +6,6 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { BlockFieldConfig, BlockFieldProps, ServiceFlowBlockProps } from '../../types'import { DetailRow } from './DetailRow'import { DetailSectionHeader } from './DetailSection'-import { FieldValue } from './FieldValue'export interface BlockSection {title: string@@ -41,14 +40,13 @@ const FieldRow = ({const showSkeleton = !!config.requiresEnrichedData && !!isLoading && !valuereturn (<DetailRow- label={config.label}- value={<FieldValue config={config} value={value} wrap={config.wrap} level={data?.level} />}- filterId={config.id}+ config={config}+ level={data.level}+ value={value}filterValue={typeof value === 'string' || typeof value === 'number' ? value : undefined}filterFields={filterFields}table={table}isLoading={showSkeleton}- wrap={config.wrap}/>)}@@ -75,7 +73,7 @@ export function createBlock(config: BlockConfig) {return (<><Collapsible defaultOpen>- <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180!">+ <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180! transition hover:bg-surface-100"><DetailSectionHeader title={config.title} icon={config.icon} /><ChevronDownclassName="transition-transform duration-200"diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/DetailRow.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/DetailRow.tsxindex d499e5f6972..9c00ba1f84e 100644--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/DetailRow.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/DetailRow.tsx@@ -1,45 +1,42 @@import { Table } from '@tanstack/react-table'-import { Filter } from 'lucide-react'+import { Filter, MoreVertical } from 'lucide-react'import { ReactNode } from 'react'-import { cn, Skeleton } from 'ui'+import { Button, cn, Skeleton } from 'ui'+import { type ColumnSchema } from '../../../UnifiedLogs.schema'+import { type BlockFieldConfig } from '../../types'import { DataTableFilterField } from '@/components/ui/DataTable/DataTable.types'+import { DataTableColumnStatusCode } from '@/components/ui/DataTable/DataTableColumn/DataTableColumnStatusCode'import { DataTableSheetRowAction } from '@/components/ui/DataTable/DataTableSheetRowAction'interface DetailRowProps {- label: string- value: ReactNode- filterId?: string+ config: BlockFieldConfig+ value: string | number | null | undefined+ level: ColumnSchema['level']filterValue?: string | number// eslint-disable-next-line @typescript-eslint/no-explicit-any -- matches ServiceFlow types conventionfilterFields: DataTableFilterField<any>[]// eslint-disable-next-line @typescript-eslint/no-explicit-any -- matches ServiceFlow types conventiontable?: Table<any>isLoading?: boolean- wrap?: boolean}export const DetailRow = ({- label,+ config,value,- filterId,+ level,+filterValue,filterFields,table,isLoading,- wrap,}: DetailRowProps) => {- const isEmpty = value === null || value === undefined || value === ''-+ const { id: filterId, label, wrap } = configconst isFilterable =- !!filterId &&- !!filterFields?.some((f) => f.value === filterId) &&- !!table &&- !isLoading &&- !isEmpty+ !!filterId && !!filterFields?.some((f) => f.value === filterId) && !!table && !isLoading+ const resolvedFilterValue = filterValue ?? undefined- const resolvedFilterValue =- filterValue ?? (typeof value === 'string' || typeof value === 'number' ? value : undefined)+ const isEmpty = value === null || value === undefined || value === ''const labelEl = (<span@@ -54,33 +51,75 @@ export const DetailRow = ({const valueEl = isLoading ? (<Skeleton className="h-4 w-24" />- ) : isEmpty ? (- <span className="font-mono text-xs text-foreground-muted">—</span>) : (- value+ <FieldValue config={config} value={value} wrap={config.wrap} level={level} />)const rowClass = cn(- 'flex items-start justify-between gap-x-10 px-4',- wrap ? 'min-h-9 py-2' : 'h-9 items-center'+ 'flex items-start justify-between items-center gap-x-10 px-4',+ wrap ? 'min-h-9 py-0' : 'h-9')return (- <DataTableSheetRowAction- fieldValue={filterId}- filterFields={filterFields}- value={resolvedFilterValue ?? ''}- table={table!}- label={label}- className={cn(rowClass, 'rounded-none group w-full cursor-pointer hover:bg-surface-100!')}- >+ <div className={cn(rowClass, 'rounded-none group w-full')}><div className="flex items-center gap-x-2 pl-[22px]">{labelEl}{isFilterable && resolvedFilterValue !== undefined && (<Filter size={12} className="text-foreground-lighter" />)}</div>- {valueEl}- </DataTableSheetRowAction>+ <div className={cn('flex items-center gap-x-2', isEmpty && 'pr-2')}>+ {valueEl}+ {!isEmpty && (+ <DataTableSheetRowAction+ fieldValue={filterId}+ filterFields={filterFields}+ value={resolvedFilterValue ?? ''}+ table={table!}+ label={label}+ >+ <Button type="text" className="px-1" icon={<MoreVertical />} />+ </DataTableSheetRowAction>+ )}+ </div>+ </div>)}++interface FieldValueProps {+ config: BlockFieldConfig+ value: unknown+ wrap?: boolean+ level?: string+}++const FieldValue = ({ config, value, wrap, level }: FieldValueProps): ReactNode => {+ if (value === null || value === undefined || value === '') {+ return <span className="font-mono text-xs text-foreground-muted">—</span>+ }++ if (config.id === 'status') {+ return (+ <DataTableColumnStatusCode+ value={value as string | number}+ level={level}+ className="text-xs"+ />+ )+ }++ if (typeof value === 'string' || typeof value === 'number') {+ return (+ <span+ className={cn(+ 'font-mono text-xs text-foreground',+ wrap ? 'break-all text-right' : 'truncate text-right'+ )}+ >+ {value}+ </span>+ )+ }++ return value as ReactNode+}diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldValue.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldValue.tsxdeleted file mode 100644index 8e1689a90c0..00000000000--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldValue.tsx+++ /dev/null@@ -1,41 +0,0 @@-import { ReactNode } from 'react'-import { cn } from 'ui'--import { BlockFieldConfig } from '../../types'-import { DataTableColumnStatusCode } from '@/components/ui/DataTable/DataTableColumn/DataTableColumnStatusCode'--interface FieldValueProps {- config: BlockFieldConfig- value: unknown- wrap?: boolean- level?: string-}--export const FieldValue = ({ config, value, wrap, level }: FieldValueProps): ReactNode => {- if (value === null || value === undefined || value === '') return null-- if (config.id === 'status') {- return (- <DataTableColumnStatusCode- value={value as string | number}- level={level}- className="text-xs"- />- )- }-- if (typeof value === 'string' || typeof value === 'number') {- return (- <span- className={cn(- 'font-mono text-xs text-foreground',- wrap ? 'break-all text-right' : 'truncate text-right'- )}- >- {value}- </span>- )- }-- return value as ReactNode-}diff --git a/apps/studio/components/ui/DataTable/DataTableSheetRowAction.tsx b/apps/studio/components/ui/DataTable/DataTableSheetRowAction.tsxindex 2408d4d9714..0f6ff89bad0 100644--- a/apps/studio/components/ui/DataTable/DataTableSheetRowAction.tsx+++ b/apps/studio/components/ui/DataTable/DataTableSheetRowAction.tsx@@ -10,7 +10,7 @@ import {Equal,Filter,} from 'lucide-react'-import { ComponentPropsWithRef } from 'react'+import { ComponentPropsWithRef, useEffect, useState } from 'react'import {cn,DropdownMenu,@@ -25,6 +25,7 @@ import {isLogsFilterColumnValue,type LogsColumnFilterValue,} from '@/components/interfaces/UnifiedLogs/UnifiedLogs.filters'+import CopyButton from '@/components/ui/CopyButton'import { DataTableFilterField } from '@/components/ui/DataTable/DataTable.types'import { useCopyToClipboard } from '@/hooks/ui/useCopyToClipboard'@@ -50,7 +51,23 @@ export function DataTableSheetRowAction<TData, TFields extends DataTableFilterFionKeyDown,...props}: DataTableSheetRowActionProps<TData, TFields>) {- const { copy, isCopied } = useCopyToClipboard()+ const { copy } = useCopyToClipboard()+ const [open, setOpen] = useState(false)++ /**+ * [Joshen] This imo is just a temporary solution and needs to be addressed at the+ * UI component level RE how we want to handle DropdownContent when scrolling, as its+ * not specific to unified logs.+ *+ * DropdownMenuContent here exceeds the scrolling parent as its portalled. Opting to+ * close the dropdown menu here when scrolling as a workaround.+ */+ useEffect(() => {+ if (!open) return+ const onScroll = () => setOpen(false)+ document.addEventListener('scroll', onScroll, true)+ return () => document.removeEventListener('scroll', onScroll, true)+ }, [open])const field = !!fieldValue ? filterFields.find((f) => f.value === fieldValue) : undefinedconst column =@@ -165,49 +182,47 @@ export function DataTableSheetRowAction<TData, TFields extends DataTableFilterFi}}- return (- <DropdownMenu>- <DropdownMenuTrigger- className={cn(- 'rounded-md ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',- 'relative',- className- )}- onKeyDown={(e) => {- if (e.key === 'ArrowDown') {- // REMINDER: default behavior is to open the dropdown menu- // But because we use it to navigate between rows, we need to prevent it- // and only use "Enter" to select the option- e.preventDefault()- }- onKeyDown?.(e)- }}- {...props}- >- {children}- {isCopied ? (- <div className="absolute inset-0 flex items-center justify-center rounded-md bg-surface-100/80 backdrop-blur-sm animate-in fade-in duration-150">- <span className="font-mono text-xs text-foreground-light">Copied</span>- </div>- ) : null}- </DropdownMenuTrigger>+ if (!!field && !!column) {+ return (+ <DropdownMenu open={open} onOpenChange={setOpen}>+ <DropdownMenuTrigger+ asChild+ className={cn(+ 'rounded-md ring-offset-background',+ 'focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',+ 'relative py-0',+ className+ )}+ onKeyDown={(e) => {+ if (e.key === 'ArrowDown') {+ // REMINDER: default behavior is to open the dropdown menu+ // But because we use it to navigate between rows, we need to prevent it+ // and only use "Enter" to select the option+ e.preventDefault()+ }+ onKeyDown?.(e)+ }}+ {...props}+ >+ {children}+ </DropdownMenuTrigger>++ <DropdownMenuContent align="end" side="bottom" className="w-56">+ {renderOptions()}- <DropdownMenuContent align="end" side="bottom" className="w-48 -translate-x-4">- {!!field && !!column && (- <>- {renderOptions()}- <DropdownMenuSeparator />- </>- )}+ <DropdownMenuSeparator />- <DropdownMenuItem- onClick={() => copy(String(value), { timeout: 1000 })}- className="flex items-center gap-2"- >- <Copy size={12} />- Copy {label}- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- )+ <DropdownMenuItem+ onClick={() => copy(String(value), { timeout: 1000 })}+ className="flex items-center gap-2"+ >+ <Copy size={12} />+ Copy {label}+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ )+ }++ return <CopyButton iconOnly type="text" text={String(value)} className="px-1" />}