mirror of
https://github.com/supabase/supabase.git
synced 2026-09-08 19:08:44 +08:00
App-level fixes that reproduce on BOTH the Next and TanStack builds — split out of #47657 (which stays TanStack-only) for reviewability. All were found by a full-site click-through of the dashboard. ## Invalid HTML nesting (React 19 "will cause a hydration error" console errors) - **FormLayout description rendered in a `<p>`** (`packages/ui-patterns`): consumers pass arbitrary JSX (the RowEditor's `created_at` timezone note passes a `<div>` with `<p>`s) → `<p>`-in-`<p>` / `<div>`-in-`<p>`. Container is now a `<div>` with identical classes (Tailwind preflight makes them render the same). - **Switch toggles nested inside Tooltip trigger buttons** (button-in-button) in ColumnEditor ("Allow Nullable" + "Is Unique"), ExtensionRow, and PublicationsTableItem → repo-standard `TooltipTrigger asChild` + `<div>` wrapper. - **Saved log queries rendered a `<div>` directly inside `<tbody>`** (`/logs/explorer/saved`) → rows are now proper `<tr><td colSpan>` wrappers; the component itself is untouched (it's valid in its sidebar usage). - **Nested anchors in observability metric cards**: a card-level `<Link>` wrapped MetricCard's "More information" `<Link>` (identical URLs) → the chevron affordance renders as a `<span>` when no `href` is passed; clicks bubble to the card link, tooltips preserved. Design-system standalone usage unaffected. - **`objectFit="cover"` passed to modern `next/image`** on the featured integration card (unknown-prop warning) — the className already had `object-cover`; prop dropped. ## Ghost dead-snippet after deletion Deleting the active SQL snippet left its id in `useDashboardHistory` (`history.sql`), so the "SQL Editor" nav item navigated to `/sql/<deleted-id>` — content fetch 404s, no editor pane renders, and a phantom tab reappears. Fixed both ends: delete flows now purge dashboard history (and the tabs store clears a stale `previewTabId`), and `/sql/[id]` treats a snippet 404 as "clean up + `router.replace` to `/sql/new` + toast" instead of rendering the dead state. Unit tests for the store/history cleanup. ## `pg-meta` migrations query 400s on every project load `ActivityStats` on project home runs the migrations list query, whose SQL was a bare `select * from supabase_migrations.schema_migrations` — that table only exists once a migration has run, so every other project logged a failed `?key=migrations` request on every load (visible in production consoles too). The SQL is now guarded with `to_regclass` + `query_to_xml` (same pattern as the advisor lints' `storage.buckets` guard), returning zero rows instead of erroring; legacy version-only tables still work. Tested against real dockerized Postgres (absent table, populated ordering, special chars, legacy schema) + MSW hook tests. Found and verified via /test-supabase-local (browser click-through + console audit on both builds). ## To test Console must stay free of React DOM-nesting errors ("cannot be a descendant of" / "cannot contain a nested") on each surface: 1. Table editor → Insert row panel (`created_at` field renders its timezone note) and Edit column panel ("Allow Nullable"/"Is Unique" tooltips still hover). 2. `/database/extensions` and `/database/publications` → toggle switches render, tooltips hover. 3. `/logs/explorer/saved` (with ≥1 saved query) → rows render full-width inside the table, hover shows Actions. 4. `/observability` → no nested-anchor error on load; card body click and the chevron both navigate; label help-icons still show tooltips. 5. `/integrations` → no `objectFit` unknown-prop warning; featured card images still cover. 6. **Ghost snippet**: open a SQL snippet → delete it via the sidebar → click the "SQL Editor" nav item → lands on `/sql/new` (no phantom tab, no 404 content fetch). Direct-load `/sql/<random-uuid>` → toast + redirect to `/sql/new`. 7. **Migrations 400**: load project home with a project that has never run a migration → the `pg-meta/<ref>/query?key=migrations` request returns **200** with `[]` (previously a 400 on every load). Database → Migrations still lists real migrations when they exist. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit * **Bug Fixes** * Deleted SQL snippets are fully removed from dashboard history and stale editor/tab state; users are redirected with a toast. * Closing preview tabs no longer leaves stale references. * Improved toggle/tooltip/dialog interactions to avoid broken UI, including metric headers showing tooltips even without direct links. * Migrations display safely when migration tables/relations are missing. * **UI Improvements** * Refreshed layout for saved queries, form descriptions, and integration imagery. * **Tests** * Added coverage for snippet history cleanup, tab removal, migrations SQL behavior, and query edge cases. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --- ### Review feedback: `query_to_xml` breaks on Multigres (Ivan) The defensive migrations query (added here to stop the `?key=migrations` 400 when the table doesn't exist yet) originally guarded with `query_to_xml`, which is forbidden through Multigres's pooler (MUL-736 / PSQL-1318). Rewritten without `query_to_xml`/`xmltable` using the splinter#170 pattern: a PL/pgSQL `do` block guarded by `to_regclass` (PL/pgSQL defers planning, so a missing table never errors) stashes the rows into a transaction-local GUC via `set_config`, and a trailing `select` reads them back with `jsonb_array_elements`. Verified that postgres-meta sends the whole SQL as one simple-query string → single implicit transaction → the local GUC survives to the `select` and doesn't leak into the pooled connection. 6/6 dockerized-Postgres tests (absent table → `[]`, populated/ordered/special-chars, legacy version-only table, full pg-meta-shaped multi-statement string, GUC non-leakage). Note (out of scope, pre-existing): `packages/pg-meta/src/sql/studio/advisor/lints.ts` still uses `query_to_xml` — a separate pre-existing Multigres risk that should get its own splinter-pattern sync. --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com> Co-authored-by: Joshen Lim <joshenlimek@gmail.com> Co-authored-by: Saxon Fletcher <saxonafletcher@gmail.com>
266 lines
8.9 KiB
TypeScript
266 lines
8.9 KiB
TypeScript
import { useParams } from 'common'
|
|
import dayjs from 'dayjs'
|
|
import Link from 'next/link'
|
|
import { useMemo } from 'react'
|
|
import {
|
|
MetricCard,
|
|
MetricCardContent,
|
|
MetricCardHeader,
|
|
MetricCardLabel,
|
|
MetricCardValue,
|
|
} from 'ui-patterns/MetricCard'
|
|
|
|
import {
|
|
parseConnectionsData,
|
|
parseInfrastructureMetrics,
|
|
} from './DatabaseInfrastructureSection.utils'
|
|
import { useInfraMonitoringAttributesQuery } from '@/data/analytics/infra-monitoring-query'
|
|
import { useMaxConnectionsQuery } from '@/data/database/max-connections-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
|
|
type DatabaseInfrastructureSectionProps = {
|
|
interval: '1hr' | '1day' | '7day'
|
|
refreshKey: number
|
|
dbErrorRate: number
|
|
isLoading: boolean
|
|
slowQueriesCount?: number
|
|
slowQueriesLoading?: boolean
|
|
}
|
|
|
|
export const DatabaseInfrastructureSection = ({
|
|
interval,
|
|
refreshKey,
|
|
dbErrorRate: _dbErrorRate,
|
|
isLoading: _dbLoading,
|
|
slowQueriesCount = 0,
|
|
slowQueriesLoading = false,
|
|
}: DatabaseInfrastructureSectionProps) => {
|
|
const { ref: projectRef } = useParams()
|
|
const { data: project } = useSelectedProjectQuery()
|
|
|
|
// refreshKey forces date recalculation when user clicks refresh button
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
const { startDate, endDate, infraInterval } = useMemo(() => {
|
|
const now = dayjs()
|
|
const end = now.toISOString()
|
|
let start: string
|
|
let infraInterval: '1h' | '1d'
|
|
|
|
switch (interval) {
|
|
case '1hr':
|
|
start = now.subtract(1, 'hour').toISOString()
|
|
infraInterval = '1h'
|
|
break
|
|
case '1day':
|
|
start = now.subtract(1, 'day').toISOString()
|
|
infraInterval = '1h'
|
|
break
|
|
case '7day':
|
|
start = now.subtract(7, 'day').toISOString()
|
|
infraInterval = '1d'
|
|
break
|
|
default:
|
|
start = now.subtract(1, 'hour').toISOString()
|
|
infraInterval = '1h'
|
|
}
|
|
|
|
return { startDate: start, endDate: end, infraInterval }
|
|
}, [interval, refreshKey])
|
|
|
|
const {
|
|
data: infraData,
|
|
isLoading: infraLoading,
|
|
error: infraError,
|
|
} = useInfraMonitoringAttributesQuery({
|
|
projectRef,
|
|
attributes: [
|
|
'avg_cpu_usage',
|
|
'ram_usage',
|
|
'disk_fs_used_system',
|
|
'disk_fs_used_wal',
|
|
'pg_database_size',
|
|
'disk_fs_size',
|
|
'disk_io_consumption',
|
|
'pg_stat_database_num_backends',
|
|
],
|
|
startDate,
|
|
endDate,
|
|
interval: infraInterval,
|
|
})
|
|
|
|
const { data: maxConnectionsData } = useMaxConnectionsQuery({
|
|
projectRef,
|
|
connectionString: project?.connectionString,
|
|
})
|
|
|
|
const metrics = useMemo(() => parseInfrastructureMetrics(infraData), [infraData])
|
|
|
|
const connections = useMemo(
|
|
() => parseConnectionsData(infraData, maxConnectionsData),
|
|
[infraData, maxConnectionsData]
|
|
)
|
|
|
|
const errorMessage =
|
|
infraError && typeof infraError === 'object' && 'message' in infraError
|
|
? String(infraError.message)
|
|
: 'Error loading data'
|
|
|
|
// Generate database report URL with time range parameters
|
|
const getDatabaseReportUrl = () => {
|
|
const now = dayjs()
|
|
let its: string
|
|
let helperText: string
|
|
|
|
switch (interval) {
|
|
case '1hr':
|
|
its = now.subtract(1, 'hour').toISOString()
|
|
helperText = 'Last 60 minutes'
|
|
break
|
|
case '1day':
|
|
its = now.subtract(24, 'hour').toISOString()
|
|
helperText = 'Last 24 hours'
|
|
break
|
|
case '7day':
|
|
its = now.subtract(7, 'day').toISOString()
|
|
helperText = 'Last 7 days'
|
|
break
|
|
default:
|
|
its = now.subtract(24, 'hour').toISOString()
|
|
helperText = 'Last 24 hours'
|
|
}
|
|
|
|
const ite = now.toISOString()
|
|
const params = new URLSearchParams({
|
|
its,
|
|
ite,
|
|
isHelper: 'true',
|
|
helperText,
|
|
})
|
|
|
|
return `/project/${projectRef}/observability/database?${params.toString()}`
|
|
}
|
|
|
|
const databaseReportUrl = getDatabaseReportUrl()
|
|
|
|
return (
|
|
<div>
|
|
<h2 className="mb-4">Database</h2>
|
|
{/* First row: Metrics */}
|
|
<div className="grid grid-cols-3 gap-2">
|
|
<Link
|
|
href={`/project/${projectRef}/observability/query-performance?totalTimeFilter=${encodeURIComponent(JSON.stringify({ operator: '>', value: 1000 }))}`}
|
|
className="block group"
|
|
>
|
|
<MetricCard isLoading={slowQueriesLoading}>
|
|
<MetricCardHeader linkTooltip="Go to query performance">
|
|
<MetricCardLabel tooltip="Queries with total execution time (execution time + planning time) greater than 1000ms. High values may indicate query optimization opportunities">
|
|
Slow Queries
|
|
</MetricCardLabel>
|
|
</MetricCardHeader>
|
|
<MetricCardContent>
|
|
<MetricCardValue>{slowQueriesCount}</MetricCardValue>
|
|
</MetricCardContent>
|
|
</MetricCard>
|
|
</Link>
|
|
|
|
<Link href={databaseReportUrl} className="block group">
|
|
<MetricCard isLoading={infraLoading}>
|
|
<MetricCardHeader linkTooltip="Go to database report">
|
|
<MetricCardLabel tooltip="Highest concurrent database connections observed in the selected window, against the connection limit. Monitor to avoid connection exhaustion.">
|
|
Peak Connections
|
|
</MetricCardLabel>
|
|
</MetricCardHeader>
|
|
<MetricCardContent>
|
|
{infraError ? (
|
|
<div className="text-xs text-destructive wrap-break-word">{errorMessage}</div>
|
|
) : connections.max > 0 ? (
|
|
<MetricCardValue>
|
|
{connections.peak}/{connections.max}
|
|
</MetricCardValue>
|
|
) : (
|
|
<MetricCardValue>--</MetricCardValue>
|
|
)}
|
|
</MetricCardContent>
|
|
</MetricCard>
|
|
</Link>
|
|
|
|
<Link href={databaseReportUrl} className="block group">
|
|
<MetricCard isLoading={infraLoading}>
|
|
<MetricCardHeader linkTooltip="Go to database report">
|
|
<MetricCardLabel tooltip="Disk usage percentage of total disk space used">
|
|
Disk Usage
|
|
</MetricCardLabel>
|
|
</MetricCardHeader>
|
|
<MetricCardContent>
|
|
{infraError ? (
|
|
<div className="text-xs text-destructive wrap-break-word">{errorMessage}</div>
|
|
) : metrics ? (
|
|
<MetricCardValue>{metrics.disk.current.toFixed(0)}%</MetricCardValue>
|
|
) : (
|
|
<MetricCardValue>--</MetricCardValue>
|
|
)}
|
|
</MetricCardContent>
|
|
</MetricCard>
|
|
</Link>
|
|
|
|
<Link href={databaseReportUrl} className="block group">
|
|
<MetricCard isLoading={infraLoading}>
|
|
<MetricCardHeader linkTooltip="Go to database report">
|
|
<MetricCardLabel tooltip="Disk I/O consumption percentage. High values may indicate disk bottlenecks">
|
|
Disk IO
|
|
</MetricCardLabel>
|
|
</MetricCardHeader>
|
|
<MetricCardContent>
|
|
{infraError ? (
|
|
<div className="text-xs text-destructive wrap-break-word">{errorMessage}</div>
|
|
) : metrics ? (
|
|
<MetricCardValue>{metrics.diskIo.current.toFixed(0)}%</MetricCardValue>
|
|
) : (
|
|
<MetricCardValue>--</MetricCardValue>
|
|
)}
|
|
</MetricCardContent>
|
|
</MetricCard>
|
|
</Link>
|
|
|
|
<Link href={databaseReportUrl} className="block group">
|
|
<MetricCard isLoading={infraLoading}>
|
|
<MetricCardHeader linkTooltip="Go to database report">
|
|
<MetricCardLabel tooltip="RAM usage percentage. Sustained high usage may indicate memory pressure">
|
|
Memory
|
|
</MetricCardLabel>
|
|
</MetricCardHeader>
|
|
<MetricCardContent>
|
|
{infraError ? (
|
|
<div className="text-xs text-destructive wrap-break-word">{errorMessage}</div>
|
|
) : metrics ? (
|
|
<MetricCardValue>{metrics.ram.current.toFixed(0)}%</MetricCardValue>
|
|
) : (
|
|
<MetricCardValue>--</MetricCardValue>
|
|
)}
|
|
</MetricCardContent>
|
|
</MetricCard>
|
|
</Link>
|
|
|
|
<Link href={databaseReportUrl} className="block group">
|
|
<MetricCard isLoading={infraLoading}>
|
|
<MetricCardHeader linkTooltip="Go to database report">
|
|
<MetricCardLabel tooltip="CPU usage percentage. High values may suggest CPU-intensive queries or workloads">
|
|
CPU
|
|
</MetricCardLabel>
|
|
</MetricCardHeader>
|
|
<MetricCardContent>
|
|
{infraError ? (
|
|
<div className="text-xs text-destructive wrap-break-word">{errorMessage}</div>
|
|
) : metrics ? (
|
|
<MetricCardValue>{metrics.cpu.current.toFixed(0)}%</MetricCardValue>
|
|
) : (
|
|
<MetricCardValue>--</MetricCardValue>
|
|
)}
|
|
</MetricCardContent>
|
|
</MetricCard>
|
|
</Link>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|