Skip to content

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

Migrate impersonation modal and warning from Emotion to Mantine (#75034)

Andrei Chernykhdfdd6542be3a
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.styled.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.styled.tsx
deleted file mode 100644
index 68674d7e2a4..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.styled.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import styled from "@emotion/styled";
-
-export const ImpersonationModalViewRoot = styled.div`
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
- padding: 2rem;
-`;
-
-export const ImpersonationDescription = styled.p`
- line-height: 1.4rem;
- margin: 0.5rem 0;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
index 392674438d8..a78bfd74037 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
@@ -12,6 +12,7 @@ import { Link } from "metabase/common/components/Link/Link";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { Form, FormProvider, FormSelect } from "metabase/forms";
+import { Stack, Text } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import { renderUserAttributesForSelect } from "metabase-enterprise/sandboxes/utils";
import type Database from "metabase-lib/v1/metadata/Database";
@@ -19,11 +20,6 @@ import type { UserAttributeKey } from "metabase-types/api";
import { ImpersonationWarning } from "../ImpersonationWarning";
-import {
- ImpersonationDescription,
- ImpersonationModalViewRoot,
-} from "./ImpersonationModalView.styled";
-
const ROLE_ATTRIBUTION_MAPPING_SCHEMA = Yup.object({
attribute: Yup.string().required(Errors.required).default(""),
});
@@ -88,15 +84,15 @@ export const ImpersonationModalView = ({
t`When the person runs a query (including native queries), Metabase will impersonate the privileges of the database role you associate with the user attribute.`;
return (
- <ImpersonationModalViewRoot>
+ <Stack gap="sm" p="xl">
<h2>{modalTitle}</h2>
- <ImpersonationDescription>
+ <Text my="sm" lh="lg">
{modalMessage}{" "}
<ExternalLink
className={CS.link}
href={permsDocsUrl}
>{t`Learn More`}</ExternalLink>
- </ImpersonationDescription>
+ </Text>
{roleRequired ? (
<>
<Alert icon="warning" variant="warning">
@@ -154,6 +150,6 @@ export const ImpersonationModalView = ({
</FormFooter>
</>
)}
- </ImpersonationModalViewRoot>
+ </Stack>
);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.styled.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.styled.tsx
deleted file mode 100644
index 8632349fdb7..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.styled.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import styled from "@emotion/styled";
-
-import { Alert } from "metabase/common/components/Alert";
-
-export const ImpersonationAlert = styled(Alert)`
- margin-bottom: 1rem;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
index 0fd955521c8..e6a5cb33c4d 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
@@ -1,14 +1,13 @@
import { jt, t } from "ttag";
+import { Alert } from "metabase/common/components/Alert";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
-import { Code } from "metabase/ui";
+import { Box, Code } from "metabase/ui";
import * as Urls from "metabase/urls";
import { isEmpty } from "metabase/utils/validate";
import type Database from "metabase-lib/v1/metadata/Database";
-import { ImpersonationAlert } from "./ImpersonationWarning.styled";
-
interface ImpersonationWarningProps {
database: Database;
}
@@ -59,12 +58,14 @@ export const ImpersonationWarning = ({
const warningText = isRedshift ? redshiftWarning : regularWarning;
return (
- <ImpersonationAlert icon="warning" variant="warning">
- {isEmpty(databaseUser) ? emptyText : warningText}{" "}
- <Link
- className={CS.link}
- to={Urls.editDatabase(database.id) + (databaseUser ? "#user" : "")}
- >{t`Edit settings`}</Link>
- </ImpersonationAlert>
+ <Box mb="md">
+ <Alert icon="warning" variant="warning">
+ {isEmpty(databaseUser) ? emptyText : warningText}{" "}
+ <Link
+ className={CS.link}
+ to={Urls.editDatabase(database.id) + (databaseUser ? "#user" : "")}
+ >{t`Edit settings`}</Link>
+ </Alert>
+ </Box>
);
};