Skip to content

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

Migrate New Model Options from Emotion to Mantine and CSS modules (#74984)

Andrei Chernykh067993f50e1f
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.module.css b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.module.css
new file mode 100644
index 00000000000..5cbdab4fd7f
--- /dev/null
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.module.css
@@ -0,0 +1,25 @@
+.optionsRoot {
+ margin-left: var(--mantine-spacing-sm);
+ margin-right: var(--mantine-spacing-sm);
+}
+
+@media (--breakpoint-min-sm) {
+ .optionsRoot {
+ margin-left: 4rem;
+ margin-right: 4rem;
+ }
+}
+
+.educationalButton {
+ padding: 1em;
+ border-radius: var(--mantine-radius-md);
+ background-color: var(--mb-color-background-tertiary);
+ color: var(--mb-color-brand);
+ font-weight: bold;
+ transition: all 0.3s;
+
+ &:hover {
+ color: var(--mb-color-text-primary-inverse);
+ background-color: var(--mb-color-brand);
+ }
+}
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
deleted file mode 100644
index 98117f1442f..00000000000
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { breakpointMinSmall } from "metabase/styled-components/theme";
-
-export const OptionsRoot = styled.div`
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- height: 100%;
- margin: auto 0.5rem;
-
- ${breakpointMinSmall} {
- margin-left: 4rem;
- margin-right: 4rem;
- }
-`;
-
-export const EducationalButton = styled(ExternalLink)`
- background-color: var(--mb-color-background-tertiary);
- border-radius: 0.5rem;
- color: var(--mb-color-brand);
- font-weight: bold;
- padding: 1em;
- transition: all 0.3s;
-
- &:hover {
- color: var(--mb-color-text-primary-inverse);
- background-color: var(--mb-color-brand);
- }
-`;
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
index d0e9f872b95..d670ba09125 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
@@ -2,6 +2,7 @@ import cx from "classnames";
import type { Location } from "history";
import { t } from "ttag";
+import { ExternalLink } from "metabase/common/components/ExternalLink";
import { NoDatabasesEmptyState } from "metabase/common/components/NoDatabasesEmptyState";
import CS from "metabase/css/core/index.css";
import NewModelOption from "metabase/models/components/NewModelOption";
@@ -12,10 +13,10 @@ import {
canUserCreateQueries,
} from "metabase/selectors/user";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
-import { Group } from "metabase/ui";
+import { Flex, Group } from "metabase/ui";
import * as Urls from "metabase/urls";
-import { EducationalButton, OptionsRoot } from "./NewModelOptions.styled";
+import S from "./NewModelOptions.module.css";
const EDUCATIONAL_LINK = getLearnUrl("metabase-basics/getting-started/models");
@@ -48,7 +49,15 @@ const NewModelOptions = ({ location }: NewModelOptionsProps) => {
}
return (
- <OptionsRoot data-testid="new-model-options">
+ <Flex
+ direction="column"
+ justify="center"
+ align="center"
+ h="100%"
+ my="auto"
+ className={S.optionsRoot}
+ data-testid="new-model-options"
+ >
<Group justify="center">
{hasDataAccess && (
<div>
@@ -87,15 +96,15 @@ const NewModelOptions = ({ location }: NewModelOptionsProps) => {
</Group>
{showMetabaseLinks && (
- <EducationalButton
+ <ExternalLink
target="_blank"
href={EDUCATIONAL_LINK}
- className={CS.mt4}
+ className={cx(CS.mt4, S.educationalButton)}
>
{t`What's a model?`}
- </EducationalButton>
+ </ExternalLink>
)}
- </OptionsRoot>
+ </Flex>
);
};
// eslint-disable-next-line import/no-default-export -- deprecated usage