The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Adjust connection logs toggle for unified logs, flip it to true by default (#47258)
Joshen Lim772b3bb36e42
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsxindex 99307558bc8..be43282627f 100644--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsx@@ -71,7 +71,7 @@ export const SEARCH_PARAMS_PARSER = {id: parseAsString,// View options- hide_connection_logs: parseAsBoolean.withDefault(true),+ show_connection_logs: parseAsBoolean.withDefault(true),}const POSTGRES_STATUS_CODE_LABELS = {diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.fields.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.fields.tsxindex 90975d700a4..fcae710eebf 100644--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.fields.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.fields.tsx@@ -22,10 +22,17 @@ export const filterFields = [value: 'log_type',type: 'checkbox',defaultOpen: true,- options: Object.entries(LOG_TYPES_LABELS).map(([value, label]) => ({ label, value })),+ options: Object.entries(LOG_TYPES_LABELS).map(([value, label]) => ({+ label,+ value,+ options:+ // [Joshen] Nested options are treated as just boolean toggles atm for simplicity+ // Refer to DataTableFilterCheckbox for their logic+ value === 'postgres' ? [{ label: 'Connection logs', value: 'show_connection_logs' }] : [],+ })),component: (props: Option) => {return (- <div className="flex w-full items-center justify-between gap-2">+ <div className="flex items-center w-full justify-between gap-2"><span className="text-foreground/70 group-hover:text-accent-foreground text-xs">{props.label}</span>@@ -33,11 +40,33 @@ export const filterFields = [)},},+ {+ label: 'Level',+ value: 'level',+ type: 'checkbox',+ defaultOpen: true,+ options: LEVELS.map((level) => ({ label: level, value: level })),+ component: (props: Option) => {+ // TODO: type `Option` with `options` values via Generics+ const value = props.value as (typeof LEVELS)[number]+ return (+ <div className="flex w-full max-w-28 items-center justify-between gap-2">+ <span className="capitalize text-foreground/70 group-hover:text-accent-foreground text-xs">+ {props.label}+ </span>+ <div className="flex items-center gap-2">+ <div className={cn('h-2.5 w-2.5 rounded-[2px]', getLevelColor(value).bg)} />+ <span className="text-xs text-muted-foreground/70">{getLevelLabel(value)}</span>+ </div>+ </div>+ )+ },+ },{label: 'Status',value: 'status',type: 'checkbox',- defaultOpen: true,+ defaultOpen: false,options: [],hasDynamicOptions: true,component: (props: Option) => {@@ -59,33 +88,11 @@ export const filterFields = [)},},- {- label: 'Level',- value: 'level',- type: 'checkbox',- defaultOpen: true,- options: LEVELS.map((level) => ({ label: level, value: level })),- component: (props: Option) => {- // TODO: type `Option` with `options` values via Generics- const value = props.value as (typeof LEVELS)[number]- return (- <div className="flex w-full max-w-28 items-center justify-between gap-2">- <span className="capitalize text-foreground/70 group-hover:text-accent-foreground text-xs">- {props.label}- </span>- <div className="flex items-center gap-2">- <div className={cn('h-2.5 w-2.5 rounded-[2px]', getLevelColor(value).bg)} />- <span className="text-xs text-muted-foreground/70">{getLevelLabel(value)}</span>- </div>- </div>- )- },- },{label: 'Method',value: 'method',type: 'checkbox',- defaultOpen: true,+ defaultOpen: false,options: METHODS.map((method) => ({ label: method, value: method })),component: (props: Option) => {return (diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.tsindex ae523692644..d0e75d0fd9c 100644--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts@@ -114,16 +114,16 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {expect(sql).not.toContain(`'%error%%'`)})- it('excludes connection log messages by default (hide_connection_logs=true)', () => {- const sql = getUnifiedLogsQuery({ ...baseSearch, hide_connection_logs: true } as any)+ it('excludes connection log messages when show_connection_logs=false', () => {+ const sql = getUnifiedLogsQuery({ ...baseSearch, show_connection_logs: false } as any)expect(sql).toContain("source != 'postgres_logs'")expect(sql).toContain("event_message NOT LIKE 'connection received%'")expect(sql).toContain("event_message NOT LIKE 'connection authenticated%'")expect(sql).toContain("event_message NOT LIKE 'connection authorized%'")})- it('includes connection log messages when hide_connection_logs=false', () => {- const sql = getUnifiedLogsQuery({ ...baseSearch, hide_connection_logs: false } as any)+ it('includes connection log messages by default (show_connection_logs=true)', () => {+ const sql = getUnifiedLogsQuery({ ...baseSearch, show_connection_logs: true } as any)expect(sql).not.toContain("event_message NOT LIKE 'connection received%'")})@@ -174,7 +174,7 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {})it('applies the connection-logs filter to every count scan so badges match the list', () => {- const sql = getLogsCountQuery({ ...baseSearch, hide_connection_logs: true } as any)+ const sql = getLogsCountQuery({ ...baseSearch, show_connection_logs: false } as any)const scans = sql.split(/\bUNION ALL\b/)expect(scans.length).toBeGreaterThan(1)for (const scan of scans) {diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.tsindex d1fd27db286..d186951ffca 100644--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts@@ -307,7 +307,8 @@ const buildBaseWhere = (* by the connection rows the list hides).*/const connectionLogsFilter = (search: QuerySearchParamsType): SafeLogSqlFragment | null => {- if (!search.hide_connection_logs) return null+ // Visible by default — only an explicit `false` hides connection logs.+ if (search.show_connection_logs !== false) return nullreturn safeSql`(source != 'postgres_logs' OR (event_message NOT LIKE 'connection received%' ANDevent_message NOT LIKE 'connection authenticated%' ANDdiff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsxindex 6d261b9ddce..8e72578a2a6 100644--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx@@ -29,7 +29,6 @@ import {import { RefreshButton } from '../../ui/DataTable/RefreshButton'import { generateDynamicColumns, UNIFIED_LOGS_COLUMNS } from './components/Columns'-import { ConnectionLogsToggle } from './components/ConnectionLogsToggle'import { DownloadLogsButton } from './components/DownloadLogsButton'import { LogsFilterBar } from './components/LogsFilterBar'import { LogsListPanel } from './components/LogsListPanel'@@ -377,7 +376,6 @@ export const UnifiedLogs = () => {isFilterBarOpen={isFilterBarOpen}setIsFilterBarOpen={setIsFilterBarOpen}dateRangeDisabled={{ after: new Date() }}- afterFilters={<ConnectionLogsToggle />}/><ResizableHandle withHandle /><ResizablePaneldiff --git a/apps/studio/components/interfaces/UnifiedLogs/components/ConnectionLogsToggle.tsx b/apps/studio/components/interfaces/UnifiedLogs/components/ConnectionLogsToggle.tsxdeleted file mode 100644index f44ad84d033..00000000000--- a/apps/studio/components/interfaces/UnifiedLogs/components/ConnectionLogsToggle.tsx+++ /dev/null@@ -1,41 +0,0 @@-import { useQueryStates } from 'nuqs'-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger, Checkbox, Label } from 'ui'--import { SEARCH_PARAMS_PARSER } from '../UnifiedLogs.constants'--export const ConnectionLogsToggle = () => {- const [{ hide_connection_logs }, setSearch] = useQueryStates(SEARCH_PARAMS_PARSER)-- return (- <Accordion type="multiple" defaultValue={['misc']}>- <AccordionItem value="misc" className="border-none">- <div className="flex items-center gap-2 pr-2">- <AccordionTrigger className="flex-1 px-2 py-0 hover:no-underline data-[state=closed]:text-muted-foreground data-open:text-foreground focus-within:data-closed:text-foreground hover:data-closed:text-foreground">- <div className="flex items-center gap-2 truncate py-2">- <p className="text-sm">Misc</p>- </div>- </AccordionTrigger>- </div>- <AccordionContent>- <div className="p-1">- <div className="rounded-sm border border-border">- <div className="group relative flex items-center space-x-2 px-2 py-2 hover:bg-accent/50">- <Checkbox- id="connection-logs"- checked={!hide_connection_logs}- onCheckedChange={(checked) => setSearch({ hide_connection_logs: !checked })}- />- <Label- htmlFor="connection-logs"- className="flex w-full cursor-pointer items-center justify-between gap-2 text-[0.8rem] font-normal text-foreground/70 group-hover:text-accent-foreground"- >- Connection logs- </Label>- </div>- </div>- </div>- </AccordionContent>- </AccordionItem>- </Accordion>- )-}diff --git a/apps/studio/components/ui/DataTable/DataTable.types.ts b/apps/studio/components/ui/DataTable/DataTable.types.tsindex cb500d6aedb..ac3fd3937cb 100644--- a/apps/studio/components/ui/DataTable/DataTable.types.ts+++ b/apps/studio/components/ui/DataTable/DataTable.types.ts@@ -4,6 +4,7 @@ import type { ReactNode } from 'react'export type Option = {label: stringvalue: string+ options?: Option[]}export type DatePreset = {diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckbox.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckbox.tsxindex 0d5148b464b..b07542f36b5 100644--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckbox.tsx+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckbox.tsx@@ -1,4 +1,5 @@-import { Search } from 'lucide-react'+import { Minus, Plus, Search } from 'lucide-react'+import { useQueryStates } from 'nuqs'import { useState } from 'react'import { Checkbox, cn, Label, Skeleton } from 'ui'@@ -7,6 +8,7 @@ import { formatCompactNumber } from '../DataTable.utils'import { InputWithAddons } from '../primitives/InputWithAddons'import { useDataTable } from '../providers/DataTableProvider'import { DataTableFilterCheckboxLoader } from './DataTableFilterCheckboxLoader'+import { SEARCH_PARAMS_PARSER } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.constants'export function DataTableFilterCheckbox<TData>({value: _value,@@ -15,6 +17,22 @@ export function DataTableFilterCheckbox<TData>({}: DataTableCheckboxFilterField<TData>) {const value = _value as stringconst [inputValue, setInputValue] = useState('')+ const [expandedOptions, setExpandedOptions] = useState<Set<string>>(new Set())+ const [searchParams, setSearchParams] = useQueryStates(SEARCH_PARAMS_PARSER)++ // Nested options map 1:1 to a boolean search param via their `value`+ // (e.g. `show_connection_logs`), so they can be read/written generically.+ const getBooleanParam = (key: string) => Boolean(searchParams[key as keyof typeof searchParams])+ const setBooleanParam = (key: string, val: boolean) =>+ setSearchParams({ [key]: val } as Partial<typeof searchParams>)++ const toggleExpanded = (key: string) =>+ setExpandedOptions((prev) => {+ const next = new Set(prev)+ if (next.has(key)) next.delete(key)+ else next.add(key)+ return next+ })const { table, columnFilters, isLoading, isLoadingCounts, getFacetedUniqueValues } =useDataTable()@@ -65,18 +83,20 @@ export function DataTableFilterCheckbox<TData>({</div></div>) : (- filterOptions- // TODO: we shoudn't sort the options here, instead filterOptions should be sorted by default- // .sort((a, b) => a.label.localeCompare(b.label))- .map((option, index) => {- const checked = filters.includes(option.value)+ filterOptions.map((option, index) => {+ const checked = filters.includes(option.value)+ const optionKey = String(option.value)+ const hasNested = (option.options ?? []).length > 0+ const isExpanded = expandedOptions.has(optionKey)- return (+ return (+ <div+ key={String(option.value)}+ className={cn('py-2', index !== filterOptions.length - 1 ? 'border-b' : undefined)}+ ><div- key={String(option.value)}className={cn(- 'group relative flex items-center space-x-2 px-2 py-2 hover:bg-accent/50',- index !== filterOptions.length - 1 ? 'border-b' : undefined+ 'group relative flex items-center space-x-2 px-2 hover:bg-accent/50')}><Checkbox@@ -100,6 +120,17 @@ export function DataTableFilterCheckbox<TData>({<span className="truncate font-normal block">{option.label}</span>)}</div>+ {hasNested && (+ <button+ type="button"+ aria-label={isExpanded ? 'Collapse' : 'Expand'}+ aria-expanded={isExpanded}+ onClick={() => toggleExpanded(optionKey)}+ className="flex h-4 w-4 shrink-0 items-center justify-center rounded-sm text-foreground-lighter hover:bg-selection hover:text-foreground mr-2.5"+ >+ {isExpanded ? <Minus size={12} /> : <Plus size={12} />}+ </button>+ )}<span className="shrink-0 flex items-center justify-center font-mono text-xs">{isLoadingCounts ? (<Skeleton className="h-4 w-4" />@@ -113,7 +144,7 @@ export function DataTableFilterCheckbox<TData>({type="button"onClick={() => column?.setFilterValue([option.value])}className={cn(- 'absolute inset-y-0 right-0 hidden font-normal text-muted-foreground backdrop-blur-xs hover:text-foreground group-hover:block',+ 'absolute inset-y-0 right-0 -top-0.5 hidden font-normal text-muted-foreground backdrop-blur-xs hover:text-foreground group-hover:block','rounded-md ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2')}>@@ -121,8 +152,55 @@ export function DataTableFilterCheckbox<TData>({</button></Label></div>- )- })+ {hasNested &&+ isExpanded &&+ option.options?.map((optionNested, nestedIndex) => {+ const nestedChecked = getBooleanParam(optionNested.value)+ const isLastNested = nestedIndex === (option.options?.length ?? 0) - 1+ return (+ <div+ key={optionNested.value}+ className={cn(+ 'group/nested relative flex items-stretch',+ nestedIndex === 0 && '[&>div:last-child]:pt-2'+ )}+ >+ <div aria-hidden className="relative w-7 shrink-0">+ {isLastNested ? (+ <span+ className={cn(+ 'absolute left-4 top-0 w-3 rounded-bl-sm border-b border-l border-border',+ option.options?.length === 1 ? 'h-[60%]' : 'h-1/2'+ )}+ />+ ) : (+ <>+ <span className="absolute left-4 top-0 h-full w-px bg-border" />+ <span className="absolute left-4 top-[55%] h-px w-3 bg-border" />+ </>+ )}+ </div>+ <div className="flex flex-1 items-center gap-x-2 rounded-sm py-1 pr-2 hover:bg-accent/50 min-w-0">+ <Checkbox+ id={`${value}-${optionNested.value}`}+ checked={nestedChecked}+ onCheckedChange={(isChecked) =>+ setBooleanParam(optionNested.value, Boolean(isChecked))+ }+ />+ <Label+ htmlFor={`${value}-${optionNested.value}`}+ className="flex w-full cursor-pointer items-center text-[0.8rem] font-normal text-foreground/70 group-hover/nested:text-accent-foreground min-w-0"+ >+ <span className="truncate text-xs">{optionNested.label}</span>+ </Label>+ </div>+ </div>+ )+ })}+ </div>+ )+ }))}</div></div>diff --git a/apps/studio/components/ui/DataTable/FilterSideBar.tsx b/apps/studio/components/ui/DataTable/FilterSideBar.tsxindex afeb19bcd56..99166c61482 100644--- a/apps/studio/components/ui/DataTable/FilterSideBar.tsx+++ b/apps/studio/components/ui/DataTable/FilterSideBar.tsx@@ -1,7 +1,7 @@import { useParams } from 'common'import Link from 'next/link'import { useRouter } from 'next/router'-import React, { useEffect, type ReactNode } from 'react'+import { cloneElement, Dispatch, SetStateAction, useEffect } from 'react'import { Badge, Button, cn, ResizablePanel, usePanelRef } from 'ui'import { FeaturePreviewSidebarPanel } from '../FeaturePreviewSidebarPanel'@@ -15,16 +15,14 @@ import { UnifiedLogsBanner } from '@/components/interfaces/UnifiedLogs/UnifiedLointerface FilterSideBarProps {isFilterBarOpen: boolean- setIsFilterBarOpen: React.Dispatch<React.SetStateAction<boolean>>+ setIsFilterBarOpen: Dispatch<SetStateAction<boolean>>dateRangeDisabled?: DateRangeDisabled- afterFilters?: ReactNode}export function FilterSideBar({isFilterBarOpen,setIsFilterBarOpen,dateRangeDisabled,- afterFilters,}: FilterSideBarProps) {const router = useRouter()const { ref } = useParams()@@ -84,7 +82,6 @@ export function FilterSideBar({<div className="flex-1 p-2 sm:overflow-y-scroll"><DataTableFilterControls dateRangeDisabled={dateRangeDisabled} />- {afterFilters}<FeaturePreviewSidebarPanelclassName="mx-2 my-4"title="Capture your logs"@@ -93,9 +90,7 @@ export function FilterSideBar({<div className="flex items-center gap-4">{LOG_DRAIN_TYPES.filter((t) =>['datadog', 'sentry', 'webhook', 'loki'].includes(t.value)- ).map((type) =>- React.cloneElement(type.icon, { height: 20, width: 20, key: type.value })- )}+ ).map((type) => cloneElement(type.icon, { height: 20, width: 20, key: type.value }))}</div>}actions={