Skip to content

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

chore: replace more deprecated buttons with mantine button (#75179)

Uladzimir Havenchyk215adbd59868
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 a78bfd74037..2e9e8efd27e 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
@@ -3,7 +3,6 @@ import { t } from "ttag";
import * as Yup from "yup";
import { Alert } from "metabase/common/components/Alert";
-import { Button } from "metabase/common/components/Button";
import { ExternalLink } from "metabase/common/components/ExternalLink/ExternalLink";
import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormFooter } from "metabase/common/components/FormFooter";
@@ -12,7 +11,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 { Button, 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";
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
index f589e6c9fa8..5f2374e6773 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
@@ -24,7 +24,7 @@ export const ToggleContainer = styled.div`
`;
export const SettingsTriggerIcon = styled(Icon)`
- color: var(--mb-color-text-secondary);
+ color: var(--mb-color-text-primary);
&:hover {
color: var(--mb-color-brand);
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
index d09071e4c5e..628e31fae4d 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
@@ -1,9 +1,8 @@
import { useEffect, useState } from "react";
import { t } from "ttag";
-import { Button } from "metabase/common/components/Button";
import { TippyPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger";
-import { Icon } from "metabase/ui";
+import { Button, Icon } from "metabase/ui";
import type { FieldType, FieldValueOptions } from "metabase-types/api";
import {
@@ -120,7 +119,7 @@ export const OptionPopover = ({
<Button
disabled={!canSave}
onClick={() => handleSave(closePopover)}
- small
+ size="sm"
>
{t`Save`}
</Button>
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
index 5c665b7294d..82b51e2ea3f 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
@@ -6,7 +6,6 @@ import {
useCreateActionPublicLinkMutation,
useDeleteActionPublicLinkMutation,
} from "metabase/api";
-import { Button } from "metabase/common/components/Button";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { CopyWidget } from "metabase/common/components/CopyWidget";
import { FormField } from "metabase/common/components/FormField";
@@ -16,7 +15,7 @@ import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import { useSelector } from "metabase/redux";
import { getSetting } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
-import { Switch, Tooltip } from "metabase/ui";
+import { ActionIcon, Icon, Switch, Tooltip } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { ActionFormSettings, WritebackAction } from "metabase-types/api";
@@ -42,13 +41,13 @@ export const ActionSettingsTriggerButton = ({
onClick: () => void;
}) => (
<Tooltip label={t`Action settings`}>
- <Button
- onlyIcon
+ <ActionIcon
+ variant="viewHeader"
onClick={onClick}
- icon="gear"
- iconSize={16}
aria-label={t`Action settings`}
- />
+ >
+ <Icon name="gear" />
+ </ActionIcon>
</Tooltip>
);
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsx
index 9f71873c95d..c65df4ada1d 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsx
@@ -1,10 +1,9 @@
import { useState } from "react";
import { t } from "ttag";
-import { Button } from "metabase/common/components/Button";
import { DataReference } from "metabase/querying/components/DataReference/DataReference";
import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";
-import { Tooltip } from "metabase/ui";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
export const DataReferenceInline = ({
onClose,
@@ -40,6 +39,12 @@ export const DataReferenceTriggerButton = ({
onClick: () => void;
}) => (
<Tooltip label={t`Data Reference`}>
- <Button onlyIcon onClick={onClick} icon="reference" iconSize={16} />
+ <ActionIcon
+ variant="viewHeader"
+ onClick={onClick}
+ aria-label={t`Data Reference`}
+ >
+ <Icon name="reference" />
+ </ActionIcon>
</Tooltip>
);
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsx
index e4bd0d897cf..7157b32b8d4 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsx
@@ -1,7 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { Button } from "metabase/common/components/Button";
import {
breakpointMinMedium,
breakpointMinSmall,
@@ -48,7 +47,3 @@ export const FormFooterContent = styled.div`
display: flex;
align-items: center;
`;
-
-export const FormSubmitButton = styled(Button)`
- margin-right: 1rem;
-`;
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
index b4b466f529c..d3ba1925e32 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
@@ -4,7 +4,6 @@ import { useEffect } from "react";
import { Link } from "react-router";
import { t } from "ttag";
-import { Button } from "metabase/common/components/Button/Button";
import { FieldSet } from "metabase/common/components/FieldSet";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { SegmentEditor } from "metabase/querying/segments/components/SegmentEditor";
@@ -14,7 +13,7 @@ import {
} from "metabase/querying/segments/utils";
import { useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
-import { Alert } from "metabase/ui";
+import { Alert, Button } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { DatasetQuery, Segment, TableId } from "metabase-types/api";
@@ -30,7 +29,6 @@ import {
FormFooterContent,
FormRoot,
FormSection,
- FormSubmitButton,
} from "./SegmentForm.styled";
export interface SegmentFormProps {
@@ -163,10 +161,16 @@ const SegmentFormActions = ({
}: SegmentFormActionsProps): JSX.Element => {
return (
<div>
- <FormSubmitButton type="submit" primary={isValid} disabled={!isValid}>
+ <Button
+ type="submit"
+ variant="filled"
+ size="sm"
+ disabled={!isValid}
+ mr="md"
+ >
{t`Save changes`}
- </FormSubmitButton>
- <Button as={Link} to="/admin/datamodel/segments">
+ </Button>
+ <Button component={Link} size="sm" to="/admin/datamodel/segments">
{t`Cancel`}
</Button>
</div>
diff --git a/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx b/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx
index ad84cd5b9b9..9992d21872d 100644
--- a/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx
+++ b/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx
@@ -1,7 +1,6 @@
import { c, t } from "ttag";
-import { Button } from "metabase/common/components/Button";
-import { Group, Text } from "metabase/ui";
+import { ActionIcon, Group, Icon, Text } from "metabase/ui";
const isLastPage = (pageIndex: number, pageSize: number, total: number) =>
pageIndex === Math.ceil(total / pageSize) - 1;
@@ -61,23 +60,25 @@ export const PaginationControls = ({
</>
)}
</Text>
- <Button
- onlyIcon
- icon="chevronleft"
+ <ActionIcon
+ variant="viewHeader"
onClick={onPreviousPage ?? undefined}
disabled={isPreviousDisabled}
data-testid="previous-page-btn"
aria-label={t`Previous page`}
- />
+ >
+ <Icon name="chevronleft" />
+ </ActionIcon>
- <Button
- onlyIcon
- icon="chevronright"
+ <ActionIcon
+ variant="viewHeader"
onClick={onNextPage ?? undefined}
disabled={isNextDisabled}
data-testid="next-page-btn"
aria-label={t`Next page`}
- />
+ >
+ <Icon name="chevronright" />
+ </ActionIcon>
</Group>
);
};
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css
index d82a7fb79f8..57e6320a5a2 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css
@@ -1,10 +1,12 @@
.AddAggregationButtonRoot {
- padding: 0.625rem;
- color: var(--mb-color-summarize);
- background-color: var(--mb-color-background-secondary);
-
- &:hover {
+ &[data-variant="subtle"] {
+ padding: 0.625rem;
color: var(--mb-color-summarize);
- background-color: var(--mb-color-background-tertiary);
+ background-color: var(--mb-color-background-secondary);
+
+ &:hover {
+ color: var(--mb-color-summarize);
+ background-color: var(--mb-color-background-tertiary);
+ }
}
}
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
index d086906c48f..fc144b09b8e 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
@@ -3,8 +3,7 @@ import { useState } from "react";
import { t } from "ttag";
import { AggregationPicker } from "metabase/common/components/AggregationPicker";
-import { Button } from "metabase/common/components/Button";
-import { Popover, Tooltip } from "metabase/ui";
+import { Button, Icon, Popover, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
import AddAggregationButtonS from "./AddAggregationButton.module.css";
@@ -37,9 +36,9 @@ export function AddAggregationButton({
{renderTooltip(
<Button
className={AddAggregationButtonS.AddAggregationButtonRoot}
- icon="add"
- borderless
- onlyIcon={hasAggregations}
+ variant="subtle"
+ size="sm"
+ leftSection={<Icon name="add" />}
onClick={() => setIsOpened(!isOpened)}
aria-label={t`Add aggregation`}
data-testid="add-aggregation-button"
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css
index 6e7a7ca4475..cc3423264d6 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css
@@ -16,15 +16,17 @@
}
.RemoveButton {
- color: var(--mb-color-text-primary-inverse);
- background-color: transparent;
- opacity: 0.6;
- transition: all 100ms;
-
- &:hover {
+ &[data-variant="subtle"] {
color: var(--mb-color-text-primary-inverse);
background-color: transparent;
- opacity: 1;
+ opacity: 0.6;
+ transition: all 100ms;
+
+ &:hover {
+ color: var(--mb-color-text-primary-inverse);
+ background-color: transparent;
+ opacity: 1;
+ }
}
}
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
index 79199cac67b..a8f938975cf 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
@@ -4,15 +4,13 @@ import type React from "react";
import { useCallback } from "react";
import { t } from "ttag";
-import { Button } from "metabase/common/components/Button";
import {
HoverParent,
QueryColumnInfoIcon,
} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
import { ColumnBucketPickerPopover } from "metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { Tooltip } from "metabase/ui";
-import { Box, type BoxProps, Flex } from "metabase/ui";
+import { Box, type BoxProps, Button, Flex, Icon, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
import BreakoutColumnListItemS from "./BreakoutColumnListItem.module.css";
@@ -138,9 +136,9 @@ export function BreakoutColumnListItem({
{isSelected && (
<Button
className={BreakoutColumnListItemS.RemoveButton}
- icon="close"
- onlyIcon
- borderless
+ variant="subtle"
+ size="xs"
+ leftSection={<Icon name="close" />}
onClick={handleRemoveColumn}
aria-label={t`Remove dimension`}
/>
@@ -150,9 +148,9 @@ export function BreakoutColumnListItem({
<Tooltip label={t`Add grouping`}>
<Button
className={BreakoutColumnListItemS.AddButton}
- icon="add"
- onlyIcon
- borderless
+ variant="subtle"
+ size="sm"
+ leftSection={<Icon name="add" />}
aria-label={t`Add dimension`}
onClick={handleAddClick}
/>
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.module.css
index 49316864ecb..d390e0d4555 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.module.css
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.module.css
@@ -8,3 +8,9 @@
line-height: 1.5em;
}
}
+
+.ArchiveButton {
+ &[data-variant="subtle"]:hover {
+ background-color: var(--mb-color-background-secondary);
+ }
+}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
index 26b81913499..e78e6ee02dc 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
@@ -6,10 +6,9 @@ import { useListCollectionsQuery } from "metabase/api";
import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";
import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormInput } from "metabase/common/components/FormInput";
-import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { FormTextArea } from "metabase/common/components/FormTextArea";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { Form, FormProvider } from "metabase/forms";
+import { Form, FormProvider, FormSubmitButton } from "metabase/forms";
import { Button, Flex, Icon } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import type { Collection, NativeQuerySnippet } from "metabase-types/api";
@@ -109,8 +108,11 @@ function SnippetFormInner({
{isEditing && (
<Button
type="button"
+ className={S.ArchiveButton}
leftSection={<Icon name="archive" />}
variant="subtle"
+ color="text-secondary"
+ size="sm"
onClick={onArchive}
>
{t`Archive`}
@@ -120,12 +122,15 @@ function SnippetFormInner({
</Flex>
<Flex align="center" justify="center" gap="sm" mt="md">
{!!onCancel && (
- <Button type="button" onClick={onCancel}>{t`Cancel`}</Button>
+ <Button type="button" size="sm" onClick={onCancel}>
+ {t`Cancel`}
+ </Button>
)}
<FormSubmitButton
- title={t`Save`}
+ label={t`Save`}
disabled={!dirty && !isInitiallyDirty}
- primary
+ variant="filled"
+ size="sm"
/>
</Flex>
</Flex>
diff --git a/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/TagEditorHelp.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
index f7d7a7c5ff8..03a167f0b78 100644
--- a/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
@@ -1,11 +1,10 @@
import cx from "classnames";
import { jt, t } from "ttag";
-import { Button } from "metabase/common/components/Button";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { Box, Code } from "metabase/ui";
+import { Box, Button, Code } from "metabase/ui";
import { uuid } from "metabase/utils/uuid";
import type Database from "metabase-lib/v1/metadata/Database";
import type { DatabaseId, NativeDatasetQuery } from "metabase-types/api";
@@ -208,8 +207,8 @@ const TagExample = ({ datasetQuery, setDatasetQuery }: TagExampleProps) => (
<Code block>{datasetQuery.native.query}</Code>
{setDatasetQuery && (
<Button
- medium
className={CS.mt1}
+ size="xs"
onClick={() => setDatasetQuery(datasetQuery, true)}
>
{t`Try it`}
diff --git a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx
index 085f4541ae2..314a834e142 100644
--- a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx
@@ -1,7 +1,7 @@
import { useCallback } from "react";
import { t } from "ttag";
-import { Button } from "metabase/common/components/Button/Button";
+import { Button } from "metabase/ui";
import type { Timeline } from "metabase-types/api";
import ModalFooter from "../ModalFooter";
@@ -30,7 +30,9 @@ const DeleteTimelineModal = ({
<ModalHeader title={t`Delete ${timeline?.name}?`} onClose={onClose} />
<ModalFooter hasPadding>
<Button onClick={onClose}>{t`Cancel`}</Button>
- <Button danger onClick={handleSubmit}>{t`Delete`}</Button>
+ <Button variant="filled" color="error" onClick={handleSubmit}>
+ {t`Delete`}
+ </Button>
</ModalFooter>
</div>
);
diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx
index 65ab108bc70..f95ca659092 100644
--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx
@@ -1,8 +1,8 @@
import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
-import { Button } from "metabase/common/components/Button/Button";
import { getSortedTimelines } from "metabase/common/utils/timelines";
+import { Button } from "metabase/ui";
import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";
import ModalFooter from "../ModalFooter";
@@ -57,7 +57,7 @@ const MoveEventModal = ({
</ModalBody>
<ModalFooter>
<Button onClick={onClose}>{t`Cancel`}</Button>
- <Button primary disabled={!isEnabled} onClick={handleSubmit}>
+ <Button variant="filled" disabled={!isEnabled} onClick={handleSubmit}>
{t`Move`}
</Button>
</ModalFooter>
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx
index e21aedfd772..1546e19fbf4 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx
@@ -1,9 +1,8 @@
import cx from "classnames";
-import { Button } from "metabase/common/components/Button";
import { EntityMenu } from "metabase/common/components/EntityMenu";
import CS from "metabase/css/core/index.css";
-import { Box, Flex, Text } from "metabase/ui";
+import { ActionIcon, Box, Flex, Icon, Text } from "metabase/ui";
import S from "./ObjectDetailHeader.module.css";
import type { ObjectId } from "./types";
@@ -55,22 +54,22 @@ export function ObjectDetailHeader({
<Flex align="center" gap="0.5rem" p="1rem">
{canZoom && (
<>
- <Button
+ <ActionIcon
+ variant="viewHeader"
data-testid="view-previous-object-detail"
- onlyIcon
- borderless
disabled={!canZoomPreviousRow}
onClick={viewPreviousObjectDetail}
- icon="chevronup"
- />
- <Button
+ >
+ <Icon name="chevronup" />
+ </ActionIcon>
+ <ActionIcon
+ variant="viewHeader"
data-testid="view-next-object-detail"
- onlyIcon
- borderless
disabled={!canZoomNextRow}
onClick={viewNextObjectDetail}
- icon="chevrondown"
- />
+ >
+ <Icon name="chevrondown" />
+ </ActionIcon>
</>
)}
@@ -85,13 +84,13 @@ export function ObjectDetailHeader({
)}
<Flex ml="md" pl="md" className={S.closeButton}>
- <Button
+ <ActionIcon
+ variant="viewHeader"
data-testid="object-detail-close-button"
- onlyIcon
- borderless
onClick={closeObjectDetail}
- icon="close"
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Flex>
</Flex>
)}
diff --git a/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsx b/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsx
index 75f4ee5182f..246f68bcdcc 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsx
@@ -1,7 +1,6 @@
import type { ReactNode } from "react";
-import { Button } from "metabase/common/components/Button";
-import { Box } from "metabase/ui";
+import { Box, Button } from "metabase/ui";
import type { VisualizationSettings } from "metabase-types/api";
interface ChartSettingsErrorButtonProps {
@@ -19,7 +18,7 @@ function ChartSettingsErrorButton({
<div>
<div>{message}</div>
<Box mt="md">
- <Button primary medium onClick={onClick}>
+ <Button variant="filled" onClick={onClick}>
{buttonLabel}
</Button>
</Box>