Skip to content

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

fix(unified-logs): apply sidebar facet filters on click (#46589)

Jordi Enricab93452cdfc0
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.filters.test.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.filters.test.ts
new file mode 100644
index 00000000000..68538d1680d
--- /dev/null
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.filters.test.ts
@@ -0,0 +1,124 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+ buildFilterSearchUpdate,
+ columnFiltersToLogsFilters,
+ logsFiltersToColumnFilters,
+ logsFiltersToUrlParams,
+ parseLogsFilterUrlParams,
+} from './UnifiedLogs.filters'
+
+describe('columnFiltersToLogsFilters', () => {
+ it('serializes a bare string[] (sidebar checkbox) using the default `=` operator', () => {
+ const filters = columnFiltersToLogsFilters([
+ { id: 'log_type', value: ['postgres', 'postgrest'] },
+ ])
+ expect(filters).toEqual([
+ { column: 'log_type', operator: '=', value: 'postgres' },
+ { column: 'log_type', operator: '=', value: 'postgrest' },
+ ])
+ expect(logsFiltersToUrlParams(filters)).toEqual([
+ 'log_type:eq:postgres',
+ 'log_type:eq:postgrest',
+ ])
+ })
+
+ it('preserves the operator from a wrapped value (top filter bar)', () => {
+ const filters = columnFiltersToLogsFilters([
+ { id: 'method', value: { operator: '<>', values: ['GET'] } },
+ ])
+ expect(filters).toEqual([{ column: 'method', operator: '<>', value: 'GET' }])
+ })
+
+ it('treats a bare non-array scalar as a single `=` value', () => {
+ const filters = columnFiltersToLogsFilters([{ id: 'status', value: '500' }])
+ expect(filters).toEqual([{ column: 'status', operator: '=', value: '500' }])
+ })
+
+ it('excludes columns not in filterableNames (e.g. the `date` timerange brush)', () => {
+ const filterable = new Set(['log_type', 'method'])
+ const filters = columnFiltersToLogsFilters(
+ [
+ { id: 'date', value: [new Date('2026-05-08T00:00:00Z'), new Date('2026-05-08T01:00:00Z')] },
+ { id: 'log_type', value: ['postgres'] },
+ ],
+ filterable
+ )
+ expect(filters).toEqual([{ column: 'log_type', operator: '=', value: 'postgres' }])
+ })
+
+ it('skips null/undefined values (cleared filters)', () => {
+ const filters = columnFiltersToLogsFilters([
+ { id: 'log_type', value: null },
+ { id: 'method', value: undefined },
+ ])
+ expect(filters).toEqual([])
+ })
+})
+
+describe('logsFiltersToColumnFilters', () => {
+ it('seeds an `=` group as a bare string[] so sidebar checkboxes render ticked', () => {
+ const columnFilters = logsFiltersToColumnFilters([
+ { column: 'log_type', operator: '=', value: 'postgres' },
+ { column: 'log_type', operator: '=', value: 'postgrest' },
+ ])
+ expect(columnFilters).toEqual([{ id: 'log_type', value: ['postgres', 'postgrest'] }])
+ })
+
+ it('keeps non-eq groups wrapped so the operator survives a round-trip', () => {
+ const columnFilters = logsFiltersToColumnFilters([
+ { column: 'event_message', operator: '~~*', value: 'error' },
+ ])
+ expect(columnFilters).toEqual([
+ { id: 'event_message', value: { operator: '~~*', values: ['error'] } },
+ ])
+ })
+
+ it('round-trips an eq URL filter back to the same param without flipping the operator', () => {
+ const seeded = logsFiltersToColumnFilters(parseLogsFilterUrlParams(['method:eq:GET']))
+ const update = buildFilterSearchUpdate(seeded, [{ value: 'method', type: 'checkbox' }])
+ expect(update.filter).toEqual(['method:eq:GET'])
+ })
+
+ it('round-trips a neq URL filter without downgrading it to eq', () => {
+ const seeded = logsFiltersToColumnFilters(parseLogsFilterUrlParams(['method:neq:GET']))
+ const update = buildFilterSearchUpdate(seeded, [{ value: 'method', type: 'checkbox' }])
+ expect(update.filter).toEqual(['method:neq:GET'])
+ })
+})
+
+describe('buildFilterSearchUpdate', () => {
+ const fields = [
+ { value: 'date', type: 'timerange' },
+ { value: 'log_type', type: 'checkbox' },
+ { value: 'method', type: 'checkbox' },
+ ]
+
+ it('serializes a bare sidebar checkbox into the `filter` param (the regression)', () => {
+ const update = buildFilterSearchUpdate([{ id: 'log_type', value: ['postgres'] }], fields)
+ expect(update.filter).toEqual(['log_type:eq:postgres'])
+ })
+
+ it('clears the `filter` param to null when no equality filters are set', () => {
+ const update = buildFilterSearchUpdate([{ id: 'log_type', value: null }], fields)
+ expect(update.filter).toBeNull()
+ })
+
+ it('routes a timerange to its own URL key, never into `filter`', () => {
+ const range = [new Date('2026-05-08T00:00:00Z'), new Date('2026-05-08T01:00:00Z')]
+ const update = buildFilterSearchUpdate(
+ [
+ { id: 'date', value: range },
+ { id: 'method', value: ['GET'] },
+ ],
+ fields
+ )
+ expect(update.filter).toEqual(['method:eq:GET'])
+ expect(update.date).toBe(range)
+ })
+
+ it('nulls an absent timerange key so a cleared brush is removed from the URL', () => {
+ const update = buildFilterSearchUpdate([{ id: 'method', value: ['GET'] }], fields)
+ expect(update.date).toBeNull()
+ })
+})
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.filters.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.filters.ts
index e327798e678..32614bf9088 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.filters.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.filters.ts
@@ -81,15 +81,51 @@ export const groupLogsFiltersByColumn = (
return grouped
}
+export const logsFiltersToColumnFilters = (
+ filters: LogsFilter[]
+): { id: string; value: string[] | LogsColumnFilterValue }[] => {
+ return Object.entries(groupLogsFiltersByColumn(filters)).map(([id, group]) =>
+ group.operator === '=' ? { id, value: group.values } : { id, value: group }
+ )
+}
+
export const columnFiltersToLogsFilters = (
- columnFilters: { id: string; value: unknown }[]
+ columnFilters: { id: string; value: unknown }[],
+ filterableNames?: Set<string>
): LogsFilter[] => {
const filters: LogsFilter[] = []
for (const { id, value } of columnFilters) {
- if (!isLogsFilterColumnValue(value)) continue
- for (const v of value.values) {
- filters.push({ column: id, operator: value.operator, value: String(v) })
+ if (filterableNames && !filterableNames.has(id)) continue
+ if (value === null || value === undefined) continue
+ const fallback: LogsColumnFilterValue = {
+ operator: '=',
+ values: (Array.isArray(value) ? value : [value]).map(String),
+ }
+ const { operator, values } = isLogsFilterColumnValue(value) ? value : fallback
+ for (const v of values) {
+ filters.push({ column: id, operator, value: v })
}
}
return filters
}
+
+export const buildFilterSearchUpdate = (
+ columnFilters: { id: string; value: unknown }[],
+ filterFields: { value: string; type: string }[]
+): Record<string, unknown> => {
+ const filterableNames = new Set(
+ filterFields.filter((field) => field.type !== 'timerange').map((field) => field.value)
+ )
+ const filterEntries = logsFiltersToUrlParams(
+ columnFiltersToLogsFilters(columnFilters, filterableNames)
+ )
+ const update: Record<string, unknown> = {
+ filter: filterEntries.length > 0 ? filterEntries : null,
+ }
+ for (const field of filterFields) {
+ if (field.type !== 'timerange') continue
+ const current = columnFilters.find((c) => c.id === field.value)?.value
+ update[field.value] = current ?? null
+ }
+ return update
+}
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
index 58884413e67..a04be8fa290 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
@@ -39,9 +39,8 @@ import { ServiceFlowPanel } from './ServiceFlowPanel'
import { SEARCH_PARAMS_PARSER } from './UnifiedLogs.constants'
import { filterFields as defaultFilterFields } from './UnifiedLogs.fields'
import {
- columnFiltersToLogsFilters,
- groupLogsFiltersByColumn,
- logsFiltersToUrlParams,
+ buildFilterSearchUpdate,
+ logsFiltersToColumnFilters,
parseLogsFilterUrlParams,
} from './UnifiedLogs.filters'
import { useLiveMode, useResetFocus } from './UnifiedLogs.hooks'
@@ -92,12 +91,7 @@ export const UnifiedLogs = () => {
const defaultColumnSorting = search.sort ? [search.sort] : []
const defaultColumnVisibility = { uuid: false }
- // Column filters are seeded from the repeatable `filter` URL param. Each entry
- // (`col:opAbbrev:value`) is grouped per column into a wrapped { operator, values }
- // shape that the query builder reads back.
- const defaultColumnFilters = Object.entries(
- groupLogsFiltersByColumn(parseLogsFilterUrlParams(search.filter))
- ).map(([id, value]) => ({ id, value }))
+ const defaultColumnFilters = logsFiltersToColumnFilters(parseLogsFilterUrlParams(search.filter))
const [topBarHeight, setTopBarHeight] = useState(0)
const topBarRef = useRef<HTMLDivElement>(null)
@@ -294,21 +288,8 @@ export const UnifiedLogs = () => {
})
}, [facets])
- // Debounced filter application to avoid too many API calls when user clicks multiple filters quickly.
- // All equality/pattern column filters serialize into the repeatable `filter` URL param. Slider/timerange
- // column filters keep their dedicated per-column URL keys so things like the timeline brush still
- // round-trip — they have their own range semantics and aren't covered by eq/neq/like.
const applyFilterSearch = () => {
- const filterEntries = logsFiltersToUrlParams(columnFiltersToLogsFilters(columnFilters))
- const update: Record<string, unknown> = {
- filter: filterEntries.length > 0 ? filterEntries : null,
- }
- for (const field of filterFields) {
- if (field.type !== 'timerange') continue
- const current = columnFilters.find((c) => c.id === field.value)?.value
- update[field.value] = current ?? null
- }
- setSearch(update)
+ setSearch(buildFilterSearchUpdate(columnFilters, filterFields))
}
const debouncedApplyFilterSearch = useDebounce(applyFilterSearch, 250)