Skip to content

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

Bring database connections to feature preview (#48638)

Joshen Limfc69c4598571
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/DatabaseConnectionsPreview.tsx b/apps/studio/components/interfaces/App/FeaturePreview/DatabaseConnectionsPreview.tsx
new file mode 100644
index 00000000000..41965bf19b8
--- /dev/null
+++ b/apps/studio/components/interfaces/App/FeaturePreview/DatabaseConnectionsPreview.tsx
@@ -0,0 +1,41 @@
+import { useParams } from 'common'
+import Image from 'next/image'
+
+import { InlineLink } from '@/components/ui/InlineLink'
+import { BASE_PATH } from '@/lib/constants'
+
+export const DatabaseConnectionsPreview = () => {
+ const { ref = '_' } = useParams()
+
+ return (
+ <div className="space-y-4">
+ <p className="text-sm text-foreground-light">
+ See every session on your database in real time, spot the ones that are slow, idle in a
+ transaction, or blocked, and terminate the one holding things up - all from{' '}
+ <InlineLink href={`/project/${ref}/observability/connections`}>
+ Database Connections
+ </InlineLink>
+ .
+ </p>
+
+ <Image
+ alt="database-connections-preview"
+ src={`${BASE_PATH}/img/previews/database-connections-preview.png`}
+ width={1200}
+ height={626}
+ className="rounded-sm border mb-4"
+ />
+
+ <div className="space-y-2">
+ <p className="text-sm">Enabling this preview will:</p>
+ <ul className="list-disc pl-6 text-sm text-foreground-light space-y-1">
+ <li>Show live connection, query, and locking activity for your database</li>
+ <li>Flag queries that are idle in transaction, long-running, or blocked</li>
+ <li>Trace a blocked query back to the session actually holding the lock</li>
+ <li>Let you terminate a stuck session directly from the table</li>
+ <li>Summarize current activity on demand using the AI Assistant</li>
+ </ul>
+ </div>
+ </div>
+ )
+}
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 63541a53ed4..a0aaea6f28e 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -139,6 +139,12 @@ export const useIsMarketplaceEnabled = () => {
return isMarketplaceEnabled && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_MARKETPLACE]
}
+export const useIsDatabaseConnectionsEnabled = () => {
+ const { flags } = useFeaturePreviewContext()
+ const isDatabaseConnectionsEnabled = useFlag('topForPostgres')
+ return isDatabaseConnectionsEnabled && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_DATABASE_CONNECTIONS]
+}
+
export const useFeaturePreviewModal = () => {
const featurePreviews = useFeaturePreviews()
const [featurePreviewModal, setFeaturePreviewModal] = useQueryState('featurePreviewModal')
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
index 29d8272bbcf..a5abbaa3b89 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
@@ -29,6 +29,7 @@ import {
import { AdvisorRulesPreview } from './AdvisorRulesPreview'
import { CLSPreview } from './CLSPreview'
+import { DatabaseConnectionsPreview } from './DatabaseConnectionsPreview'
import { useFeaturePreviewContext, useFeaturePreviewModal } from './FeaturePreviewContext'
import { IntegrationsLayoutPreview } from './IntegrationsLayoutPreview'
import { JitDbAccessPreview } from './JitDbAccessPreview'
@@ -51,6 +52,7 @@ const FEATURE_PREVIEW_KEY_TO_CONTENT: {
[LOCAL_STORAGE_KEYS.UI_PREVIEW_JIT_DB_ACCESS]: <JitDbAccessPreview />,
[LOCAL_STORAGE_KEYS.UI_PREVIEW_SQL_EDITOR_MANUAL_SAVE]: <SqlEditorManualSavePreview />,
[LOCAL_STORAGE_KEYS.UI_PREVIEW_MARKETPLACE]: <IntegrationsLayoutPreview />,
+ [LOCAL_STORAGE_KEYS.UI_PREVIEW_DATABASE_CONNECTIONS]: <DatabaseConnectionsPreview />,
}
export const FeaturePreviewModal = () => {
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
index 65be8e9df45..bb8139bfd18 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
+++ b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
@@ -20,10 +20,11 @@ export type FeaturePreview = {
}
export const useFeaturePreviews = (): FeaturePreview[] => {
- const platformWebhooksEnabled = useFlag('platformWebhooks')
+ const isPlatformWebhooksEnabled = useFlag('platformWebhooks')
const jitDbAccessEnabled = useFlag('jitDbAccess')
const isMarketplaceEnabled = useFlag('marketplaceIntegrations')
- const sqlEditorManualSaveEnabled = useFlag('sqlEditorManualSave')
+ const isSqlEditorManualSaveEnabled = useFlag('sqlEditorManualSave')
+ const isDatabaseConnectionsEnabled = useFlag('topForPostgres')
const unifiedLogsDefaultOptIn = useFlag('unifiedLogsDefaultOptIn')
@@ -64,17 +65,17 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
key: LOCAL_STORAGE_KEYS.UI_PREVIEW_PLATFORM_WEBHOOKS,
name: 'Platform webhooks',
discussionsUrl: undefined,
- isNew: true,
+ isNew: false,
isPlatformOnly: true,
isDefaultOptIn: false,
- enabled: platformWebhooksEnabled,
+ enabled: isPlatformWebhooksEnabled,
getRoute: (ref?: string) => `/project/${ref}/settings/webhooks`,
},
{
key: LOCAL_STORAGE_KEYS.UI_PREVIEW_JIT_DB_ACCESS,
- name: 'Temporary access',
+ name: 'Temporary database access',
discussionsUrl: undefined,
- isNew: true,
+ isNew: false,
isPlatformOnly: true,
isDefaultOptIn: false,
enabled: jitDbAccessEnabled,
@@ -107,15 +108,26 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
isNew: true,
isPlatformOnly: true,
isDefaultOptIn: false,
- enabled: sqlEditorManualSaveEnabled,
+ enabled: isSqlEditorManualSaveEnabled,
+ },
+ {
+ key: LOCAL_STORAGE_KEYS.UI_PREVIEW_DATABASE_CONNECTIONS,
+ name: 'Diagnose blocked queries',
+ discussionsUrl: 'https://github.com/orgs/supabase/discussions/48639',
+ isNew: true,
+ isPlatformOnly: false,
+ isDefaultOptIn: false,
+ enabled: isDatabaseConnectionsEnabled,
+ getRoute: (ref?: string) => `/project/${ref}/observability/connections`,
},
].sort((a, b) => Number(b.isNew) - Number(a.isNew)),
[
unifiedLogsDefaultOptIn,
- platformWebhooksEnabled,
+ isPlatformWebhooksEnabled,
jitDbAccessEnabled,
isMarketplaceEnabled,
- sqlEditorManualSaveEnabled,
+ isSqlEditorManualSaveEnabled,
+ isDatabaseConnectionsEnabled,
]
)
}
diff --git a/apps/studio/components/interfaces/Observability/DatabaseConnections/Activity.tsx b/apps/studio/components/interfaces/Observability/DatabaseConnections/Activity.tsx
index f31ee12d219..73428c7208e 100644
--- a/apps/studio/components/interfaces/Observability/DatabaseConnections/Activity.tsx
+++ b/apps/studio/components/interfaces/Observability/DatabaseConnections/Activity.tsx
@@ -84,7 +84,10 @@ export const Activity = ({ live }: ActivityProps) => {
)
})
const rootBlockers = (data ?? []).filter(
- (x) => x.blocked_by.length === 0 && blockingPids.has(x.pid)
+ (x) =>
+ x.blocked_by.length === 0 &&
+ blockingPids.has(x.pid) &&
+ (rolesFilter.length === 0 || rolesFilter.includes(x.role_name))
)
const stateOptions = [
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.test.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.test.tsx
index 6a782d5076f..f63bdd9f116 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.test.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.test.tsx
@@ -26,10 +26,14 @@ vi.mock('@/lib/constants', async () => {
}
})
-vi.mock('common', () => ({
- useFlag: vi.fn().mockReturnValue(false),
- useParams: vi.fn().mockReturnValue({ ref: REF }),
-}))
+vi.mock('common', async (importOriginal) => {
+ const actual = await importOriginal<typeof import('common')>()
+ return {
+ ...actual,
+ useFlag: vi.fn().mockReturnValue(false),
+ useParams: vi.fn().mockReturnValue({ ref: REF }),
+ }
+})
vi.mock('@/components/interfaces/QueryPerformance/hooks/useSupamonitorStatus', () => ({
useSupamonitorStatus: vi.fn(),
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.tsx
index efd8b8c1b98..44ff90b6442 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.utils.tsx
@@ -2,6 +2,7 @@ import { useFlag, useParams } from 'common'
import { useRouter } from 'next/router'
import { useMemo } from 'react'
+import { useIsDatabaseConnectionsEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { useSupamonitorStatus } from '@/components/interfaces/QueryPerformance/hooks/useSupamonitorStatus'
import { useContentQuery, type Content, type ContentBase } from '@/data/content/content-query'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
@@ -45,10 +46,10 @@ const usePreservedQueryParams = () => {
export const useGenerateObservabilityMenu = () => {
const { ref } = useParams()
const preservedQueryParams = usePreservedQueryParams()
+ const { isSupamonitorEnabled } = useSupamonitorStatus()
const showOverview = useFlag('observabilityOverview')
- const topForPostgres = useFlag('topForPostgres')
- const { isSupamonitorEnabled } = useSupamonitorStatus()
+ const isDatabaseConnectionsEnabled = useIsDatabaseConnectionsEnabled()
const storageSupported = useIsFeatureEnabled('project_storage:all')
const baseUrl = `/project/${ref}/observability`
@@ -91,7 +92,7 @@ export const useGenerateObservabilityMenu = () => {
},
]
: []),
- ...(topForPostgres
+ ...(isDatabaseConnectionsEnabled
? [
{
name: 'Database Connections',
diff --git a/apps/studio/public/img/previews/database-connections-preview.png b/apps/studio/public/img/previews/database-connections-preview.png
new file mode 100644
index 00000000000..c2736bfba82
Binary files /dev/null and b/apps/studio/public/img/previews/database-connections-preview.png differ
diff --git a/packages/common/constants/local-storage.ts b/packages/common/constants/local-storage.ts
index 526f36d42dd..d8f053a72db 100644
--- a/packages/common/constants/local-storage.ts
+++ b/packages/common/constants/local-storage.ts
@@ -27,6 +27,7 @@ export const LOCAL_STORAGE_KEYS = {
UI_PREVIEW_JIT_DB_ACCESS: 'supabase-ui-jit-db-access',
UI_PREVIEW_SQL_EDITOR_MANUAL_SAVE: 'supabase-ui-sql-editor-manual-save',
UI_PREVIEW_MARKETPLACE: 'supabase-ui-marketplace',
+ UI_PREVIEW_DATABASE_CONNECTIONS: 'preview-database-connections',
AI_ASSISTANT_MCP_OPT_IN: 'ai-assistant-mcp-opt-in',
SIGN_IN_CHATGPT_ENABLED: 'siwc-enabled',