Skip to content

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

Move account to feature tier (#75211)

Fraser0ef9a1f2a3fe
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index 87b1b7fc4b0..7f76e0408d6 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -47,7 +47,7 @@ const elements = [
createElement({ type: "basic", name: "ui" }),
// shared
- createElement({ type: "shared", name: "account" }),
+ createElement({ type: "feature", name: "account" }),
createElement({ type: "shared", name: "actions" }),
createElement({ type: "shared", name: "api" }),
createElement({ type: "shared", name: "archive" }),
diff --git a/frontend/src/metabase/account/notifications/actions.ts b/frontend/src/metabase/account/notifications/actions.ts
index 097269b1244..8e5ed1e103f 100644
--- a/frontend/src/metabase/account/notifications/actions.ts
+++ b/frontend/src/metabase/account/notifications/actions.ts
@@ -1,6 +1,6 @@
import { push } from "react-router-redux";
-import type { NotificationListItem } from "./types";
+import type { NotificationListItem } from "metabase/notifications/types";
const PREFIX = `/account/notifications`;
diff --git a/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
index d920982f800..7be97d2b3bc 100644
--- a/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
+++ b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
@@ -3,14 +3,13 @@ import { t } from "ttag";
import { ModalContent } from "metabase/common/components/ModalContent";
import { FormMessage } from "metabase/forms";
+import type { NotificationType } from "metabase/notifications/types";
import { formatChannelRecipients } from "metabase/pulse";
import { Box, Button, Stack } from "metabase/ui";
import Settings from "metabase/utils/settings";
import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";
import type { Alert, DashboardSubscription, User } from "metabase-types/api";
-import type { NotificationType } from "../../types";
-
type ArchiveModalProps = {
item: Alert | DashboardSubscription;
type: NotificationType;
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx
index 5056e08a02d..d335a1ff815 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx
+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx
@@ -2,10 +2,12 @@ import type { JSX } from "react";
import { useCallback } from "react";
import { t } from "ttag";
-import { formatCreatorMessage } from "metabase/account/notifications/components/NotificationCard/utils";
-import type { DashboardSubscriptionListItem } from "metabase/account/notifications/types";
import { Link } from "metabase/common/components/Link";
-import { formatTitle } from "metabase/notifications/utils";
+import type { DashboardSubscriptionListItem } from "metabase/notifications/types";
+import {
+ formatCreatorMessage,
+ formatTitle,
+} from "metabase/notifications/utils";
import { canArchiveLegacyAlert, formatChannel } from "metabase/pulse";
import { Box, Flex, Icon, Text } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.unit.spec.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.unit.spec.tsx
index abdb2d1d479..8c9c9a5cc05 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.unit.spec.tsx
+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.unit.spec.tsx
@@ -1,5 +1,5 @@
import { fireEvent, render, screen } from "__support__/ui";
-import type { DashboardSubscriptionListItem } from "metabase/account/notifications/types";
+import type { DashboardSubscriptionListItem } from "metabase/notifications/types";
import type { Channel } from "metabase-types/api";
import {
createMockChannel,
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx
index 6aca4b03935..a0f8c4d81b4 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx
+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx
@@ -1,11 +1,11 @@
import { type JSX, useCallback } from "react";
import { t } from "ttag";
-import { formatCreatorMessage } from "metabase/account/notifications/components/NotificationCard/utils";
-import type { QuestionNotificationListItem } from "metabase/account/notifications/types";
import { Link } from "metabase/common/components/Link/Link";
+import type { QuestionNotificationListItem } from "metabase/notifications/types";
import {
canArchive,
+ formatCreatorMessage,
formatNotificationSchedule,
formatTitle,
getNotificationEnabledChannelsMap,
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.unit.spec.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.unit.spec.tsx
index 534414a7dcc..eeff11eb582 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.unit.spec.tsx
+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.unit.spec.tsx
@@ -1,7 +1,7 @@
import { fireEvent, screen } from "@testing-library/react";
import { renderWithTheme } from "__support__/ui";
-import type { QuestionNotificationListItem } from "metabase/account/notifications/types";
+import type { QuestionNotificationListItem } from "metabase/notifications/types";
import type { Notification } from "metabase-types/api";
import {
createMockNotification,
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/utils.ts b/frontend/src/metabase/account/notifications/components/NotificationCard/utils.ts
deleted file mode 100644
index fb60e1033fe..00000000000
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/utils.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { t } from "ttag";
-
-import type { NotificationListItem } from "metabase/account/notifications/types";
-import Settings from "metabase/utils/settings";
-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting/date";
-import type { UserId } from "metabase-types/api";
-
-export const formatCreatorMessage = (
- item: NotificationListItem["item"],
- userId: UserId,
-) => {
- let creatorString = "";
- const options = Settings.formattingOptions();
-
- if (userId === item.creator?.id) {
- creatorString += t`Created by you`;
- } else if (item.creator?.common_name) {
- creatorString += t`Created by ${item.creator.common_name}`;
- } else {
- creatorString += t`Created`;
- }
-
- if (item.created_at) {
- const createdAt = formatDateTimeWithUnit(item.created_at, "day", options);
- creatorString += t` on ${createdAt}`;
- }
-
- return creatorString;
-};
diff --git a/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.tsx b/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.tsx
index 287e5924436..4791bee54a6 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.tsx
+++ b/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.tsx
@@ -2,8 +2,8 @@ import cx from "classnames";
import type { JSX, ReactNode } from "react";
import { t } from "ttag";
-import type { NotificationListItem } from "metabase/account/notifications/types";
import CS from "metabase/css/core/index.css";
+import type { NotificationListItem } from "metabase/notifications/types";
import { Box, Flex, Icon, Text, UnstyledButton } from "metabase/ui";
import type { User } from "metabase-types/api";
diff --git a/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx b/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx
index bfbe34b4802..95d4bde4247 100644
--- a/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx
+++ b/frontend/src/metabase/account/notifications/components/UnsubscribeModal/UnsubscribeModal.tsx
@@ -3,11 +3,10 @@ import { t } from "ttag";
import { ModalContent } from "metabase/common/components/ModalContent";
import { FormMessage } from "metabase/forms";
+import type { NotificationType } from "metabase/notifications/types";
import { Button } from "metabase/ui";
import type { Alert, DashboardSubscription, User } from "metabase-types/api";
-import type { NotificationType } from "../../types";
-
type UnsubscribeModalProps = {
item: Alert | DashboardSubscription;
type: NotificationType;
diff --git a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx
index 98895b56ec4..c5705aec2db 100644
--- a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx
+++ b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx
@@ -1,12 +1,12 @@
import type { JSX, ReactNode } from "react";
import { useMemo } from "react";
-import type { NotificationListItem } from "metabase/account/notifications/types";
import {
skipToken,
useListNotificationsQuery,
useListSubscriptionsQuery,
} from "metabase/api";
+import type { NotificationListItem } from "metabase/notifications/types";
import { useDispatch, useSelector } from "metabase/redux";
import {
canManageSubscriptions as canManageSubscriptionsSelector,
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx
index 2f73f333f04..5cb64b70849 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx
@@ -3,8 +3,8 @@ import type { MouseEvent } from "react";
import { msgid, ngettext, t } from "ttag";
import _ from "underscore";
-import { formatCreatorMessage } from "metabase/account/notifications/components/NotificationCard/utils";
import {
+ formatCreatorMessage,
formatNotificationSchedule,
getNotificationHandlersGroupedByTypes,
} from "metabase/notifications/utils";
diff --git a/frontend/src/metabase/account/notifications/types.ts b/frontend/src/metabase/notifications/types.ts
similarity index 100%
rename from frontend/src/metabase/account/notifications/types.ts
rename to frontend/src/metabase/notifications/types.ts
diff --git a/frontend/src/metabase/notifications/utils.ts b/frontend/src/metabase/notifications/utils.ts
index 042b8929fba..28a1cb460b0 100644
--- a/frontend/src/metabase/notifications/utils.ts
+++ b/frontend/src/metabase/notifications/utils.ts
@@ -1,8 +1,8 @@
import { c, msgid, ngettext, t } from "ttag";
import _ from "underscore";
-import type { NotificationListItem } from "metabase/account/notifications/types";
import { cronToScheduleSettings } from "metabase/common/components/Schedule/cron";
+import type { NotificationListItem } from "metabase/notifications/types";
import { getScheduleExplanation } from "metabase/utils/cron";
import { getEmailDomain, isEmail } from "metabase/utils/email";
import { formatTimeWithUnit } from "metabase/utils/formatting/time";
@@ -153,6 +153,29 @@ export const formatTitle = ({ item, type }: NotificationListItem) => {
}
};
+export const formatCreatorMessage = (
+ item: NotificationListItem["item"],
+ userId: UserId,
+) => {
+ let creatorString = "";
+ const options = MetabaseSettings.formattingOptions();
+
+ if (userId === item.creator?.id) {
+ creatorString += t`Created by you`;
+ } else if (item.creator?.common_name) {
+ creatorString += t`Created by ${item.creator.common_name}`;
+ } else {
+ creatorString += t`Created`;
+ }
+
+ if (item.created_at) {
+ const createdAt = formatDateTimeWithUnit(item.created_at, "day", options);
+ creatorString += t` on ${createdAt}`;
+ }
+
+ return creatorString;
+};
+
const getRecipientIdentity = (recipient: NotificationRecipient) => {
if (recipient.type === "notification-recipient/user") {
return recipient.user_id;