The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix price displayed for advanced transforms in upsell modal (#73855)
Brad Anderson5e8a288ed468
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsxindex 5d3cda9be6c..70186d6fb96 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx@@ -11,7 +11,7 @@ import {createMockSettings,createMockTokenFeatures,} from "metabase-types/api/mocks";-import { mockAdvancedTransformsAddOn } from "metabase-types/api/mocks/add-ons";+import { mockAdvancedTransformsCloudAddOn } from "metabase-types/api/mocks/add-ons";import { PurchaseAdvancedTransforms } from "./PurchaseAdvancedTransforms";@@ -36,7 +36,7 @@ const setup = () => {renderWithProviders(<PurchaseAdvancedTransformshandleModalClose={handleModalClose}- addOn={mockAdvancedTransformsAddOn}+ addOn={mockAdvancedTransformsCloudAddOn}freeUnitsIncluded/>,{diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.tsindex 33f8e12114e..54e04988303 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts@@ -36,14 +36,22 @@ export function useTransformsBilling() {product_type === "transforms-advanced-metered" && self_service,) ?? false;+ const instanceDeployment = isHosted ? "hosting" : "selfhosted";+const basicTransformsAddOn = addOns?.find(- ({ active, product_type, self_service }) =>- active && self_service && product_type === "transforms-basic-metered",+ ({ active, product_type, self_service, deployment }) =>+ active &&+ self_service &&+ product_type === "transforms-basic-metered" &&+ deployment === instanceDeployment,);const advancedTransformsAddOn = addOns?.find(- ({ active, product_type, self_service }) =>- active && self_service && product_type === "transforms-advanced-metered",+ ({ active, product_type, self_service, deployment }) =>+ active &&+ self_service &&+ product_type === "transforms-advanced-metered" &&+ deployment === instanceDeployment,);return {diff --git a/frontend/src/metabase-types/api/mocks/add-ons.ts b/frontend/src/metabase-types/api/mocks/add-ons.tsindex b0a2675b1f0..a8e196f50e8 100644--- a/frontend/src/metabase-types/api/mocks/add-ons.ts+++ b/frontend/src/metabase-types/api/mocks/add-ons.ts@@ -1,6 +1,28 @@import type { ICloudAddOnProduct } from "metabase-types/api";-export const mockAdvancedTransformsAddOn: ICloudAddOnProduct = {+export const mockAdvancedTransformsSelfHostedAddOn: ICloudAddOnProduct = {+ description: "Advanced Transforms Add-on (self-hosted) (Monthly)- metered",+ name: "Advanced Transforms Add-on (self-hosted) metered",+ self_service: true,+ trial_days: 0,+ short_name: "Advanced Transforms (self-hosted) - metered",+ is_metered: true,+ product_type: "transforms-advanced-metered",+ default_total_units: 1,+ free_units: 1000,+ billing_period_months: 1,+ default_base_fee: 0,+ active: true,+ id: 110,+ deployment: "selfhosted",+ token_features: ["transforms-python", "transforms-basic"],+ default_included_units: 0,+ default_price_per_unit: 0.01,+ product_tiers: [],+ default_prepaid_units: 1,+};++export const mockAdvancedTransformsCloudAddOn: ICloudAddOnProduct = {active: true,billing_period_months: 1,default_base_fee: 0,@@ -125,7 +147,11 @@ export function createMockCloudAddOns(// transforms{- ...mockAdvancedTransformsAddOn,+ ...mockAdvancedTransformsSelfHostedAddOn,+ billing_period_months,+ },+ {+ ...mockAdvancedTransformsCloudAddOn,billing_period_months,},];diff --git a/frontend/test/__support__/server-mocks/store.ts b/frontend/test/__support__/server-mocks/store.tsindex 75e87ca9eac..c324648aa42 100644--- a/frontend/test/__support__/server-mocks/store.ts+++ b/frontend/test/__support__/server-mocks/store.ts@@ -3,7 +3,7 @@ import { match } from "ts-pattern";import {createMockCloudAddOns,- mockAdvancedTransformsAddOn,+ mockAdvancedTransformsCloudAddOn,} from "metabase-types/api/mocks/add-ons";import type { AddOnProductType } from "metabase-types/api/store";@@ -52,7 +52,7 @@ export function setupBillingEndpoints({...(hasAdvancedTransformsAddOn? [{- ...mockAdvancedTransformsAddOn,+ ...mockAdvancedTransformsCloudAddOn,billing_period_months: billingPeriodMonths,},]