Skip to content

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

Adjust auth log detail pane in unified logs (#46372)

Joshen Lim5f4153d9e001
diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx
index 1895f904349..c1686de52bd 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx
@@ -1,6 +1,7 @@
import { Table } from '@tanstack/react-table'
-import { Cable, Clock, Database } from 'lucide-react'
+import { Cable, ChevronDown, Clock, Database } from 'lucide-react'
import { memo } from 'react'
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'
import { ColumnSchema } from '../../../UnifiedLogs.schema'
import { getRowTimestampMs } from '../../../UnifiedLogs.utils'
@@ -70,40 +71,52 @@ export const PostgresFlowDetail = memo(function PostgresFlowDetail({
((data as Record<string, unknown>)?.error_severity as string | undefined)
return (
- <div className="[&>*:nth-child(even)]:bg-surface-100/50">
+ <div>
<DetailSectionHeader
title="Request started"
icon={Clock}
summary={formattedTime ?? undefined}
/>
- <DetailSectionHeader title="Postgres" icon={Database} />
+ <Collapsible defaultOpen>
+ <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180!">
+ <DetailSectionHeader title="Postgres" icon={Database} />
+ <ChevronDown className="transition-transform duration-200" strokeWidth={1.5} size={14} />
+ </CollapsibleTrigger>
+ <CollapsibleContent className="[&>*:nth-child(odd)]:bg-surface-100/50">
+ {postgresPrimaryFields.map((field) => (
+ <FieldDetailRow
+ key={field.id}
+ config={field}
+ data={data}
+ enrichedData={enrichedData}
+ isLoading={isLoading}
+ filterFields={filterFields}
+ table={table}
+ />
+ ))}
+ </CollapsibleContent>
+ </Collapsible>
- {postgresPrimaryFields.map((field) => (
- <FieldDetailRow
- key={field.id}
- config={field}
- data={data}
- enrichedData={enrichedData}
- isLoading={isLoading}
- filterFields={filterFields}
- table={table}
- />
- ))}
-
- <DetailSectionHeader title="Connection & Session Details" icon={Cable} />
-
- {postgresDetailsFields.map((field) => (
- <FieldDetailRow
- key={field.id}
- config={field}
- data={data}
- enrichedData={enrichedData}
- isLoading={isLoading}
- filterFields={filterFields}
- table={table}
- />
- ))}
+ <Collapsible defaultOpen>
+ <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180!">
+ <DetailSectionHeader title="Connection & Session Details" icon={Cable} />
+ <ChevronDown className="transition-transform duration-200" strokeWidth={1.5} size={14} />
+ </CollapsibleTrigger>
+ <CollapsibleContent className="[&>*:nth-child(odd)]:bg-surface-100/50">
+ {postgresDetailsFields.map((field) => (
+ <FieldDetailRow
+ key={field.id}
+ config={field}
+ data={data}
+ enrichedData={enrichedData}
+ isLoading={isLoading}
+ filterFields={filterFields}
+ table={table}
+ />
+ ))}
+ </CollapsibleContent>
+ </Collapsible>
<DetailSectionHeader
title="Operation result"
diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx
index 95aea634dc4..6d62bb8022c 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx
@@ -1,5 +1,7 @@
-import { LucideIcon } from 'lucide-react'
+import { partition } from 'lodash'
+import { ChevronDown, LucideIcon } from 'lucide-react'
import { memo } from 'react'
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'
import { BlockFieldConfig, BlockFieldProps, ServiceFlowBlockProps } from '../../types'
import { DetailRow } from './DetailRow'
@@ -59,25 +61,30 @@ export function createBlock(config: BlockConfig) {
filterFields,
table,
}: ServiceFlowBlockProps) {
- return (
- <>
- <DetailSectionHeader title={config.title} icon={config.icon} />
+ const [seeMoreFieldsSections, otherSections] = partition(
+ config.sections,
+ (x) => 'type' in x && x.type === 'fieldWithSeeMore'
+ ) as [FieldWithSeeMoreSection[], BlockSection[]]
- {config.primaryFields?.map((field) => (
- <FieldRow
- key={field.id}
- config={field}
- data={data}
- enrichedData={enrichedData}
- isLoading={isLoading}
- filterFields={filterFields}
- table={table}
- />
- ))}
+ /**
+ * [Joshen] AFAICT, a lot of the fields do not apply for auth logs as the data is not present
+ * Am opting to hide all the additional fields only for auth logs, but we can present them if
+ * we do eventually have the data to show
+ */
- {config.sections?.map((section) => {
- if ('type' in section && section.type === 'fieldWithSeeMore') {
- return [section.primaryField, ...section.additionalFields].map((field) => (
+ return (
+ <>
+ <Collapsible defaultOpen>
+ <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180!">
+ <DetailSectionHeader title={config.title} icon={config.icon} />
+ <ChevronDown
+ className="transition-transform duration-200"
+ strokeWidth={1.5}
+ size={14}
+ />
+ </CollapsibleTrigger>
+ <CollapsibleContent className="[&>*:nth-child(odd)]:bg-surface-100/50">
+ {config.primaryFields?.map((field) => (
<FieldRow
key={field.id}
config={field}
@@ -87,27 +94,52 @@ export function createBlock(config: BlockConfig) {
filterFields={filterFields}
table={table}
/>
- ))
- }
+ ))}
+ {data.log_type !== 'auth' &&
+ seeMoreFieldsSections.map((section) => {
+ return [section.primaryField, ...section.additionalFields].map((field) => (
+ <FieldRow
+ key={field.id}
+ config={field}
+ data={data}
+ enrichedData={enrichedData}
+ isLoading={isLoading}
+ filterFields={filterFields}
+ table={table}
+ />
+ ))
+ })}
+ </CollapsibleContent>
+ </Collapsible>
- const blockSection = section as BlockSection
- return (
- <span key={blockSection.title} className="contents">
- <DetailSectionHeader title={blockSection.title} icon={blockSection.icon} />
- {blockSection.fields.map((field) => (
- <FieldRow
- key={field.id}
- config={field}
- data={data}
- enrichedData={enrichedData}
- isLoading={isLoading}
- filterFields={filterFields}
- table={table}
- />
- ))}
- </span>
- )
- })}
+ {data.log_type !== 'auth' &&
+ otherSections.map((section) => {
+ return (
+ <Collapsible key={section.title}>
+ <CollapsibleTrigger className="w-full flex items-center justify-between pr-4 [&[data-state=open]>svg]:-rotate-180!">
+ <DetailSectionHeader title={section.title} icon={section.icon} />
+ <ChevronDown
+ className="transition-transform duration-200"
+ strokeWidth={1.5}
+ size={14}
+ />
+ </CollapsibleTrigger>
+ <CollapsibleContent className="[&>*:nth-child(odd)]:bg-surface-100/50">
+ {section.fields.map((field) => (
+ <FieldRow
+ key={field.id}
+ config={field}
+ data={data}
+ enrichedData={enrichedData}
+ isLoading={isLoading}
+ filterFields={filterFields}
+ table={table}
+ />
+ ))}
+ </CollapsibleContent>
+ </Collapsible>
+ )
+ })}
</>
)
})
diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/config/serviceFlowFields.ts b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/config/serviceFlowFields.ts
index 9aac986d2c6..95c3227835c 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/config/serviceFlowFields.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/config/serviceFlowFields.ts
@@ -1,6 +1,6 @@
import { BlockFieldConfig } from '../types'
import { getStorageMetadata } from '../utils/storageUtils'
-import { formatBytes } from '@/lib/helpers'
+import { formatBytes, tryParseJson } from '@/lib/helpers'
// Helper functions that avoid duplication with existing storage utilities
const getFileName = (path: string): string => {
@@ -371,28 +371,34 @@ export const postgrestResponseFields: BlockFieldConfig[] = [
// Primary GoTrue/Auth Fields (Always Visible)
export const authPrimaryFields: BlockFieldConfig[] = [
{
- id: 'auth_path',
- label: 'Auth Path',
+ id: 'log_id',
+ label: 'Log ID',
getValue: (data, enrichedData) => {
- return enrichedData?.path || enrichedData?.request_path || data?.path
+ const logId = data?.id || enrichedData?.id
+ return logId ?? null
},
- requiresEnrichedData: true,
},
{
- id: 'log_id',
- label: 'Log ID',
+ id: 'status',
+ label: 'Status',
+ getValue: (data) => {
+ return data.status
+ },
+ },
+ {
+ id: 'auth_path',
+ label: 'Auth Path',
getValue: (data, enrichedData) => {
- const logId = data?.id || enrichedData?.id
- return logId ? `${logId.substring(0, 8)}...` : null
+ return enrichedData?.path || enrichedData?.request_path || data?.path || data?.pathname
},
},
{
id: 'referer',
label: 'Referer',
- getValue: (_data, enrichedData) => {
- return enrichedData?.headers_referer || null
+ getValue: (data, enrichedData) => {
+ const eventMessage = tryParseJson(data.event_message)
+ return eventMessage?.referer || enrichedData?.headers_referer || null
},
- requiresEnrichedData: true,
},
]
diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx
index 3029481f7b1..63e17c0ada9 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx
@@ -158,13 +158,12 @@ export function ServiceFlowPanel({
table={table}
/>
) : (
- <div className="[&>*:nth-child(even)]:bg-surface-100/50">
+ <div>
<DetailSectionHeader
title="Request started"
icon={Clock}
summary={formattedTime ?? undefined}
/>
-
<MemoizedNetworkBlock
data={selectedRow}
enrichedData={serviceFlowData?.result?.[0]}
@@ -172,7 +171,6 @@ export function ServiceFlowPanel({
filterFields={filterFields}
table={table}
/>
-
{serviceFlowType === 'auth' ? (
<MemoizedGoTrueBlock
data={selectedRow}
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts
index e03af92e3ab..9247288a343 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts
@@ -136,10 +136,8 @@ export function parseAuthLogEventMessage(value: string | undefined): string | un
const msg = parsed.msg
if (typeof msg === 'string' && msg.trim()) {
- const authEvent =
- 'action' in parsed || 'auth_event_action' in parsed
- ? (parsed.action || parsed.auth_event.action).replaceAll('_', ' ')
- : undefined
+ const action = parsed.action ?? parsed.auth_event?.action
+ const authEvent = typeof action === 'string' ? action.replaceAll('_', ' ') : undefined
return `${authEvent ? `${authEvent}: ` : ''}${msg}`
}
}
diff --git a/apps/studio/data/logs/otel-inspection.utils.ts b/apps/studio/data/logs/otel-inspection.utils.ts
index 71b78bc2281..db0d6631432 100644
--- a/apps/studio/data/logs/otel-inspection.utils.ts
+++ b/apps/studio/data/logs/otel-inspection.utils.ts
@@ -40,9 +40,10 @@ export function flattenOtelInspectionRow(
): UnifiedLogInspectionEntry & Record<string, unknown> {
const attrs: Record<string, any> = row.log_attributes ?? {}
+ const host = attrs['request.host'] ?? attrs['host'] ?? ''
// Path key differs across sources: edge_logs uses `request.path`,
// function_edge_logs uses `request.pathname`. Coalesce.
- const requestPath = attrs['request.path'] ?? attrs['request.pathname']
+ const requestPath = attrs['request.path'] ?? attrs['request.pathname'] ?? attrs['path'] ?? ''
// Status: HTTP response code for gateway rows, Postgres SQL state code for postgres rows.
const status =
row.source === 'postgres_logs' ? attrs['parsed.sql_state_code'] : attrs['response.status_code']
@@ -70,9 +71,9 @@ export function flattenOtelInspectionRow(
level,
// Network -- flat aliases the panel reads as `enrichedData.request_path` etc.
+ host,
method: attrs['request.method'] ?? '',
path: requestPath ?? '',
- host: attrs['request.host'] ?? '',
status_code: status != null ? String(status) : '',
request_path: requestPath ?? null,
request_host: attrs['request.host'] ?? null,