The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Add source filter in query performance page (#43740)
Joshen Limcc31ed72c10a
diff --git a/apps/studio/components/interfaces/Home/AdvisorWidget.tsx b/apps/studio/components/interfaces/Home/AdvisorWidget.tsxindex e81295f82f7..47b6cfc2a91 100644--- a/apps/studio/components/interfaces/Home/AdvisorWidget.tsx+++ b/apps/studio/components/interfaces/Home/AdvisorWidget.tsx@@ -1,7 +1,6 @@import { useParams } from 'common'import { LINTER_LEVELS } from 'components/interfaces/Linter/Linter.constants'import { createLintSummaryPrompt, EntityTypeIcon } from 'components/interfaces/Linter/Linter.utils'-import { useQueryPerformanceQuery } from 'components/interfaces/Reports/Reports.queries'import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { AiAssistantDropdown } from 'components/ui/AiAssistantDropdown'import { ButtonTooltip } from 'components/ui/ButtonTooltip'@@ -31,6 +30,8 @@ import {} from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { useQueryPerformanceQuery } from '../QueryPerformance/useQueryPerformanceQuery'+interface SlowQuery {rolname: stringmean_time: number@@ -43,9 +44,7 @@ export const AdvisorWidget = () => {const [selectedTab, setSelectedTab] = useState<'security' | 'performance'>('security')const { data: lints, isPending: isLoadingLints } = useProjectLintsQuery({ projectRef })const { data: slowestQueriesData, isLoading: isLoadingSlowestQueries } = useQueryPerformanceQuery(- {- preset: 'slowestExecutionTime',- }+ { preset: 'slowestExecutionTime' })const snap = useAiAssistantStateSnapshot()const { openSidebar } = useSidebarManagerSnapshot()diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.ts b/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.tsindex 03b2b9d8300..cbd2e9794cb 100644--- a/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.ts+++ b/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.ts@@ -19,3 +19,40 @@ export interface QueryPerformanceRow {_count?: numberfirst_seen?: string}++export type QueryPerformancePreset =+ | 'mostFrequentlyInvoked'+ | 'mostTimeConsuming'+ | 'slowestExecutionTime'+ | 'queryHitRate'+ | 'unified'+ | 'slowQueriesCount'+ | 'queryMetrics'++export type QueryPerformanceSort = {+ column:+ | 'query'+ | 'rolname'+ | 'total_time'+ | 'prop_total_time'+ | 'calls'+ | 'avg_rows'+ | 'max_time'+ | 'mean_time'+ | 'min_time'+ order: 'asc' | 'desc'+}++export type QuerySource = 'dashboard' | 'non-dashboard'++export type QueryPerformanceSQLParams = {+ preset: QueryPerformancePreset+ orderBy?: QueryPerformanceSort+ searchQuery?: string+ roles?: string[]+ sources?: QuerySource[]+ minCalls?: number+ minTotalTime?: number+ runIndexAdvisor?: boolean+ filterIndexAdvisor?: boolean+}diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceFilterBar.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceFilterBar.tsxindex 9cf6198bc35..0d9b9819c50 100644--- a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceFilterBar.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceFilterBar.tsx@@ -1,24 +1,28 @@-import { parseAsArrayOf, parseAsJson, parseAsString, useQueryStates } from 'nuqs'-import { ReactNode, useEffect, useState } from 'react'import {NumericFilter,ReportsNumericFilter,} from 'components/interfaces/Reports/v2/ReportsNumericFilter'+import { useDebouncedValue } from 'hooks/misc/useDebouncedValue'+import { parseAsArrayOf, parseAsJson, parseAsString, useQueryStates } from 'nuqs'+import { ReactNode, useEffect, useState } from 'react'+import { FilterInput } from './components/FilterInput'import { FilterPill } from './components/FilterPill'import { IndexAdvisorFilter } from './components/IndexAdvisorFilter'import { RolesFilterDropdown } from './components/RolesFilterDropdown'import { SortIndicator } from './components/SortIndicator'+import { SourceFilterDropdown } from './components/SourceFilterDropdown'import { useIndexAdvisorStatus } from './hooks/useIsIndexAdvisorStatus'import { useQueryPerformanceSort } from './hooks/useQueryPerformanceSort'-import { useDebouncedValue } from 'hooks/misc/useDebouncedValue'export const QueryPerformanceFilterBar = ({actions,showRolesFilter = false,+ showSourceFilter = false,}: {actions?: ReactNodeshowRolesFilter?: boolean+ showSourceFilter?: boolean}) => {const { sort, clearSort } = useQueryPerformanceSort()const { isIndexAdvisorEnabled } = useIndexAdvisorStatus()@@ -27,6 +31,7 @@ export const QueryPerformanceFilterBar = ({{search: searchQuery,roles: defaultFilterRoles,+ sources: defaultFilterSources,callsFilter: callsFilterRaw,totalTimeFilter: totalTimeFilterRaw,indexAdvisor,@@ -35,6 +40,7 @@ export const QueryPerformanceFilterBar = ({] = useQueryStates({search: parseAsString.withDefault(''),roles: parseAsArrayOf(parseAsString).withDefault([]),+ sources: parseAsArrayOf(parseAsString).withDefault([]),callsFilter: parseAsJson<NumericFilter | null>((value) =>value === null || value === undefined ? null : (value as NumericFilter)),@@ -47,8 +53,9 @@ export const QueryPerformanceFilterBar = ({const callsFilter = callsFilterRaw ?? nullconst totalTimeFilter = totalTimeFilterRaw ?? null- const [filters, setFilters] = useState<{ roles: string[] }>({+ const [filters, setFilters] = useState<{ roles: string[]; sources: string[] }>({roles: defaultFilterRoles,+ sources: defaultFilterSources,})const [inputValue, setInputValue] = useState(searchQuery)@@ -61,6 +68,11 @@ export const QueryPerformanceFilterBar = ({setSearchParams({ roles })}+ const onFilterSourcesChange = (sources: string[]) => {+ setFilters({ ...filters, sources })+ setSearchParams({ sources })+ }+const debouncedInputValue = useDebouncedValue(inputValue, 300)const onIndexAdvisorToggle = () => {@@ -139,8 +151,8 @@ export const QueryPerformanceFilterBar = ({value={filters.roles.join(', ')}onClear={(e) => {e.stopPropagation()- setFilters({ roles: [] })- setSearchParams({ roles: [] })+ setFilters({ ...filters, roles: [] })+ setSearchParams({ ...filters, roles: [] })}}/>) : (@@ -150,6 +162,13 @@ export const QueryPerformanceFilterBar = ({/>))}+ {showSourceFilter && (+ <SourceFilterDropdown+ activeOptions={filters.sources}+ onSaveFilters={onFilterSourcesChange}+ />+ )}+{isIndexAdvisorEnabled && (<IndexAdvisorFilterisActive={indexAdvisor === 'true'}diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceMetrics.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceMetrics.tsxindex de6e087098f..700e08a1470 100644--- a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceMetrics.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceMetrics.tsx@@ -1,15 +1,13 @@-import React, { useMemo } from 'react'-import { parseAsJson, useQueryStates } from 'nuqs'+import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'import { Info } from 'lucide-react'+import { parseAsJson, useQueryStates } from 'nuqs'+import React, { useMemo } from 'react'+import { cn, Skeleton, Tooltip, TooltipContent, TooltipTrigger } from 'ui'-import { Skeleton, cn, Tooltip, TooltipContent, TooltipTrigger } from 'ui'-import { useQueryPerformanceQuery } from '../Reports/Reports.queries'-import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'+import { useQueryPerformanceQuery } from './useQueryPerformanceQuery'export const QueryPerformanceMetrics = () => {- const { data: queryMetrics, isLoading } = useQueryPerformanceQuery({- preset: 'queryMetrics',- })+ const { data: queryMetrics, isLoading } = useQueryPerformanceQuery({ preset: 'queryMetrics' })const [, setSearchParams] = useQueryStates({totalTimeFilter: parseAsJson<NumericFilter | null>((value) =>diff --git a/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx b/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsxindex d604d849635..6c62842337e 100644--- a/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx@@ -1,31 +1,30 @@-import { LoadingLine, cn } from 'ui'-import { useState, useEffect, useMemo } from 'react'--import { Button } from 'ui'-import { X, RefreshCw, RotateCcw } from 'lucide-react'-import { Markdown } from '../../Markdown'-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'-import { Admonition } from 'ui-patterns'-import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'import { LOCAL_STORAGE_KEYS, useParams } from 'common'-import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { DOCS_URL, IS_PLATFORM } from 'lib/constants'-import { executeSql } from 'data/sql/execute-sql-query'-import { toast } from 'sonner'+import { PresetHookResult } from 'components/interfaces/Reports/Reports.utils'+import { ButtonTooltip } from 'components/ui/ButtonTooltip'+import { DownloadResultsButton } from 'components/ui/DownloadResultsButton'import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'import { formatDatabaseID } from 'data/read-replicas/replicas.utils'-import { PresetHookResult } from 'components/interfaces/Reports/Reports.utils'+import { executeSql } from 'data/sql/execute-sql-query'import { DbQueryHook } from 'hooks/analytics/useDbQuery'-import { QueryPerformanceMetrics } from '../QueryPerformanceMetrics'+import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'+import { DOCS_URL, IS_PLATFORM } from 'lib/constants'+import { getErrorMessage } from 'lib/get-error-message'+import { RefreshCw, RotateCcw, X } from 'lucide-react'+import { parseAsString, useQueryStates } from 'nuqs'+import { useEffect, useMemo, useState } from 'react'+import { toast } from 'sonner'+import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'+import { Button, cn, LoadingLine } from 'ui'+import { Admonition } from 'ui-patterns'+import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'++import { Markdown } from '../../Markdown'+import { captureQueryPerformanceError } from '../QueryPerformance.utils'import { QueryPerformanceFilterBar } from '../QueryPerformanceFilterBar'import { QueryPerformanceGrid } from '../QueryPerformanceGrid'+import { QueryPerformanceMetrics } from '../QueryPerformanceMetrics'import { transformStatementDataToRows } from './WithStatements.utils'-import { DownloadResultsButton } from 'components/ui/DownloadResultsButton'-import { ButtonTooltip } from 'components/ui/ButtonTooltip'-import { captureQueryPerformanceError } from '../QueryPerformance.utils'-import { getErrorMessage } from 'lib/get-error-message'-import { parseAsString, useQueryStates } from 'nuqs'interface WithStatementsProps {queryHitRate: PresetHookResult@@ -155,7 +154,8 @@ export const WithStatements = ({)}<QueryPerformanceMetrics /><QueryPerformanceFilterBar- showRolesFilter={true}+ showRolesFilter+ showSourceFilteractions={<><ButtonTooltipdiff --git a/apps/studio/components/interfaces/QueryPerformance/components/SourceFilterDropdown.tsx b/apps/studio/components/interfaces/QueryPerformance/components/SourceFilterDropdown.tsxnew file mode 100644index 00000000000..f3f1ade100e--- /dev/null+++ b/apps/studio/components/interfaces/QueryPerformance/components/SourceFilterDropdown.tsx@@ -0,0 +1,36 @@+import { FilterPopover } from 'components/ui/FilterPopover'++interface SourceFilterDropdownProps {+ activeOptions: string[]+ onSaveFilters: (options: string[]) => void+ className?: string+}++const sources = [+ {+ name: 'dashboard',+ displayName: 'Dashboard',+ },+ {+ name: 'non-dashboard',+ displayName: 'Non-dashboard',+ },+]++export const SourceFilterDropdown = ({+ activeOptions,+ onSaveFilters,+ className,+}: SourceFilterDropdownProps) => {+ return (+ <FilterPopover+ name="Source"+ options={sources}+ valueKey="name"+ labelKey="displayName"+ activeOptions={activeOptions}+ onSaveFilters={onSaveFilters}+ className={className || 'w-60'}+ />+ )+}diff --git a/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.ts b/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.tsindex 8679e85f1b2..6ebafea90c8 100644--- a/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.ts+++ b/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.ts@@ -1,22 +1,19 @@import { useQueryClient } from '@tanstack/react-query'+import { useTableIndexAdvisor } from 'components/grid/context/TableIndexAdvisorContext'+import { databaseIndexesKeys } from 'data/database-indexes/keys'+import { databaseKeys } from 'data/database/keys'+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { useRouter } from 'next/router'import { parseAsString, useQueryStates } from 'nuqs'import { useCallback } from 'react'-import {- QueryPerformanceSort,- useQueryPerformanceQuery,-} from 'components/interfaces/Reports/Reports.queries'-import { databaseIndexesKeys } from 'data/database-indexes/keys'-import { databaseKeys } from 'data/database/keys'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import {QUERY_PERFORMANCE_PRESET_MAP,QUERY_PERFORMANCE_REPORT_TYPES,} from '../QueryPerformance.constants'+import { type QueryPerformanceSort } from '../QueryPerformance.types'+import { useQueryPerformanceQuery } from '../useQueryPerformanceQuery'import { useIndexAdvisorStatus } from './useIsIndexAdvisorStatus'-import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'-import { useTableIndexAdvisor } from 'components/grid/context/TableIndexAdvisorContext'export function useIndexInvalidation() {const router = useRouter()diff --git a/apps/studio/components/interfaces/QueryPerformance/hooks/useQueryPerformanceSort.ts b/apps/studio/components/interfaces/QueryPerformance/hooks/useQueryPerformanceSort.tsindex 5cc9740a778..21bcb82075d 100644--- a/apps/studio/components/interfaces/QueryPerformance/hooks/useQueryPerformanceSort.ts+++ b/apps/studio/components/interfaces/QueryPerformance/hooks/useQueryPerformanceSort.ts@@ -1,5 +1,6 @@-import { useQueryStates, parseAsString } from 'nuqs'-import { QueryPerformanceSort } from '../../Reports/Reports.queries'+import { parseAsString, useQueryStates } from 'nuqs'++import { type QueryPerformanceSort } from '../QueryPerformance.types'export const useQueryPerformanceSort = () => {const [{ sort, order }, setQueryStates] = useQueryStates({diff --git a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.test.ts b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.test.tsnew file mode 100644index 00000000000..8d00a5d3ecf--- /dev/null+++ b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.test.ts@@ -0,0 +1,138 @@+import { describe, expect, it } from 'vitest'++import { generateQueryPerformanceSql } from './useQueryPerformanceQuery'++describe('generateQueryPerformanceSql', () => {+ it('generates sql with no filters', () => {+ const result = generateQueryPerformanceSql({ preset: 'mostFrequentlyInvoked' })+ expect(result.sql).toBeDefined()+ expect(result.whereSql).toBe('')+ expect(result.orderBySql).toBeUndefined()+ })++ it('generates ORDER BY clause', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ orderBy: { column: 'calls', order: 'desc' },+ })+ expect(result.orderBySql).toBe('ORDER BY calls desc')+ })++ it('filters by roles', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ roles: ['postgres', 'anon'],+ })+ expect(result.whereSql).toContain("auth.rolname in ('postgres', 'anon')")+ })++ it('filters by search query', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ searchQuery: 'SELECT',+ })+ expect(result.whereSql).toContain("statements.query ~* 'SELECT'")+ })++ it('filters by dashboard source only', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ sources: ['dashboard'],+ })+ expect(result.whereSql).toContain("statements.query ~* 'source: dashboard'")+ })++ it('filters by non-dashboard source only', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ sources: ['non-dashboard'],+ })+ expect(result.whereSql).toContain("statements.query !~* 'source: dashboard'")+ })++ it('does not add source filter when both sources are selected', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ sources: ['dashboard', 'non-dashboard'],+ })+ expect(result.whereSql).not.toContain('source: dashboard')+ })++ it('filters by minimum calls', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ minCalls: 10,+ })+ expect(result.whereSql).toContain('statements.calls >= 10')+ })++ it('does not filter by minCalls when 0', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ minCalls: 0,+ })+ expect(result.whereSql).not.toContain('statements.calls')+ })++ it('filters by minimum total time', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ minTotalTime: 500,+ })+ expect(result.whereSql).toContain(+ '(statements.total_exec_time + statements.total_plan_time) >= 500'+ )+ })++ it('combines multiple WHERE conditions with AND', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ roles: ['postgres'],+ searchQuery: 'SELECT',+ minCalls: 5,+ })+ expect(result.whereSql).toContain("auth.rolname in ('postgres')")+ expect(result.whereSql).toContain("statements.query ~* 'SELECT'")+ expect(result.whereSql).toContain('statements.calls >= 5')+ expect(result.whereSql.split(' AND ').length).toBe(3)+ })++ it('passes WHERE clause to base sql function', () => {+ const result = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ roles: ['postgres'],+ })+ expect(result.sql).toContain('WHERE')+ })++ it('does not include user-defined WHERE conditions when no filters set', () => {+ const result = generateQueryPerformanceSql({ preset: 'mostFrequentlyInvoked' })+ expect(result.whereSql).toBe('')+ // The base SQL may still contain its own WHERE clause (e.g. statements.calls > 0)+ // but the user-defined whereSql should be empty+ })++ it('passes runIndexAdvisor and filterIndexAdvisor flags', () => {+ const resultWithAdvisor = generateQueryPerformanceSql({+ preset: 'mostFrequentlyInvoked',+ runIndexAdvisor: true,+ filterIndexAdvisor: true,+ })+ expect(resultWithAdvisor.sql).toBeDefined()+ })++ it('works with different presets', () => {+ const presets = [+ 'mostFrequentlyInvoked',+ 'mostTimeConsuming',+ 'slowestExecutionTime',+ 'queryHitRate',+ 'unified',+ ] as const++ for (const preset of presets) {+ const result = generateQueryPerformanceSql({ preset })+ expect(result.sql).toBeDefined()+ }+ })+})diff --git a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.tsnew file mode 100644index 00000000000..464fb826a61--- /dev/null+++ b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts@@ -0,0 +1,61 @@+import useDbQuery from 'hooks/analytics/useDbQuery'++import { PRESET_CONFIG } from '../Reports/Reports.constants'+import { Presets } from '../Reports/Reports.types'+import { QueryPerformanceSQLParams } from './QueryPerformance.types'++export function generateQueryPerformanceSql({+ preset,+ orderBy,+ searchQuery = '',+ roles = [],+ sources = [],+ minCalls = 0,+ minTotalTime = 0,+ runIndexAdvisor = false,+ filterIndexAdvisor = false,+}: QueryPerformanceSQLParams) {+ const queryPerfQueries = PRESET_CONFIG[Presets.QUERY_PERFORMANCE]+ const baseSQL = queryPerfQueries.queries[preset]++ const orderBySql = orderBy && `ORDER BY ${orderBy.column} ${orderBy.order}`++ const whereConditions = []+ if (roles.length > 0) {+ whereConditions.push(`auth.rolname in (${roles.map((r) => `'${r}'`).join(', ')})`)+ }+ if (searchQuery.length > 0) {+ whereConditions.push(`statements.query ~* '${searchQuery}'`)+ }+ if (sources.includes('dashboard') && !sources.includes('non-dashboard')) {+ whereConditions.push(`statements.query ~* 'source: dashboard'`)+ }+ if (sources.includes('non-dashboard') && !sources.includes('dashboard')) {+ whereConditions.push(`statements.query !~* 'source: dashboard'`)+ }+ if (minCalls > 0) {+ whereConditions.push(`statements.calls >= ${minCalls}`)+ }+ if (minTotalTime > 0) {+ whereConditions.push(+ `(statements.total_exec_time + statements.total_plan_time) >= ${minTotalTime}`+ )+ }++ const whereSql = whereConditions.join(' AND ')++ const sql = baseSQL.sql(+ [],+ whereSql.length > 0 ? `WHERE ${whereSql}` : undefined,+ orderBySql,+ runIndexAdvisor,+ filterIndexAdvisor+ )++ return { sql, whereSql, orderBySql }+}++export const useQueryPerformanceQuery = (props: QueryPerformanceSQLParams) => {+ const { sql, whereSql, orderBySql } = generateQueryPerformanceSql(props)+ return useDbQuery({ sql, params: undefined, where: whereSql, orderBy: orderBySql })+}diff --git a/apps/studio/components/interfaces/Reports/Reports.queries.ts b/apps/studio/components/interfaces/Reports/Reports.queries.tsdeleted file mode 100644index 5f2a5216c89..00000000000--- a/apps/studio/components/interfaces/Reports/Reports.queries.ts+++ /dev/null@@ -1,77 +0,0 @@-import useDbQuery from 'hooks/analytics/useDbQuery'-import { PRESET_CONFIG } from './Reports.constants'-import { Presets } from './Reports.types'--export type QueryPerformanceSort = {- column:- | 'query'- | 'rolname'- | 'total_time'- | 'prop_total_time'- | 'calls'- | 'avg_rows'- | 'max_time'- | 'mean_time'- | 'min_time'- order: 'asc' | 'desc'-}--export type QueryPerformanceQueryOpts = {- preset:- | 'mostFrequentlyInvoked'- | 'mostTimeConsuming'- | 'slowestExecutionTime'- | 'queryHitRate'- | 'unified'- | 'slowQueriesCount'- | 'queryMetrics'- searchQuery?: string- orderBy?: QueryPerformanceSort- roles?: string[]- runIndexAdvisor?: boolean- minCalls?: number- minTotalTime?: number- filterIndexAdvisor?: boolean-}--export const useQueryPerformanceQuery = ({- preset,- orderBy,- searchQuery = '',- roles,- runIndexAdvisor = false,- minCalls,- minTotalTime,- filterIndexAdvisor = false,-}: QueryPerformanceQueryOpts) => {- const queryPerfQueries = PRESET_CONFIG[Presets.QUERY_PERFORMANCE]- const baseSQL = queryPerfQueries.queries[preset]-- const whereSql = [- roles !== undefined && roles.length > 0- ? `auth.rolname in (${roles.map((r) => `'${r}'`).join(', ')})`- : '',- searchQuery.length > 0 ? `statements.query ~* '${searchQuery}'` : '',- typeof minCalls === 'number' && minCalls > 0 ? `statements.calls >= ${minCalls}` : '',- typeof minTotalTime === 'number' && minTotalTime > 0- ? `(statements.total_exec_time + statements.total_plan_time) >= ${minTotalTime}`- : '',- ]- .filter((x) => x.length > 0)- .join(' AND ')-- const orderBySql = orderBy && `ORDER BY ${orderBy.column} ${orderBy.order}`- const sql = baseSQL.sql(- [],- whereSql.length > 0 ? `WHERE ${whereSql}` : undefined,- orderBySql,- runIndexAdvisor,- filterIndexAdvisor- )- return useDbQuery({- sql,- params: undefined,- where: whereSql,- orderBy: orderBySql,- })-}diff --git a/apps/studio/components/interfaces/Reports/Reports.utils.tsx b/apps/studio/components/interfaces/Reports/Reports.utils.tsxindex 76908e4b42e..7e737385c3f 100644--- a/apps/studio/components/interfaces/Reports/Reports.utils.tsx+++ b/apps/studio/components/interfaces/Reports/Reports.utils.tsx@@ -1,14 +1,14 @@-import dayjs from 'dayjs'-import {isUnixMicro,unixMicroToIsoTimestamp,} from 'components/interfaces/Settings/Logs/Logs.utils'import { REPORT_STATUS_CODE_COLORS } from 'data/reports/report.utils'+import dayjs from 'dayjs'import useDbQuery, { DbQueryHook } from 'hooks/analytics/useDbQuery'import useLogsQuery, { LogsQueryHook } from 'hooks/analytics/useLogsQuery'import { getHttpStatusCodeInfo } from 'lib/http-status-codes'-import type { BaseQueries, PresetConfig, ReportQuery } from './Reports.types'++import { type BaseQueries, type PresetConfig, type ReportQuery } from './Reports.types'/*** Converts a query params string to an objectdiff --git a/apps/studio/pages/project/[ref]/observability/query-performance.tsx b/apps/studio/pages/project/[ref]/observability/query-performance.tsxindex 62b4a4a137a..f33e60bbf9f 100644--- a/apps/studio/pages/project/[ref]/observability/query-performance.tsx+++ b/apps/studio/pages/project/[ref]/observability/query-performance.tsx@@ -1,20 +1,20 @@-import { parseAsArrayOf, parseAsInteger, parseAsJson, parseAsString, useQueryStates } from 'nuqs'-import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'-import { useParams } from 'common'import { useIndexAdvisorStatus } from 'components/interfaces/QueryPerformance/hooks/useIsIndexAdvisorStatus'import { useQueryPerformanceSort } from 'components/interfaces/QueryPerformance/hooks/useQueryPerformanceSort'import { QueryPerformance } from 'components/interfaces/QueryPerformance/QueryPerformance'+import { type QuerySource } from 'components/interfaces/QueryPerformance/QueryPerformance.types'+import { useQueryPerformanceQuery } from 'components/interfaces/QueryPerformance/useQueryPerformanceQuery'import { PRESET_CONFIG } from 'components/interfaces/Reports/Reports.constants'-import { useQueryPerformanceQuery } from 'components/interfaces/Reports/Reports.queries'import { Presets } from 'components/interfaces/Reports/Reports.types'import { queriesFactory } from 'components/interfaces/Reports/Reports.utils'+import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'import { DefaultLayout } from 'components/layouts/DefaultLayout'import ObservabilityLayout from 'components/layouts/ObservabilityLayout/ObservabilityLayout'import { DatabaseSelector } from 'components/ui/DatabaseSelector'import { DocsButton } from 'components/ui/DocsButton'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { DOCS_URL } from 'lib/constants'+import { parseAsArrayOf, parseAsInteger, parseAsJson, parseAsString, useQueryStates } from 'nuqs'import type { NextPageWithLayout } from 'types'import { Admonition } from 'ui-patterns'@@ -25,12 +25,20 @@ const QueryPerformanceReport: NextPageWithLayout = () => {const { sort: sortConfig } = useQueryPerformanceSort()const [- { search: searchQuery, roles, minCalls, totalTimeFilter: totalTimeFilterRaw, indexAdvisor },+ {+ search: searchQuery,+ roles,+ sources,+ minCalls,+ totalTimeFilter: totalTimeFilterRaw,+ indexAdvisor,+ },] = useQueryStates({sort: parseAsString,order: parseAsString,search: parseAsString.withDefault(''),roles: parseAsArrayOf(parseAsString).withDefault([]),+ sources: parseAsArrayOf(parseAsString).withDefault([]),minCalls: parseAsInteger,totalTimeFilter: parseAsJson<NumericFilter | null>((value) =>value === null || value === undefined ? null : (value as NumericFilter)@@ -57,6 +65,7 @@ const QueryPerformanceReport: NextPageWithLayout = () => {orderBy: sortConfig || undefined,preset: 'unified',roles,+ sources: sources as QuerySource[],runIndexAdvisor: isIndexAdvisorEnabled,minCalls: minCalls ?? undefined,minTotalTime,