ensure frontend does not show overage card for free trial projects

frontend/src/graph/operators/query.gql

@@ -1012,6 +1012,7 @@ query GetBillingDetails($workspace_id: ID!) {
 		sessionsBillingLimit
 		errorsBillingLimit
 		logsBillingLimit
+		tracesBillingLimit
 		sessionsDailyAverage
 		errorsDailyAverage
 		logsDailyAverage

frontend/src/pages/Billing/BillingPageV2.tsx

@@ -43,7 +43,6 @@ import {
 import {
 	getCostCents,
 	getNextBillingDate,
-	getQuantity,
 	PlanSelectStep,
 	UpdatePlanModal,
 } from '@/pages/Billing/UpdatePlanPage'
@@ -64,6 +63,7 @@ type UsageCardProps = {
 	planType: PlanType
 	billingLimitCents: number | undefined
 	usageAmount: number
+	usageLimitAmount: number | undefined
 	includedQuantity: number
 	isPaying: boolean
 	enableBillingLimits: boolean | undefined
@@ -79,6 +79,7 @@ const UsageCard = ({
 	retentionPeriod,
 	billingLimitCents,
 	usageAmount,
+	usageLimitAmount,
 	includedQuantity,
 	isPaying,
 	enableBillingLimits,
@@ -95,13 +96,6 @@ const UsageCard = ({
 				includedQuantity,
 		  )
 		: 0
-	const usageLimitAmount = getQuantity(
-		productType,
-		rate,
-		retentionPeriod,
-		billingLimitCents,
-		includedQuantity,
-	)
 
 	const costFormatted =
 		'$ ' +
@@ -325,6 +319,11 @@ const BillingPageV2 = ({}: BillingPageProps) => {
 	const logsUsage = data?.billingDetails.logsMeter ?? 0
 	const tracesUsage = data?.billingDetails.tracesMeter ?? 0
 
+	const sessionsLimit = data?.billingDetails.sessionsBillingLimit ?? undefined
+	const errorsLimit = data?.billingDetails.errorsBillingLimit ?? undefined
+	const logsLimit = data?.billingDetails.logsBillingLimit ?? undefined
+	const tracesLimit = data?.billingDetails.tracesBillingLimit ?? undefined
+
 	const includedSessions = data?.billingDetails.plan.sessionsLimit ?? 0
 	const includedErrors = data?.billingDetails.plan.errorsLimit ?? 0
 	const includedLogs = data?.billingDetails.plan.logsLimit ?? 0
@@ -379,19 +378,19 @@ const BillingPageV2 = ({}: BillingPageProps) => {
 		'$ ' +
 		toDecimal(dinero({ amount: Math.round(totalCents), currency: USD }))
 
-	const sessionsLimit = isPaying
+	const sessionsSpendLimit = isPaying
 		? data?.workspace?.sessions_max_cents ?? undefined
 		: 0
 
-	const errorsLimit = isPaying
+	const errorsSpendLimit = isPaying
 		? data?.workspace?.errors_max_cents ?? undefined
 		: 0
 
-	const logsLimit = isPaying
+	const logsSpendLimit = isPaying
 		? data?.workspace?.logs_max_cents ?? undefined
 		: 0
 
-	const tracesLimit = isPaying
+	const tracesSpendLimit = isPaying
 		? data?.workspace?.traces_max_cents ?? undefined
 		: 0
 
@@ -569,8 +568,9 @@ const BillingPageV2 = ({}: BillingPageProps) => {
 						productType={ProductType.Sessions}
 						rate={sessionsRate}
 						retentionPeriod={sessionsRetention}
-						billingLimitCents={sessionsLimit}
+						billingLimitCents={sessionsSpendLimit}
 						usageAmount={sessionsUsage}
+						usageLimitAmount={sessionsLimit}
 						awsMpSubscription={
 							data?.billingDetails?.plan.aws_mp_subscription
 						}
@@ -589,8 +589,9 @@ const BillingPageV2 = ({}: BillingPageProps) => {
 						productType={ProductType.Errors}
 						rate={errorsRate}
 						retentionPeriod={errorsRetention}
-						billingLimitCents={errorsLimit}
+						billingLimitCents={errorsSpendLimit}
 						usageAmount={errorsUsage}
+						usageLimitAmount={errorsLimit}
 						awsMpSubscription={
 							data?.billingDetails?.plan.aws_mp_subscription
 						}
@@ -609,8 +610,9 @@ const BillingPageV2 = ({}: BillingPageProps) => {
 						productType={ProductType.Logs}
 						rate={logsRate}
 						retentionPeriod={logsRetention}
-						billingLimitCents={logsLimit}
+						billingLimitCents={logsSpendLimit}
 						usageAmount={logsUsage}
+						usageLimitAmount={logsLimit}
 						awsMpSubscription={
 							data?.billingDetails?.plan.aws_mp_subscription
 						}
@@ -629,8 +631,9 @@ const BillingPageV2 = ({}: BillingPageProps) => {
 						productType={ProductType.Traces}
 						rate={tracesRate}
 						retentionPeriod={tracesRetention}
-						billingLimitCents={tracesLimit}
+						billingLimitCents={tracesSpendLimit}
 						usageAmount={tracesUsage}
+						usageLimitAmount={tracesLimit}
 						awsMpSubscription={
 							data?.billingDetails?.plan.aws_mp_subscription
 						}

frontend/src/pages/Billing/UpdatePlanPage.tsx

@@ -119,27 +119,6 @@ export const getCostCents = (
 	)
 }
 
-export const getQuantity = (
-	productType: ProductType,
-	rateCents: number | undefined,
-	retentionPeriod: RetentionPeriod,
-	totalCents: number | undefined,
-	includedQuantity: number,
-): number | undefined => {
-	if (totalCents === undefined) {
-		return undefined
-	}
-
-	if (!rateCents) {
-		rateCents =
-			BASE_UNIT_COST_CENTS[productType] / UNIT_QUANTITY[productType]
-	}
-	return Math.floor(
-		totalCents / (rateCents * RETENTION_MULTIPLIER[retentionPeriod]) +
-			includedQuantity,
-	)
-}
-
 export const getNextBillingDate = (
 	isPaying: boolean,
 	nextInvoiceDate: Date | undefined,

frontend/src/pages/Billing/utils/utils.ts

@@ -9,6 +9,7 @@ import {
 	PlanType,
 	ProductType,
 	RetentionPeriod,
+	Workspace,
 } from '../../../graph/generated/schemas'
 
 /**
@@ -68,7 +69,8 @@ export const RETENTION_PERIOD_LABELS: { [K in RetentionPeriod]: string } = {
 	[RetentionPeriod.ThreeYears]: '3 year retention',
 }
 
-export const getMeterAmounts = (
+type meterArgs = {
+	workspace: Maybe<Pick<Workspace, 'trial_end_date'>> | undefined
 	details:
 		| Maybe<
 				{ __typename?: 'BillingDetails' } & Pick<
@@ -100,8 +102,13 @@ export const getMeterAmounts = (
 					}
 		  >
 		| undefined
-		| null,
-): { [K in ProductType]: [number, number | undefined] } => {
+		| null
+}
+
+export const getMeterAmounts = ({
+	details,
+	workspace,
+}: meterArgs): { [K in ProductType]: [number, number | undefined] } => {
 	if (!details) {
 		return {
 			[ProductType.Sessions]: [0, undefined],
@@ -110,30 +117,33 @@ export const getMeterAmounts = (
 			[ProductType.Traces]: [0, undefined],
 		}
 	}
-	const canChargeOverage = details.plan.type !== 'Free'
+	const trialActive = workspace?.trial_end_date
+		? moment(workspace?.trial_end_date).isAfter(moment())
+		: false
+	const canChargeOverage = trialActive || details.plan.type !== 'Free'
 	const sessionsMeter = details?.meter ?? 0
-	const sessionsQuota = details?.sessionsBillingLimit
-		? details.sessionsBillingLimit
-		: canChargeOverage
-		? undefined
+	const sessionsQuota = canChargeOverage
+		? details?.sessionsBillingLimit
+			? details.sessionsBillingLimit
+			: undefined
 		: details?.plan.sessionsLimit
 	const errorsMeter = details?.errorsMeter ?? 0
-	const errorsQuota = details?.errorsBillingLimit
-		? details.errorsBillingLimit
-		: canChargeOverage
-		? undefined
+	const errorsQuota = canChargeOverage
+		? details?.errorsBillingLimit
+			? details.errorsBillingLimit
+			: undefined
 		: details?.plan.errorsLimit
 	const logsMeter = details?.logsMeter ?? 0
-	const logsQuota = details?.logsBillingLimit
-		? details.logsBillingLimit
-		: canChargeOverage
-		? undefined
+	const logsQuota = canChargeOverage
+		? details?.logsBillingLimit
+			? details.logsBillingLimit
+			: undefined
 		: details?.plan.logsLimit
 	const tracesMeter = details?.tracesMeter ?? 0
-	const tracesQuota = details?.tracesBillingLimit
-		? details.tracesBillingLimit
-		: canChargeOverage
-		? undefined
+	const tracesQuota = canChargeOverage
+		? details?.tracesBillingLimit
+			? details.tracesBillingLimit
+			: undefined
 		: details?.plan.tracesLimit
 	return {
 		[ProductType.Sessions]: [sessionsMeter, sessionsQuota],
@@ -146,7 +156,10 @@ export const getMeterAmounts = (
 export const getQuotaPercents = (
 	data: GetBillingDetailsForProjectQuery,
 ): [ProductType, number][] => {
-	const amts = getMeterAmounts(data.billingDetailsForProject)
+	const amts = getMeterAmounts({
+		workspace: data.workspace_for_project,
+		details: data.billingDetailsForProject,
+	})
 	const sessionAmts = amts[ProductType.Sessions]
 	const errorAmts = amts[ProductType.Errors]
 	const logAmts = amts[ProductType.Logs]

frontend/src/pages/LogsPage/LogsOverageCard/LogsOverageCard.tsx

@@ -34,7 +34,10 @@ export const LogsOverageCard = () => {
 		)
 	}
 
-	const meters = getMeterAmounts(data.billingDetails)
+	const meters = getMeterAmounts({
+		workspace: data.workspace,
+		details: data.billingDetails,
+	})
 	const meter = meters[ProductType.Logs][0]
 	const quota = meters[ProductType.Logs][1]
 	if (quota === undefined || meter < quota) {

frontend/src/pages/Sessions/SessionsFeedV3/OverageCard/OverageCard.tsx

@@ -38,7 +38,10 @@ export const OverageCard = ({ productType }: Props) => {
 		)
 	}
 
-	const meters = getMeterAmounts(data.billingDetails)
+	const meters = getMeterAmounts({
+		workspace: data.workspace,
+		details: data.billingDetails,
+	})
 	const meter = meters[productType][0]
 	const quota = meters[productType][1]
 	if (quota === undefined || meter < quota) {