The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Joshen/fe 3697 progressively default opt in to unified logs (#47296)
Joshen Lim2bac064adf91
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsxindex fad16eb4c9c..356dd83dcfb 100644--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx@@ -75,17 +75,20 @@ export const useIsColumnLevelPrivilegesEnabled = () => {}export const useUnifiedLogsPreview = () => {+ const unifiedLogsDefaultOptIn = useFlag('unifiedLogsDefaultOptIn')const { flags, onUpdateFlag } = useFeaturePreviewContext()const { hasLoaded: flagsHaveLoaded } = useContext(FeatureFlagContext)- const unifiedLogsEnabled = useFlag('unifiedLogs')const isLoading = !flagsHaveLoaded- const isEnabled = unifiedLogsEnabled && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS]+ const isEnabled = flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS]++ const hasToggledPreview = !!safeLocalStorage.getItem(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS)+ const isDefaultOptIn = flagsHaveLoaded && unifiedLogsDefaultOptIn && !hasToggledPreviewconst enable = () => onUpdateFlag(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS, true)const disable = () => onUpdateFlag(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS, false)- return { isEnabled, isEligible: unifiedLogsEnabled, isLoading, enable, disable }+ return { isEnabled, isLoading, isDefaultOptIn, enable, disable }}export const useIsPgDeltaDiffEnabled = () => {diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.tsindex e70e3dd8f1b..137ae7c8df2 100644--- a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts+++ b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts@@ -20,12 +20,13 @@ export type FeaturePreview = {}export const useFeaturePreviews = (): FeaturePreview[] => {- const isUnifiedLogsPreviewAvailable = useFlag('unifiedLogs')const pgDeltaDiffEnabled = useFlag('pgdeltaDiff')const platformWebhooksEnabled = useFlag('platformWebhooks')const jitDbAccessEnabled = useFlag('jitDbAccess')const isMarketplaceEnabled = useFlag('marketplaceIntegrations')+ const unifiedLogsDefaultOptIn = useFlag('unifiedLogsDefaultOptIn')+return useMemo(() =>[@@ -43,10 +44,10 @@ 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,+ enabled: true,isNew: true,isPlatformOnly: true,- isDefaultOptIn: false,+ isDefaultOptIn: unifiedLogsDefaultOptIn,getRoute: (ref?: string) => `/project/${ref}/logs`,},{@@ -111,7 +112,7 @@ export const useFeaturePreviews = (): FeaturePreview[] => {},].sort((a, b) => Number(b.isNew) - Number(a.isNew)),[- isUnifiedLogsPreviewAvailable,+ unifiedLogsDefaultOptIn,pgDeltaDiffEnabled,platformWebhooksEnabled,jitDbAccessEnabled,diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogsBanner.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogsBanner.tsxindex dede3b3cb4f..f42e66ef45f 100644--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogsBanner.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogsBanner.tsx@@ -1,30 +1,42 @@+import { useParams } from 'common'import { CircleHelpIcon, Undo2 } from 'lucide-react'+import { useRouter } from 'next/router'import { Badge, Button, cn } from 'ui'+import {+ useFeaturePreviewModal,+ useUnifiedLogsPreview,+} from '../App/FeaturePreview/FeaturePreviewContext'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'interface UnifiedLogsBannerProps {- variant: 'promo' | 'utility'- onEnable?: () => void- onMoreInfo?: () => void- onSwitchBack?: () => voidclassName?: string}-export function UnifiedLogsBanner({- variant,- onEnable,- onMoreInfo,- onSwitchBack,- className,-}: UnifiedLogsBannerProps) {+export function UnifiedLogsBanner({ className = 'mx-4 mt-4' }: UnifiedLogsBannerProps) {+ const router = useRouter()+ const { ref } = useParams()++ const { selectFeaturePreview } = useFeaturePreviewModal()+ const { enable, disable, isDefaultOptIn, isEnabled } = useUnifiedLogsPreview()+const cardClassName = cn('rounded-lg border p-4 space-y-3 text-left','bg-muted/10 border-border/50',className)- if (variant === 'utility') {+ const onSwitchBack = () => {+ disable()+ router.push(`/project/${ref}/logs/explorer`)+ }++ const onEnable = () => {+ enable()+ router.push(`/project/${ref}/logs`)+ }++ if (isEnabled && !isDefaultOptIn) {return (<div className={cn('rounded-lg border px-4 py-3', 'bg-muted/10 border-border/50', className)}><div className="flex items-center justify-between gap-3">@@ -50,16 +62,28 @@ export function UnifiedLogsBanner({</div><h3 className="font-medium text-sm text-foreground">Introducing unified logs</h3><div className="flex justify-start items-start gap-x-2">- <Button variant="default" onClick={onEnable}>- Enable preview- </Button>- <ButtonTooltip- variant="default"- className="px-1.5"- icon={<CircleHelpIcon />}- onClick={onMoreInfo}- tooltip={{ content: { side: 'bottom', text: 'More information' } }}- />+ {isDefaultOptIn ? (+ <Button+ variant="default"+ icon={<CircleHelpIcon />}+ onClick={() => selectFeaturePreview('supabase-ui-preview-unified-logs')}+ >+ More information+ </Button>+ ) : (+ <>+ <Button variant="default" onClick={onEnable}>+ Enable preview+ </Button>+ <ButtonTooltip+ variant="default"+ className="px-1.5"+ icon={<CircleHelpIcon />}+ onClick={() => selectFeaturePreview('supabase-ui-preview-unified-logs')}+ tooltip={{ content: { side: 'bottom', text: 'More information' } }}+ />+ </>+ )}</div></div>)diff --git a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsxindex 6ac286ae309..09ea7768a83 100644--- a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx+++ b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx@@ -1,17 +1,9 @@-import { IS_PLATFORM, useFlag, useParams } from 'common'+import { IS_PLATFORM, useParams } from 'common'import { ChevronRight, Plus } from 'lucide-react'import Link from 'next/link'import { useRouter } from 'next/router'import React, { useState } from 'react'-import {- Badge,- Button,- cn,- Collapsible,- CollapsibleContent,- CollapsibleTrigger,- Separator,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger, Separator } from 'ui'import {InnerSideBarEmptyPanel,InnerSideBarFilters,@@ -21,10 +13,6 @@ import {import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import { FeaturePreviewSidebarPanel } from '../../ui/FeaturePreviewSidebarPanel'-import {- useFeaturePreviewModal,- useUnifiedLogsPreview,-} from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'import { useIsETLPrivateAlpha } from '@/components/interfaces/Database/Replication/useIsETLPrivateAlpha'import { LOG_DRAIN_TYPES } from '@/components/interfaces/LogDrains/LogDrains.constants'import SavedQueriesItem from '@/components/interfaces/Settings/Logs/Logs.SavedQueriesItem'@@ -64,10 +52,6 @@ export function LogsSidebarMenuV2() {const router = useRouter()const { ref } = useParams() as { ref: string }- const unifiedLogsFlagEnabled = useFlag('unifiedLogs')- const { selectFeaturePreview } = useFeaturePreviewModal()- const { enable: enableUnifiedLogs, isEligible: isUnifiedLogsEligible } = useUnifiedLogsPreview()-const [searchText, setSearchText] = useState('')const {@@ -225,32 +209,7 @@ export function LogsSidebarMenuV2() {return (<div className="pb-4 relative">- {IS_PLATFORM && !unifiedLogsFlagEnabled && (- <FeaturePreviewSidebarPanel- className="mx-4 mt-4"- illustration={<Badge variant="default">Coming soon</Badge>}- title="New logs"- description="Get early access"- actions={- <Link href="https://forms.supabase.com/unified-logs-signup" target="_blank">- <Button variant="default" size="tiny">- Early access- </Button>- </Link>- }- />- )}- {isUnifiedLogsEligible && (- <UnifiedLogsBanner- variant="promo"- className="mx-4 mt-4"- onEnable={() => {- enableUnifiedLogs()- router.push(`/project/${ref}/logs`)- }}- onMoreInfo={() => selectFeaturePreview('supabase-ui-preview-unified-logs')}- />- )}+ <UnifiedLogsBanner /><divclassName={cn(@@ -265,7 +224,7 @@ export function LogsSidebarMenuV2() {aria-labelledby="Search collections"value={searchText}onChange={(e) => setSearchText(e.target.value)}- ></InnerSideBarFilterSearchInput>+ /></InnerSideBarFilters><Buttondiff --git a/apps/studio/components/layouts/ProjectLayout/index.test.tsx b/apps/studio/components/layouts/ProjectLayout/index.test.tsxindex 8fca42fbcc8..6a2ebf1f56b 100644--- a/apps/studio/components/layouts/ProjectLayout/index.test.tsx+++ b/apps/studio/components/layouts/ProjectLayout/index.test.tsx@@ -193,7 +193,6 @@ vi.mock('@/components/ui/BannerStack/Banners/BannerUnifiedLogs', () => ({vi.mock('@/components/interfaces/App/FeaturePreview/FeaturePreviewContext', () => ({useUnifiedLogsPreview: () => ({isEnabled: false,- isEligible: false,isLoading: false,enable: () => {},disable: () => {},@@ -392,7 +391,9 @@ describe('FREE_MICRO_UPGRADE banner', () => {await waitFor(() => {expect(mockDismissBanner).toHaveBeenCalledWith('free-micro-upgrade-banner')})- expect(mockAddBanner).not.toHaveBeenCalled()+ expect(mockAddBanner).not.toHaveBeenCalledWith(+ expect.objectContaining({ id: 'free-micro-upgrade-banner' })+ )})it('calls dismissBanner when compute warnings are cleared', async () => {@@ -410,7 +411,9 @@ describe('FREE_MICRO_UPGRADE banner', () => {await waitFor(() => {expect(mockDismissBanner).toHaveBeenCalledWith('free-micro-upgrade-banner')})- expect(mockAddBanner).not.toHaveBeenCalled()+ expect(mockAddBanner).not.toHaveBeenCalledWith(+ expect.objectContaining({ id: 'free-micro-upgrade-banner' })+ )})it('calls dismissBanner when project is not nano compute', async () => {@@ -421,6 +424,8 @@ describe('FREE_MICRO_UPGRADE banner', () => {await waitFor(() => {expect(mockDismissBanner).toHaveBeenCalledWith('free-micro-upgrade-banner')})- expect(mockAddBanner).not.toHaveBeenCalled()+ expect(mockAddBanner).not.toHaveBeenCalledWith(+ expect.objectContaining({ id: 'free-micro-upgrade-banner' })+ )})})diff --git a/apps/studio/components/layouts/ProjectLayout/index.tsx b/apps/studio/components/layouts/ProjectLayout/index.tsxindex 6d811bdb278..55bc499d8d6 100644--- a/apps/studio/components/layouts/ProjectLayout/index.tsx+++ b/apps/studio/components/layouts/ProjectLayout/index.tsx@@ -1,4 +1,4 @@-import { LOCAL_STORAGE_KEYS, mergeRefs, useParams } from 'common'+import { IS_PLATFORM, LOCAL_STORAGE_KEYS, mergeRefs, useParams } from 'common'import { AnimatePresence, motion } from 'framer-motion'import { XIcon } from 'lucide-react'import Head from 'next/head'@@ -41,7 +41,6 @@ import { RestoreFailedState } from './RestoreFailedState'import { RestoringState } from './RestoringState'import { UnhealthyState } from './UnhealthyState'import { UpgradingState } from './UpgradingState'-import { useUnifiedLogsPreview } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'import { CreateBranchModal } from '@/components/interfaces/BranchManagement/CreateBranchModal'import { ProjectAPIDocs } from '@/components/interfaces/ProjectAPIDocs/ProjectAPIDocs'import { BannerFreeMicroUpgrade } from '@/components/ui/BannerStack/Banners/BannerFreeMicroUpgrade'@@ -161,7 +160,6 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<ProjecLOCAL_STORAGE_KEYS.UNIFIED_LOGS_BANNER_DISMISSED,false)- const { isEligible: showUnifiedLogsBanner } = useUnifiedLogsPreview()const [isProjectIntegrationBannerDismissed, setIsProjectIntegrationBannerDismissed] =useLocalStorageQuery(getProjectIntegrationBannerDismissKey({@@ -241,7 +239,7 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<ProjecuseEffect(() => {if (!selectedProject?.ref) return- if (showUnifiedLogsBanner && !isUnifiedLogsBannerDismissed) {+ if (IS_PLATFORM && !isUnifiedLogsBannerDismissed) {addBanner({id: BANNER_ID.UNIFIED_LOGS,isDismissed: false,@@ -251,13 +249,7 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec} else {dismissBanner(BANNER_ID.UNIFIED_LOGS)}- }, [- selectedProject?.ref,- showUnifiedLogsBanner,- isUnifiedLogsBannerDismissed,- addBanner,- dismissBanner,- ])+ }, [selectedProject?.ref, isUnifiedLogsBannerDismissed, addBanner, dismissBanner])useLayoutEffect(() => {const unregister = registerOpenMenu(() => {diff --git a/apps/studio/components/ui/DataTable/FilterSideBar.tsx b/apps/studio/components/ui/DataTable/FilterSideBar.tsxindex 99166c61482..71fb110655c 100644--- a/apps/studio/components/ui/DataTable/FilterSideBar.tsx+++ b/apps/studio/components/ui/DataTable/FilterSideBar.tsx@@ -1,6 +1,5 @@import { useParams } from 'common'import Link from 'next/link'-import { useRouter } from 'next/router'import { cloneElement, Dispatch, SetStateAction, useEffect } from 'react'import { Badge, Button, cn, ResizablePanel, usePanelRef } from 'ui'@@ -9,7 +8,6 @@ import { DateRangeDisabled } from './DataTable.types'import { DataTableFilterControls } from './DataTableFilters/DataTableFilterControls'import { DataTableResetButton } from './DataTableResetButton'import { useDataTable } from './providers/DataTableProvider'-import { useUnifiedLogsPreview } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'import { LOG_DRAIN_TYPES } from '@/components/interfaces/LogDrains/LogDrains.constants'import { UnifiedLogsBanner } from '@/components/interfaces/UnifiedLogs/UnifiedLogsBanner'@@ -24,17 +22,9 @@ export function FilterSideBar({setIsFilterBarOpen,dateRangeDisabled,}: FilterSideBarProps) {- const router = useRouter()const { ref } = useParams()const { table } = useDataTable()- const { disable: disableUnifiedLogs, isEligible: isUnifiedLogsEligible } = useUnifiedLogsPreview()-- const handleGoBackToOldLogs = () => {- disableUnifiedLogs()- router.push(`/project/${ref}/logs/explorer`)- }-const panelRef = usePanelRef()useEffect(() => {@@ -66,19 +56,13 @@ export function FilterSideBar({<div className="flex h-[48px] items-center justify-between gap-3"><div className="flex items-center gap-2"><p className="text-foreground text-lg">Logs</p>- {isUnifiedLogsEligible && <Badge variant="default">Beta</Badge>}+ <Badge variant="default">Beta</Badge></div>{table.getState().columnFilters.length ? <DataTableResetButton /> : null}</div></div>- {isUnifiedLogsEligible && (- <UnifiedLogsBanner- variant="utility"- className="mx-4 mt-4"- onSwitchBack={handleGoBackToOldLogs}- />- )}+ <UnifiedLogsBanner /><div className="flex-1 p-2 sm:overflow-y-scroll"><DataTableFilterControls dateRangeDisabled={dateRangeDisabled} />