Skip to content

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

Parameterize cloud-add-on API (#64424)

Nemanja Glumac3dffc9d900c5
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage.tsx
index 9b319c87505..9389eb9b7ea 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage.tsx
@@ -9,7 +9,7 @@ import {
SettingsSection,
} from "metabase/admin/components/SettingsSection";
import { getCurrentUser } from "metabase/admin/datamodel/selectors";
-import { usePurchaseMetabotCloudAddOnMutation } from "metabase/api/metabot";
+import { usePurchaseCloudAddOnMutation } from "metabase/api";
import ExternalLink from "metabase/common/components/ExternalLink";
import Markdown from "metabase/common/components/Markdown";
import { useSetting } from "metabase/common/hooks";
@@ -84,11 +84,12 @@ export const MetabotPurchasePage = () => {
storeUserEmails.length > 0 ? storeUserEmails[0] : undefined;
const [settingUpModalOpened, settingUpModalHandlers] = useDisclosure(false);
- const [purchaseMetabotAddOn] = usePurchaseMetabotCloudAddOnMutation();
+ const [purchaseCloudAddOn] = usePurchaseCloudAddOnMutation();
const onSubmit = useCallback(
async ({ terms_of_service }: MetabotPurchaseFormFields) => {
settingUpModalHandlers.open();
- await purchaseMetabotAddOn({
+ await purchaseCloudAddOn({
+ product_type: "metabase-ai",
terms_of_service,
})
.unwrap()
@@ -97,7 +98,7 @@ export const MetabotPurchasePage = () => {
isFetchBaseQueryError(error) && handleFieldError(error.data);
});
},
- [purchaseMetabotAddOn, settingUpModalHandlers],
+ [purchaseCloudAddOn, settingUpModalHandlers],
);
return (
diff --git a/frontend/src/metabase-types/api/cloud-add-ons.ts b/frontend/src/metabase-types/api/cloud-add-ons.ts
new file mode 100644
index 00000000000..4cd17c87974
--- /dev/null
+++ b/frontend/src/metabase-types/api/cloud-add-ons.ts
@@ -0,0 +1,4 @@
+export interface PurchaseCloudAddOnRequest {
+ product_type: "metabase-ai";
+ terms_of_service: boolean;
+}
diff --git a/frontend/src/metabase-types/api/index.ts b/frontend/src/metabase-types/api/index.ts
index 882c2b7fc3b..fdfb32c3d8e 100644
--- a/frontend/src/metabase-types/api/index.ts
+++ b/frontend/src/metabase-types/api/index.ts
@@ -10,6 +10,7 @@ export * from "./bookmark";
export * from "./bug-report";
export * from "./card";
export * from "./click-behavior";
+export * from "./cloud-add-ons";
export * from "./collection";
export * from "./comments";
export * from "./content-translation";
diff --git a/frontend/src/metabase-types/api/metabot.ts b/frontend/src/metabase-types/api/metabot.ts
index f0baa770d02..92bc6a2bc42 100644
--- a/frontend/src/metabase-types/api/metabot.ts
+++ b/frontend/src/metabase-types/api/metabot.ts
@@ -238,9 +238,3 @@ export interface MetabotGenerateContentResponse {
description: string;
error: string | null;
}
-
-/* Metabot v3 - Add-on Purchase Types */
-
-export interface PurchaseMetabotAddOnRequest {
- terms_of_service: boolean;
-}
diff --git a/frontend/src/metabase/api/cloud-add-ons.ts b/frontend/src/metabase/api/cloud-add-ons.ts
new file mode 100644
index 00000000000..8699522706a
--- /dev/null
+++ b/frontend/src/metabase/api/cloud-add-ons.ts
@@ -0,0 +1,17 @@
+import type { PurchaseCloudAddOnRequest } from "metabase-types/api";
+
+import { Api } from "./api";
+
+export const cloudAddOnApi = Api.injectEndpoints({
+ endpoints: (builder) => ({
+ purchaseCloudAddOn: builder.mutation<void, PurchaseCloudAddOnRequest>({
+ query: ({ product_type, ...body }) => ({
+ method: "POST",
+ url: `/api/ee/cloud-add-ons/${product_type}`,
+ body,
+ }),
+ }),
+ }),
+});
+
+export const { usePurchaseCloudAddOnMutation } = cloudAddOnApi;
diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.ts
index d93f667c22e..b536bab8481 100644
--- a/frontend/src/metabase/api/index.ts
+++ b/frontend/src/metabase/api/index.ts
@@ -7,6 +7,7 @@ export * from "./bookmark";
export * from "./bug-report";
export * from "./card";
export * from "./channel";
+export * from "./cloud-add-ons";
export * from "./cloud-migration";
export * from "./collection";
export * from "./dashboard";
diff --git a/frontend/src/metabase/api/metabot.ts b/frontend/src/metabase/api/metabot.ts
deleted file mode 100644
index 796a1fe3e57..00000000000
--- a/frontend/src/metabase/api/metabot.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { PurchaseMetabotAddOnRequest } from "metabase-types/api/metabot";
-
-import { Api } from "./api";
-
-export const metabotCloudAddOnApi = Api.injectEndpoints({
- endpoints: (builder) => ({
- purchaseMetabotCloudAddOn: builder.mutation<
- void,
- PurchaseMetabotAddOnRequest
- >({
- query: (body) => ({
- method: "POST",
- url: "/api/ee/cloud-add-ons/metabase-ai",
- body,
- }),
- }),
- }),
-});
-
-export const { usePurchaseMetabotCloudAddOnMutation } = metabotCloudAddOnApi;