Skip to content

Commit 9f9b083

Browse files
authored
fix: item description and unit price of Billing Breakdown (supabase#29996)
1 parent 62dc3ce commit 9f9b083

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {
113113
<th className="py-2 font-medium text-right text-sm text-foreground-light pr-4">
114114
Usage
115115
</th>
116-
<th className="py-2 font-medium text-left text-sm text-foreground-light">
116+
<th className="py-2 pr-2 font-medium text-left text-sm text-foreground-light max-w-[200px]">
117117
Unit price
118118
</th>
119119
<th className="py-2 font-medium text-right text-sm text-foreground-light">Cost</th>
@@ -124,19 +124,22 @@ const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {
124124
<tr key={item.description} className="border-b">
125125
<td className="py-2 text-sm max-w-[200px]" colSpan={item.proration ? 3 : 1}>
126126
{item.description ?? 'Unknown'}
127+
{item.usage_metric &&
128+
billingMetricUnit(item.usage_metric) &&
129+
` (${billingMetricUnit(item.usage_metric)})`}
127130
</td>
128131
{!item.proration && (
129132
<td className="py-2 text-sm text-right pr-4">
130133
{item.quantity?.toLocaleString()}
131134
</td>
132135
)}
133136
{!item.proration && (
134-
<td className="py-2 text-sm">
137+
<td className="py-2 pr-2 text-sm max-w-[200px]">
135138
{item.unit_price === 0
136139
? 'FREE'
137140
: item.unit_price
138141
? formatCurrency(item.unit_price)
139-
: null}
142+
: `${item.unit_price_desc}`}
140143
</td>
141144
)}
142145
<td className="py-2 text-sm text-right">{formatCurrency(item.amount)}</td>

apps/studio/components/interfaces/Organization/BillingSettings/helpers.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ export const billingMetricUnit = (pricingMetric: PricingMetric) => {
4646
PricingMetric.PITR_7,
4747
PricingMetric.PITR_14,
4848
PricingMetric.PITR_28,
49+
PricingMetric.LOG_DRAIN,
50+
PricingMetric.AUTH_MFA_PHONE,
51+
PricingMetric.AUTH_MFA_WEB_AUTHN,
4952
].includes(pricingMetric)
5053
) {
5154
return 'Hours'

apps/studio/data/analytics/org-daily-stats-query.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ export enum PricingMetric {
4040
DISK_THROUGHPUT_GP3 = 'DISK_THROUGHPUT_GP3',
4141
LOG_DRAIN = 'LOG_DRAIN',
4242
LOG_DRAIN_EVENTS = 'LOG_DRAIN_EVENTS',
43+
AUTH_MFA_PHONE = 'AUTH_MFA_PHONE',
44+
AUTH_MFA_WEB_AUTHN = 'AUTH_MFA_WEB_AUTHN',
4345
}
4446

4547
export enum ComputeUsageMetric {

0 commit comments

Comments
 (0)