Skip to content

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

Security Center: Markdown (#79737)

Egor Grushin741ed577d96a
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx
index 93fd4c55c94..1cc8c265233 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx
@@ -1,6 +1,7 @@
import { match } from "ts-pattern";
import { t } from "ttag";
+import { Markdown } from "metabase/common/components/Markdown";
import { useSetting } from "metabase/settings";
import {
Anchor,
@@ -26,6 +27,8 @@ import type {
import { trackSecurityAdvisoryDownloadClicked } from "../../analytics";
import { getDownloadJarForInstance, isAcknowledged } from "../../utils";
+const DISALLOWED_ELEMENTS = ["img"];
+
interface AdvisoryCardProps {
advisory: Advisory;
isAffecting: boolean;
@@ -73,7 +76,13 @@ export function AdvisoryCard({
<Title order={4}>{advisory.title}</Title>
- <Text c="text-secondary">{advisory.description}</Text>
+ <Markdown
+ c="text-secondary"
+ disallowHeading
+ disallowedElements={DISALLOWED_ELEMENTS}
+ >
+ {advisory.description}
+ </Markdown>
{advisory.affected_versions.length > 0 && (
<Box>
@@ -90,7 +99,13 @@ export function AdvisoryCard({
<Box>
<Text fw={700} mb="xs">{t`Remediation`}</Text>
- <Text c="text-secondary">{advisory.remediation}</Text>
+ <Markdown
+ c="text-secondary"
+ disallowHeading
+ disallowedElements={DISALLOWED_ELEMENTS}
+ >
+ {advisory.remediation}
+ </Markdown>
</Box>
<Group gap="md" mt="sm">
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.unit.spec.tsx
new file mode 100644
index 00000000000..2a6b71004cf
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.unit.spec.tsx
@@ -0,0 +1,75 @@
+import { renderWithProviders, screen, within } from "__support__/ui";
+import { createMockSettingsState } from "metabase/redux/store/mocks";
+import type { Advisory } from "metabase-types/api";
+import { createMockVersion } from "metabase-types/api/mocks";
+import { createAdvisory } from "metabase-types/api/mocks/security-center";
+
+import { AdvisoryCard } from "./AdvisoryCard";
+
+const setup = ({
+ advisory,
+ isAffecting = true,
+}: {
+ advisory: Advisory;
+ isAffecting?: boolean;
+}) => {
+ renderWithProviders(
+ <AdvisoryCard advisory={advisory} isAffecting={isAffecting} />,
+ {
+ storeInitialState: {
+ settings: createMockSettingsState({
+ version: createMockVersion({ tag: "v0.59.3" }),
+ }),
+ },
+ },
+ );
+};
+
+describe("AdvisoryCard", () => {
+ it("renders markdown in the description and the remediation", () => {
+ setup({
+ advisory: createAdvisory({
+ affected_versions: [],
+ description: "A **critical** flaw in the [handler](https://acme.test).",
+ remediation: "Steps:\n\n- Upgrade to `v0.59.4`\n- Rotate the secret",
+ }),
+ });
+
+ const card = screen.getByTestId("advisory-card");
+
+ expect(within(card).getByText("critical").tagName).toBe("STRONG");
+
+ const link = within(card).getByRole("link", { name: "handler" });
+ expect(link).toHaveAttribute("href", "https://acme.test");
+ expect(link).toHaveAttribute("target", "_blank");
+
+ expect(within(card).getAllByRole("listitem")).toHaveLength(2);
+ expect(within(card).getByText("v0.59.4").tagName).toBe("CODE");
+ });
+
+ it("does not render images from the advisory feed", () => {
+ setup({
+ advisory: createAdvisory({
+ description: "Before ![tracker](https://attacker.test/pixel.png) after",
+ remediation: "![tracker](//attacker.test/pixel.png)",
+ }),
+ });
+
+ const card = screen.getByTestId("advisory-card");
+
+ expect(within(card).queryByRole("img")).not.toBeInTheDocument();
+ expect(card.querySelector("img")).toBeNull();
+ });
+
+ it("renders plain text unchanged", () => {
+ setup({
+ advisory: createAdvisory({
+ description: "Plain description",
+ remediation: "Plain remediation",
+ }),
+ });
+
+ expect(screen.getByText("Plain description")).toBeInTheDocument();
+ expect(screen.getByText("Plain remediation")).toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
index 41e18c32731..07efa49181e 100644
--- a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
@@ -193,7 +193,13 @@ export const Columns = {
name="info"
size={16}
tooltip={
- <Markdown dark disallowHeading unstyleLinks lineClamp={8}>
+ <Markdown
+ dark
+ compact
+ disallowHeading
+ unstyleLinks
+ lineClamp={8}
+ >
{tc(item.description)}
</Markdown>
}
diff --git a/frontend/src/metabase/common/components/Markdown/Markdown.module.css b/frontend/src/metabase/common/components/Markdown/Markdown.module.css
index 28e0ae33b0d..138bad4db67 100644
--- a/frontend/src/metabase/common/components/Markdown/Markdown.module.css
+++ b/frontend/src/metabase/common/components/Markdown/Markdown.module.css
@@ -1,7 +1,17 @@
.markdownRoot {
+ --markdown-border-color: var(--mb-color-border-neutral);
+ --markdown-surface-color: var(--mb-color-background_page-secondary);
+
color: var(--markdown-color, inherit);
}
+.markdownRoot[data-dark] {
+ --markdown-border-color: var(--mb-color-background_page-tertiary-inverse);
+ --markdown-surface-color: var(
+ --mb-color-background_surface-secondary-inverse
+ );
+}
+
.lineClamp {
display: -webkit-box;
-webkit-line-clamp: var(--markdown-line-clamp);
@@ -11,43 +21,153 @@
white-space: pre-line;
}
-.markdownRoot p {
+.markdownRoot :where(p) {
margin: 0;
line-height: 1.57em;
}
-.markdownRoot p:not(:last-child) {
- margin-bottom: var(--mantine-spacing-sm);
+.markdownRoot :where(h1, h2, h3, h4, h5, h6) {
+ margin: 0;
}
-.markdownRoot a {
+.markdownRoot :where(a) {
cursor: pointer;
text-decoration: none;
color: var(--mb-color-core-brand);
}
-.markdownRoot a:hover {
+.markdownRoot :where(a:hover) {
text-decoration: underline;
}
-.markdownRoot[data-unstyle-links] a {
+.markdownRoot[data-unstyle-links] :where(a) {
color: var(--mb-color-text-primary-inverse);
}
-.markdownRoot[data-unstyle-links] a:hover {
+.markdownRoot[data-unstyle-links] :where(a:hover) {
text-decoration: none;
}
-.markdownRoot img {
+.markdownRoot :where(img) {
max-width: 100%;
height: auto;
}
-.markdownRoot hr {
+.markdownRoot :where(hr) {
+ margin: 0;
border: none;
- border-bottom: 1px solid var(--mb-color-border-neutral);
+ border-bottom: 1px solid var(--markdown-border-color);
+}
+
+.markdownRoot :where(ul, ol) {
+ margin: 0;
+ padding-left: var(--mantine-spacing-lg);
+}
+
+.markdownRoot :where(ul) {
+ list-style-type: disc;
+}
+
+.markdownRoot :where(ol) {
+ list-style-type: decimal;
+}
+
+.markdownRoot
+ :where(li:has(> input[type="checkbox"], > p > input[type="checkbox"])) {
+ list-style: none;
+}
+
+.markdownRoot :where(input[type="checkbox"]) {
+ margin-right: var(--mantine-spacing-xs);
+}
+
+.markdownRoot:where(:not([data-custom-code])) {
+ :where(code) {
+ font-family: var(--mb-default-monospace-font-family, monospace);
+ font-size: 0.875em;
+ background-color: var(--markdown-surface-color);
+ border: 1px solid var(--markdown-border-color);
+ border-radius: var(--mantine-radius-xs);
+ padding: 0.125rem 0.25rem;
+ }
+
+ :where(pre code) {
+ background-color: transparent;
+ border: none;
+ padding: 0;
+ }
+}
+
+.markdownRoot :where(pre) {
+ margin: 0;
+ padding: var(--mantine-spacing-sm);
+ overflow-x: auto;
+ background-color: var(--markdown-surface-color);
+ border: 1px solid var(--markdown-border-color);
+ border-radius: var(--mantine-radius-sm);
+}
+
+.markdownRoot :where(blockquote) {
+ margin: 0;
+ padding-left: var(--mantine-spacing-md);
+ border-left: 2px solid var(--markdown-border-color);
+}
+
+.tableScroll {
+ max-width: 100%;
+ overflow-x: auto;
+}
+
+.markdownRoot :where(table) {
+ border-collapse: collapse;
+}
+
+.markdownRoot :where(th, td) {
+ padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
+ border: 1px solid var(--markdown-border-color);
+ text-align: left;
+ vertical-align: top;
+}
+
+.markdownRoot :where(th) {
+ font-weight: 700;
+}
+
+.markdownRoot :where(section[data-footnotes]) {
+ font-size: 0.875em;
+ border-top: 1px solid var(--markdown-border-color);
+ padding-top: var(--mantine-spacing-sm);
+}
+
+.markdownRoot > :where(:not(:last-child)) {
+ margin-bottom: var(--mantine-spacing-sm);
+}
+
+.markdownRoot :where(p:not(:last-child)) {
+ margin-bottom: var(--mantine-spacing-sm);
+}
+
+.markdownRoot :where(li:not(:last-child)) {
+ margin-bottom: var(--mantine-spacing-xs);
+}
+
+.markdownRoot :where(li > ul, li > ol) {
+ margin-top: var(--mantine-spacing-xs);
+}
+
+.markdownRoot[data-compact] > :where(:not(:last-child)),
+.markdownRoot[data-compact] :where(p:not(:last-child)) {
+ margin-bottom: var(--mantine-spacing-xs);
+}
+
+.markdownRoot[data-compact] :where(ul, ol) {
+ padding-left: var(--mantine-spacing-md);
+}
+
+.markdownRoot[data-compact] :where(li:not(:last-child)) {
+ margin-bottom: 0;
}
-.markdownRoot[data-dark] hr {
- border-bottom-color: var(--mb-color-background_page-tertiary-inverse);
+.markdownRoot[data-compact] :where(pre) {
+ padding: var(--mantine-spacing-xs);
}
diff --git a/frontend/src/metabase/common/components/Markdown/Markdown.stories.tsx b/frontend/src/metabase/common/components/Markdown/Markdown.stories.tsx
index daa4a89419c..2a7c5651542 100644
--- a/frontend/src/metabase/common/components/Markdown/Markdown.stories.tsx
+++ b/frontend/src/metabase/common/components/Markdown/Markdown.stories.tsx
@@ -1,6 +1,12 @@
import type { StoryFn } from "@storybook/react";
+import { Box } from "metabase/ui";
+
import { Markdown, type MarkdownProps } from "./Markdown";
+import {
+ KITCHEN_SINK_MARKDOWN,
+ UNBREAKABLE_TABLE_MARKDOWN,
+} from "./kitchen-sink-markdown";
export default {
title: "Components/Ask Before Using/Markdown",
@@ -23,3 +29,53 @@ export const Default = {
Here’s a [doc](https://metabase.test) with the findings.`,
},
};
+
+const DARK_SURFACE_PROPS = {
+ bg: "tooltip-background",
+ c: "tooltip-text",
+ p: "lg",
+} as const;
+
+const KitchenSinkTemplate: StoryFn<MarkdownProps> = ({ dark, ...args }) => {
+ return (
+ <Box {...(dark && DARK_SURFACE_PROPS)}>
+ <Markdown dark={dark} {...args} />
+ </Box>
+ );
+};
+
+export const KitchenSink = {
+ render: KitchenSinkTemplate,
+
+ args: {
+ children: KITCHEN_SINK_MARKDOWN,
+ compact: false,
+ dark: false,
+ disallowHeading: false,
+ unstyleLinks: false,
+ },
+
+ argTypes: {
+ compact: { control: "boolean" },
+ dark: { control: "boolean" },
+ disallowHeading: { control: "boolean" },
+ unstyleLinks: { control: "boolean" },
+ lineClamp: { control: "number" },
+ },
+};
+
+const NarrowTemplate: StoryFn<MarkdownProps> = (args) => {
+ return (
+ <Box w={320}>
+ <Markdown {...args} />
+ </Box>
+ );
+};
+
+export const NarrowContainer = {
+ render: NarrowTemplate,
+
+ args: {
+ children: UNBREAKABLE_TABLE_MARKDOWN,
+ },
+};
diff --git a/frontend/src/metabase/common/components/Markdown/Markdown.tsx b/frontend/src/metabase/common/components/Markdown/Markdown.tsx
index b102bab7f51..4d36afff161 100644
--- a/frontend/src/metabase/common/components/Markdown/Markdown.tsx
+++ b/frontend/src/metabase/common/components/Markdown/Markdown.tsx
@@ -3,9 +3,14 @@ import type {
AnchorHTMLAttributes,
CSSProperties,
ComponentPropsWithRef,
+ TableHTMLAttributes,
} from "react";
import { useMemo } from "react";
-import ReactMarkdown, { defaultUrlTransform } from "react-markdown";
+import ReactMarkdown, {
+ type Components,
+ type ExtraProps,
+ defaultUrlTransform,
+} from "react-markdown";
import remarkGfm from "remark-gfm";
import type { ColorName } from "metabase/ui/colors/types";
@@ -20,6 +25,24 @@ const MarkdownLink = (props: AnchorHTMLAttributes<HTMLAnchorElement>) => (
<a {...props} target="_blank" rel="noopener noreferrer" />
);
+const MarkdownTable = ({
+ node,
+ ...props
+}: TableHTMLAttributes<HTMLTableElement> & ExtraProps) => (
+ <div className={S.tableScroll}>
+ <table {...props} />
+ </div>
+);
+
+const HEADINGS_AS_PARAGRAPHS: Components = {
+ h1: "p",
+ h2: "p",
+ h3: "p",
+ h4: "p",
+ h5: "p",
+ h6: "p",
+};
+
type MarkdownCssVariables = CSSProperties & {
"--markdown-color"?: string;
"--markdown-line-clamp"?: number;
@@ -42,6 +65,7 @@ export interface MarkdownProps extends ComponentPropsWithRef<
dark?: boolean;
disallowHeading?: boolean;
unstyleLinks?: boolean;
+ compact?: boolean;
children: string;
lineClamp?: number;
c?: ColorName;
@@ -54,21 +78,20 @@ export const Markdown = ({
dark,
disallowHeading = false,
unstyleLinks = false,
+ compact = false,
c,
lineClamp,
components,
...rest
}: MarkdownProps): JSX.Element => {
- const additionalOptions = {
- ...(disallowHeading && {
- disallowedElements: ["h1", "h2", "h3", "h4", "h5", "h6"],
- unwrapDisallowed: true,
- }),
- };
-
const customizedComponents = useMemo(
- () => ({ a: MarkdownLink, ...components }),
- [components],
+ () => ({
+ a: MarkdownLink,
+ table: MarkdownTable,
+ ...(disallowHeading && HEADINGS_AS_PARAGRAPHS),
+ ...components,
+ }),
+ [components, disallowHeading],
);
const style: MarkdownCssVariables = {
@@ -82,12 +105,13 @@ export const Markdown = ({
style={style}
data-dark={dark || undefined}
data-unstyle-links={unstyleLinks || undefined}
+ data-compact={compact || undefined}
+ data-custom-code={!!components?.code || undefined}
>
<ReactMarkdown
remarkPlugins={REMARK_PLUGINS}
urlTransform={urlTransform}
components={customizedComponents}
- {...additionalOptions}
{...rest}
>
{children}
diff --git a/frontend/src/metabase/common/components/Markdown/Markdown.unit.spec.tsx b/frontend/src/metabase/common/components/Markdown/Markdown.unit.spec.tsx
new file mode 100644
index 00000000000..da838d5d10a
--- /dev/null
+++ b/frontend/src/metabase/common/components/Markdown/Markdown.unit.spec.tsx
@@ -0,0 +1,146 @@
+import { render, screen } from "__support__/ui";
+import { checkNotNull } from "metabase/utils/types";
+
+import { Markdown, type MarkdownProps } from "./Markdown";
+import { KITCHEN_SINK_MARKDOWN } from "./kitchen-sink-markdown";
+
+const KNOWN_ELEMENTS = [
+ "a",
+ "blockquote",
+ "br",
+ "code",
+ "del",
+ "div",
+ "em",
+ "h1",
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "h6",
+ "hr",
+ "img",
+ "input",
+ "li",
+ "ol",
+ "p",
+ "pre",
+ "section",
+ "strong",
+ "sup",
+ "table",
+ "tbody",
+ "td",
+ "th",
+ "thead",
+ "tr",
+ "ul",
+];
+
+const setup = (props: MarkdownProps) => {
+ render(
+ <div data-testid="markdown-host">
+ <Markdown {...props} />
+ </div>,
+ );
+
+ return {
+ root: checkNotNull(screen.getByTestId("markdown-host").firstElementChild),
+ };
+};
+
+const getTagNames = (root: Element) => {
+ const tagNames = [...root.querySelectorAll("*")].map((element) =>
+ element.tagName.toLowerCase(),
+ );
+
+ return [...new Set(tagNames)].sort();
+};
+
+describe("Markdown", () => {
+ it("does not emit elements outside the set the stylesheet accounts for", () => {
+ const { root } = setup({ children: KITCHEN_SINK_MARKDOWN });
+
+ const tagNames = getTagNames(root);
+
+ expect(tagNames).toContain("table");
+ expect(
+ tagNames.filter((tagName) => !KNOWN_ELEMENTS.includes(tagName)),
+ ).toEqual([]);
+ });
+
+ it("opens links in a new tab", () => {
+ setup({ children: "A [link](https://metabase.test)." });
+
+ const link = screen.getByRole("link", { name: "link" });
+
+ expect(link).toHaveAttribute("href", "https://metabase.test");
+ expect(link).toHaveAttribute("target", "_blank");
+ expect(link).toHaveAttribute("rel", "noopener noreferrer");
+ });
+
+ it("keeps metabase:// urls", () => {
+ setup({ children: "A [link](metabase://question/1)." });
+
+ expect(screen.getByRole("link", { name: "link" })).toHaveAttribute(
+ "href",
+ "metabase://question/1",
+ );
+ });
+
+ it("keeps base64 image data uris", () => {
+ const src = "data:image/png;base64,iVBORw0KGgo=";
+ const { root } = setup({ children: `![Chart](${src})` });
+
+ expect(root.querySelector("img")).toHaveAttribute("src", src);
+ });
+
+ it("strips unsafe url protocols", () => {
+ const { root } = setup({ children: "A [link](javascript:alert(1))." });
+
+ expect(root.querySelector("a")).toHaveAttribute("href", "");
+ });
+
+ it("escapes raw html instead of rendering it", () => {
+ const { root } = setup({
+ children: "Before <script>window.x = 1</script> after",
+ });
+
+ expect(root.querySelector("script")).toBeNull();
+ expect(screen.getByText(/window.x = 1/)).toBeInTheDocument();
+ });
+
+ it("wraps tables in their own container so they can scroll", () => {
+ const { root } = setup({
+ children: "| A | B |\n| --- | --- |\n| 1 | 2 |",
+ });
+
+ const table = checkNotNull(root.querySelector("table"));
+ const wrapper = checkNotNull(table.parentElement);
+
+ expect(wrapper.tagName).toBe("DIV");
+ expect(wrapper).not.toBe(root);
+ expect(wrapper.parentElement).toBe(root);
+ });
+
+ it("lets call sites replace the table wrapper", () => {
+ const { root } = setup({
+ children: "| A | B |\n| --- | --- |\n| 1 | 2 |",
+ components: { table: "table" },
+ });
+
+ const table = checkNotNull(root.querySelector("table"));
+
+ expect(table.parentElement).toBe(root);
+ });
+
+ it("renders headings as paragraphs when they are disallowed", () => {
+ const { root } = setup({
+ children: "# Title\n\nBody",
+ disallowHeading: true,
+ });
+
+ expect(root.querySelector("h1")).toBeNull();
+ expect(screen.getByText("Title").tagName).toBe("P");
+ });
+});
diff --git a/frontend/src/metabase/common/components/Markdown/kitchen-sink-markdown.ts b/frontend/src/metabase/common/components/Markdown/kitchen-sink-markdown.ts
new file mode 100644
index 00000000000..623a3d0713d
--- /dev/null
+++ b/frontend/src/metabase/common/components/Markdown/kitchen-sink-markdown.ts
@@ -0,0 +1,51 @@
+export const KITCHEN_SINK_MARKDOWN = `# Heading level 1
+
+## Heading level 2
+
+### Heading level 3
+
+Paragraph with **bold**, *italic*, ~~strikethrough~~, \`inline code\` and a
+[link](https://metabase.test) plus an autolink https://metabase.test/autolink.
+
+Line before a hard break\\
+line after a hard break.
+
+- Bullet item
+- Bullet item with \`code\`
+ - Nested bullet item
+ - Another nested bullet item
+- Last bullet item
+
+1. Ordered item
+2. Ordered item
+3. Ordered item
+
+- [ ] Unchecked task
+- [x] Checked task
+
+> Blockquote spanning
+> two lines.
+
+\`\`\`sh
+java -jar metabase.jar migrate up
+\`\`\`
+
+| Column | Status |
+| --- | --- |
+| Static embedding | Vulnerable |
+| Interactive embedding | Not affected |
+
+![Image](https://metabase.test/image.png)
+
+---
+
+Footnote reference[^1].
+
+[^1]: Footnote definition.
+`;
+
+export const UNBREAKABLE_TABLE_MARKDOWN = `| Setting | Value |
+| --- | --- |
+| Endpoint | \`https://metabase.test/api/setting/report-timezone?include-updated-at=true\` |
+| Token | MB_PREMIUM_EMBEDDING_TOKEN_0123456789abcdef0123456789abcdef |
+`;
diff --git a/frontend/src/metabase/common/components/MarkdownPreview/MarkdownPreview.tsx b/frontend/src/metabase/common/components/MarkdownPreview/MarkdownPreview.tsx
index 2f0836f70c8..b394e14f5e0 100644
--- a/frontend/src/metabase/common/components/MarkdownPreview/MarkdownPreview.tsx
+++ b/frontend/src/metabase/common/components/MarkdownPreview/MarkdownPreview.tsx
@@ -44,7 +44,13 @@ export const MarkdownPreview = ({
position="bottom"
disabled={!isTruncated}
label={
- <Markdown dark disallowHeading unstyleLinks lineClamp={lineClamp}>
+ <Markdown
+ dark
+ compact
+ disallowHeading
+ unstyleLinks
+ lineClamp={lineClamp}
+ >
{children}
</Markdown>
}
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx
index a2264056816..fa4795c288d 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx
@@ -42,7 +42,7 @@ export const EntityDisplay = ({
name="info"
c="text-disabled"
tooltip={
- <Markdown dark disallowHeading unstyleLinks lineClamp={8}>
+ <Markdown dark compact disallowHeading unstyleLinks lineClamp={8}>
{entity.description}
</Markdown>
}
diff --git a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css
index 2c36171c41a..d5ad83a729a 100644
--- a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css
+++ b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css
@@ -63,6 +63,7 @@
padding: 0.5rem 0.75rem;
text-align: left;
vertical-align: top;
+ border: none;
border-top: 1px solid var(--mb-color-border-neutral);
}
@@ -121,20 +122,13 @@
}
.aiMarkdown code {
- font-family: Monaco, Menlo, "Courier New", monospace;
- background: var(--mb-color-background_page-secondary);
color: var(--mb-color-text-primary);
padding: 0.125rem 0.375rem;
- border-radius: 0.25rem;
- font-size: 0.875em;
- border: 1px solid var(--mb-color-border-neutral);
}
.aiMarkdown pre code {
font-size: 0.6875rem;
line-height: 1.5;
- background: transparent;
- border: none;
padding: 0;
}
@@ -149,18 +143,9 @@
.aiMarkdown ul,
.aiMarkdown ol {
- padding-left: 1.5rem;
margin-bottom: 1rem;
}
-.aiMarkdown ul {
- list-style-type: disc;
-}
-
-.aiMarkdown ol {
- list-style-type: decimal;
-}
-
.aiMarkdown li {
margin-bottom: 0.5rem;
line-height: 1.5;
diff --git a/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.tsx b/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.tsx
index f0dcd14c8d8..8a2ec6f4c6a 100644
--- a/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.tsx
+++ b/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.tsx
@@ -131,7 +131,7 @@ export const LegendCaption = ({
{hasInfoTooltip && description && !shouldHideDescription(width) && (
<Tooltip
label={
- <Markdown dark disallowHeading unstyleLinks lineClamp={8}>
+ <Markdown dark compact disallowHeading unstyleLinks lineClamp={8}>
{tc(description)}
</Markdown>
}
diff --git a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsx b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsx
index 83a72fca22e..f195bd41ca1 100644
--- a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsx
+++ b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.tsx
@@ -35,7 +35,7 @@ const SkeletonCaption = ({
<Tooltip
maw="22em"
label={
- <Markdown dark disallowHeading unstyleLinks>
+ <Markdown dark compact disallowHeading unstyleLinks lineClamp={8}>
{description}
</Markdown>
}