Skip to content

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

GDGT-1760 Remove Code & BoldCode components (#69348)

Kamil Mielnik3c724995fb7c
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 9f9efca14ab..aa7cd5c672a 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,10 +1,10 @@
import { jt, t } from "ttag";
-import { BoldCode } from "metabase/common/components/Code";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
import * as Urls from "metabase/lib/urls";
import { isEmpty } from "metabase/lib/validate";
+import { Code } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
import { ImpersonationAlert } from "./ImpersonationWarning.styled";
@@ -24,36 +24,36 @@ export const ImpersonationWarning = ({
// eslint-disable-next-line metabase/no-literal-metabase-strings -- Metabase settings
const redshiftWarning = jt`You’re connecting Metabase to the ${(
- <BoldCode key="2" size="13px">
+ <Code c="brand" key="1" fw="bold" fz={13}>
{database.name}
- </BoldCode>
+ </Code>
)} database using the credentials for the Redshift user ${(
- <BoldCode key="3" size="13px">
- {databaseUser}
- </BoldCode>
+ <Code c="brand" key="2" fw="bold" fz={13}>
+ {String(databaseUser)}
+ </Code>
)}. For impersonation to work, ${(
- <BoldCode key="3" size="13px">
- {databaseUser}
- </BoldCode>
+ <Code c="brand" key="3" fw="bold" fz={13}>
+ {String(databaseUser)}
+ </Code>
)} must be a superuser in Redshift.`;
// eslint-disable-next-line metabase/no-literal-metabase-strings -- Metabase settings
const regularWarning = jt`${(
- <BoldCode key="1" size="13px">
- {databaseUser}
- </BoldCode>
+ <Code c="brand" key="1" fw="bold" fz={13}>
+ {String(databaseUser)}
+ </Code>
)} is the database user Metabase is using to connect to your ${(
- <BoldCode key="2" size="13px">
+ <Code c="brand" key="2" fw="bold" fz={13}>
{database.name}
- </BoldCode>
+ </Code>
)} database. Make sure that ${(
- <BoldCode key="3" size="13px">
- {databaseUser}
- </BoldCode>
+ <Code c="brand" key="3" fw="bold" fz={13}>
+ {String(databaseUser)}
+ </Code>
)} has access to everything in ${(
- <BoldCode key="4" size="13px">
+ <Code c="brand" key="4" fw="bold" fz={13}>
{database.name}
- </BoldCode>
+ </Code>
)} that all Metabase groups may need access to, as that database user account is what Metabase uses to sync table information.`;
const warningText = isRedshift ? redshiftWarning : regularWarning;
diff --git a/frontend/src/metabase/admin/tools/components/Help/Help.tsx b/frontend/src/metabase/admin/tools/components/Help/Help.tsx
index 3e697147c81..e077b3380e3 100644
--- a/frontend/src/metabase/admin/tools/components/Help/Help.tsx
+++ b/frontend/src/metabase/admin/tools/components/Help/Help.tsx
@@ -9,7 +9,6 @@ import {
SettingsSection,
} from "metabase/admin/components/SettingsSection";
import { UpsellBetterSupport } from "metabase/admin/upsells";
-import { Code } from "metabase/common/components/Code";
import { CopyButton } from "metabase/common/components/CopyButton";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useSetting } from "metabase/common/hooks";
@@ -18,7 +17,7 @@ import { useSelector } from "metabase/lib/redux";
import { PLUGIN_SUPPORT } from "metabase/plugins";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { UtilApi } from "metabase/services";
-import { Box, Group } from "metabase/ui";
+import { Box, Code, Group } from "metabase/ui";
import S from "./help.module.css";
@@ -86,7 +85,9 @@ const InfoBlock = ({ children }: InfoBlockProps) => (
<Box className={S.InfoBlockButton}>
<CopyButton value={children} />
</Box>
- <Code>{children}</Code>
+ <Code bg="transparent" block>
+ {children}
+ </Code>
</Box>
);
diff --git a/frontend/src/metabase/common/components/Code/Code.jsx b/frontend/src/metabase/common/components/Code/Code.jsx
deleted file mode 100644
index da738bb2948..00000000000
--- a/frontend/src/metabase/common/components/Code/Code.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* eslint "react/prop-types": "warn" */
-import PropTypes from "prop-types";
-import { Fragment } from "react";
-
-import CS from "metabase/css/core/index.css";
-import { Text } from "metabase/ui";
-
-export const BoldCode = ({ children, ...props }) => (
- <Text fw="bold" color="brand" component="span" {...props}>
- <code>{children}</code>
- </Text>
-);
-
-export const Code = ({ children, block }) => {
- if (block) {
- return <div className={CS.textCode}>{children}</div>;
- } else if (typeof children === "string" && children.split(/\n/g).length > 1) {
- return (
- <span>
- {children.split(/\n/g).map((line, index) => (
- <Fragment key={index}>
- <span className={CS.textCode} style={{ lineHeight: "1.8em" }}>
- {line}
- </span>
- <br />
- </Fragment>
- ))}
- </span>
- );
- } else {
- return <span className={CS.textCode}>{children}</span>;
- }
-};
-
-BoldCode.propTypes = {
- children: PropTypes.any.isRequired,
-};
-
-Code.propTypes = {
- children: PropTypes.any.isRequired,
- block: PropTypes.bool,
-};
diff --git a/frontend/src/metabase/common/components/Code/index.tsx b/frontend/src/metabase/common/components/Code/index.tsx
deleted file mode 100644
index e1be3258b76..00000000000
--- a/frontend/src/metabase/common/components/Code/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./Code";
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
index 074f3016392..c4fb516e23e 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
@@ -2,11 +2,11 @@ import cx from "classnames";
import { jt, t } from "ttag";
import { Button } from "metabase/common/components/Button";
-import { Code } from "metabase/common/components/Code";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { uuid } from "metabase/lib/uuid";
+import { Code } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
import type { DatabaseId, NativeDatasetQuery } from "metabase-types/api";
@@ -205,7 +205,7 @@ const TagExample = ({ datasetQuery, setDatasetQuery }: TagExampleProps) => (
<div>
<h5>{t`Example:`}</h5>
<p>
- <Code>{datasetQuery.native.query}</Code>
+ <Code block>{datasetQuery.native.query}</Code>
{setDatasetQuery && (
<Button
medium