Skip to content

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

Convert `PulseApi` to RTK hooks (#75583)

Romeo Van Snick02d7cbddedc8
diff --git a/frontend/src/metabase/api/subscription.ts b/frontend/src/metabase/api/subscription.ts
index 38ab004217a..14e8fc5c352 100644
--- a/frontend/src/metabase/api/subscription.ts
+++ b/frontend/src/metabase/api/subscription.ts
@@ -1,3 +1,4 @@
+import type { DashboardSubscriptionData } from "metabase/redux/store";
import type {
ChannelApiResponse,
CreateSubscriptionRequest,
@@ -76,6 +77,16 @@ export const subscriptionApi = Api.injectEndpoints({
idTag("subscription", id),
]),
}),
+ testSubscription: builder.mutation<
+ { ok: boolean },
+ DashboardSubscriptionData
+ >({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/pulse/test",
+ body,
+ }),
+ }),
getChannelInfo: builder.query<ChannelApiResponse, void>({
query: () => ({
method: "GET",
@@ -92,5 +103,6 @@ export const {
useCreateSubscriptionMutation,
useUpdateSubscriptionMutation,
useUnsubscribeMutation,
+ useTestSubscriptionMutation,
useGetChannelInfoQuery,
} = subscriptionApi;
diff --git a/frontend/src/metabase/notifications/pulse/actions.ts b/frontend/src/metabase/notifications/pulse/actions.ts
index 7a689e4a983..1ddcee93376 100644
--- a/frontend/src/metabase/notifications/pulse/actions.ts
+++ b/frontend/src/metabase/notifications/pulse/actions.ts
@@ -6,7 +6,6 @@ import { subscriptionApi } from "metabase/api";
import { createThunkAction } from "metabase/redux";
import type { DraftDashboardSubscription } from "metabase/redux/store";
import { addUndo } from "metabase/redux/undo";
-import { PulseApi } from "metabase/services";
import type {
ChannelApiResponse,
CreateSubscriptionRequest,
@@ -75,8 +74,10 @@ export const saveEditingPulse = createThunkAction(
export const testPulse = createThunkAction(
TEST_PULSE,
function (pulse: DashboardSubscription | DraftDashboardSubscription) {
- return async function () {
- return await PulseApi.test(pulse);
+ return async function (dispatch) {
+ return await dispatch(
+ subscriptionApi.endpoints.testSubscription.initiate(pulse),
+ ).unwrap();
};
},
);
@@ -84,9 +85,11 @@ export const testPulse = createThunkAction(
export const fetchPulseFormInput = createThunkAction(
FETCH_PULSE_FORM_INPUT,
function () {
- return async function (): Promise<ChannelApiResponse | undefined> {
+ return async function (dispatch): Promise<ChannelApiResponse | undefined> {
try {
- return await PulseApi.form_input();
+ return await dispatch(
+ subscriptionApi.endpoints.getChannelInfo.initiate(),
+ ).unwrap();
} catch {
// This request is expected to fail when the user lacks
// "Subscriptions and Alerts" permissions. Swallow the error
diff --git a/frontend/src/metabase/services.js b/frontend/src/metabase/services.js
index dd385ce6618..092d81c09b8 100644
--- a/frontend/src/metabase/services.js
+++ b/frontend/src/metabase/services.js
@@ -73,16 +73,6 @@ export const ModerationReviewApi = {
update: PUT("/api/moderation-review/:id"),
};
-export const PulseApi = {
- list: GET("/api/pulse"),
- create: POST("/api/pulse"),
- get: GET("/api/pulse/:pulseId"),
- update: PUT("/api/pulse/:id"),
- test: POST("/api/pulse/test"),
- form_input: GET("/api/pulse/form_input"),
- unsubscribe: DELETE("/api/pulse/:id/subscription"),
-};
-
/// this in unauthenticated, for letting people who are not logged in unsubscribe from Alerts/DashboardSubscriptions
export const PulseUnsubscribeApi = {
unsubscribe: POST("/api/pulse/unsubscribe"),