Skip to content

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

Migrate NewModelOption to TS and move hover styling to CSS (#75130)

Andrei Chernykh9b6d1ea98e9c
diff --git a/frontend/src/metabase/models/components/NewModelOption.jsx b/frontend/src/metabase/models/components/NewModelOption.jsx
deleted file mode 100644
index b8f6588058a..00000000000
--- a/frontend/src/metabase/models/components/NewModelOption.jsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/* eslint-disable react/prop-types */
-import cx from "classnames";
-import { Component } from "react";
-import { Link } from "react-router";
-
-import CS from "metabase/css/core/index.css";
-
-import S from "./NewModelOption.module.css";
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default class NewModelOption extends Component {
- state = {
- hover: false,
- };
-
- render() {
- const { width, image, title, description, ...props } = this.props;
- const { hover } = this.state;
-
- return (
- <Link
- {...props}
- className={S.linkWrapper}
- style={{
- boxSizing: "border-box",
- boxShadow: hover
- ? "0 3px 8px 0 var(--mb-color-text-tertiary)"
- : "0 1px 3px 0 var(--mb-color-text-tertiary)",
- minHeight: 340,
- }}
- onMouseOver={() => this.setState({ hover: true })}
- onMouseLeave={() => this.setState({ hover: false })}
- >
- <div
- className={cx(CS.flex, CS.alignCenter, CS.layoutCentered)}
- style={{ height: "160px" }}
- >
- <img
- src={`${image}.png`}
- style={{ width: width ? `${width}px` : "210px" }}
- srcSet={`${image}@2x.png 2x`}
- />
- </div>
- <div
- className={cx(CS.textNormal, CS.mt2, CS.mb2, CS.textParagraph)}
- style={{ lineHeight: "1.25em" }}
- >
- <h2 className={cx(S.modelTitle, { [CS.textBrand]: hover })}>
- {title}
- </h2>
- <p
- className={cx(CS.textMedium, CS.textSmall)}
- style={{ maxWidth: "360px" }}
- >
- {description}
- </p>
- </div>
- </Link>
- );
- }
-}
diff --git a/frontend/src/metabase/models/components/NewModelOption.module.css b/frontend/src/metabase/models/components/NewModelOption.module.css
index 3cc11057dd9..14eb20bc96c 100644
--- a/frontend/src/metabase/models/components/NewModelOption.module.css
+++ b/frontend/src/metabase/models/components/NewModelOption.module.css
@@ -1,4 +1,5 @@
.linkWrapper {
+ box-sizing: border-box;
text-decoration: none;
display: block;
background-color: var(--mb-color-background-primary);
@@ -8,10 +9,20 @@
border-radius: var(--default-border-radius);
cursor: pointer;
height: 100%;
+ min-height: 21.25rem;
text-align: center;
+ box-shadow: 0 1px 3px 0 var(--mb-color-text-tertiary);
transition: all 0.2s linear;
}
+.linkWrapper:hover {
+ box-shadow: 0 3px 8px 0 var(--mb-color-text-tertiary);
+}
+
.modelTitle {
transition: all 0.2s linear;
}
+
+.linkWrapper:hover .modelTitle {
+ color: var(--mb-color-brand);
+}
diff --git a/frontend/src/metabase/models/components/NewModelOption.tsx b/frontend/src/metabase/models/components/NewModelOption.tsx
new file mode 100644
index 00000000000..a824877574e
--- /dev/null
+++ b/frontend/src/metabase/models/components/NewModelOption.tsx
@@ -0,0 +1,38 @@
+import { Link, type LinkProps } from "react-router";
+
+import { Box, Flex, Text, Title } from "metabase/ui";
+
+import S from "./NewModelOption.module.css";
+
+const DEFAULT_IMAGE_WIDTH = 210;
+
+type NewModelOptionProps = LinkProps & {
+ image: string;
+ title: string;
+ description: string;
+ width?: number;
+};
+
+export function NewModelOption({
+ width = DEFAULT_IMAGE_WIDTH,
+ image,
+ title,
+ description,
+ ...props
+}: NewModelOptionProps) {
+ return (
+ <Link {...props} className={S.linkWrapper}>
+ <Flex align="center" justify="center" h="10rem">
+ <img src={`${image}.png`} srcSet={`${image}@2x.png 2x`} width={width} />
+ </Flex>
+ <Box my="md">
+ <Title order={2} className={S.modelTitle}>
+ {title}
+ </Title>
+ <Text c="text-secondary" maw="22.5rem" mt="sm">
+ {description}
+ </Text>
+ </Box>
+ </Link>
+ );
+}
diff --git a/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx b/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx
new file mode 100644
index 00000000000..f48b54fac9a
--- /dev/null
+++ b/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx
@@ -0,0 +1,56 @@
+import { Route } from "react-router";
+
+import { renderWithProviders, screen } from "__support__/ui";
+
+import { NewModelOption } from "./NewModelOption";
+
+const defaultProps = {
+ image: "app/img/sql_illustration",
+ title: "Use a native query",
+ description: "Fall back to SQL.",
+ to: "/model/new/native",
+};
+
+const setup = (props = {}) =>
+ renderWithProviders(
+ <Route
+ path="*"
+ component={() => <NewModelOption {...defaultProps} {...props} />}
+ />,
+ { withRouter: true },
+ );
+
+describe("NewModelOption", () => {
+ it("renders the title and description", () => {
+ setup();
+
+ expect(
+ screen.getByRole("heading", { name: "Use a native query" }),
+ ).toBeInTheDocument();
+ expect(screen.getByText("Fall back to SQL.")).toBeInTheDocument();
+ });
+
+ it("links to the provided target", () => {
+ setup();
+
+ expect(screen.getByRole("link")).toHaveAttribute(
+ "href",
+ "/model/new/native",
+ );
+ });
+
+ it("renders the image with src, srcSet, and the provided width", () => {
+ setup({ width: 180 });
+
+ const img = screen.getByRole("img");
+ expect(img).toHaveAttribute("src", "app/img/sql_illustration.png");
+ expect(img).toHaveAttribute("srcset", "app/img/[email protected] 2x");
+ expect(img).toHaveAttribute("width", "180");
+ });
+
+ it("falls back to the default image width when none is provided", () => {
+ setup();
+
+ expect(screen.getByRole("img")).toHaveAttribute("width", "210");
+ });
+});
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
index d670ba09125..39b8f2c03ba 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
@@ -5,7 +5,7 @@ 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";
+import { NewModelOption } from "metabase/models/components/NewModelOption";
import { useSelector } from "metabase/redux";
import { getLearnUrl, getSetting } from "metabase/selectors/settings";
import {