Skip to content

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

feat(studio): add pagination to query performance page FE-2774 (#43697)

Jordi Enric2e1795dfa09a
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
index b3547a4d70e..30f95cb0832 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
@@ -3,15 +3,16 @@ import { CreateCronJobSheet } from 'components/interfaces/Integrations/CronJobs/
import { CronJob } from 'data/database-cron-jobs/database-cron-jobs-infinite-query'
import { useDatabaseExtensionsQuery } from 'data/database-extensions/database-extensions-query'
import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
+import { useInfiniteScroll } from 'hooks/misc/useInfiniteScroll'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import { cleanPointerEventsNoneOnBody, isAtBottom } from 'lib/helpers'
+import { cleanPointerEventsNoneOnBody } from 'lib/helpers'
import { createNavigationHandler } from 'lib/navigation'
import { isGreaterThanOrEqual } from 'lib/semver'
import { Loader2 } from 'lucide-react'
import { useRouter } from 'next/router'
import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
-import { MouseEvent, UIEvent, useEffect, useMemo, useRef, useState } from 'react'
+import { MouseEvent, useEffect, useMemo, useState } from 'react'
import { toast } from 'sonner'
import { LoadingLine } from 'ui'
@@ -92,24 +93,12 @@ export const CronjobsTab = () => {
[org?.slug, ref, sendEvent, setCronJobForEditing, setCronJobForDeletion]
)
- const xScroll = useRef<number>(0)
-
- const handleScroll = (event: UIEvent<HTMLDivElement>) => {
- const isScrollingHorizontally = xScroll.current !== event.currentTarget.scrollLeft
- xScroll.current = event.currentTarget.scrollLeft
-
- if (
- grid.isLoading ||
- grid.isFetchingNextPage ||
- isScrollingHorizontally ||
- !isAtBottom(event) ||
- !grid.hasNextPage
- ) {
- return
- }
-
- grid.fetchNextPage()
- }
+ const handleScroll = useInfiniteScroll({
+ isLoading: grid.isLoading,
+ isFetchingNextPage: grid.isFetchingNextPage,
+ hasNextPage: grid.hasNextPage,
+ fetchNextPage: grid.fetchNextPage,
+ })
const onOpenCreateJobSheet = () => {
sendEvent({
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx
index de7223dc5f7..b8a4a7aec7a 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx
@@ -1,17 +1,18 @@
-import dayjs from 'dayjs'
-import { CircleCheck, CircleX, Loader } from 'lucide-react'
-import { UIEvent, useCallback, useMemo } from 'react'
-import DataGrid, { Column, Row } from 'react-data-grid'
-
import { useParams } from 'common'
import {
CronJobRun,
useCronJobRunsInfiniteQuery,
} from 'data/database-cron-jobs/database-cron-jobs-runs-infinite-query'
+import dayjs from 'dayjs'
+import { useInfiniteScroll } from 'hooks/misc/useInfiniteScroll'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
+import { CircleCheck, CircleX, Loader } from 'lucide-react'
+import { useMemo } from 'react'
+import DataGrid, { Column, Row } from 'react-data-grid'
import { cn, CodeBlock, LoadingLine, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
import { TimestampInfo } from 'ui-patterns'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
+
import { calculateDuration, formatDate } from './CronJobs.utils'
import CronJobsEmptyState from './CronJobsEmptyState'
@@ -146,10 +147,6 @@ const columns = cronJobColumns.map((col) => {
return result
})
-function isAtBottom({ currentTarget }: UIEvent<HTMLDivElement>): boolean {
- return currentTarget.scrollTop + 10 >= currentTarget.scrollHeight - currentTarget.clientHeight
-}
-
export const PreviousRunsTab = () => {
const { childId } = useParams()
const { data: project } = useSelectedProjectQuery()
@@ -160,6 +157,8 @@ export const PreviousRunsTab = () => {
data,
isPending: isLoadingCronJobRuns,
isFetching,
+ isFetchingNextPage,
+ hasNextPage,
fetchNextPage,
} = useCronJobRunsInfiniteQuery(
{
@@ -172,15 +171,12 @@ export const PreviousRunsTab = () => {
const cronJobRuns = useMemo(() => data?.pages.flatMap((p) => p) || [], [data?.pages])
- const handleScroll = useCallback(
- (event: UIEvent<HTMLDivElement>) => {
- if (isLoadingCronJobRuns || !isAtBottom(event)) return
- // the cancelRefetch is to prevent the query from being refetched when the user scrolls back up and down again,
- // resulting in multiple fetchNextPage calls
- fetchNextPage({ cancelRefetch: false })
- },
- [fetchNextPage, isLoadingCronJobRuns]
- )
+ const handleScroll = useInfiniteScroll({
+ isLoading: isLoadingCronJobRuns,
+ isFetchingNextPage,
+ hasNextPage,
+ fetchNextPage,
+ })
return (
<div className="h-full flex flex-col">
diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.tsx
index 3c7a6d9d6b9..b5f22178325 100644
--- a/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.tsx
@@ -1,14 +1,14 @@
-import { useEffect } from 'react'
-
-import { WithStatements } from './WithStatements/WithStatements'
import { useParams } from 'common'
-import { DbQueryHook } from 'hooks/analytics/useDbQuery'
+import { useEffect } from 'react'
import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'
+
import { PresetHookResult } from '../Reports/Reports.utils'
+import { QueryPerformanceInfiniteHook } from './useQueryPerformanceQuery'
+import { WithStatements } from './WithStatements/WithStatements'
interface QueryPerformanceProps {
queryHitRate: PresetHookResult
- queryPerformanceQuery: DbQueryHook<any>
+ queryPerformanceQuery: QueryPerformanceInfiniteHook
queryMetrics: PresetHookResult
}
diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.ts b/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.ts
index cbd2e9794cb..243b653811a 100644
--- a/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.ts
+++ b/apps/studio/components/interfaces/QueryPerformance/QueryPerformance.types.ts
@@ -55,4 +55,6 @@ export type QueryPerformanceSQLParams = {
minTotalTime?: number
runIndexAdvisor?: boolean
filterIndexAdvisor?: boolean
+ page?: number
+ pageSize?: number
}
diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx
index ca0a1306058..70afdd20335 100644
--- a/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx
@@ -1,11 +1,13 @@
-import { ArrowDown, ArrowRight, ArrowUp, ChevronDown, TextSearch } from 'lucide-react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import DataGrid, { Column, DataGridHandle, Row } from 'react-data-grid'
-
import { useParams } from 'common'
+import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { ArrowDown, ArrowRight, ArrowUp, ChevronDown, TextSearch } from 'lucide-react'
+import { parseAsArrayOf, parseAsJson, parseAsString, useQueryStates } from 'nuqs'
+import { UIEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import DataGrid, { Column, DataGridHandle, Row } from 'react-data-grid'
import {
Button,
+ cn,
CodeBlock,
DropdownMenu,
DropdownMenuContent,
@@ -15,15 +17,15 @@ import {
SheetContent,
SheetDescription,
SheetTitle,
+ Tabs_Shadcn_,
TabsContent_Shadcn_,
TabsList_Shadcn_,
TabsTrigger_Shadcn_,
- Tabs_Shadcn_,
- cn,
} from 'ui'
+import { Admonition } from 'ui-patterns'
import { InfoTooltip } from 'ui-patterns/info-tooltip'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
-import { Admonition } from 'ui-patterns'
+
import { useQueryPerformanceSort } from './hooks/useQueryPerformanceSort'
import {
hasIndexRecommendations,
@@ -38,8 +40,6 @@ import {
} from './QueryPerformance.constants'
import { QueryPerformanceRow } from './QueryPerformance.types'
import { formatDuration } from './QueryPerformance.utils'
-import { parseAsString, parseAsArrayOf, parseAsJson, useQueryStates } from 'nuqs'
-import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'
interface QueryPerformanceGridProps {
aggregatedData: QueryPerformanceRow[]
@@ -48,6 +48,7 @@ interface QueryPerformanceGridProps {
currentSelectedQuery?: string | null
onCurrentSelectQuery?: (query: string) => void
onRetry?: () => void
+ onScroll?: (event: UIEvent<HTMLDivElement>) => void
}
const calculateTimeConsumedWidth = (data: QueryPerformanceRow[]) => {
@@ -79,6 +80,7 @@ export const QueryPerformanceGrid = ({
currentSelectedQuery,
onCurrentSelectQuery,
onRetry,
+ onScroll,
}: QueryPerformanceGridProps) => {
const { sort, setSortConfig } = useQueryPerformanceSort()
const gridRef = useRef<DataGridHandle>(null)
@@ -512,6 +514,7 @@ export const QueryPerformanceGrid = ({
headerRowHeight={36}
columns={columns}
rows={reportData}
+ onScroll={onScroll}
rowClass={(_, idx) => {
const isSelected = idx === selectedRow
const query = reportData[idx]?.query
diff --git a/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx b/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx
index 6c62842337e..560aac63aad 100644
--- a/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx
@@ -5,7 +5,7 @@ import { DownloadResultsButton } from 'components/ui/DownloadResultsButton'
import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'
import { formatDatabaseID } from 'data/read-replicas/replicas.utils'
import { executeSql } from 'data/sql/execute-sql-query'
-import { DbQueryHook } from 'hooks/analytics/useDbQuery'
+import { useInfiniteScroll } from 'hooks/misc/useInfiniteScroll'
import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { DOCS_URL, IS_PLATFORM } from 'lib/constants'
@@ -24,11 +24,12 @@ import { captureQueryPerformanceError } from '../QueryPerformance.utils'
import { QueryPerformanceFilterBar } from '../QueryPerformanceFilterBar'
import { QueryPerformanceGrid } from '../QueryPerformanceGrid'
import { QueryPerformanceMetrics } from '../QueryPerformanceMetrics'
+import { QueryPerformanceInfiniteHook } from '../useQueryPerformanceQuery'
import { transformStatementDataToRows } from './WithStatements.utils'
interface WithStatementsProps {
queryHitRate: PresetHookResult
- queryPerformanceQuery: DbQueryHook<any>
+ queryPerformanceQuery: QueryPerformanceInfiniteHook
queryMetrics: PresetHookResult
}
@@ -40,7 +41,16 @@ export const WithStatements = ({
const { ref } = useParams()
const { data: project } = useSelectedProjectQuery()
const state = useDatabaseSelectorStateSnapshot()
- const { data, isLoading, isRefetching, error: queryError } = queryPerformanceQuery
+ const {
+ data,
+ isLoading,
+ isRefetching,
+ isFetchingNextPage,
+ hasNextPage,
+ error: queryError,
+ fetchNextPage,
+ refetch: runQuery,
+ } = queryPerformanceQuery
const isPrimaryDatabase = state.selectedDatabaseId === ref
const formattedDatabaseId = formatDatabaseID(state.selectedDatabaseId ?? '')
@@ -60,7 +70,7 @@ export const WithStatements = ({
})
const handleRefresh = () => {
- queryPerformanceQuery.runQuery()
+ runQuery()
queryHitRate.runQuery()
queryMetrics.runQuery()
}
@@ -71,6 +81,13 @@ export const WithStatements = ({
const { data: databases } = useReadReplicasQuery({ projectRef: ref })
+ const handleScroll = useInfiniteScroll({
+ isLoading,
+ isFetchingNextPage,
+ hasNextPage,
+ fetchNextPage,
+ })
+
useEffect(() => {
state.setSelectedDatabaseId(ref)
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -183,7 +200,7 @@ export const WithStatements = ({
</>
}
/>
- <LoadingLine loading={isLoading || isRefetching} />
+ <LoadingLine loading={isLoading || isRefetching || isFetchingNextPage} />
<QueryPerformanceGrid
aggregatedData={processedData}
isLoading={isLoading}
@@ -193,6 +210,7 @@ export const WithStatements = ({
: null
}
onRetry={handleRefresh}
+ onScroll={handleScroll}
/>
<div
className={cn('px-6 py-6 flex gap-x-4 border-t relative', {
diff --git a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.test.ts b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.test.ts
index 8d00a5d3ecf..08079445784 100644
--- a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.test.ts
+++ b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.test.ts
@@ -135,4 +135,38 @@ describe('generateQueryPerformanceSql', () => {
expect(result.sql).toBeDefined()
}
})
+
+ it('clamps page=0 to page=1 (no negative offset)', () => {
+ const result = generateQueryPerformanceSql({ preset: 'unified', page: 0, pageSize: 20 })
+ expect(result.sql).toContain('offset 0')
+ expect(result.sql).not.toMatch(/offset -\d/)
+ })
+
+ it('clamps negative page to page=1', () => {
+ const result = generateQueryPerformanceSql({ preset: 'unified', page: -5, pageSize: 20 })
+ expect(result.sql).toContain('offset 0')
+ })
+
+ it('clamps pageSize above 100 to 100', () => {
+ const result = generateQueryPerformanceSql({ preset: 'unified', page: 1, pageSize: 9999 })
+ expect(result.sql).toContain('limit 100')
+ expect(result.sql).not.toContain('limit 9999')
+ })
+
+ it('applies LIMIT and OFFSET for page 2', () => {
+ const result = generateQueryPerformanceSql({ preset: 'unified', page: 2, pageSize: 20 })
+ expect(result.sql).toContain('limit 20 offset 20')
+ })
+
+ it('does not produce NaN in SQL when page is NaN', () => {
+ const result = generateQueryPerformanceSql({ preset: 'unified', page: NaN, pageSize: 20 })
+ expect(result.sql).not.toContain('NaN')
+ expect(result.sql).toContain('offset 0')
+ })
+
+ it('does not produce NaN in SQL when pageSize is NaN', () => {
+ const result = generateQueryPerformanceSql({ preset: 'unified', page: 1, pageSize: NaN })
+ expect(result.sql).not.toContain('NaN')
+ expect(result.sql).toContain('limit 20')
+ })
})
diff --git a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts
index 464fb826a61..023f17eacb0 100644
--- a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts
+++ b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts
@@ -1,8 +1,13 @@
+import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query'
+import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'
+import { executeSql } from 'data/sql/execute-sql-query'
import useDbQuery from 'hooks/analytics/useDbQuery'
+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
+import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'
import { PRESET_CONFIG } from '../Reports/Reports.constants'
import { Presets } from '../Reports/Reports.types'
-import { QueryPerformanceSQLParams } from './QueryPerformance.types'
+import { QueryPerformanceRow, QueryPerformanceSQLParams } from './QueryPerformance.types'
export function generateQueryPerformanceSql({
preset,
@@ -14,7 +19,14 @@ export function generateQueryPerformanceSql({
minTotalTime = 0,
runIndexAdvisor = false,
filterIndexAdvisor = false,
+ page = 1,
+ pageSize = 20,
}: QueryPerformanceSQLParams) {
+ const safePage = Number.isFinite(page) ? Math.max(1, Math.floor(page)) : 1
+ const safePageSize = Number.isFinite(pageSize)
+ ? Math.min(Math.max(1, Math.floor(pageSize)), 100)
+ : 20
+
const queryPerfQueries = PRESET_CONFIG[Presets.QUERY_PERFORMANCE]
const baseSQL = queryPerfQueries.queries[preset]
@@ -49,7 +61,9 @@ export function generateQueryPerformanceSql({
whereSql.length > 0 ? `WHERE ${whereSql}` : undefined,
orderBySql,
runIndexAdvisor,
- filterIndexAdvisor
+ filterIndexAdvisor,
+ safePage,
+ safePageSize
)
return { sql, whereSql, orderBySql }
@@ -59,3 +73,103 @@ export const useQueryPerformanceQuery = (props: QueryPerformanceSQLParams) => {
const { sql, whereSql, orderBySql } = generateQueryPerformanceSql(props)
return useDbQuery({ sql, params: undefined, where: whereSql, orderBy: orderBySql })
}
+
+export interface QueryPerformanceInfiniteHook {
+ data: QueryPerformanceRow[] | undefined
+ isLoading: boolean
+ isRefetching: boolean
+ isFetchingNextPage: boolean
+ hasNextPage: boolean
+ error: unknown
+ fetchNextPage: () => void
+ refetch: () => void
+ resolvedSql: string
+}
+
+export const useQueryPerformanceInfiniteQuery = (
+ props: Omit<QueryPerformanceSQLParams, 'page'>
+): QueryPerformanceInfiniteHook => {
+ const queryClient = useQueryClient()
+ const { data: project } = useSelectedProjectQuery()
+ const state = useDatabaseSelectorStateSnapshot()
+ const { data: databases } = useReadReplicasQuery({ projectRef: project?.ref })
+ const connectionString = (databases || []).find(
+ (db) => db.identifier === state.selectedDatabaseId
+ )?.connectionString
+
+ // Clamp pageSize the same way generateQueryPerformanceSql does so getNextPageParam
+ // and the queryKey are always consistent with the SQL actually executed.
+ const rawPageSize = props.pageSize
+ const safePageSize = Number.isFinite(rawPageSize)
+ ? Math.min(Math.max(1, Math.floor(rawPageSize!)), 100)
+ : 20
+ const { sql: page1Sql } = generateQueryPerformanceSql({
+ ...props,
+ page: 1,
+ pageSize: safePageSize,
+ })
+
+ // When a read-replica is selected, require its connection string before fetching.
+ // Falling back to the primary's connection string would silently query the wrong database.
+ const isPrimarySelected = !state.selectedDatabaseId || state.selectedDatabaseId === project?.ref
+ const effectiveConnectionString = isPrimarySelected
+ ? (connectionString ?? project?.connectionString)
+ : connectionString
+
+ const { data, isPending, isRefetching, isFetchingNextPage, hasNextPage, error, fetchNextPage } =
+ useInfiniteQuery({
+ queryKey: [
+ 'projects',
+ project?.ref,
+ 'query-performance-infinite',
+ {
+ ...props,
+ pageSize: safePageSize,
+ identifier: state.selectedDatabaseId,
+ connectionString: effectiveConnectionString,
+ },
+ ],
+ initialPageParam: 1,
+ queryFn: ({ pageParam, signal }) => {
+ const { sql } = generateQueryPerformanceSql({
+ ...props,
+ page: pageParam,
+ pageSize: safePageSize,
+ })
+ return executeSql<QueryPerformanceRow[]>(
+ {
+ projectRef: project?.ref,
+ connectionString: effectiveConnectionString,
+ sql,
+ },
+ signal
+ ).then((res) => res.result)
+ },
+ getNextPageParam: (lastPage, allPages) => {
+ return lastPage.length < safePageSize ? undefined : allPages.length + 1
+ },
+ // Don't run until we have a connection string for the selected database.
+ // For replicas this prevents a silent fallback to the primary before replicas load.
+ enabled: Boolean(project?.ref) && Boolean(effectiveConnectionString),
+ refetchOnWindowFocus: false,
+ refetchOnReconnect: false,
+ })
+
+ return {
+ data: data?.pages.flatMap((page) => page) ?? undefined,
+ isLoading: isPending,
+ isRefetching,
+ isFetchingNextPage,
+ hasNextPage: hasNextPage ?? false,
+ error,
+ fetchNextPage,
+ // Reset to page 1 instead of re-fetching all loaded pages, avoiding a burst
+ // of N requests when the user clicks Refresh after scrolling through multiple pages.
+ refetch: () =>
+ queryClient.resetQueries({
+ queryKey: ['projects', project?.ref, 'query-performance-infinite'],
+ exact: false,
+ }),
+ resolvedSql: page1Sql,
+ }
+}
diff --git a/apps/studio/components/interfaces/Reports/Reports.constants.ts b/apps/studio/components/interfaces/Reports/Reports.constants.ts
index c9a98310cfe..7c56e63954e 100644
--- a/apps/studio/components/interfaces/Reports/Reports.constants.ts
+++ b/apps/studio/components/interfaces/Reports/Reports.constants.ts
@@ -546,7 +546,25 @@ select
},
unified: {
queryType: 'db',
- sql: (_params, where, orderBy, runIndexAdvisor = false, filterIndexAdvisor = false) => {
+ sql: (
+ _params,
+ where,
+ orderBy,
+ runIndexAdvisor = false,
+ filterIndexAdvisor = false,
+ page = 1,
+ pageSize = 20
+ ) => {
+ const offset = (page - 1) * pageSize
+ // When filtering by index suggestions we need a larger scan window since we don't
+ // know how many rows will match. Cap at a reasonable upper bound to avoid running
+ // index_advisor() across the entire dataset on any code path where it's active.
+ const INDEX_ADVISOR_SCAN_CAP = 500
+ const baseScanTarget =
+ filterIndexAdvisor && runIndexAdvisor ? offset + pageSize * 10 : offset + pageSize
+ const baseCteLimit = runIndexAdvisor
+ ? Math.min(baseScanTarget, INDEX_ADVISOR_SCAN_CAP)
+ : baseScanTarget
const baseQuery = `
-- reports-query-performance-unified
set search_path to public, extensions;
@@ -586,7 +604,7 @@ select
-- skip queries that were never actually executed
WHERE statements.calls > 0 ${where ? where.replace(/^WHERE/, 'AND') : ''}
${orderBy || 'order by total_time desc'}
- limit 50
+ ${baseCteLimit !== null ? `limit ${baseCteLimit}` : ''}
),
query_results as (
select
@@ -616,7 +634,7 @@ select
from query_results
${filterIndexAdvisor && runIndexAdvisor ? `where (index_advisor_result->>'has_suggestion')::boolean = true` : ''}
${orderBy || 'order by total_time desc'}
- limit 20`
+ limit ${pageSize} offset ${offset}`
return baseQuery
},
diff --git a/apps/studio/components/interfaces/Reports/Reports.types.ts b/apps/studio/components/interfaces/Reports/Reports.types.ts
index 246afb7fca7..da46ba98bd7 100644
--- a/apps/studio/components/interfaces/Reports/Reports.types.ts
+++ b/apps/studio/components/interfaces/Reports/Reports.types.ts
@@ -26,7 +26,9 @@ export interface ReportQuery {
where?: string,
orderBy?: string,
runIndexAdvisor?: boolean,
- filterIndexAdvisor?: boolean
+ filterIndexAdvisor?: boolean,
+ page?: number,
+ pageSize?: number
) => string
}
diff --git a/apps/studio/hooks/misc/useInfiniteScroll.ts b/apps/studio/hooks/misc/useInfiniteScroll.ts
new file mode 100644
index 00000000000..0804a8e1308
--- /dev/null
+++ b/apps/studio/hooks/misc/useInfiniteScroll.ts
@@ -0,0 +1,44 @@
+import { isAtBottom } from 'lib/helpers'
+import { UIEvent, useCallback, useRef } from 'react'
+
+interface UseInfiniteScrollOptions {
+ isLoading?: boolean
+ isFetchingNextPage?: boolean
+ hasNextPage?: boolean
+ fetchNextPage: (options?: { cancelRefetch?: boolean }) => void
+}
+
+/**
+ * Returns a scroll handler that triggers fetchNextPage when the user scrolls
+ * to the bottom of a scrollable container. Includes horizontal scroll detection
+ * to avoid triggering loads when the user scrolls horizontally.
+ */
+export function useInfiniteScroll({
+ isLoading = false,
+ isFetchingNextPage = false,
+ hasNextPage = false,
+ fetchNextPage,
+}: UseInfiniteScrollOptions) {
+ const xScroll = useRef(0)
+
+ return useCallback(
+ (event: UIEvent<HTMLDivElement>) => {
+ const isScrollingHorizontally = xScroll.current !== event.currentTarget.scrollLeft
+ xScroll.current = event.currentTarget.scrollLeft
+
+ const shouldFetchNextPage =
+ !isLoading &&
+ !isFetchingNextPage &&
+ !isScrollingHorizontally &&
+ isAtBottom(event) &&
+ hasNextPage
+
+ if (!shouldFetchNextPage) {
+ return
+ }
+
+ fetchNextPage({ cancelRefetch: false })
+ },
+ [isLoading, isFetchingNextPage, hasNextPage, fetchNextPage]
+ )
+}
diff --git a/apps/studio/pages/project/[ref]/observability/query-performance.tsx b/apps/studio/pages/project/[ref]/observability/query-performance.tsx
index f33e60bbf9f..e50407d27ef 100644
--- a/apps/studio/pages/project/[ref]/observability/query-performance.tsx
+++ b/apps/studio/pages/project/[ref]/observability/query-performance.tsx
@@ -3,7 +3,7 @@ import { useIndexAdvisorStatus } from 'components/interfaces/QueryPerformance/ho
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 { useQueryPerformanceInfiniteQuery } from 'components/interfaces/QueryPerformance/useQueryPerformanceQuery'
import { PRESET_CONFIG } from 'components/interfaces/Reports/Reports.constants'
import { Presets } from 'components/interfaces/Reports/Reports.types'
import { queriesFactory } from 'components/interfaces/Reports/Reports.utils'
@@ -60,7 +60,7 @@ const QueryPerformanceReport: NextPageWithLayout = () => {
? totalTimeFilter.value
: undefined
- const queryPerformanceQuery = useQueryPerformanceQuery({
+ const queryPerformanceQuery = useQueryPerformanceInfiniteQuery({
searchQuery,
orderBy: sortConfig || undefined,
preset: 'unified',