Skip to content

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

feat(studio): unified logs guard change (#44962)

kemal.earth4ec48666d27c
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 831aae1095c..073660d5cc0 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -12,6 +12,7 @@ import {
} from 'react'
import { useFeaturePreviews } from './useFeaturePreviews'
+import { useIsEnterpriseOrSupabaseOrg } from './useIsEnterpriseOrSupabaseOrg'
import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'
import { EMPTY_OBJ } from '@/lib/void'
@@ -85,14 +86,20 @@ export const useIsColumnLevelPrivilegesEnabled = () => {
export const useUnifiedLogsPreview = () => {
const { flags, onUpdateFlag } = useFeaturePreviewContext()
+ const { hasLoaded: flagsHaveLoaded } = useContext(FeatureFlagContext)
const unifiedLogsEnabled = useFlag('unifiedLogs')
- const isEnabled = unifiedLogsEnabled && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS]
+ const { isEligible: isEnterpriseOrSupabaseOrg, isLoading: isOrgLoading } =
+ useIsEnterpriseOrSupabaseOrg()
+
+ const isLoading = !flagsHaveLoaded || isOrgLoading
+ const isEligible = unifiedLogsEnabled && isEnterpriseOrSupabaseOrg
+ const isEnabled = isEligible && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS]
const enable = () => onUpdateFlag(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS, true)
const disable = () => onUpdateFlag(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS, false)
- return { isEnabled, enable, disable }
+ return { isEnabled, isEligible, isLoading, enable, disable }
}
export const useIsPgDeltaDiffEnabled = () => {
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/UnifiedLogsPreview.tsx b/apps/studio/components/interfaces/App/FeaturePreview/UnifiedLogsPreview.tsx
index a968d7e42e2..fc623381159 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/UnifiedLogsPreview.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/UnifiedLogsPreview.tsx
@@ -14,7 +14,7 @@ export const UnifiedLogsPreview = () => {
unified view across all your services. Built for better performance and easier debugging.
</p>
<p className="text-foreground-light text-sm mb-4">
- This interface will only be available for organizations on the Team plan or above.
+ This interface is only available for organizations on the Enterprise plan.
</p>
<Image
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
index f92dbcd3fba..8c9b80f931e 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
+++ b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
@@ -1,5 +1,7 @@
import { LOCAL_STORAGE_KEYS, useFlag } from 'common'
+import { useIsEnterpriseOrSupabaseOrg } from './useIsEnterpriseOrSupabaseOrg'
+
export type FeaturePreview = {
key: string
name: string
@@ -15,6 +17,7 @@ export type FeaturePreview = {
export const useFeaturePreviews = (): FeaturePreview[] => {
const isUnifiedLogsPreviewAvailable = useFlag('unifiedLogs')
+ const { isEligible: isEnterpriseOrSupabaseOrg } = useIsEnterpriseOrSupabaseOrg()
const pgDeltaDiffEnabled = useFlag('pgdeltaDiff')
const showFloatingMobileToolbar = useFlag('enableFloatingMobileToolbar')
@@ -26,7 +29,7 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
key: LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS,
name: 'New Logs interface',
discussionsUrl: 'https://github.com/orgs/supabase/discussions/37234',
- enabled: isUnifiedLogsPreviewAvailable,
+ enabled: isUnifiedLogsPreviewAvailable && isEnterpriseOrSupabaseOrg,
isNew: false,
isPlatformOnly: true,
isDefaultOptIn: false,
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useIsEnterpriseOrSupabaseOrg.ts b/apps/studio/components/interfaces/App/FeaturePreview/useIsEnterpriseOrSupabaseOrg.ts
new file mode 100644
index 00000000000..81580a0ea31
--- /dev/null
+++ b/apps/studio/components/interfaces/App/FeaturePreview/useIsEnterpriseOrSupabaseOrg.ts
@@ -0,0 +1,19 @@
+import { useParams } from 'common'
+
+import { useProjectDetailQuery } from '@/data/projects/project-detail-query'
+import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
+import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
+
+export const useIsEnterpriseOrSupabaseOrg = () => {
+ const { ref } = useParams()
+ const { isLoading: isProjectLoading } = useProjectDetailQuery({ ref })
+ const { data: org, isLoading: isOrgLoading } = useSelectedOrganizationQuery()
+ const { data: subscription, isLoading: isSubscriptionLoading } = useOrgSubscriptionQuery({
+ orgSlug: org?.slug,
+ })
+
+ const isLoading = isProjectLoading || isOrgLoading || (org !== undefined && isSubscriptionLoading)
+ const isEligible = subscription?.plan?.id === 'enterprise' || org?.id === 1
+
+ return { isLoading, isEligible }
+}
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
index 96a4b519e33..7ac01952e46 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
@@ -52,6 +52,7 @@ import { useUnifiedLogsChartQuery } from '@/data/logs/unified-logs-chart-query'
import { useUnifiedLogsCountQuery } from '@/data/logs/unified-logs-count-query'
import { useUnifiedLogsInfiniteQuery } from '@/data/logs/unified-logs-infinite-query'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
+import { useTrack } from '@/lib/telemetry/track'
export const CHART_CONFIG = {
success: {
@@ -72,6 +73,7 @@ export const UnifiedLogs = () => {
useResetFocus()
const { ref: projectRef } = useParams()
+ const track = useTrack()
const [search, setSearch] = useQueryStates(SEARCH_PARAMS_PARSER)
const { sort, start, size, id, cursor, direction, live, ...filter } = search
@@ -305,6 +307,7 @@ export const UnifiedLogs = () => {
setSearch({
id: selectedRowId,
})
+ track('unified_logs_row_clicked', { logType: selectedRow.original.log_type })
// Don't clear rowSelection here - let it persist to maintain the selection
} else if (!selectedRowId && search.id) {
// Clear the URL parameter when no row is selected
diff --git a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
index 2c67de6fb0c..d654daba7b8 100644
--- a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
+++ b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
@@ -82,7 +82,7 @@ export function LogsSidebarMenuV2() {
const unifiedLogsFlagEnabled = useFlag('unifiedLogs')
const { selectFeaturePreview } = useFeaturePreviewModal()
- const { enable: enableUnifiedLogs } = useUnifiedLogsPreview()
+ const { enable: enableUnifiedLogs, isEligible: isUnifiedLogsEligible } = useUnifiedLogsPreview()
const [searchText, setSearchText] = useState('')
@@ -247,7 +247,7 @@ export function LogsSidebarMenuV2() {
}
/>
)}
- {unifiedLogsFlagEnabled && (
+ {isUnifiedLogsEligible && (
<FeaturePreviewSidebarPanel
className="mx-4 mt-4"
title="Introducing unified logs"
diff --git a/apps/studio/components/ui/DataTable/FilterSideBar.tsx b/apps/studio/components/ui/DataTable/FilterSideBar.tsx
index 1797cb30cca..a4dadc8001c 100644
--- a/apps/studio/components/ui/DataTable/FilterSideBar.tsx
+++ b/apps/studio/components/ui/DataTable/FilterSideBar.tsx
@@ -1,4 +1,4 @@
-import { useFlag, useParams } from 'common'
+import { useParams } from 'common'
import Link from 'next/link'
import { useRouter } from 'next/router'
import React, { useEffect } from 'react'
@@ -27,8 +27,7 @@ export function FilterSideBar({
const { ref } = useParams()
const { table } = useDataTable()
- const isUnifiedLogsPreviewAvailable = useFlag('unifiedLogs')
- const { disable: disableUnifiedLogs } = useUnifiedLogsPreview()
+ const { disable: disableUnifiedLogs, isEligible: isUnifiedLogsEligible } = useUnifiedLogsPreview()
const handleGoBackToOldLogs = () => {
disableUnifiedLogs()
@@ -69,7 +68,7 @@ export function FilterSideBar({
</div>
<div className="flex-1 p-2 sm:overflow-y-scroll">
- {isUnifiedLogsPreviewAvailable && (
+ {isUnifiedLogsEligible && (
<FeaturePreviewSidebarPanel
className="mx-2 mt-2 mb-3"
title="Go back to old logs"
diff --git a/apps/studio/pages/project/[ref]/logs/index.tsx b/apps/studio/pages/project/[ref]/logs/index.tsx
index de5ab047052..c82d487dc2d 100644
--- a/apps/studio/pages/project/[ref]/logs/index.tsx
+++ b/apps/studio/pages/project/[ref]/logs/index.tsx
@@ -12,14 +12,14 @@ export const LogPage: NextPageWithLayout = () => {
const router = useRouter()
const { ref } = useParams()
- const { isEnabled: isUnifiedLogsEnabled } = useUnifiedLogsPreview()
+ const { isEnabled: isUnifiedLogsEnabled, isLoading } = useUnifiedLogsPreview()
useEffect(() => {
- if (!isUnifiedLogsEnabled && ref) {
+ if (!isLoading && !isUnifiedLogsEnabled && ref) {
router.replace(`/project/${ref}/logs/explorer`)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [isUnifiedLogsEnabled, ref])
+ }, [isLoading, isUnifiedLogsEnabled, ref])
if (isUnifiedLogsEnabled) {
return (
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 889907864a1..ed2d13c7c4d 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -3202,6 +3202,20 @@ export interface ResourceExhaustionBannerAiAssistantClickedEvent {
}
}
+/**
+ * User clicked a row in the Unified Logs interface.
+ *
+ * @group Events
+ * @source studio
+ */
+export interface UnifiedLogsRowClickedEvent {
+ action: 'unified_logs_row_clicked'
+ properties: {
+ logType: string
+ }
+ groups: TelemetryGroups
+}
+
/**
* @hidden
*/
@@ -3381,3 +3395,4 @@ export type TelemetryEvent =
| AccessTokenRemovedEvent
| ResourceExhaustionBannerUpgradeClickedEvent
| ResourceExhaustionBannerAiAssistantClickedEvent
+ | UnifiedLogsRowClickedEvent