The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
chore: add entitlement check to observability log retention (#43469)
Ignacio Dobroniche29f4ca6f30a
diff --git a/apps/studio/components/interfaces/Home/ProjectUsage.tsx b/apps/studio/components/interfaces/Home/ProjectUsage.tsxindex 3422b715957..71adca4495e 100644--- a/apps/studio/components/interfaces/Home/ProjectUsage.tsx+++ b/apps/studio/components/interfaces/Home/ProjectUsage.tsx@@ -10,14 +10,14 @@ import {} from 'data/analytics/project-log-stats-query'import dayjs from 'dayjs'import { useFillTimeseriesSorted } from 'hooks/analytics/useFillTimeseriesSorted'-import { useCurrentOrgPlan } from 'hooks/misc/useCurrentOrgPlan'+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { Auth, Database, Realtime, Storage } from 'icons'import sumBy from 'lodash/sumBy'import Link from 'next/link'import { useRouter } from 'next/router'-import { useState } from 'react'+import { useEffect, useState } from 'react'import { Loading } from 'ui'type ChartIntervalKey = ProjectLogStatsVariables['interval']@@ -32,12 +32,18 @@ const ProjectUsage = () => {'project_storage:all',])- const { plan } = useCurrentOrgPlan()+ const { getEntitlementMax } = useCheckEntitlements('log.retention_days')+ const retentionDays = getEntitlementMax()- const DEFAULT_INTERVAL: ChartIntervalKey = plan?.id === 'free' ? '1hr' : '1day'+ const DEFAULT_INTERVAL: ChartIntervalKey =+ retentionDays !== undefined && retentionDays < 7 ? '1hr' : '1day'const [interval, setInterval] = useState<ChartIntervalKey>(DEFAULT_INTERVAL)+ useEffect(() => {+ setInterval(retentionDays !== undefined && retentionDays < 7 ? '1hr' : '1day')+ }, [retentionDays])+const { data, isPending: isLoading } = useProjectLogStatsQuery({ projectRef, interval })const selectedInterval = CHART_INTERVALS.find((i) => i.key === interval) || CHART_INTERVALS[1]@@ -94,8 +100,6 @@ const ProjectUsage = () => {<ChartIntervalDropdownvalue={interval || '1day'}onChange={(interval) => setInterval(interval as ProjectLogStatsVariables['interval'])}- planId={plan?.id}- planName={plan?.name}organizationSlug={organization?.slug}dropdownAlign="start"tooltipSide="right"diff --git a/apps/studio/components/interfaces/HomeNew/ProjectUsageSection.tsx b/apps/studio/components/interfaces/HomeNew/ProjectUsageSection.tsxindex c50067a5ed3..d642ce60f5a 100644--- a/apps/studio/components/interfaces/HomeNew/ProjectUsageSection.tsx+++ b/apps/studio/components/interfaces/HomeNew/ProjectUsageSection.tsx@@ -10,12 +10,12 @@ import {import { useSendEventMutation } from 'data/telemetry/send-event-mutation'import dayjs from 'dayjs'import { useFillTimeseriesSorted } from 'hooks/analytics/useFillTimeseriesSorted'-import { useCurrentOrgPlan } from 'hooks/misc/useCurrentOrgPlan'+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import Link from 'next/link'import { useRouter } from 'next/router'-import { useMemo, useState } from 'react'+import { useEffect, useMemo, useState } from 'react'import { Card, CardContent, CardHeader, CardTitle, Loading } from 'ui'import { Row } from 'ui-patterns'import { LogsBarChart } from 'ui-patterns/LogsBarChart'@@ -55,11 +55,17 @@ export const ProjectUsageSection = () => {'project_auth:all','project_storage:all',])- const { plan } = useCurrentOrgPlan()+ const { getEntitlementMax } = useCheckEntitlements('log.retention_days')+ const retentionDays = getEntitlementMax()- const DEFAULT_INTERVAL: ChartIntervalKey = plan?.id === 'free' ? '1hr' : '1day'+ const DEFAULT_INTERVAL: ChartIntervalKey =+ retentionDays !== undefined && retentionDays < 7 ? '1hr' : '1day'const [interval, setInterval] = useState<ChartIntervalKey>(DEFAULT_INTERVAL)+ useEffect(() => {+ setInterval(retentionDays !== undefined && retentionDays < 7 ? '1hr' : '1day')+ }, [retentionDays])+const selectedInterval = CHART_INTERVALS.find((i) => i.key === interval) || CHART_INTERVALS[1]const { datetimeFormat } = useMemo(() => {@@ -208,8 +214,6 @@ export const ProjectUsageSection = () => {<ChartIntervalDropdownvalue={interval}onChange={(interval) => setInterval(interval as ChartIntervalKey)}- planId={plan?.id}- planName={plan?.name}organizationSlug={organization?.slug}dropdownAlign="end"tooltipSide="left"diff --git a/apps/studio/components/interfaces/Observability/ObservabilityOverview.tsx b/apps/studio/components/interfaces/Observability/ObservabilityOverview.tsxindex 998916d8924..c8235010cc1 100644--- a/apps/studio/components/interfaces/Observability/ObservabilityOverview.tsx+++ b/apps/studio/components/interfaces/Observability/ObservabilityOverview.tsx@@ -5,7 +5,6 @@ import ReportPadding from 'components/interfaces/Reports/ReportPadding'import { ChartIntervalDropdown } from 'components/ui/Logs/ChartIntervalDropdown'import { CHART_INTERVALS } from 'components/ui/Logs/logs.utils'import dayjs from 'dayjs'-import { useCurrentOrgPlan } from 'hooks/misc/useCurrentOrgPlan'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { RefreshCw } from 'lucide-react'@@ -25,7 +24,6 @@ export const ObservabilityOverview = () => {const router = useRouter()const { ref: projectRef } = useParams()const { data: organization } = useSelectedOrganizationQuery()- const { plan } = useCurrentOrgPlan()const queryClient = useQueryClient()const { projectStorageAll: storageSupported } = useIsFeatureEnabled(['project_storage:all'])@@ -156,8 +154,6 @@ export const ObservabilityOverview = () => {<ChartIntervalDropdownvalue={interval}onChange={(interval) => setInterval(interval as ChartIntervalKey)}- planId={plan?.id}- planName={plan?.name}organizationSlug={organization?.slug}dropdownAlign="end"tooltipSide="left"diff --git a/apps/studio/components/ui/Logs/ChartIntervalDropdown.tsx b/apps/studio/components/ui/Logs/ChartIntervalDropdown.tsxindex 15728fc0f28..24b11d79c90 100644--- a/apps/studio/components/ui/Logs/ChartIntervalDropdown.tsx+++ b/apps/studio/components/ui/Logs/ChartIntervalDropdown.tsx@@ -1,4 +1,5 @@import { InlineLink } from 'components/ui/InlineLink'+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'import { ChevronDown } from 'lucide-react'import {Button,@@ -12,15 +13,17 @@ import {TooltipTrigger,} from 'ui'-import { CHART_INTERVALS, LOG_RETENTION } from './logs.utils'+import { CHART_INTERVALS } from './logs.utils'-type PlanId = keyof typeof LOG_RETENTION+function getDaysRequired(startValue: number, startUnit: string): number {+ if (startUnit === 'day') return startValue+ if (startUnit === 'hour') return startValue / 24+ return 0+}interface ChartIntervalDropdownProps {value: stringonChange: (value: string) => void- planId?: string- planName?: stringorganizationSlug?: stringdropdownAlign?: 'start' | 'center' | 'end'tooltipSide?: 'left' | 'right' | 'top' | 'bottom'@@ -29,14 +32,14 @@ interface ChartIntervalDropdownProps {export const ChartIntervalDropdown = ({value,onChange,- planId = 'free',- planName,organizationSlug,dropdownAlign = 'start',tooltipSide = 'right',}: ChartIntervalDropdownProps) => {const selectedInterval = CHART_INTERVALS.find((i) => i.key === value) || CHART_INTERVALS[1]- const normalizedPlanId = (planId && planId in LOG_RETENTION ? planId : 'free') as PlanId++ const { getEntitlementMax } = useCheckEntitlements('log.retention_days')+ const retentionDays = getEntitlementMax()return (<DropdownMenu>@@ -48,10 +51,10 @@ export const ChartIntervalDropdown = ({<DropdownMenuContent side="bottom" align={dropdownAlign} className="w-40"><DropdownMenuRadioGroup value={value} onValueChange={onChange}>{CHART_INTERVALS.map((i) => {- const disabled = !i.availableIn?.includes(normalizedPlanId)+ const daysRequired = getDaysRequired(i.startValue, i.startUnit)+ const disabled = retentionDays !== undefined && daysRequired > retentionDaysif (disabled) {- const retentionDuration = LOG_RETENTION[normalizedPlanId]return (<Tooltip key={i.key}><TooltipTrigger asChild>@@ -61,8 +64,8 @@ export const ChartIntervalDropdown = ({</TooltipTrigger><TooltipContent side={tooltipSide}><p>- {planName} plan only includes up to {retentionDuration} day- {retentionDuration > 1 ? 's' : ''} of log retention+ Your plan only includes up to {retentionDays} day+ {retentionDays !== undefined && retentionDays > 1 ? 's' : ''} of log retention</p><p className="text-foreground-light">{organizationSlug ? (diff --git a/apps/studio/components/ui/Logs/logs.utils.ts b/apps/studio/components/ui/Logs/logs.utils.tsindex b6eed6c53a4..5369cbe4c14 100644--- a/apps/studio/components/ui/Logs/logs.utils.ts+++ b/apps/studio/components/ui/Logs/logs.utils.ts@@ -1,13 +1,5 @@import type { ChartIntervals } from 'types'-export const LOG_RETENTION = {- free: 1,- pro: 7,- team: 28,- enterprise: 90,- platform: 1,-}-export const CHART_INTERVALS: ChartIntervals[] = [{key: '1hr',@@ -15,7 +7,6 @@ export const CHART_INTERVALS: ChartIntervals[] = [startValue: 1,startUnit: 'hour',format: 'MMM D, h:mma',- availableIn: ['free', 'pro', 'team', 'enterprise', 'platform'],},{key: '1day',@@ -23,7 +14,6 @@ export const CHART_INTERVALS: ChartIntervals[] = [startValue: 24,startUnit: 'hour',format: 'MMM D, ha',- availableIn: ['free', 'pro', 'team', 'enterprise', 'platform'],},{key: '7day',@@ -31,6 +21,5 @@ export const CHART_INTERVALS: ChartIntervals[] = [startValue: 7,startUnit: 'day',format: 'MMM D',- availableIn: ['pro', 'team', 'enterprise'],},]diff --git a/apps/studio/types/ui.ts b/apps/studio/types/ui.tsindex bd47d809ad5..f642cce1fc8 100644--- a/apps/studio/types/ui.ts+++ b/apps/studio/types/ui.ts@@ -1,6 +1,5 @@import type { PostgresColumn } from '@supabase/postgres-meta'import { ProjectLogStatsVariables } from 'data/analytics/project-log-stats-query'-import { PlanId } from 'data/subscriptions/types'export interface Notification {category: 'info' | 'error' | 'success' | 'loading'@@ -23,7 +22,6 @@ export interface ChartIntervals {startValue: numberstartUnit: 'minute' | 'hour' | 'day'format?: 'MMM D, h:mm:ssa' | 'MMM D, h:mma' | 'MMM D, ha' | 'MMM D'- availableIn?: PlanId[]}export interface VaultSecret {