Skip to content

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

chore: Convert the last audit_app JS files to TypeScript (#78745)

Andrei Chernykh8699c85e9be6
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx
index ab54b7e1555..4f0a33b4dcc 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx
@@ -1,26 +1,27 @@
import { useState } from "react";
import { t } from "ttag";
-import { useGetUserQuery } from "metabase/api";
+import { skipToken, useGetUserQuery } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useToast } from "metabase/common/hooks/use-toast";
import { Stack, Text } from "metabase/ui";
-import { getResponseErrorMessage } from "metabase/utils/errors";
+import { parseIntParam } from "metabase/urls";
import { useUnsubscribeUserFromSubscriptionsMutation } from "metabase-enterprise/api";
import type { User } from "metabase-types/api";
-interface UnsubscribeUserModal {
- params: { userId: string };
+interface UnsubscribeUserModalProps {
+ params: { userId?: string };
onClose: () => void;
}
export const UnsubscribeUserModal = ({
params,
onClose,
-}: UnsubscribeUserModal) => {
- const userId = parseInt(params.userId, 10);
- const { data: user, isLoading, error } = useGetUserQuery(userId);
+}: UnsubscribeUserModalProps) => {
+ const userId = parseIntParam(params.userId);
+ const { data: user, isLoading, error } = useGetUserQuery(userId ?? skipToken);
const [unsubscribeUserFromSubscriptions] =
useUnsubscribeUserFromSubscriptionsMutation();
@@ -42,8 +43,8 @@ export const UnsubscribeUserModal = ({
sendToast({ message: t`Unsubscribe successful` });
onClose();
} catch (error) {
- const msg = getResponseErrorMessage(error);
- setErrorMessage(msg ?? t`Unknown error encountered`);
+ const message = getErrorMessage(error, t`Unknown error encountered`);
+ setErrorMessage(message);
}
};
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js b/enterprise/frontend/src/metabase-enterprise/audit_app/index.tsx
similarity index 75%
rename from enterprise/frontend/src/metabase-enterprise/audit_app/index.js
rename to enterprise/frontend/src/metabase-enterprise/audit_app/index.tsx
index da924826fed..3cdbe688dc9 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/index.tsx
@@ -9,6 +9,7 @@ import {
import { Menu } from "metabase/ui";
import { isInternalUser } from "metabase/urls";
import { hasPremiumFeature } from "metabase-enterprise/settings";
+import type { User } from "metabase-types/api";
import { InsightsLink } from "./components/InsightsLink";
import { InsightsMenuItem } from "./components/InsightsMenuItem";
@@ -19,31 +20,30 @@ import {
getAiAnalyticsUpsellRoutes,
} from "./metabot-analytics/routes";
import { handleMetabotSlashCommand } from "./metabot-analytics/slash-commands";
-import { getUserMenuRotes } from "./routes";
+import { getUserMenuRoutes } from "./routes";
import { isAuditDb } from "./utils";
+const getUserMenuItems = (user: User): React.ReactNode => [
+ <Menu.Item
+ component={ForwardRefLink}
+ to={
+ isInternalUser(user)
+ ? `/admin/people/${user.id}/unsubscribe`
+ : `/admin/people/tenants/people/${user.id}/unsubscribe`
+ }
+ key="unsubscribe"
+ >
+ {t`Unsubscribe from all subscriptions / alerts`}
+ </Menu.Item>,
+];
+
/**
* Initialize audit app plugin features that depend on hasPremiumFeature.
*/
export function initializePlugin() {
if (hasPremiumFeature("audit_app")) {
- // Add new menu item function
- const menuItemFunction = (user) => [
- <Menu.Item
- component={ForwardRefLink}
- to={
- isInternalUser(user)
- ? `/admin/people/${user.id}/unsubscribe`
- : `/admin/people/tenants/people/${user.id}/unsubscribe`
- }
- key="unsubscribe"
- >
- {t`Unsubscribe from all subscriptions / alerts`}
- </Menu.Item>,
- ];
-
- PLUGIN_ADMIN_USER_MENU_ITEMS.push(menuItemFunction);
- PLUGIN_ADMIN_USER_MENU_ROUTES.push(getUserMenuRotes);
+ PLUGIN_ADMIN_USER_MENU_ITEMS.push(getUserMenuItems);
+ PLUGIN_ADMIN_USER_MENU_ROUTES.push(getUserMenuRoutes);
PLUGIN_AUDIT.isEnabled = true;
PLUGIN_AUDIT.isAuditDb = isAuditDb;
PLUGIN_AUDIT.InsightsLink = InsightsLink;
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/routes.jsx b/enterprise/frontend/src/metabase-enterprise/audit_app/routes.ts
similarity index 80%
rename from enterprise/frontend/src/metabase-enterprise/audit_app/routes.jsx
rename to enterprise/frontend/src/metabase-enterprise/audit_app/routes.ts
index af2e8242472..44321a87703 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/routes.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/routes.ts
@@ -2,5 +2,5 @@ import { modalRoute } from "metabase/common/components/ModalRoute";
import { UnsubscribeUserModal } from "./containers/UnsubscribeUserModal/UnsubscribeUserModal";
-export const getUserMenuRotes = () =>
+export const getUserMenuRoutes = (): React.ReactNode =>
modalRoute("unsubscribe", UnsubscribeUserModal, { noWrap: true });