expand frontend to support billing limit as number

PostHog · Jul 23, 2024 · 001a27b · 001a27b
1 parent 59f9b7a
commit 001a27b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/ee/billing/billing_types.py b/ee/billing/billing_types.py
@@ -98,7 +98,7 @@ class CustomerInfo(TypedDict):
     current_total_amount_usd: Optional[str]
     current_total_amount_usd_after_discount: Optional[str]
     products: Optional[list[CustomerProduct]]
-    custom_limits_usd: Optional[dict[str, str]]
+    custom_limits_usd: Optional[dict[str, str | int]]
     usage_summary: Optional[dict[str, dict[str, Optional[int]]]]
     free_trial_until: Optional[str]
     discount_percent: Optional[int]

diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
@@ -137,7 +137,6 @@ export const WEBHOOK_SERVICES: Record<string, string> = {
 export const FEATURE_FLAGS = {
     // Experiments / beta features
     FUNNELS_CUE_OPT_OUT: 'funnels-cue-opt-out-7301', // owner: @neilkakkar
-    BILLING_LIMIT: 'billing-limit', // owner: @timgl
     KAFKA_INSPECTOR: 'kafka-inspector', // owner: @yakkomajuri
     HISTORICAL_EXPORTS_V2: 'historical-exports-v2', // owner @macobo
     PERSON_ON_EVENTS_ENABLED: 'person-on-events-enabled', //owner: @EDsCODE

diff --git a/frontend/src/scenes/billing/billingLogic.tsx b/frontend/src/scenes/billing/billingLogic.tsx
@@ -190,7 +190,7 @@ export const billingLogic = kea<billingLogicType>([
                     return parseBillingResponse(response)
                 },
 
-                updateBillingLimits: async (limits: { [key: string]: string | null }) => {
+                updateBillingLimits: async (limits: { [key: string]: string | number | null }) => {
                     const response = await api.update('api/billing', { custom_limits_usd: limits })
 
                     lemonToast.success('Billing limits updated')
@@ -304,12 +304,12 @@ export const billingLogic = kea<billingLogicType>([
                 }
                 let projectedTotal = 0
                 for (const product of billing.products || []) {
-                    const billingLimit: string =
+                    const billingLimit =
                         billing?.custom_limits_usd?.[product.type] ||
-                        (product.usage_key ? billing?.custom_limits_usd?.[product.usage_key] || '0' : '0')
+                        (product.usage_key ? billing?.custom_limits_usd?.[product.usage_key] || 0 : 0)
                     projectedTotal += Math.min(
                         parseFloat(product.projected_amount_usd || '0'),
-                        parseFloat(billingLimit)
+                        typeof billingLimit === 'number' ? billingLimit : parseFloat(billingLimit)
                     )
                 }
                 return projectedTotal

diff --git a/frontend/src/scenes/billing/billingProductLogic.ts b/frontend/src/scenes/billing/billingProductLogic.ts
@@ -148,7 +148,7 @@ export const billingProductLogic = kea<billingProductLogicType>([
             (billing, product) => {
                 return (
                     billing?.custom_limits_usd?.[product.type] ||
-                    (product.usage_key ? billing?.custom_limits_usd?.[product.usage_key] : '')
+                    (product.usage_key ? billing?.custom_limits_usd?.[product.usage_key] : null)
                 )
             },
         ],
@@ -197,7 +197,11 @@ export const billingProductLogic = kea<billingProductLogicType>([
                               productAndAddonTiers,
                               billing?.discount_percent
                           )
-                        : convertAmountToUsage(customLimitUsd || '', productAndAddonTiers, billing?.discount_percent)
+                        : convertAmountToUsage(
+                              typeof customLimitUsd === 'number' ? `${customLimitUsd}` : customLimitUsd || '',
+                              productAndAddonTiers,
+                              billing?.discount_percent
+                          )
                     : 0
             },
         ],
@@ -252,7 +256,11 @@ export const billingProductLogic = kea<billingProductLogicType>([
             actions.setIsEditingBillingLimit(false)
             actions.setBillingLimitInput(
                 values.customLimitUsd
-                    ? parseInt(values.customLimitUsd)
+                    ? parseInt(
+                          typeof values.customLimitUsd === 'number'
+                              ? `${values.customLimitUsd}`
+                              : values.customLimitUsd || ''
+                      )
                     : props.product.tiers && parseInt(props.product.projected_amount_usd || '0')
                     ? parseInt(props.product.projected_amount_usd || '0') * 1.5
                     : DEFAULT_BILLING_LIMIT
@@ -368,7 +376,7 @@ export const billingProductLogic = kea<billingProductLogicType>([
                     return
                 }
                 actions.updateBillingLimits({
-                    [props.product.type]: typeof input === 'number' ? `${input}` : null,
+                    [props.product.type]: input,
                 })
             },
             options: {

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -1584,7 +1584,7 @@ export interface BillingType {
     products: BillingProductV2Type[]
 
     custom_limits_usd?: {
-        [key: string]: string | null | undefined
+        [key: string]: string | number | null | undefined
     }
     billing_period?: {
         current_period_start: Dayjs