From 5f85ce3f4c556a9da9db9d88becb116d7ccfe065 Mon Sep 17 00:00:00 2001 From: dante01yoon Date: Sun, 1 Nov 2026 19:34:16 -0500 Subject: [PATCH 1/3] [backport core/1.59] FRONT-3621 fix(billing): read auto top-up visibility from billing capabilities so local follows the server (#22405) Backport of #22405 to core/1.59. Adds the served auto_top_up_enabled field to the core/1.59 ingest types as optional, so the capabilities read can use it without the full ingest-types sync; a missing field reads as false. (cherry picked from commit fbac2166fb1d5b599bff65c8b05146a07205232e) --- packages/ingest-types/src/types.gen.ts | 9 +++++++++ packages/ingest-types/src/zod.gen.ts | 1 + src/composables/__mocks__/useFeatureFlags.ts | 1 - src/composables/useFeatureFlags.test.ts | 3 +-- src/composables/useFeatureFlags.ts | 9 --------- .../billingTab/BillingAutoTopUpCard.test.ts | 9 +++++---- .../components/billingTab/BillingTab.test.ts | 18 +++++++++++------- .../components/billingTab/BillingTab.vue | 4 +--- .../__mocks__/useBillingCapabilities.ts | 7 +++++++ .../composables/useAutoTopUpBannerKind.test.ts | 12 ++++++------ .../composables/useAutoTopUpBannerKind.ts | 8 +++----- .../composables/useBillingCapabilities.test.ts | 18 ++++++++++++++++++ .../composables/useBillingCapabilities.ts | 7 +++++++ src/platform/remoteConfig/serverFeatureFlag.ts | 1 - src/platform/remoteConfig/types.ts | 1 - 15 files changed, 69 insertions(+), 39 deletions(-) diff --git a/packages/ingest-types/src/types.gen.ts b/packages/ingest-types/src/types.gen.ts index b90bfd251fa..ee47483720d 100644 --- a/packages/ingest-types/src/types.gen.ts +++ b/packages/ingest-types/src/types.gen.ts @@ -6178,6 +6178,15 @@ export type BillingCapabilityDenialParams = { * Effective billing UI guidance for one authenticated user and workspace. */ export type BillingCapabilitiesResponse = { + /** + * Whether auto top-up is rolled out to this user: the auto_top_up_enabled + * rollout flag, evaluated by ingest the same way GET /api/features + * evaluates it. Any evaluation failure reads as false. It gates + * visibility only; capabilities.can_manage_auto_top_up still decides + * who may manage auto top-up. + * + */ + auto_top_up_enabled?: boolean auto_top_up_setup?: AutoTopUpSetup capabilities: BillingCapabilities denied_reason_params?: BillingCapabilityDenialParams diff --git a/packages/ingest-types/src/zod.gen.ts b/packages/ingest-types/src/zod.gen.ts index 9e1264aa1f6..8ea10d41138 100644 --- a/packages/ingest-types/src/zod.gen.ts +++ b/packages/ingest-types/src/zod.gen.ts @@ -3832,6 +3832,7 @@ export const zAutoTopUpSetup = z.object({ * Effective billing UI guidance for one authenticated user and workspace. */ export const zBillingCapabilitiesResponse = z.object({ + auto_top_up_enabled: z.boolean().optional(), auto_top_up_setup: zAutoTopUpSetup.optional(), capabilities: zBillingCapabilities, denied_reason_params: zBillingCapabilityDenialParams.optional(), diff --git a/src/composables/__mocks__/useFeatureFlags.ts b/src/composables/__mocks__/useFeatureFlags.ts index 6b073c731bc..ec04e4bbc55 100644 --- a/src/composables/__mocks__/useFeatureFlags.ts +++ b/src/composables/__mocks__/useFeatureFlags.ts @@ -41,7 +41,6 @@ const defaultFlags: FeatureFlags = { billingSdkTopupRailEnabled: false, billingSdkSubscriptionEnabled: false, unifiedBillingSettingsEnabled: false, - autoTopUpEnabled: false, billingSdkSubscriptionRailEnabled: false, v1PaymentRecovery: false, signupTurnstileMode: 'off', diff --git a/src/composables/useFeatureFlags.test.ts b/src/composables/useFeatureFlags.test.ts index 22f82306bd5..e6352feaa7f 100644 --- a/src/composables/useFeatureFlags.test.ts +++ b/src/composables/useFeatureFlags.test.ts @@ -391,8 +391,7 @@ describe('useFeatureFlags', () => { { flag: 'unifiedBillingSettingsEnabled' as const, offCloudTrue: true - }, - { flag: 'autoTopUpEnabled' as const, offCloudTrue: false } + } ])('$flag', ({ flag, offCloudTrue }) => { afterEach(() => { vi.mocked(distributionTypes).isCloud = false diff --git a/src/composables/useFeatureFlags.ts b/src/composables/useFeatureFlags.ts index bc390270ec8..489ce05e9ec 100644 --- a/src/composables/useFeatureFlags.ts +++ b/src/composables/useFeatureFlags.ts @@ -334,14 +334,6 @@ export function useFeatureFlags() { remoteConfig.value.unified_billing_settings ) }, - get autoTopUpEnabled() { - if (!isCloud) return false - - return resolveStrictBooleanFlag( - ServerFeatureFlag.AUTO_TOP_UP_ENABLED, - remoteConfig.value.auto_top_up_enabled - ) - }, get v1PaymentRecovery() { return resolveAuthGatedFlag( ServerFeatureFlag.V1_PAYMENT_RECOVERY, @@ -432,7 +424,6 @@ export function startFeatureFlagTelemetry() { flags.billingSdkSubscriptionEnabled, [ServerFeatureFlag.UNIFIED_BILLING_SETTINGS]: flags.unifiedBillingSettingsEnabled, - [ServerFeatureFlag.AUTO_TOP_UP_ENABLED]: flags.autoTopUpEnabled, [ServerFeatureFlag.V1_PAYMENT_RECOVERY]: flags.v1PaymentRecovery, [ServerFeatureFlag.SIGNUP_TURNSTILE]: flags.signupTurnstileMode, [ServerFeatureFlag.SUPPORTS_MODEL_TYPE_TAGS]: flags.supportsModelTypeTags, diff --git a/src/platform/billing/components/billingTab/BillingAutoTopUpCard.test.ts b/src/platform/billing/components/billingTab/BillingAutoTopUpCard.test.ts index 09a24718226..48a629f72ce 100644 --- a/src/platform/billing/components/billingTab/BillingAutoTopUpCard.test.ts +++ b/src/platform/billing/components/billingTab/BillingAutoTopUpCard.test.ts @@ -14,9 +14,11 @@ import { WorkspaceApiError, workspaceApi } from '@/platform/workspace/api/workspaceApi' -import { useFeatureFlags } from '@/composables/useFeatureFlags' import { activateBillingScope } from '@/platform/billing/composables/activateBillingScope.testUtils' -import { canManageAutoTopUpFact } from '@/platform/billing/composables/__mocks__/useBillingCapabilities' +import { + autoTopUpEnabledFact, + canManageAutoTopUpFact +} from '@/platform/billing/composables/__mocks__/useBillingCapabilities' import { usePausedBanner } from '@/platform/billing/composables/usePausedBanner' import { useBillingCapabilities } from '@/platform/billing/composables/useBillingCapabilities' @@ -26,7 +28,6 @@ import BillingLocalCreditBanner from './BillingLocalCreditBanner.vue' vi.mock(import('firebase/auth'), { spy: true }) vi.mock(import('@/platform/billing/composables/useBillingContext')) vi.mock(import('@/platform/billing/composables/useBillingDialogs')) -vi.mock(import('@/composables/useFeatureFlags')) vi.mock(import('@/platform/billing/composables/usePausedBanner')) vi.mock(import('@/platform/workspace/composables/useWorkspaceUI')) vi.mock(import('@/platform/workspace/api/workspaceApi')) @@ -138,7 +139,7 @@ describe('BillingAutoTopUpCard', () => { vi.mocked(usePausedBanner).mockReturnValue({ isPaused: computed(() => false) }) - vi.mocked(useFeatureFlags().flags).autoTopUpEnabled = true + useBillingCapabilities().autoTopUpEnabled = autoTopUpEnabledFact(true) useBillingCapabilities().canManageAutoTopUp = canManageAutoTopUpFact(true) render(BillingLocalCreditBanner, i18nOptions()) await vi.waitFor(() => diff --git a/src/platform/billing/components/billingTab/BillingTab.test.ts b/src/platform/billing/components/billingTab/BillingTab.test.ts index af7848bb2e4..d2eac2ff657 100644 --- a/src/platform/billing/components/billingTab/BillingTab.test.ts +++ b/src/platform/billing/components/billingTab/BillingTab.test.ts @@ -95,7 +95,7 @@ interface Scenario { capabilitiesReady?: boolean capabilitiesResolved?: boolean balance?: BalanceInfo | null - autoTopUpFlag?: boolean + autoTopUpEnabled?: boolean canManageAutoTopUp?: boolean canTopUp?: boolean topUpDenial?: string @@ -205,6 +205,12 @@ function arrange(scenario: Scenario = {}) { scenario.canManageAutoTopUp ?? true ) ), + autoTopUpEnabled: computed(() => + receiveServerFact( + 'auto_top_up_enabled', + scenario.autoTopUpEnabled ?? true + ) + ), autoTopUpSetup: computed(() => null), isReady: computed(() => scenario.capabilitiesReady ?? true), hasResolvedCapabilities: computed( @@ -214,8 +220,6 @@ function arrange(scenario: Scenario = {}) { refresh }) ) - vi.mocked(useFeatureFlags().flags).autoTopUpEnabled = - scenario.autoTopUpFlag ?? true vi.mocked(useFreeTierQuota).mockReturnValue( fromPartial({ quotaEnabled: computed(() => false), @@ -1335,7 +1339,7 @@ describe('BillingTab', () => { settleDetail.push(resolve) }) ) - arrange({ autoTopUpFlag: false }) + arrange({ autoTopUpEnabled: false }) await vi.waitFor(() => expect(settleDetail).toHaveLength(1)) settleDetail[0](checkout('credits_applying', { session_id: 'cs_1' })) @@ -1381,7 +1385,7 @@ describe('BillingTab', () => { settleDetail.push(resolve) }) ) - arrange({ autoTopUpFlag: false }) + arrange({ autoTopUpEnabled: false }) await vi.waitFor(() => expect(settleDetail).toHaveLength(1)) const visibility = vi.spyOn(document, 'visibilityState', 'get') @@ -1493,7 +1497,7 @@ describe('BillingTab', () => { settleDetail.push(resolve) }) ) - arrange({ autoTopUpFlag: false }) + arrange({ autoTopUpEnabled: false }) await vi.waitFor(() => expect(settleDetail).toHaveLength(1)) vi.mocked(workspaceApi.listTopupCheckouts).mockClear() @@ -1681,7 +1685,7 @@ describe('BillingTab', () => { it.for<{ case: string; scenario: Scenario; reads: number }>([ { case: 'the flag is off', - scenario: { autoTopUpFlag: false }, + scenario: { autoTopUpEnabled: false }, reads: 0 }, { diff --git a/src/platform/billing/components/billingTab/BillingTab.vue b/src/platform/billing/components/billingTab/BillingTab.vue index 523e6ba6d7f..4fff9426884 100644 --- a/src/platform/billing/components/billingTab/BillingTab.vue +++ b/src/platform/billing/components/billingTab/BillingTab.vue @@ -76,7 +76,7 @@ @retry="retryBalance" @add-credits="addCredits('credits_panel')" /> -