Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

fix: remove -tiered add-on on disconnect (#72807)

Maksym Yakubychc6babc336d2f
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
index 1fa555b00d7..33390eaed8a 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
@@ -33,6 +33,7 @@ import {
METABASE_MANAGED_AI_FEATURE,
METABASE_MANAGED_AI_PRODUCT_TYPE,
METABASE_MANAGED_AI_TERMS_URL,
+ METABASE_TIERED_AI_PRODUCT_TYPE,
METABOT_V3_FEATURE,
OFFER_METABASE_MANAGED_AI_FEATURE,
} from "../../constants";
@@ -110,14 +111,49 @@ export function MetabaseAIProviderSetup() {
.otherwise(() => handleMetabasePurchase);
const onDisconnect = useCallback(async () => {
- if (!hasMetabaseManagedAiProviderFeature) {
+ const feature = match({
+ offerMetabaseManagedAi,
+ hasMetabaseManagedAiProviderFeature,
+ hasDeprecatedMetabaseAiProvider,
+ })
+ .returnType<
+ | typeof METABASE_MANAGED_AI_PRODUCT_TYPE
+ | typeof METABASE_TIERED_AI_PRODUCT_TYPE
+ | null
+ >()
+ .with(
+ { hasMetabaseManagedAiProviderFeature: true },
+ () => METABASE_MANAGED_AI_PRODUCT_TYPE,
+ )
+ .with(
+ { offerMetabaseManagedAi: true, hasDeprecatedMetabaseAiProvider: true },
+ () => METABASE_TIERED_AI_PRODUCT_TYPE,
+ )
+ .with(
+ {
+ offerMetabaseManagedAi: false,
+ hasDeprecatedMetabaseAiProvider: true,
+ },
+ // If we can't upgrade to managed AI, we don't want to disable the existing one.
+ () => null,
+ )
+ .otherwise(() => {
+ throw new Error("No feature is enabled to cancel");
+ });
+
+ if (!feature) {
return;
}
await removeCloudAddOn({
- product_type: METABASE_MANAGED_AI_PRODUCT_TYPE,
+ product_type: feature,
}).unwrap();
- }, [hasMetabaseManagedAiProviderFeature, removeCloudAddOn]);
+ }, [
+ offerMetabaseManagedAi,
+ hasMetabaseManagedAiProviderFeature,
+ hasDeprecatedMetabaseAiProvider,
+ removeCloudAddOn,
+ ]);
const { isLoading } = useMetabotSetupContext(onConnect, onDisconnect);
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/constants.ts b/enterprise/frontend/src/metabase-enterprise/metabot/constants.ts
index 6d62e609903..c11be1eef69 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/constants.ts
@@ -2,6 +2,7 @@ export const METABOT_V3_FEATURE = "metabot-v3";
export const OFFER_METABASE_MANAGED_AI_FEATURE = "offer-metabase-ai-managed";
export const METABASE_MANAGED_AI_FEATURE = "metabase-ai-managed";
export const METABASE_MANAGED_AI_PRODUCT_TYPE = "metabase-ai-managed";
+export const METABASE_TIERED_AI_PRODUCT_TYPE = "metabase-ai-tiered";
export const METABASE_MANAGED_AI_TERMS_URL =
"https://www.metabase.com/license/hosting";
export const METABASE_MANAGED_AI_UNIT_MULTIPLIER = 1_000_000;
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/index.ts b/enterprise/frontend/src/metabase-enterprise/metabot/index.ts
index 4a6443dc7ae..f4fa3e51926 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/index.ts
@@ -6,7 +6,8 @@ import { MetabaseAIProviderSetup } from "./components/MetabotAdmin/MetabaseAIPro
export function initializePlugin() {
if (
hasPremiumFeature("offer-metabase-ai-managed") ||
- hasPremiumFeature("metabase-ai-managed")
+ hasPremiumFeature("metabase-ai-managed") ||
+ hasPremiumFeature("metabot-v3")
) {
PLUGIN_METABOT.isEnabled = true;
PLUGIN_METABOT.MetabaseAIProviderSetup = MetabaseAIProviderSetup;
diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.ts
index b7911949c11..0406bcad050 100644
--- a/frontend/src/metabase-types/api/settings.ts
+++ b/frontend/src/metabase-types/api/settings.ts
@@ -265,8 +265,10 @@ const tokenStatusFeatures = [
"embedding-simple",
"embedding-hub",
"hosting",
+ "offer-metabase-ai-managed",
"metabase-ai-managed",
"metabase-store-managed",
+ "metabot-v3",
"no-upsell",
"official-collections",
"query-reference-validation",
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.unit.spec.tsx
index e2a00f9b429..33e5aba28bc 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSetup.unit.spec.tsx
@@ -104,6 +104,7 @@ type MetabotSettingsUpdateBody = {
type SetupOptions = {
isHosted?: boolean;
hasDeprecatedMetabaseAiProvider?: boolean;
+ offerMetabaseManagedAi?: boolean;
llmProxyConfigured?: boolean;
savedProviderValue?: string | null;
isConfigured?: boolean;
@@ -127,7 +128,8 @@ type SetupOptions = {
async function setup({
isHosted = false,
- hasDeprecatedMetabaseAiProvider = false,
+ hasDeprecatedMetabaseAiProvider,
+ offerMetabaseManagedAi,
llmProxyConfigured = isHosted,
savedProviderValue = "anthropic/claude-haiku-4-5",
isConfigured = true,
@@ -161,19 +163,23 @@ async function setup({
...apiKeyValues,
};
+ const createTokenFeatureFlags = (features: TokenStatusFeature[]) =>
+ createMockTokenFeatures({
+ hosting: isHosted,
+ "offer-metabase-ai-managed":
+ offerMetabaseManagedAi ??
+ (isHosted || features.includes("offer-metabase-ai-managed")),
+ "metabase-ai-managed": features.includes("metabase-ai-managed"),
+ "metabot-v3":
+ hasDeprecatedMetabaseAiProvider ?? features.includes("metabot-v3"),
+ });
+
const sessionProperties = createMockSettings({
"is-hosted?": isHosted,
"llm-proxy-configured?": llmProxyConfigured,
"llm-metabot-provider": savedProviderValue,
"llm-metabot-configured?": isConfigured,
- "token-features": createMockTokenFeatures({
- hosting: isHosted,
- "offer-metabase-ai-managed": isHosted,
- "metabase-ai-managed": tokenStatusFeatures.includes(
- "metabase-ai-managed",
- ),
- "metabot-v3": hasDeprecatedMetabaseAiProvider,
- }),
+ "token-features": createTokenFeatureFlags(tokenStatusFeatures),
"token-status": createMockTokenStatus({
features: tokenStatusFeatures,
"store-users": isStoreUser
@@ -233,14 +239,9 @@ async function setup({
});
fetchMock.post("path:/api/premium-features/token/refresh", () => {
- sessionProperties["token-features"] = createMockTokenFeatures({
- hosting: isHosted,
- "offer-metabase-ai-managed": isHosted,
- "metabase-ai-managed": refreshedTokenStatusFeatures.includes(
- "metabase-ai-managed",
- ),
- "metabot-v3": hasDeprecatedMetabaseAiProvider,
- });
+ sessionProperties["token-features"] = createTokenFeatureFlags(
+ refreshedTokenStatusFeatures,
+ );
sessionProperties["token-status"] = createMockTokenStatus({
features: refreshedTokenStatusFeatures,
});
@@ -693,9 +694,12 @@ describe("MetabotSetup", () => {
),
).toBe(false);
- const settingsRequest = fetchMock.callHistory
- .calls("path:/api/metabot/settings")
- .find((call) => call.request?.method === "PUT");
+ const [settingsRequest] = fetchMock.callHistory.calls(
+ "path:/api/metabot/settings",
+ {
+ method: "PUT",
+ },
+ );
expect(settingsRequest?.options?.body).toBe(
JSON.stringify({ provider: "metabase", model: "" }),
@@ -752,9 +756,12 @@ describe("MetabotSetup", () => {
).toBe(true);
});
- const request = fetchMock.callHistory
- .calls("path:/api/ee/cloud-add-ons/metabase-ai-managed")
- .find((call) => call.request?.method === "POST");
+ const [request] = fetchMock.callHistory.calls(
+ "path:/api/ee/cloud-add-ons/metabase-ai-managed",
+ {
+ method: "POST",
+ },
+ );
expect(request?.options?.body).toBe(
JSON.stringify({ terms_of_service: true }),
@@ -866,9 +873,12 @@ describe("MetabotSetup", () => {
);
});
- const request = fetchMock.callHistory
- .calls("path:/api/metabot/settings")
- .find((call) => call.request?.method === "PUT");
+ const [request] = fetchMock.callHistory.calls(
+ "path:/api/metabot/settings",
+ {
+ method: "PUT",
+ },
+ );
expect(request?.options?.body).toBe(
JSON.stringify({ provider: "anthropic", model: "claude-sonnet-4-5" }),
@@ -901,9 +911,9 @@ describe("MetabotSetup", () => {
expect(fetchMock.callHistory.called("path:/api/setting")).toBe(true);
});
- const request = fetchMock.callHistory
- .calls("path:/api/setting")
- .find((call) => call.request?.method === "PUT");
+ const [request] = fetchMock.callHistory.calls("path:/api/setting", {
+ method: "PUT",
+ });
expect(request?.options?.body).toBe(
JSON.stringify({
@@ -924,15 +934,20 @@ describe("MetabotSetup", () => {
it("disconnects the Metabase-managed provider by removing the add-on before clearing the provider setting", async () => {
await setup({
isHosted: true,
- tokenStatusFeatures: ["metabase-ai-managed"],
+ tokenStatusFeatures: ["metabase-ai-managed", "offer-metabase-ai-managed"],
savedProviderValue: "metabase/anthropic/claude-sonnet-4-6",
});
- await screen.findByText("Current billing cycle");
+ await screen.findByText("Connected to Metabase");
await userEvent.click(
await screen.findByRole("button", { name: "Disconnect" }),
);
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/ee/cloud-add-ons/metabase-ai-tiered",
+ ),
+ ).toBe(false);
await waitFor(() => {
expect(
fetchMock.callHistory.called(
@@ -945,12 +960,70 @@ describe("MetabotSetup", () => {
expect(fetchMock.callHistory.called("path:/api/setting")).toBe(true);
});
- const removeRequest = fetchMock.callHistory
- .calls("path:/api/ee/cloud-add-ons/metabase-ai-managed")
- .find((call) => call.request?.method === "DELETE");
- const request = fetchMock.callHistory
- .calls("path:/api/setting")
- .find((call) => call.request?.method === "PUT");
+ const [removeRequest] = fetchMock.callHistory.calls(
+ "path:/api/ee/cloud-add-ons/metabase-ai-managed",
+ {
+ method: "DELETE",
+ },
+ );
+ const [request] = fetchMock.callHistory.calls("path:/api/setting", {
+ method: "PUT",
+ });
+
+ expect(removeRequest).toBeDefined();
+ expect(request?.options?.body).toBe(
+ JSON.stringify({
+ "llm-metabot-provider": null,
+ }),
+ );
+
+ const callHistory = fetchMock.callHistory.calls();
+
+ expect(
+ callHistory.indexOf(removeRequest as (typeof callHistory)[number]),
+ ).toBeLessThan(
+ callHistory.indexOf(request as (typeof callHistory)[number]),
+ );
+ });
+
+ it("disconnects the tiered Metabase provider by removing the add-on before clearing the provider setting", async () => {
+ await setup({
+ isHosted: true,
+ tokenStatusFeatures: ["metabot-v3", "offer-metabase-ai-managed"],
+ savedProviderValue: "metabase/anthropic/claude-sonnet-4-6",
+ });
+
+ await screen.findByText("Connected to Metabase");
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Disconnect" }),
+ );
+
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/ee/cloud-add-ons/metabase-ai-managed",
+ ),
+ ).toBe(false);
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/ee/cloud-add-ons/metabase-ai-tiered",
+ ),
+ ).toBe(true);
+ });
+
+ await waitFor(() => {
+ expect(fetchMock.callHistory.called("path:/api/setting")).toBe(true);
+ });
+
+ const [removeRequest] = fetchMock.callHistory.calls(
+ "path:/api/ee/cloud-add-ons/metabase-ai-tiered",
+ {
+ method: "DELETE",
+ },
+ );
+ const [request] = fetchMock.callHistory.calls("path:/api/setting", {
+ method: "PUT",
+ });
expect(removeRequest).toBeDefined();
expect(request?.options?.body).toBe(
@@ -968,6 +1041,48 @@ describe("MetabotSetup", () => {
);
});
+ it("does not disconnect the tiered Metabase provider if no offer-metabase-ai-managed is set", async () => {
+ await setup({
+ isHosted: true,
+ offerMetabaseManagedAi: false,
+ tokenStatusFeatures: ["metabot-v3"],
+ savedProviderValue: "metabase/anthropic/claude-sonnet-4-6",
+ });
+
+ await screen.findByText("Connected to Metabase");
+
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Disconnect" }),
+ );
+
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/ee/cloud-add-ons/metabase-ai-managed",
+ ),
+ ).toBe(false);
+ expect(
+ fetchMock.callHistory.called(
+ "path:/api/ee/cloud-add-ons/metabase-ai-tiered",
+ ),
+ ).toBe(false);
+
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called("path:/api/setting", { method: "PUT" }),
+ ).toBe(true);
+ });
+
+ const [request] = fetchMock.callHistory.calls("path:/api/setting", {
+ method: "PUT",
+ });
+
+ expect(request?.options?.body).toBe(
+ JSON.stringify({
+ "llm-metabot-provider": null,
+ }),
+ );
+ });
+
it("does not clear the provider setting if removing the Metabase-managed add-on fails", async () => {
await setup({
isHosted: true,
diff --git a/frontend/test/__support__/server-mocks/metabot.ts b/frontend/test/__support__/server-mocks/metabot.ts
index 043cd72105a..012b73ccee2 100644
--- a/frontend/test/__support__/server-mocks/metabot.ts
+++ b/frontend/test/__support__/server-mocks/metabot.ts
@@ -18,6 +18,8 @@ import { createMockUserMetabotPermissions } from "metabase-types/api/mocks/metab
const METABASE_MANAGED_AI_PRODUCT_TYPE: PurchaseCloudAddOnRequest["product_type"] =
"metabase-ai-managed";
+const METABASE_TIERED_AI_PRODUCT_TYPE: PurchaseCloudAddOnRequest["product_type"] =
+ "metabase-ai-tiered";
const METABASE_MANAGED_AI_UNIT_MULTIPLIER = 1_000_000;
export function setupMetabotsEndpoints(
@@ -218,6 +220,11 @@ export function setupMetabaseManagedAiEndpoints({
`path:/api/ee/cloud-add-ons/${METABASE_MANAGED_AI_PRODUCT_TYPE}`,
removeCloudAddOnResponse,
);
+
+ fetchMock.delete(
+ `path:/api/ee/cloud-add-ons/${METABASE_TIERED_AI_PRODUCT_TYPE}`,
+ removeCloudAddOnResponse,
+ );
}
const METABOT_GROUP_PERMISSIONS_ROUTE_NAME = "metabot-group-permissions";