Skip to content

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

feat(feature-preview): remove hardcoded plan check for unified logs (#46114)

Jordi Enricdf618569369f
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 5cbbdfc4e3a..8ba88fe57f2 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -12,7 +12,6 @@ import {
} from 'react'
import { useFeaturePreviews } from './useFeaturePreviews'
-import { useIsEnterpriseOrSupabaseOrg } from './useIsEnterpriseOrSupabaseOrg'
import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'
import { EMPTY_OBJ } from '@/lib/void'
@@ -89,17 +88,13 @@ export const useUnifiedLogsPreview = () => {
const { hasLoaded: flagsHaveLoaded } = useContext(FeatureFlagContext)
const unifiedLogsEnabled = useFlag('unifiedLogs')
- 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 isLoading = !flagsHaveLoaded
+ const isEnabled = unifiedLogsEnabled && 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, isEligible, isLoading, enable, disable }
+ return { isEnabled, isEligible: unifiedLogsEnabled, isLoading, enable, disable }
}
export const useIsPgDeltaDiffEnabled = () => {
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
index 874fdfcb336..84e0b11db79 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
+++ b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
@@ -1,7 +1,5 @@
import { LOCAL_STORAGE_KEYS, useFlag } from 'common'
-import { useIsEnterpriseOrSupabaseOrg } from './useIsEnterpriseOrSupabaseOrg'
-
export type FeaturePreview = {
key: string
name: string
@@ -17,8 +15,6 @@ export type FeaturePreview = {
export const useFeaturePreviews = (): FeaturePreview[] => {
const isUnifiedLogsPreviewAvailable = useFlag('unifiedLogs')
- const { isEligible: isEnterpriseOrSupabaseOrg } = useIsEnterpriseOrSupabaseOrg()
-
const pgDeltaDiffEnabled = useFlag('pgdeltaDiff')
const platformWebhooksEnabled = useFlag('platformWebhooks')
const jitDbAccessEnabled = useFlag('jitDbAccess')
@@ -37,7 +33,7 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
key: LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS,
name: 'Updated Logs interface',
discussionsUrl: 'https://github.com/orgs/supabase/discussions/37234',
- enabled: isUnifiedLogsPreviewAvailable || isEnterpriseOrSupabaseOrg,
+ enabled: isUnifiedLogsPreviewAvailable,
isNew: true,
isPlatformOnly: true,
isDefaultOptIn: false,
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useIsEnterpriseOrSupabaseOrg.ts b/apps/studio/components/interfaces/App/FeaturePreview/useIsEnterpriseOrSupabaseOrg.ts
deleted file mode 100644
index 81580a0ea31..00000000000
--- a/apps/studio/components/interfaces/App/FeaturePreview/useIsEnterpriseOrSupabaseOrg.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-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 }
-}