Skip to content

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

fix: feature preview showing disabled features (#43339)

Jordi Enric8cb4404065a3
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 7fbd506af9f..2b6eb4d64c9 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -82,8 +82,9 @@ export const useIsColumnLevelPrivilegesEnabled = () => {
export const useUnifiedLogsPreview = () => {
const { flags, onUpdateFlag } = useFeaturePreviewContext()
+ const unifiedLogsEnabled = useFlag('unifiedLogs')
- const isEnabled = flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS]
+ 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)
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
index faaeae557e0..ca9f986f09f 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
@@ -65,15 +65,17 @@ export const FeaturePreviewModal = () => {
)
const { flags, onUpdateFlag } = featurePreviewContext
- const selectedFeature =
- featurePreviews.find((preview) => preview.key === selectedFeatureKey) ?? featurePreviews[0]
- const isSelectedFeatureEnabled = flags[selectedFeatureKey]
+ const allFeaturePreviews = (
+ IS_PLATFORM ? featurePreviews : featurePreviews.filter((x) => !x.isPlatformOnly)
+ ).filter((x) => x.enabled)
- const allFeaturePreviews = IS_PLATFORM
- ? featurePreviews
- : featurePreviews.filter((x) => !x.isPlatformOnly)
+ const selectedFeature =
+ allFeaturePreviews.find((preview) => preview.key === selectedFeatureKey) ??
+ allFeaturePreviews[0]
+ const isSelectedFeatureEnabled = flags[selectedFeature?.key]
const toggleFeature = () => {
+ if (!selectedFeature) return
onUpdateFlag(selectedFeature.key, !isSelectedFeatureEnabled)
sendEvent({
action: isSelectedFeatureEnabled ? 'feature_preview_disabled' : 'feature_preview_enabled',
@@ -100,7 +102,7 @@ export const FeaturePreviewModal = () => {
<DialogSectionSeparator />
<DialogSection className="!p-0">
- {featurePreviews.length > 0 ? (
+ {allFeaturePreviews.length > 0 ? (
<div className="flex">
<div>
<ScrollArea className="h-[550px] w-[280px] border-r">
@@ -113,7 +115,7 @@ export const FeaturePreviewModal = () => {
onClick={() => selectFeaturePreview(feature.key)}
className={cn(
'flex items-center justify-between p-4 border-b cursor-pointer bg transition',
- selectedFeature.key === feature.key ? 'bg-surface-300' : 'bg-surface-100'
+ selectedFeature?.key === feature.key ? 'bg-surface-300' : 'bg-surface-100'
)}
>
<div className="flex items-center gap-x-3">
@@ -152,7 +154,7 @@ export const FeaturePreviewModal = () => {
</Button>
</div>
</div>
- {FEATURE_PREVIEW_KEY_TO_CONTENT[selectedFeature.key]}
+ {FEATURE_PREVIEW_KEY_TO_CONTENT[selectedFeature?.key ?? '']}
</div>
</div>
) : (