Skip to content

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

Migrate the auth card and cloud panel off Emotion (#83267)

Andrei Chernykh3c0d9e930f3f
diff --git a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.styled.tsx b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.styled.tsx
deleted file mode 100644
index 05fd590cee8..00000000000
--- a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.styled.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { color } from "metabase/ui/utils/colors";
-
-export const CardRoot = styled.div`
- flex: 1;
- max-width: 52rem;
-`;
-
-export const CardHeader = styled.div`
- display: flex;
- align-items: flex-end;
- gap: 1rem;
- margin-bottom: 0.25rem;
-`;
-
-export const CardTitle = styled.div`
- color: var(--mb-color-text-primary);
- font-size: 1.5rem;
- font-weight: bold;
-`;
-
-export const CardDescription = styled.div`
- color: var(--mb-color-text-primary);
- font-size: 0.875rem;
- line-height: 1.5rem;
- margin-bottom: 1rem;
- max-width: 40rem;
-`;
-
-interface CardBadgeProps {
- isEnabled: boolean;
-}
-
-export const CardBadge = styled.div<CardBadgeProps>`
- color: ${(props) =>
- props.isEnabled ? color("core-brand") : color("feedback-negative")};
- background-color: ${(props) =>
- props.isEnabled
- ? "var(--mb-color-background_surface-brand-subtle)"
- : "var(--mb-color-background_page-secondary)"};
- padding: 0.25rem 0.375rem;
- border-radius: 0.25rem;
- font-weight: bold;
-`;
diff --git a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx
index 48e235eadd7..890abbd064f 100644
--- a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx
+++ b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx
@@ -6,16 +6,18 @@ import { useGetEnvVarDocsUrl } from "metabase/admin/settings/utils";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { Link } from "metabase/common/components/Link";
import { SettingsSection } from "metabase/settings-components";
-import { ActionIcon, Anchor, Button, Icon, Menu, Text } from "metabase/ui";
-import type { SettingDefinition } from "metabase-types/api";
-
import {
- CardBadge,
- CardDescription,
- CardHeader,
- CardRoot,
- CardTitle,
-} from "./AuthCard.styled";
+ ActionIcon,
+ Anchor,
+ Box,
+ Button,
+ Flex,
+ Icon,
+ Menu,
+ Text,
+ Title,
+} from "metabase/ui";
+import type { SettingDefinition } from "metabase-types/api";
export interface AuthCardProps {
setting?: Pick<SettingDefinition, "is_env_setting" | "env_name">;
@@ -124,17 +126,33 @@ export const AuthCardBody = ({
return (
<SettingsSection>
- <CardRoot data-testid={`${type}-setting`}>
- <CardHeader>
- <CardTitle>{title}</CardTitle>
+ <Box flex={1} maw="52rem" data-testid={`${type}-setting`}>
+ <Flex align="flex-end" gap="lg" mb="xxs">
+ <Title order={2} c="text-primary">
+ {title}
+ </Title>
{isConfigured && (
- <CardBadge isEnabled={isEnabled} data-testid="card-badge">
+ <Box
+ c={isEnabled ? "core-brand" : "feedback-negative"}
+ bg={
+ isEnabled
+ ? "background_surface-brand-subtle"
+ : "background_page-secondary"
+ }
+ py="xxs"
+ px="xs"
+ bdrs="xxs"
+ fw="bold"
+ data-testid="card-badge"
+ >
{badgeContent}
- </CardBadge>
+ </Box>
)}
{children}
- </CardHeader>
- <CardDescription>{description}</CardDescription>
+ </Flex>
+ <Box c="text-primary" fz="md" lh="1.5rem" mb="lg" maw="40rem">
+ {description}
+ </Box>
{footer ? (
footer
) : (
@@ -142,7 +160,7 @@ export const AuthCardBody = ({
<Button>{buttonLabel}</Button>
</Link>
)}
- </CardRoot>
+ </Box>
</SettingsSection>
);
};
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx
deleted file mode 100644
index e4e8df536b3..00000000000
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { alpha } from "metabase/ui/colors";
-
-export const MigrationCard = styled.div`
- border: 1px solid var(--mb-color-border-neutral);
- border-radius: 0.5rem;
- padding: 2rem 3rem;
- background: var(--mb-color-background_page-primary);
-`;
-
-export const LargeIconContainer = styled.div<{
- color: string;
-}>`
- display: flex;
- align-items: center;
- justify-content: center;
- flex-shrink: 0;
- height: 4rem;
- width: 4rem;
- border-radius: 50%;
- background: ${(props) => alpha(props.color, 0.15)};
- color: ${(props) => props.color};
-`;
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/LargeIconContainer.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/LargeIconContainer.tsx
new file mode 100644
index 00000000000..1f96142dd77
--- /dev/null
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/LargeIconContainer.tsx
@@ -0,0 +1,25 @@
+import { Flex, type FlexProps } from "metabase/ui";
+import { alpha } from "metabase/ui/colors";
+
+type LargeIconContainerProps = FlexProps & {
+ color: string;
+ children: React.ReactNode;
+};
+
+/** A 4rem circle around a status icon, tinted with the icon's color. */
+export const LargeIconContainer = ({
+ color,
+ style,
+ ...props
+}: LargeIconContainerProps) => (
+ <Flex
+ w="4rem"
+ h="4rem"
+ bdrs="50%"
+ flex="0 0 auto"
+ align="center"
+ justify="center"
+ style={{ ...style, color, backgroundColor: alpha(color, 0.15) }}
+ {...props}
+ />
+);
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCard.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCard.tsx
new file mode 100644
index 00000000000..98b2107bad9
--- /dev/null
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCard.tsx
@@ -0,0 +1,9 @@
+import { Paper, type PaperProps } from "metabase/ui";
+
+type MigrationCardProps = PaperProps & {
+ children: React.ReactNode;
+};
+
+export const MigrationCard = (props: MigrationCardProps) => (
+ <Paper withBorder shadow="none" radius="sm" py="xxl" px="3rem" {...props} />
+);
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsx
index 456909efd93..9008d5fd4e4 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsx
@@ -4,7 +4,8 @@ import { Link } from "metabase/common/components/Link";
import { Box, Flex, Icon, Text } from "metabase/ui";
import { color } from "metabase/ui/colors";
-import { LargeIconContainer, MigrationCard } from "./CloudPanel.styled";
+import { LargeIconContainer } from "./LargeIconContainer";
+import { MigrationCard } from "./MigrationCard";
interface MigrationCreationErrorProps {
error: any;
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx
index 21afa003320..9856b695956 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx
@@ -5,7 +5,8 @@ import { Box, Button, Flex, Icon, Text } from "metabase/ui";
import { color } from "metabase/ui/colors";
import type { CloudMigration } from "metabase-types/api/cloud-migration";
-import { LargeIconContainer, MigrationCard } from "./CloudPanel.styled";
+import { LargeIconContainer } from "./LargeIconContainer";
+import { MigrationCard } from "./MigrationCard";
import { getMigrationEventTime } from "./utils";
interface MigrationErrorProps {
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
index 22d6ed0cded..c7bbc3661a6 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
@@ -19,7 +19,7 @@ import {
import { useCancelCloudMigrationMutation } from "../../api/cloud-migration";
-import { MigrationCard } from "./CloudPanel.styled";
+import { MigrationCard } from "./MigrationCard";
import type { InProgressCloudMigration, InProgressStates } from "./utils";
import { getMigrationUrl } from "./utils";
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
index e633513930d..0494ebe9be0 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx
@@ -6,7 +6,8 @@ import { Box, Button, Flex, Icon, Text } from "metabase/ui";
import { color } from "metabase/ui/colors";
import type { CloudMigration } from "metabase-types/api/cloud-migration";
-import { LargeIconContainer, MigrationCard } from "./CloudPanel.styled";
+import { LargeIconContainer } from "./LargeIconContainer";
+import { MigrationCard } from "./MigrationCard";
import { getMigrationEventTime, getMigrationUrl } from "./utils";
interface MigrationSuccessProps {