Skip to content

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

Migrate move card toast from Emotion to Mantine and CSS module (#74995)

Andrei Chernykh5d0322cada56
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.module.css b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.module.css
new file mode 100644
index 00000000000..53124a03d62
--- /dev/null
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.module.css
@@ -0,0 +1,3 @@
+.destinationLink {
+ margin-left: var(--mantine-spacing-xs);
+}
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx
deleted file mode 100644
index 936ecaf8c68..00000000000
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Link } from "metabase/common/components/Link";
-import { Icon } from "metabase/ui";
-
-export const ToastRoot = styled.div`
- display: flex;
- align-items: center;
-`;
-
-export const StyledIcon = styled(Icon)`
- color: var(--mb-color-text-primary-inverse);
- margin-right: var(--mantine-spacing-sm);
-`;
-
-export const DestinationLink = styled(Link)`
- color: var(--mb-color-brand);
- margin-left: var(--mantine-spacing-xs);
-`;
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
index 509b6f2356f..89b5cc80d9c 100644
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
@@ -8,10 +8,12 @@ import {
} from "metabase/api";
import type { MoveDestination } from "metabase/collections/types";
import { coerceCollectionId } from "metabase/collections/utils";
+import { Link } from "metabase/common/components/Link";
+import { Flex, Icon } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { Card, CollectionId, DashboardId } from "metabase-types/api";
-import { DestinationLink, StyledIcon, ToastRoot } from "./MoveCardToast.styled";
+import S from "./MoveCardToast.module.css";
type MoveCardToastProps = {
card: Card;
@@ -23,10 +25,10 @@ function MoveCardToast({ card, destination }: MoveCardToastProps) {
if (!destination) {
return (
- <ToastRoot>
- <StyledIcon name="warning" />
+ <Flex align="center">
+ <Icon name="warning" color="text-primary-inverse" mr="sm" />
{t`Something went wrong`}
- </ToastRoot>
+ </Flex>
);
}
@@ -41,14 +43,14 @@ function MoveCardToast({ card, destination }: MoveCardToastProps) {
);
return (
- <ToastRoot data-testid="move-card-toast">
- <StyledIcon name="collection" />
+ <Flex align="center" data-testid="move-card-toast">
+ <Icon name="collection" color="text-primary-inverse" mr="sm" />
{match(type)
.with("question", () => jt`Question moved to ${link}`)
.with("model", () => jt`Model moved to ${link}`)
.with("metric", () => jt`Metric moved to ${link}`)
.exhaustive()}
- </ToastRoot>
+ </Flex>
);
}
@@ -62,9 +64,13 @@ const DashboardLink = ({ dashboardId }: { dashboardId: DashboardId }) => {
}
return (
- <DestinationLink to={Urls.dashboard(dashboard)}>
+ <Link
+ variant="brand"
+ className={S.destinationLink}
+ to={Urls.dashboard(dashboard)}
+ >
{dashboard.name}
- </DestinationLink>
+ </Link>
);
};
@@ -78,9 +84,13 @@ const CollectionLink = ({ collectionId }: { collectionId: CollectionId }) => {
}
return (
- <DestinationLink to={Urls.collection(collection)}>
+ <Link
+ variant="brand"
+ className={S.destinationLink}
+ to={Urls.collection(collection)}
+ >
{collection.name}
- </DestinationLink>
+ </Link>
);
};