Skip to content

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

feat: add User Filter to the unified logs (#47879)

Ivan Vasilov3c6ef31959b5
diff --git a/apps/studio/components/interfaces/Auth/Users/Users.utils.tsx b/apps/studio/components/interfaces/Auth/Users/Users.utils.tsx
index 3e0756fdfe5..3f753634897 100644
--- a/apps/studio/components/interfaces/Auth/Users/Users.utils.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/Users.utils.tsx
@@ -1,6 +1,6 @@
import dayjs from 'dayjs'
import { SqlEditor, TableEditor } from 'icons'
-import { Copy, Trash, UserIcon } from 'lucide-react'
+import { Copy, ScrollText, Trash, UserIcon } from 'lucide-react'
import { Column, useRowSelection } from 'react-data-grid'
import {
Checkbox,
@@ -283,6 +283,7 @@ export const formatUserColumns = ({
setSortByValue,
onSelectDeleteUser,
onSelectImpersonateUser,
+ onSelectViewLogs,
}: {
specificFilterColumn: string
columns: UsersTableColumn[]
@@ -292,6 +293,7 @@ export const formatUserColumns = ({
setSortByValue: (val: string) => void
onSelectDeleteUser: (user: User) => void
onSelectImpersonateUser: (user: User, destination: 'sql' | 'table-editor') => Promise<void>
+ onSelectViewLogs: (user: User) => void
}) => {
const columnOrder = config.map((c) => c.id) ?? columns.map((c) => c.id)
@@ -464,6 +466,17 @@ export const formatUserColumns = ({
<span>Run SQL as user</span>
</ContextMenuItem>
+ <ContextMenuItem
+ className="gap-x-2"
+ onFocusCapture={(e) => e.stopPropagation()}
+ onSelect={() => {
+ if (user) onSelectViewLogs(user)
+ }}
+ >
+ <ScrollText size={12} />
+ <span>View user logs</span>
+ </ContextMenuItem>
+
<ContextMenuSeparator />
<ContextMenuItem
diff --git a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx
index 76624b3b31b..55387ef9ade 100644
--- a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx
@@ -56,6 +56,7 @@ import {
import { formatUserColumns, formatUsersData } from './Users.utils'
import { UsersFooter } from './UsersFooter'
import { UsersSearch } from './UsersSearch'
+import { buildUnifiedLogsUrl } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.utils'
import { AlertError } from '@/components/ui/AlertError'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { FilterPopover } from '@/components/ui/FilterPopover'
@@ -157,7 +158,6 @@ export const UsersV2 = () => {
'show',
parseAsString.withOptions({ history: 'push', clearOnDefault: true })
)
-
const [improvedSearchDismissed, setImprovedSearchDismissed] = useLocalStorageQuery(
LOCAL_STORAGE_KEYS.AUTH_USERS_IMPROVED_SEARCH_DISMISSED(projectRef ?? ''),
false
@@ -373,6 +373,12 @@ export const UsersV2 = () => {
}
}
+ const onSelectViewLogs = (user: User) => {
+ const identifier = user.id || user.email
+ if (!projectRef || !identifier) return
+ router.push(buildUnifiedLogsUrl({ projectRef, user: identifier }))
+ }
+
const handleScroll = (event: UIEvent<HTMLDivElement>) => {
const isScrollingHorizontally = xScroll.current !== event.currentTarget.scrollLeft
xScroll.current = event.currentTarget.scrollLeft
@@ -482,6 +488,7 @@ export const UsersV2 = () => {
setSortByValue: updateSortByValue,
onSelectDeleteUser: setSelectedUserToDelete,
onSelectImpersonateUser,
+ onSelectViewLogs,
})
setColumns(columns)
if (columns.length < userTableColumns.length) {
@@ -716,6 +723,7 @@ export const UsersV2 = () => {
setSortByValue: updateSortByValue,
onSelectDeleteUser: setSelectedUserToDelete,
onSelectImpersonateUser,
+ onSelectViewLogs,
})
setSelectedColumns(value)
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsx
index 084dce16c00..cda74b29f94 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.constants.tsx
@@ -94,6 +94,10 @@ export const SEARCH_PARAMS_PARSER = {
edge_auth: parseAsBoolean.withDefault(true),
edge_storage: parseAsBoolean.withDefault(true),
edge_postgrest: parseAsBoolean.withDefault(true),
+
+ // Support searching for user against user ID
+ // See userAttributionCondition in UnifiedLogs.queries.ts.
+ user: parseAsString,
}
const POSTGRES_STATUS_CODE_LABELS = {
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
index 69b419ec01e..15f713a3474 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
@@ -5,6 +5,7 @@ import {
getLogsChartQuery,
getLogsCountQuery,
getUnifiedLogsQuery,
+ isUserFilterUnreachable,
} from './UnifiedLogs.queries'
import { getUnifiedLogsQuery as getUnifiedLogsQueryBQ } from './UnifiedLogs.queries.bq'
@@ -15,6 +16,10 @@ const baseSearch = {
// Helper: build a search with extra `filter` URL entries on top of the base.
const withFilters = (...entries: string[]) => ({ ...baseSearch, filter: entries }) as any
+// Helper: build a search with the cross-cutting `user` filter set, plus optional `filter` entries.
+const withUser = (user: string, ...entries: string[]) =>
+ ({ ...baseSearch, user, filter: entries }) as any
+
describe('UnifiedLogs.queries (OTEL flat)', () => {
describe('getUnifiedLogsQuery', () => {
it('defaults to postgres + edge log types when none specified', () => {
@@ -276,6 +281,77 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {
})
})
+ describe('user filter', () => {
+ it('restricts to auth_logs/postgres_logs and skips the default postgres+edge restriction', () => {
+ const sql = getUnifiedLogsQuery(withUser('user-123'))
+ const where = sql.split(/\bWHERE\b/)[1] ?? ''
+ expect(where).toContain(`log_attributes['auth_event.actor_id'] = 'user-123'`)
+ expect(where).toContain(`source = 'postgres_logs'`)
+ // The unfiltered default (postgres_logs OR edge_logs) would incorrectly exclude
+ // auth_logs, the primary attributable source, so it must not appear here.
+ expect(where).not.toContain(`(source = 'postgres_logs') OR (source = 'edge_logs')`)
+ })
+
+ it('does not restrict sources when the user filter is inactive', () => {
+ const sql = getUnifiedLogsQuery(baseSearch)
+ const where = sql.split(/\bWHERE\b/)[1] ?? ''
+ expect(where).not.toContain(`auth_event.actor_id`)
+ })
+
+ it('ANDs an explicit non-attributable log_type filter with the user condition (edge case: always zero rows)', () => {
+ // Locks in the exact shape `isUserFilterUnreachable` detects — `source = 'edge_logs'`
+ // AND `(source = 'auth_logs' ...) OR (source = 'postgres_logs' ...)` can never both hold.
+ const sql = getUnifiedLogsQuery(withUser('user-123', 'log_type:eq:edge'))
+ const where = sql.split(/\bWHERE\b/)[1] ?? ''
+ expect(where).toContain(`source = 'edge_logs'`)
+ expect(where).toContain(`log_attributes['auth_event.actor_id'] = 'user-123'`)
+ })
+ })
+
+ describe('isUserFilterUnreachable', () => {
+ it('is false when no user filter is active', () => {
+ expect(isUserFilterUnreachable(withFilters('log_type:eq:edge'))).toBe(false)
+ })
+
+ it('is false when the user filter is active with no explicit log_type filter', () => {
+ expect(isUserFilterUnreachable(withUser('user-123'))).toBe(false)
+ })
+
+ it('is false when the explicit log_type filter includes an attributable source (auth)', () => {
+ expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:auth'))).toBe(false)
+ })
+
+ it('is false when the explicit log_type filter includes an attributable source (postgres)', () => {
+ expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:postgres'))).toBe(false)
+ })
+
+ it('is false when at least one of several selected log types is attributable', () => {
+ expect(
+ isUserFilterUnreachable(withUser('user-123', 'log_type:eq:edge', 'log_type:eq:auth'))
+ ).toBe(false)
+ })
+
+ it('is true when the explicit log_type filter restricts to a single non-attributable source', () => {
+ expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:edge'))).toBe(true)
+ })
+
+ it('is true when every selected log type is non-attributable', () => {
+ expect(
+ isUserFilterUnreachable(withUser('user-123', 'log_type:eq:edge', 'log_type:eq:storage'))
+ ).toBe(true)
+ })
+
+ it('(neq) is false when excluding a non-attributable source — the attributable sources remain eligible', () => {
+ expect(isUserFilterUnreachable(withUser('user-123', 'log_type:neq:edge'))).toBe(false)
+ })
+
+ it('(neq) is true only when both attributable sources are excluded', () => {
+ expect(
+ isUserFilterUnreachable(withUser('user-123', 'log_type:neq:auth', 'log_type:neq:postgres'))
+ ).toBe(true)
+ })
+ })
+
describe('analyticsLiteral escaping', () => {
it('emits ClickHouse / BigQuery escape syntax (doubled `\\\\`, no `E` prefix)', () => {
// pg-meta's literal() would emit `E'a\\b'` for `a\b` — the `E` prefix is
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
index 7a51e9c0412..1b56bae859e 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
@@ -274,7 +274,10 @@ const buildBaseWhere = (
if (logTypeFilter) {
const condition = translateFilter('log_type', logTypeFilter.values, logTypeFilter.operator)
if (condition) parts.push(condition)
- } else {
+ } else if (!userFilterValue(search)) {
+ // Skip the default (postgres|edge) source restriction while the user filter is
+ // active — the user clause governs which sources are eligible (auth + postgres),
+ // and the default would otherwise exclude auth_logs, the primary attributable source.
parts.push(logTypeWhereCondition([...DEFAULT_LOG_TYPES]))
}
}
@@ -314,9 +317,71 @@ const EDGE_SERVICE_PATH_FILTER: Record<'edge_auth' | 'edge_storage' | 'edge_post
* so the row list, chart and sidebar facet counts stay in sync (otherwise the
* badges over-count by the rows the list hides).
*/
+/** Trimmed value of the cross-cutting user filter, or '' when inactive. */
+const userFilterValue = (search: QuerySearchParamsType): string =>
+ typeof search.user === 'string' ? search.user.trim() : ''
+
+/**
+ * Cross-cutting "attributable to one user" condition. Only the two sources that can
+ * be positively tied to a user are eligible, each with its own match:
+ * - auth_logs: structured identity (`auth_event.actor_id`)
+ * - postgres_logs: the identifier appears verbatim in the error text (e.g. a 23502
+ * failing row echoing the id column).
+ * edge_logs / storage_logs / realtime_logs carry no per-user field and can't satisfy
+ * either branch, so they're auto-excluded while the filter is active — never guessed
+ * at via IP or timestamp proximity.
+ */
+const userAttributionCondition = (search: QuerySearchParamsType): SafeLogSqlFragment | null => {
+ const value = userFilterValue(search)
+ if (!value) return null
+ const exact = lit(value)
+ const contains = lit('%' + value + '%')
+ return safeSql`(
+ (source = 'auth_logs' AND (
+ log_attributes['auth_event.actor_id'] = ${exact}
+ OR event_message ILIKE ${contains}
+ ))
+ OR (source = 'postgres_logs' AND event_message ILIKE ${contains})
+ )`
+}
+
+const USER_ATTRIBUTABLE_SOURCES = new Set([LOG_TYPE_TO_SOURCE.auth, LOG_TYPE_TO_SOURCE.postgres])
+
+/**
+ * True when the user filter is active but an explicit log_type filter restricts the
+ * view to source(s) that can never satisfy `userAttributionCondition` (e.g. `edge`) —
+ * the combination is guaranteed to match zero rows. Consumed by the UI to show a
+ * specific empty state instead of the generic "No results found".
+ *
+ * [Joshen] Basically filtering by user only works on Auth and Postgres logs atm
+ * Refer to userAttributeCondition above
+ */
+export const isUserFilterUnreachable = (search: QuerySearchParamsType): boolean => {
+ if (!userFilterValue(search)) return false
+
+ const logTypeFilter = groupLogsFiltersByColumn(parseLogsFilterUrlParams(search.filter)).log_type
+ if (!logTypeFilter) return false
+
+ const sources = logTypeFilter.values.map(
+ (v) => LOG_TYPE_TO_SOURCE[v as keyof typeof LOG_TYPE_TO_SOURCE] ?? v
+ )
+
+ if (logTypeFilter.operator === '<>') {
+ // Excludes these sources from view — unreachable only if both attributable
+ // sources are excluded (excluding just one still leaves the other eligible).
+ return [...USER_ATTRIBUTABLE_SOURCES].every((source) => sources.includes(source))
+ }
+
+ // Restricts the view to these sources — unreachable unless at least one is attributable.
+ return !sources.some((source) => USER_ATTRIBUTABLE_SOURCES.has(source))
+}
+
const applySearchParamsFilter = (search: QuerySearchParamsType): SafeLogSqlFragment | null => {
const conditions: SafeLogSqlFragment[] = []
+ const userCondition = userAttributionCondition(search)
+ if (userCondition) conditions.push(userCondition)
+
// Visible by default — only an explicit `false` hides connection logs.
if (search.show_connection_logs === false) {
conditions.push(safeSql`(source != 'postgres_logs' OR (
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
index 6453c9b780d..7981955ec75 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
@@ -43,6 +43,7 @@ import {
parseLogsFilterUrlParams,
} from './UnifiedLogs.filters'
import { useLiveMode, useResetFocus } from './UnifiedLogs.hooks'
+import { isUserFilterUnreachable } from './UnifiedLogs.queries'
import { ColumnSchema } from './UnifiedLogs.schema'
import { QuerySearchParamsType } from './UnifiedLogs.types'
import {
@@ -483,6 +484,16 @@ export const UnifiedLogs = () => {
setColumnOrder={setColumnOrder}
setColumnVisibility={setColumnVisibility}
searchParamsParser={SEARCH_PARAMS_PARSER}
+ emptyStateMessage={
+ isUserFilterUnreachable(search) ? (
+ <div className="text-sm flex flex-col gap-y-1">
+ <p className="text-foreground-light">No results found</p>
+ <p className="text-foreground-lighter">
+ Filtering by user is only supported for Auth and Postgres log types
+ </p>
+ </div>
+ ) : undefined
+ }
/>
</div>
</ResizablePanel>
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts
index ad43604bf36..9d4f493efc0 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts
@@ -11,16 +11,20 @@ export type UnifiedLogType = keyof typeof LOG_TYPES_LABELS
export const buildUnifiedLogsUrl = ({
projectRef,
logType,
+ user,
start,
end,
}: {
projectRef: string
- logType: UnifiedLogType
+ logType?: UnifiedLogType
+ /** Pre-applies the cross-cutting "filter by user" (?user=) — an id or email. */
+ user?: string
start?: string | Date
end?: string | Date
}) => {
const params = new URLSearchParams()
- params.append('filter', `log_type:eq:${logType}`)
+ if (logType) params.append('filter', `log_type:eq:${logType}`)
+ if (user) params.set('user', user)
if (start && end) {
params.set('date', `${new Date(start).valueOf()}-${new Date(end).valueOf()}`)
}
diff --git a/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.tsx b/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.tsx
index 4596974f61f..6e985f95a8b 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.tsx
@@ -1,11 +1,12 @@
+import { useParams } from 'common'
import { LoaderCircle, Search } from 'lucide-react'
+import { parseAsString, useQueryState } from 'nuqs'
import { useEffect, useEffectEvent, useRef, useState } from 'react'
import {
FilterBar,
FilterCondition,
type FilterBarHandle,
type FilterGroup,
- type FilterProperty,
} from 'ui-patterns/FilterBar'
import {
@@ -13,7 +14,11 @@ import {
type LogsColumnFilterValue,
type LogsFilterOperator,
} from '../UnifiedLogs.filters'
+import { buildFilterProperties, getUserFilterValue, USER_PROPERTY } from './LogsFilterBar.utils'
+import { searchAuthUsers } from '@/components/interfaces/UserJourneys/UserJourneys.queries'
import { useDataTable } from '@/components/ui/DataTable/providers/DataTableProvider'
+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { UUID_REGEX } from '@/lib/constants'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -41,44 +46,67 @@ const buildFilterGroup = (
}
export const LogsFilterBar = () => {
+ const { ref: projectRef } = useParams()
+ const { data: project } = useSelectedProjectQuery()
const { table, filterFields, columnFilters, isFetching } = useDataTable()
- const filterBarRef = useRef<FilterBarHandle>(null)
useShortcut(SHORTCUT_IDS.UNIFIED_LOGS_FOCUS_FILTER, () => filterBarRef.current?.focus(), {
registerInCommandMenu: true,
})
+ const filterBarRef = useRef<FilterBarHandle>(null)
const [freeformText, setFreeformText] = useState('')
- const filterProperties: FilterProperty[] = filterFields
- .filter((x) => x.type !== 'timerange')
- .map((filter) => ({
- label: filter.label,
- name: filter.value,
- type: 'string',
- options: filter.options ?? [],
- operators:
- filter.value === 'event_message'
- ? [
- { label: 'iLike', value: '~~*', group: 'pattern' },
- { label: 'Not iLike', value: '!~~*', group: 'pattern' },
- ]
- : [
- { label: 'Equals', value: '=', group: 'comparison' },
- { label: 'Not equal', value: '<>', group: 'comparison' },
- ],
- }))
+ // [Joshen] We're separately declaring useQueryState for user here, as there's no "user" column
+ // in the Tanstack table.
+ const [user, setUser] = useQueryState(USER_PROPERTY, parseAsString)
+
+ // A UUID is matched exactly rather than searched (it's already a resolved id, not a keyword).
+ const searchUserOptions = async (search?: string) => {
+ const value = search?.trim() ?? ''
+ if (UUID_REGEX.test(value)) return [{ label: value, value }]
+ if (!projectRef) return []
+ const users = await searchAuthUsers(projectRef, project?.connectionString ?? null, value).catch(
+ () => []
+ )
+ return users.map((u) => ({ label: u.email ?? u.id, value: u.id }))
+ }
+
+ const filterProperties = buildFilterProperties({
+ fields: filterFields,
+ userOptions: searchUserOptions,
+ })
+
+ const withUserCondition = (group: FilterGroup): FilterGroup => {
+ if (!user) return group
+ return {
+ ...group,
+ conditions: [
+ ...group.conditions,
+ { propertyName: USER_PROPERTY, value: user, operator: '=' },
+ ],
+ }
+ }
+
+ const columnBackedNames = new Set(
+ filterProperties.map((p) => p.name).filter((name) => name !== USER_PROPERTY)
+ )
// Local state because the FilterBar carries transient states
const [filters, setFilters] = useState<FilterGroup>(() =>
- buildFilterGroup(columnFilters, new Set(filterProperties.map((p) => p.name)))
+ withUserCondition(buildFilterGroup(columnFilters, columnBackedNames))
)
- // Read latest filterProperties without making the effect depend on its (per-render) identity.
+ // Read latest values without making the effect depend on their (per-render) identity.
const syncFromColumnFilters = useEffectEvent(() => {
- setFilters(buildFilterGroup(columnFilters, new Set(filterProperties.map((p) => p.name))))
+ setFilters(withUserCondition(buildFilterGroup(columnFilters, columnBackedNames)))
})
+ const applyUser = (raw: string | undefined) => {
+ const value = raw?.trim() ?? ''
+ setUser(value || null)
+ }
+
// No nested conditions in unified logs — type-cast to FilterCondition on read.
const onApply = (next: FilterGroup) => {
const isValid = next.conditions.every(
@@ -89,10 +117,11 @@ export const LogsFilterBar = () => {
)
if (!isValid) return
- // Coalesce conditions into one wrapped value per column. Mixed operators on
- // the same column aren't expressible in the column-filter shape — last wins.
+ applyUser(getUserFilterValue(next.conditions as FilterCondition[]))
+
const wrappedByColumn = new Map<string, LogsColumnFilterValue>()
for (const cond of next.conditions as FilterCondition[]) {
+ if (cond.propertyName === USER_PROPERTY) continue
const operator = cond.operator as LogsFilterOperator
const existing = wrappedByColumn.get(cond.propertyName)
if (!existing) {
@@ -109,11 +138,10 @@ export const LogsFilterBar = () => {
// Only clear filters owned by this bar — leaves externally-set filters
// (e.g. the timeline date range) untouched.
- const managedNames = new Set(filterProperties.map((p) => p.name))
const nextNames = new Set(wrappedByColumn.keys())
const filtersToRemove = table
.getState()
- .columnFilters.filter((x) => managedNames.has(x.id) && !nextNames.has(x.id))
+ .columnFilters.filter((x) => columnBackedNames.has(x.id) && !nextNames.has(x.id))
filtersToRemove.forEach((x) => {
table.getColumn(x.id)?.setFilterValue(undefined)
})
@@ -122,7 +150,7 @@ export const LogsFilterBar = () => {
useEffect(() => {
syncFromColumnFilters()
// eslint-disable-next-line react-hooks/exhaustive-deps -- useEffectEvent fn intentionally not a dep (eslint-plugin-react-hooks v5 doesn't recognize stable useEffectEvent yet)
- }, [columnFilters])
+ }, [columnFilters, user])
return (
<FilterBar
diff --git a/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.utils.test.ts b/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.utils.test.ts
new file mode 100644
index 00000000000..96af8707399
--- /dev/null
+++ b/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.utils.test.ts
@@ -0,0 +1,117 @@
+import { describe, expect, it } from 'vitest'
+import { z } from 'zod'
+
+import {
+ buildFilterProperties,
+ filterPropertySchema,
+ getUserFilterValue,
+ USER_PROPERTY,
+ type FilterableField,
+} from './LogsFilterBar.utils'
+
+describe('buildFilterProperties', () => {
+ const fields: FilterableField[] = [
+ { label: 'Date', value: 'date', type: 'timerange' },
+ {
+ label: 'Log type',
+ value: 'log_type',
+ type: 'checkbox',
+ options: [{ label: 'Postgres', value: 'postgres' }],
+ },
+ { label: 'Event message', value: 'event_message', type: 'input' },
+ ]
+
+ it('produces properties that all satisfy the FilterProperty schema', () => {
+ const result = buildFilterProperties({ fields })
+ expect(() => filterPropertySchema.array().parse(result)).not.toThrow()
+ })
+
+ it('drops timerange fields and appends the synthetic user property last', () => {
+ const names = buildFilterProperties({ fields }).map((property) => property.name)
+ expect(names).not.toContain('date')
+ expect(names).toEqual(['log_type', 'event_message', USER_PROPERTY])
+ })
+
+ it('gives the event_message column pattern (ILIKE) operators', () => {
+ const eventMessage = buildFilterProperties({ fields }).find(
+ (property) => property.name === 'event_message'
+ )
+ expect(eventMessage?.operators).toEqual([
+ { label: 'iLike', value: '~~*', group: 'pattern' },
+ { label: 'Not iLike', value: '!~~*', group: 'pattern' },
+ ])
+ })
+
+ it('gives every other column comparison operators', () => {
+ const logType = buildFilterProperties({ fields }).find(
+ (property) => property.name === 'log_type'
+ )
+ expect(logType?.operators).toEqual([
+ { label: 'Equals', value: '=', group: 'comparison' },
+ { label: 'Not equal', value: '<>', group: 'comparison' },
+ ])
+ })
+
+ it('defaults a column without options to an empty array', () => {
+ const eventMessage = buildFilterProperties({ fields }).find(
+ (property) => property.name === 'event_message'
+ )
+ expect(eventMessage?.options).toEqual([])
+ })
+
+ it('appends a user property limited to the equals operator', () => {
+ const user = buildFilterProperties({ fields }).find(
+ (property) => property.name === USER_PROPERTY
+ )
+ expect(user).toEqual({
+ label: 'User',
+ name: USER_PROPERTY,
+ type: 'string',
+ options: [],
+ operators: [{ label: 'Equals', value: '=', group: 'comparison' }],
+ })
+ })
+
+ it('wires a provided async options function into the user property', () => {
+ const userOptions = async () => []
+ const user = buildFilterProperties({ fields, userOptions }).find(
+ (property) => property.name === USER_PROPERTY
+ )
+ expect(user?.options).toBe(userOptions)
+ })
+})
+
+describe('getUserFilterValue', () => {
+ const resultSchema = z.string().optional()
+
+ it('returns the user condition value coerced to a string, validated by schema', () => {
+ const result = getUserFilterValue([
+ { propertyName: 'log_type', value: 'postgres', operator: '=' },
+ { propertyName: USER_PROPERTY, value: '[email protected]', operator: '=' },
+ ])
+ expect(() => resultSchema.parse(result)).not.toThrow()
+ expect(result).toBe('[email protected]')
+ })
+
+ it('coerces a non-string condition value to a string', () => {
+ const result = getUserFilterValue([{ propertyName: USER_PROPERTY, value: 42, operator: '=' }])
+ expect(() => resultSchema.parse(result)).not.toThrow()
+ expect(result).toBe('42')
+ })
+
+ it('returns undefined when no user condition is present', () => {
+ const result = getUserFilterValue([
+ { propertyName: 'log_type', value: 'postgres', operator: '=' },
+ ])
+ expect(() => resultSchema.parse(result)).not.toThrow()
+ expect(result).toBeUndefined()
+ })
+
+ it('returns the first user condition value when several are present', () => {
+ const result = getUserFilterValue([
+ { propertyName: USER_PROPERTY, value: 'first', operator: '=' },
+ { propertyName: USER_PROPERTY, value: 'second', operator: '=' },
+ ])
+ expect(result).toBe('first')
+ })
+})
diff --git a/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.utils.ts b/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.utils.ts
new file mode 100644
index 00000000000..6dac6208a45
--- /dev/null
+++ b/apps/studio/components/interfaces/UnifiedLogs/components/LogsFilterBar.utils.ts
@@ -0,0 +1,74 @@
+import {
+ type AsyncOptionsFunction,
+ type FilterCondition,
+ type FilterProperty,
+} from 'ui-patterns/FilterBar'
+import { z } from 'zod'
+
+import type { Option } from '@/components/ui/DataTable/DataTable.types'
+
+export const USER_PROPERTY = 'user'
+
+export type FilterableField = {
+ label: string
+ value: string
+ type: string
+ options?: Option[]
+}
+
+const filterOperatorSchema = z.object({
+ label: z.string(),
+ value: z.string(),
+ group: z.string().optional(),
+})
+
+export const filterPropertySchema = z.object({
+ label: z.string(),
+ name: z.string(),
+ type: z.enum(['string', 'number', 'date', 'boolean']),
+ options: z.union([z.array(z.any()), z.function()]).optional(),
+ operators: z.array(filterOperatorSchema).optional(),
+})
+
+export const buildFilterProperties = ({
+ fields,
+ userOptions,
+}: {
+ fields: FilterableField[]
+ userOptions?: AsyncOptionsFunction
+}): FilterProperty[] => {
+ return [
+ ...fields
+ .filter((field) => field.type !== 'timerange')
+ .map(
+ (field): FilterProperty => ({
+ label: field.label,
+ name: field.value,
+ type: 'string',
+ options: field.options ?? [],
+ operators:
+ field.value === 'event_message'
+ ? [
+ { label: 'iLike', value: '~~*', group: 'pattern' },
+ { label: 'Not iLike', value: '!~~*', group: 'pattern' },
+ ]
+ : [
+ { label: 'Equals', value: '=', group: 'comparison' },
+ { label: 'Not equal', value: '<>', group: 'comparison' },
+ ],
+ })
+ ),
+ {
+ label: 'User',
+ name: USER_PROPERTY,
+ type: 'string',
+ options: userOptions ?? [],
+ operators: [{ label: 'Equals', value: '=', group: 'comparison' }],
+ },
+ ]
+}
+
+export const getUserFilterValue = (conditions: FilterCondition[]): string | undefined => {
+ const userCondition = conditions.find((condition) => condition.propertyName === USER_PROPERTY)
+ return userCondition ? String(userCondition.value) : undefined
+}
diff --git a/apps/studio/components/interfaces/UnifiedLogs/components/UserLogFilterControl.tsx b/apps/studio/components/interfaces/UnifiedLogs/components/UserLogFilterControl.tsx
new file mode 100644
index 00000000000..f69725913f7
--- /dev/null
+++ b/apps/studio/components/interfaces/UnifiedLogs/components/UserLogFilterControl.tsx
@@ -0,0 +1,129 @@
+import { keepPreviousData } from '@tanstack/react-query'
+import { useDebounce } from '@uidotdev/usehooks'
+import { useParams } from 'common'
+import { Loader2, Search, X } from 'lucide-react'
+import { parseAsString, useQueryState } from 'nuqs'
+import { useMemo, useState } from 'react'
+import { AccordionContent, AccordionItem, AccordionTrigger, Button, Checkbox, cn, Label } from 'ui'
+import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
+
+import { InputWithAddons } from '@/components/ui/DataTable/primitives/InputWithAddons'
+import { useUsersInfiniteQuery } from '@/data/auth/users-infinite-query'
+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+
+type UserOption = { id: string; email: string | null }
+
+export const UserLogFilterControl = () => {
+ const { ref: projectRef } = useParams()
+ const { data: project } = useSelectedProjectQuery()
+
+ const [user, setUser] = useQueryState('user', parseAsString)
+ const [search, setSearch] = useState('')
+ const debouncedSearch = useDebounce(search, 700)
+
+ const { data, isFetching, isPending } = useUsersInfiniteQuery(
+ {
+ projectRef,
+ connectionString: project?.connectionString,
+ keywords: debouncedSearch.trim(),
+ sort: 'id',
+ order: 'asc',
+ },
+ { placeholderData: keepPreviousData }
+ )
+
+ const results: UserOption[] = useMemo(
+ () =>
+ (data?.pages[0]?.result ?? [])
+ .filter((u): u is typeof u & { id: string } => !!u.id)
+ .map((u) => ({ id: u.id, email: u.email ?? null })),
+ [data?.pages]
+ )
+
+ // Only one user can be filtered on at a time — keep the current selection visible (and
+ // checked) even if it falls outside the current search results, e.g. right after loading
+ // from a deep link.
+ const options: UserOption[] =
+ user && !results.some((u) => u.id === user) ? [{ id: user, email: null }, ...results] : results
+
+ const toggle = (id: string) => setUser(id === user ? null : id)
+
+ return (
+ <AccordionItem value="user" 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">User</p>
+ </div>
+ </AccordionTrigger>
+ {user ? (
+ <Button
+ type="button"
+ variant="outline"
+ icon={<X />}
+ className="h-5 rounded-full px-1.5 py-1 font-mono text-[10px] [&>span]:translate-y-[-0.6px] space-x-1"
+ aria-label="Clear user filter"
+ onClick={(e) => {
+ e.stopPropagation()
+ setUser(null)
+ }}
+ >
+ 1
+ </Button>
+ ) : null}
+ </div>
+ <AccordionContent>
+ <div className="p-1 grid gap-2">
+ <InputWithAddons
+ placeholder="Search by email or id"
+ leading={<Search size={14} className="text-foreground-lighter" />}
+ containerClassName="h-8 rounded-sm"
+ value={search}
+ trailing={isFetching ? <Loader2 size={12} className="animate-spin" /> : undefined}
+ onChange={(e) => setSearch(e.target.value)}
+ />
+
+ <div className="max-h-[215px] overflow-y-auto rounded-sm border border-border empty:border-none">
+ {isPending ? (
+ <div className="p-2">
+ <GenericSkeletonLoader />
+ </div>
+ ) : options.length === 0 ? (
+ <div className="flex items-center justify-center px-2 py-3 text-center">
+ <p className="text-xs text-foreground-lighter">No users found</p>
+ </div>
+ ) : (
+ options.map((option, index) => {
+ const checked = option.id === user
+
+ return (
+ <div
+ key={option.id}
+ className={cn(
+ 'group flex items-center gap-2 px-2 py-2 hover:bg-accent/50',
+ index !== options.length - 1 ? 'border-b' : undefined
+ )}
+ >
+ <Checkbox
+ id={`user-${option.id}`}
+ checked={checked}
+ onCheckedChange={() => toggle(option.id)}
+ />
+ <Label
+ htmlFor={`user-${option.id}`}
+ className="flex-1 min-w-0 text-[0.8rem] text-foreground/70 group-hover:text-accent-foreground"
+ >
+ <span className="truncate font-normal block">
+ {option.email ?? option.id}
+ </span>
+ </Label>
+ </div>
+ )
+ })
+ )}
+ </div>
+ </div>
+ </AccordionContent>
+ </AccordionItem>
+ )
+}
diff --git a/apps/studio/components/interfaces/UserJourneys/UserJourneys.queries.ts b/apps/studio/components/interfaces/UserJourneys/UserJourneys.queries.ts
new file mode 100644
index 00000000000..111c0a1b596
--- /dev/null
+++ b/apps/studio/components/interfaces/UserJourneys/UserJourneys.queries.ts
@@ -0,0 +1,44 @@
+import { getPaginatedUsersSQL } from '@supabase/pg-meta'
+
+import { authKeys } from '@/data/auth/keys'
+import { getQueryClient } from '@/data/query-client'
+import { executeSql } from '@/data/sql/execute-sql-mutation'
+
+export interface JourneyUser {
+ id: string
+ email: string | null
+ createdAt: string | null
+ lastSignInAt: string | null
+}
+
+export async function searchAuthUsers(
+ projectRef: string,
+ connectionString: string | null,
+ keywords: string,
+ signal?: AbortSignal
+): Promise<JourneyUser[]> {
+ const queryClient = getQueryClient()
+ const result = await queryClient.fetchQuery<
+ { id: string; email: string | null; created_at: string; last_sign_in_at: string | null }[]
+ >({
+ // eslint-disable-next-line @tanstack/query/exhaustive-deps
+ queryKey: authKeys.usersSearch(projectRef, keywords),
+ queryFn: () => {
+ const sql = getPaginatedUsersSQL({
+ keywords,
+ limit: 20,
+ sort: 'id',
+ order: 'asc',
+ })
+ return executeSql<
+ { id: string; email: string | null; created_at: string; last_sign_in_at: string | null }[]
+ >({ projectRef, connectionString, sql }, signal).then((res) => res.result)
+ },
+ })
+ return result.map((row) => ({
+ id: row.id,
+ email: row.email,
+ createdAt: row.created_at,
+ lastSignInAt: row.last_sign_in_at,
+ }))
+}
diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControls.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControls.tsx
index e13a8906643..e5d299a0b96 100644
--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControls.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControls.tsx
@@ -1,3 +1,4 @@
+import { Fragment, type ReactNode } from 'react'
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from 'ui'
import { DateRangeDisabled } from '../DataTable.types'
@@ -17,10 +18,13 @@ import { DataTableFilterTimerange } from './DataTableFilterTimerange'
interface DataTableFilterControls {
dateRangeDisabled?: DateRangeDisabled
+ /** Extra accordion items to render immediately after the field whose `value` is the key. */
+ itemsAfter?: Record<string, ReactNode>
}
export function DataTableFilterControls({
dateRangeDisabled: _dateRangeDisabled,
+ itemsAfter,
}: DataTableFilterControls) {
const { filterFields, isLoadingCounts } = useDataTable()
return (
@@ -35,46 +39,49 @@ export function DataTableFilterControls({
.map((field) => {
const value = field.value as string
return (
- <AccordionItem key={value} value={value} 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">{field.label}</p>
- </div>
- </AccordionTrigger>
- <DataTableFilterResetButton {...field} />
- </div>
- <AccordionContent>
- {/* REMINDER: avoid the focus state to be cut due to overflow-hidden */}
- {/* REMINDER: need to move within here because of accordion height animation */}
- <div className="p-1">
- {(() => {
- switch (field.type) {
- case 'checkbox': {
- // [Joshen] Loader here so that CheckboxAsync can retrieve the data
- // immediately to be set in its react query state
- if (field.hasDynamicOptions && isLoadingCounts) {
- return <DataTableFilterCheckboxLoader />
- } else if (field.hasAsyncSearch) {
- return <DataTableFilterCheckboxAsync {...field} />
- } else {
- return <DataTableFilterCheckbox {...field} />
+ <Fragment key={value}>
+ <AccordionItem value={value} 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">{field.label}</p>
+ </div>
+ </AccordionTrigger>
+ <DataTableFilterResetButton {...field} />
+ </div>
+ <AccordionContent>
+ {/* REMINDER: avoid the focus state to be cut due to overflow-hidden */}
+ {/* REMINDER: need to move within here because of accordion height animation */}
+ <div className="p-1">
+ {(() => {
+ switch (field.type) {
+ case 'checkbox': {
+ // [Joshen] Loader here so that CheckboxAsync can retrieve the data
+ // immediately to be set in its react query state
+ if (field.hasDynamicOptions && isLoadingCounts) {
+ return <DataTableFilterCheckboxLoader />
+ } else if (field.hasAsyncSearch) {
+ return <DataTableFilterCheckboxAsync {...field} />
+ } else {
+ return <DataTableFilterCheckbox {...field} />
+ }
+ }
+ case 'slider': {
+ return <DataTableFilterSlider {...field} />
+ }
+ case 'input': {
+ return <DataTableFilterInput {...field} />
+ }
+ case 'timerange': {
+ return <DataTableFilterTimerange {...field} />
}
}
- case 'slider': {
- return <DataTableFilterSlider {...field} />
- }
- case 'input': {
- return <DataTableFilterInput {...field} />
- }
- case 'timerange': {
- return <DataTableFilterTimerange {...field} />
- }
- }
- })()}
- </div>
- </AccordionContent>
- </AccordionItem>
+ })()}
+ </div>
+ </AccordionContent>
+ </AccordionItem>
+ {itemsAfter?.[value] ?? null}
+ </Fragment>
)
})}
</Accordion>
diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
index 1e89501fc94..71700a6f8a9 100644
--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
@@ -19,6 +19,7 @@ import {
import { useMediaQuery } from '../hooks/useMediaQuery'
import { Kbd } from '../primitives/Kbd'
import { DataTableFilterControls } from './DataTableFilterControls'
+import { UserLogFilterControl } from '@/components/interfaces/UnifiedLogs/components/UserLogFilterControl'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -63,7 +64,7 @@ export function DataTableFilterControlsDrawer() {
</DrawerHeader>
</VisuallyHidden.VisuallyHidden>
<div className="px-4 flex-1 overflow-y-auto">
- <DataTableFilterControls />
+ <DataTableFilterControls itemsAfter={{ level: <UserLogFilterControl /> }} />
</div>
<DrawerFooter>
<DrawerClose asChild>
diff --git a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx b/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
index 43dddc72634..179558cd4c0 100644
--- a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableInfinite.tsx
@@ -3,7 +3,7 @@ import type { ColumnDef, Row, Table as TTable, VisibilityState } from '@tanstack
import { flexRender } from '@tanstack/react-table'
import { LoaderCircle } from 'lucide-react'
import { useQueryState } from 'nuqs'
-import { Fragment, UIEvent, useCallback, useRef } from 'react'
+import { Fragment, ReactNode, UIEvent, useCallback, useRef } from 'react'
import { Button, cn, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from 'ui'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
@@ -27,6 +27,8 @@ export interface DataTableInfiniteProps<TData, TValue, _TMeta> {
fetchNextPage: (options?: FetchNextPageOptions | undefined) => Promise<unknown>
setColumnOrder: (columnOrder: string[]) => void
setColumnVisibility: (columnVisibility: VisibilityState) => void
+ /** Overrides the "No results found" copy shown when the current filters can't match any row. */
+ emptyStateMessage?: string | ReactNode
// [Joshen] See if we can type this properly
searchParamsParser: any
@@ -43,6 +45,7 @@ export function DataTableInfinite<TData, TValue, TMeta>({
totalRowsFetched = 0,
setColumnOrder,
setColumnVisibility,
+ emptyStateMessage = 'No results found',
searchParamsParser,
}: DataTableInfiniteProps<TData, TValue, TMeta>) {
const tableRef = useRef<HTMLTableElement>(null)
@@ -193,7 +196,11 @@ export function DataTableInfinite<TData, TValue, TMeta>({
className={cn(TableCellClassName, 'text-center')}
>
<div className="flex flex-col items-center justify-center h-full gap-3">
- <p className="text-foreground-light text-sm">No results found</p>
+ {typeof emptyStateMessage === 'string' ? (
+ <p className="text-foreground-light text-sm">{emptyStateMessage}</p>
+ ) : (
+ emptyStateMessage
+ )}
</div>
</TableCell>
</TableRow>
diff --git a/apps/studio/components/ui/DataTable/DataTableResetButton.tsx b/apps/studio/components/ui/DataTable/DataTableResetButton.tsx
index 7cc8a49fd26..158326bb76f 100644
--- a/apps/studio/components/ui/DataTable/DataTableResetButton.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableResetButton.tsx
@@ -6,9 +6,19 @@ import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
-export function DataTableResetButton() {
+export interface DataTableResetButtonProps {
+ /** Called alongside `table.resetColumnFilters()` — for filters that live outside TanStack Table's columnFilters state (e.g. a cross-cutting URL param). */
+ onReset?: () => void
+}
+
+export function DataTableResetButton({ onReset }: DataTableResetButtonProps) {
const { table } = useDataTable()
- useShortcut(SHORTCUT_IDS.DATA_TABLE_RESET_FILTERS, () => table.resetColumnFilters(), {
+ const reset = () => {
+ table.resetColumnFilters()
+ onReset?.()
+ }
+
+ useShortcut(SHORTCUT_IDS.DATA_TABLE_RESET_FILTERS, reset, {
registerInCommandMenu: true,
})
@@ -18,7 +28,7 @@ export function DataTableResetButton() {
label="Reset filters"
side="left"
>
- <Button variant="default" size="tiny" onClick={() => table.resetColumnFilters()} icon={<X />}>
+ <Button variant="default" size="tiny" onClick={reset} icon={<X />}>
Reset
</Button>
</ShortcutTooltip>
diff --git a/apps/studio/components/ui/DataTable/FilterSideBar.tsx b/apps/studio/components/ui/DataTable/FilterSideBar.tsx
index 71fb110655c..09f408c004c 100644
--- a/apps/studio/components/ui/DataTable/FilterSideBar.tsx
+++ b/apps/studio/components/ui/DataTable/FilterSideBar.tsx
@@ -1,5 +1,6 @@
import { useParams } from 'common'
import Link from 'next/link'
+import { parseAsString, useQueryState } from 'nuqs'
import { cloneElement, Dispatch, SetStateAction, useEffect } from 'react'
import { Badge, Button, cn, ResizablePanel, usePanelRef } from 'ui'
@@ -9,6 +10,7 @@ import { DataTableFilterControls } from './DataTableFilters/DataTableFilterContr
import { DataTableResetButton } from './DataTableResetButton'
import { useDataTable } from './providers/DataTableProvider'
import { LOG_DRAIN_TYPES } from '@/components/interfaces/LogDrains/LogDrains.constants'
+import { UserLogFilterControl } from '@/components/interfaces/UnifiedLogs/components/UserLogFilterControl'
import { UnifiedLogsBanner } from '@/components/interfaces/UnifiedLogs/UnifiedLogsBanner'
interface FilterSideBarProps {
@@ -24,6 +26,7 @@ export function FilterSideBar({
}: FilterSideBarProps) {
const { ref } = useParams()
const { table } = useDataTable()
+ const [user, setUser] = useQueryState('user', parseAsString)
const panelRef = usePanelRef()
@@ -58,14 +61,19 @@ export function FilterSideBar({
<p className="text-foreground text-lg">Logs</p>
<Badge variant="default">Beta</Badge>
</div>
- {table.getState().columnFilters.length ? <DataTableResetButton /> : null}
+ {table.getState().columnFilters.length || user ? (
+ <DataTableResetButton onReset={() => setUser(null)} />
+ ) : null}
</div>
</div>
<UnifiedLogsBanner />
<div className="flex-1 p-2 sm:overflow-y-scroll">
- <DataTableFilterControls dateRangeDisabled={dateRangeDisabled} />
+ <DataTableFilterControls
+ dateRangeDisabled={dateRangeDisabled}
+ itemsAfter={{ level: <UserLogFilterControl /> }}
+ />
<FeaturePreviewSidebarPanel
className="mx-2 my-4"
title="Capture your logs"
diff --git a/apps/studio/data/auth/keys.ts b/apps/studio/data/auth/keys.ts
index baf29ce6dc1..b1b4cb6cd37 100644
--- a/apps/studio/data/auth/keys.ts
+++ b/apps/studio/data/auth/keys.ts
@@ -14,6 +14,8 @@ export const authKeys = {
column?: OptimizedSearchColumns
}
) => ['projects', projectRef, 'users-infinite', params].filter(Boolean),
+ usersSearch: (projectRef: string | undefined, keywords: string) =>
+ ['projects', projectRef, 'users-search', keywords] as const,
usersCount: (
projectRef: string | undefined,
params?: {
diff --git a/packages/ui-patterns/src/FilterBar/CommandListItem.tsx b/packages/ui-patterns/src/FilterBar/CommandListItem.tsx
index ec450b2f84e..774d92e5ae4 100644
--- a/packages/ui-patterns/src/FilterBar/CommandListItem.tsx
+++ b/packages/ui-patterns/src/FilterBar/CommandListItem.tsx
@@ -26,7 +26,7 @@ export function CommandListItem({
onClick={() => onSelect(item)}
className={cn(
'relative flex items-center justify-between gap-2 px-2 h-[28px] text-xs cursor-pointer select-none outline-hidden text-foreground',
- isHighlighted && 'bg-surface-300',
+ isHighlighted && 'bg-overlay-hover',
!isHighlighted && 'hover:bg-surface-200'
)}
data-testid={`filter-menu-item-${item.value}`}