The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Replace legacy button CSS with Mantine buttons (#80386)
Andrei Chernykh6cd29dedb0ec
diff --git a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.jsindex ca795882456..cf6437a2046 100644--- a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js+++ b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js@@ -2246,7 +2246,9 @@ describe("issue 64138", () => {}).within(() => {cy.findByLabelText("Zoom in").should("not.exist");- cy.findByText("Set as default view").should("be.visible").click();+ // the update button is disabled until the map is panned, so only+ // assert that it is shown while the zoom controls are hidden+ cy.findByText("Set as default view").should("be.visible");});cy.log("hovering marker icons should not open their tooltips");diff --git a/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx b/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsxindex 4ba8ec260dc..f62c7fb2294 100644--- a/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx+++ b/frontend/src/metabase/admin/components/AdminPaneLayout/AdminPaneLayout.tsx@@ -28,7 +28,7 @@ export const AdminPaneLayout = ({gap="md"wrap="nowrap">- <Stack gap="md">+ <Stack gap="md" miw={0}>{title && (<h2 data-testid="admin-pane-page-title" className={CS.m0}>{title}@@ -36,7 +36,7 @@ export const AdminPaneLayout = ({)}{description && <Text maw="40rem">{description}</Text>}</Stack>- {titleActions}+ {titleActions && <Box flex="0 0 auto">{titleActions}</Box>}</Flex>)}diff --git a/frontend/src/metabase/admin/people/components/AddMemberRow.tsx b/frontend/src/metabase/admin/people/components/AddMemberRow.tsxindex 7a49386ae6d..109331621e9 100644--- a/frontend/src/metabase/admin/people/components/AddMemberRow.tsx+++ b/frontend/src/metabase/admin/people/components/AddMemberRow.tsx@@ -91,11 +91,10 @@ export function AddMemberRow({onCancel={onCancel}ariaLabel={t`Search for a user to add`}>- {Array.from(selectedUsersById.values()).map((user, index) => (+ {Array.from(selectedUsersById.values()).map((user) => (<Pillkey={user.id}size="md"- ms={index > 0 ? "sm" : ""}withRemoveButtononRemove={() => handleRemoveUser(user)}>diff --git a/frontend/src/metabase/admin/people/components/AddRow.tsx b/frontend/src/metabase/admin/people/components/AddRow.tsxindex 55e59185947..a4e36377635 100644--- a/frontend/src/metabase/admin/people/components/AddRow.tsx+++ b/frontend/src/metabase/admin/people/components/AddRow.tsx@@ -31,6 +31,8 @@ export const AddRow = ({p="0.5rem"display="relative"align="center"+ wrap="wrap"+ gap="sm"bd="1px solid var(--mb-color-core-brand)"style={{ borderRadius: "0.5rem" }}>@@ -38,7 +40,8 @@ export const AddRow = ({<Inputtype="text"variant="unstyled"- flex="1 0 auto"+ flex="1 1 auto"+ miw={0}fz="lg"styles={{ input: { background: "transparent" } }}value={value}@@ -48,15 +51,17 @@ export const AddRow = ({onKeyDown={onKeyDown}onChange={onChange}/>- <Button variant="subtle" bg="transparent" onClick={onCancel} mr="sm">- {t`Cancel`}- </Button>- <Button- variant={isValid ? "filled" : "outline"}- disabled={!isValid}- onClick={onDone}- >- {t`Add`}- </Button>+ <Flex flex="0 0 auto" gap="sm">+ <Button variant="subtle" bg="transparent" onClick={onCancel}>+ {t`Cancel`}+ </Button>+ <Button+ variant={isValid ? "filled" : "outline"}+ disabled={!isValid}+ onClick={onDone}+ >+ {t`Add`}+ </Button>+ </Flex></Flex>);diff --git a/frontend/src/metabase/admin/people/components/Alert.tsx b/frontend/src/metabase/admin/people/components/Alert.tsxindex 1903635fbf2..68783f8ef65 100644--- a/frontend/src/metabase/admin/people/components/Alert.tsx+++ b/frontend/src/metabase/admin/people/components/Alert.tsx@@ -1,35 +1,23 @@-import cx from "classnames";import { t } from "ttag";-import ButtonsS from "metabase/css/components/buttons.module.css";-import CS from "metabase/css/core/index.css";-import { Button, Modal, Title } from "metabase/ui";+import { Button, Modal, Stack, Text } from "metabase/ui";interface AlertProps {message?: string | null;onClose: () => void;}-const Alert = ({ message, onClose }: AlertProps) => (+export const Alert = ({ message, onClose }: AlertProps) => (<Modalsize="md"- opened={!!message}+ opened={Boolean(message)}onClose={onClose}withCloseButton={false}- padding="0"data-testid="alert-modal">- <div className={cx(CS.flex, CS.flexColumn, CS.layoutCentered, CS.p4)}>- <Title order={3} className={cx(CS.mb2, CS.textWrap)}>- {message}- </Title>- <Button- className={cx(ButtonsS.Button, ButtonsS.ButtonPrimary)}- variant="primary"- onClick={onClose}- >{t`Ok`}</Button>- </div>+ <Stack gap="lg">+ <Text>{message}</Text>+ <Button variant="filled" ml="auto" onClick={onClose}>{t`Ok`}</Button>+ </Stack></Modal>);--export { Alert };diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsxindex aedd828189b..246a1ddf9a8 100644--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx@@ -8,6 +8,7 @@ import {useDeleteMembershipMutation,useUpdateMembershipMutation,} from "metabase/api";+import { getErrorMessage } from "metabase/api/utils";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { useToast } from "metabase/common/hooks/use-toast";import {@@ -57,9 +58,7 @@ export const GroupDetail = ({),);} catch (error) {- const errorMessage =- error instanceof Error ? error.message : String(error);- setAlertMessage(errorMessage);+ setAlertMessage(getErrorMessage(error));}};diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.tsx b/frontend/src/metabase/admin/people/components/GroupsListing.tsxindex 3fb4ee93102..be6d63cf98b 100644--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx@@ -517,7 +517,6 @@ export const GroupsListing = (props: GroupsListingProps) => {<Buttonvariant="filled"onClick={onCreateAGroupButtonClicked}- flex="0 1 140px">{t`Create a group`}</Button>)}diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsxindex cfa972a8a97..6dd8c5218ed 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsx@@ -32,7 +32,7 @@ export function UpdatesSettingsPage() {/>{checkForUpdates && (<div- className={cx(CS.pt3, CS.px2, {+ className={cx(CS.pt3, {[CS.borderTop]: !isHosted,})}>diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsxindex be1a59e12f1..b9e482879f1 100644--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx@@ -14,7 +14,6 @@ import { useLazyLoadGeoJSONQuery } from "metabase/admin/settings/api/geojson";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import AdminS from "metabase/css/admin.module.css";-import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import { useAdminSetting } from "metabase/settings";import {@@ -137,7 +136,8 @@ export const CustomGeoJSONWidget = () => {/>{!map && (<Button- className={cx(ButtonsS.Button, ButtonsS.ButtonPrimary, CS.ml1)}+ flex="0 0 auto"+ ml="sm"onClick={handleAddMap}variant="filled">@@ -418,16 +418,14 @@ const EditMap = ({onMapChange({ ...map, url: e.target.value })}/>- <button+ <Button+ ml="sm"disabled={!map.url}- className={cx(ButtonsS.Button, CS.ml1, {- [ButtonsS.ButtonPrimary]: !geoJson,- [CS.disabled]: !map.url,- })}+ variant={geoJson ? "default" : "filled"}onClick={onLoadGeoJson}>{geoJson ? t`Refresh` : t`Load`}- </button>+ </Button></div></SettingContainer><div className={cx({ disabled: !geoJson })}>@@ -503,22 +501,17 @@ const EditMap = ({</div><div className={cx(CS.py1, CS.flex)}><div className={CS.mlAuto}>- <button- className={ButtonsS.Button}- onClick={onCancel}- >{t`Cancel`}</button>- <button+ <Button onClick={onCancel}>{t`Cancel`}</Button>+ <Button+ ml="sm"+ variant="filled"disabled={!map.name || !map.url || !map.region_name || !map.region_key}- className={cx(ButtonsS.Button, ButtonsS.ButtonPrimary, CS.ml1, {- [CS.disabled]:- !map.name || !map.url || !map.region_name || !map.region_key,- })}onClick={onSave}>{originalMap ? t`Save map` : t`Add map`}- </button>+ </Button></div></div></div>diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.cssindex df752ad13ba..b333c4c792b 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css@@ -2,6 +2,11 @@background-color: var(--mb-color-core-summarize);}+/* the default variant's translucent hover lets the banner color bleed through */+.updateButton[data-variant="default"]:hover {+ background-color: var(--mb-color-background_page-secondary);+}+.message {padding: 1rem;color: var(--mb-color-text-primary-inverse);diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsxindex 0d10a57cf35..3c74411bb1e 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx@@ -3,11 +3,10 @@ import { c, t } from "ttag";import { getCurrentVersion } from "metabase/admin/app/selectors";import { ExternalLink } from "metabase/common/components/ExternalLink";-import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import { useSelector } from "metabase/redux";import { useGetVersionInfoQuery } from "metabase/settings";-import { Tabs } from "metabase/ui";+import { Button, Tabs } from "metabase/ui";import { newVersionAvailable, versionIsLatest } from "metabase/utils/version";import S from "./VersionUpdateNotice.module.css";@@ -82,13 +81,12 @@ function NewVersionAvailable({<span className={cx(CS.textWhite, CS.textBold)}>{t`Metabase ${formatVersion(latestVersion)} is available. You're running ${currentVersion}.`}</span>- <ExternalLink- className={cx(- ButtonsS.Button,- ButtonsS.ButtonWhite,- ButtonsS.ButtonMedium,- CS.borderless,- )}+ <Button+ className={S.updateButton}+ component={ExternalLink}+ flex="0 0 auto"+ ml="sm"+ size="sm"href={"https://www.metabase.com/docs/" +latestVersion +@@ -96,7 +94,7 @@ function NewVersionAvailable({}>{t`Update`}- </ExternalLink>+ </Button></div></div>);diff --git a/frontend/src/metabase/common/components/ViewButton/ViewButton.module.css b/frontend/src/metabase/common/components/ViewButton/ViewButton.module.cssindex cb1706915cc..0b4e264701e 100644--- a/frontend/src/metabase/common/components/ViewButton/ViewButton.module.css+++ b/frontend/src/metabase/common/components/ViewButton/ViewButton.module.css@@ -6,7 +6,7 @@padding: 0.5rem 0.75rem;font-weight: bold;border: none;- border-radius: var(--default-button-border-radius);+ border-radius: var(--mantine-radius-sm);background-color: color-mix(in srgb,var(--view-button-color) 20%,diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.module.css b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.module.cssindex 6ce98eeb48c..4ffef795020 100644--- a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.module.css+++ b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.module.css@@ -11,7 +11,7 @@}.UpsellCta {- /* Copied (and slightly adapted if needed) from metabase/css/components/buttons.module.css */+ /* Inlined from the legacy button styles (buttons.module.css, since removed) */display: inline-flex;align-items: center;justify-content: center;diff --git a/frontend/src/metabase/css/components/buttons.module.css b/frontend/src/metabase/css/components/buttons.module.cssdeleted file mode 100644index ec25ef50faa..00000000000--- a/frontend/src/metabase/css/components/buttons.module.css+++ /dev/null@@ -1,215 +0,0 @@-:root {- --default-button-border-radius: 6px;-}--.Button {- display: inline-block;- box-sizing: border-box;- text-decoration: none;- padding: 0.5rem 0.75rem;- background: transparent;- border: 1px solid var(--mb-color-border-neutral);- color: var(--mb-color-text-primary);- cursor: pointer;- font-weight: bold;- font-family: var(--mb-default-font-family);- border-radius: var(--default-button-border-radius);- transition: all 200ms linear;- transition-property: color, border-color, background-color;-}--.Button:hover {- color: var(--mb-color-text-brand);- border-color: var(--mb-color-border-neutral);- background: var(--mb-color-background_page-secondary);-}--.Button:focus-visible {- border-color: var(--mb-color-background_page-primary);- outline: 1px solid var(--mb-color-core-brand);-}--@media screen and (--breakpoint-min-lg) {- .Button {- padding: 0.75rem 1rem;- }-}--.ButtonSmall {- padding: 0.45rem 1rem;-}--.ButtonMedium {- padding: 0.5rem 0.75rem;- font-size: 0.8rem;-}--.ButtonLarge {- padding: 0.8rem 1.25rem;- font-size: 1rem;-}--.ButtonNormal {- font-weight: normal;-}--.ButtonRound {- border-radius: 99px;-}--.ButtonPrimary {- color: var(--mb-color-text-primary-inverse);- background: var(--mb-color-core-brand);- border-color: var(--mb-color-core-brand);-}--.ButtonPrimary:hover {- color: var(--mb-color-text-primary-inverse);- border-color: var(--mb-color-core-brand);- background-color: var(--mb-color-core-brand-hover);-}--.ButtonPrimary:focus-visible {- border-color: var(--mb-color-background_page-primary);- outline-color: var(--mb-color-core-brand);-}--.ButtonWarning {- color: var(--mb-color-text-primary-inverse);- background: var(--mb-color-feedback-negative);- border-color: var(--mb-color-feedback-negative);-}--.ButtonWarning:hover {- color: var(--mb-color-text-primary-inverse);- border-color: var(--mb-color-feedback-negative);- background-color: var(--mb-color-feedback-negative);-}--.ButtonWarning:focus-visible {- border-color: var(--mb-color-background_page-primary);- outline-color: var(--mb-color-feedback-negative);-}--.ButtonCancel {- border-radius: 99px;-}--.ButtonWhite {- background-color: var(--mb-color-background_page-primary);- color: var(--mb-color-text-primary);- border-color: var(--mb-color-border-neutral);-}--.ButtonBorderless {- border-color: transparent;- background: transparent;- color: var(--mb-color-text-secondary);-}--.ButtonBorderless:hover {- border-color: transparent;- color: var(--mb-color-text-secondary);-}--.ButtonBorderless:focus-visible {- border-color: var(--mb-color-background_page-primary);- outline-color: var(--mb-color-core-brand);-}--.ButtonOnlyIcon {- border: none;- background: transparent;- color: var(--mb-color-text-primary);- padding: 0;-}--.ButtonOnlyIcon:focus-visible {- border: none;- outline-color: var(--mb-color-core-brand);-}--.ButtonGroup {- display: inline-block;- border-radius: var(--default-button-border-radius);- border: 1px solid var(--mb-color-border-neutral);- overflow: hidden;- clear: both;-}--.ButtonGroup .Button {- margin: 0;- float: left;- border-top: none;- border-bottom: none;- border-right: none;- border-radius: 0;- box-shadow: none;-}--.ButtonGroup .ButtonActive {- background-color: var(--mb-color-feedback-positive);- color: var(--mb-color-text-primary-inverse);-}--.ButtonGroup .Button:first-child {- border-left: none;-}--.ButtonGroupBrand {- border-color: white;-}--.ButtonGroupBrand .Button {- border-color: white;- color: var(--mb-color-core-brand);- background-color: var(--mb-color-background_page-tertiary);-}--.ButtonGroupBrand .ButtonActive {- background-color: var(--mb-color-core-brand);- color: white;-}--.Button:disabled {- opacity: 0.5;- cursor: not-allowed;-}--.ButtonDanger {- background-color: var(--mb-color-feedback-negative);- border-color: var(--mb-color-feedback-negative);- color: var(--mb-color-text-primary-inverse);-}--.ButtonDanger:hover {- color: white;- background-color: var(--mb-color-feedback-negative);- border-color: var(--mb-color-feedback-negative);-}--.ButtonDanger:focus-visible {- border-color: var(--mb-color-background_page-primary);- outline-color: var(--mb-color-feedback-negative);-}--.ButtonSuccess {- background-color: var(--mb-color-feedback-positive);- border-color: var(--mb-color-feedback-positive);- color: var(--mb-color-text-primary-inverse);-}--.ButtonSuccess:hover {- background-color: var(--mb-color-feedback-positive);- border-color: var(--mb-color-feedback-positive);- color: var(--mb-color-text-primary-inverse);-}--.ButtonSuccess:focus-visible {- border-color: var(--mb-color-background_page-primary);- outline-color: var(--mb-color-feedback-positive);-}--.ButtonFullWidth {- width: 100%;-}diff --git a/frontend/src/metabase/css/dashboard.module.css b/frontend/src/metabase/css/dashboard.module.cssindex 6b4af6e2413..22953fef149 100644--- a/frontend/src/metabase/css/dashboard.module.css+++ b/frontend/src/metabase/css/dashboard.module.css@@ -39,11 +39,6 @@pointer-events: all;}-.PinMapUpdateButtonDisabled {- pointer-events: none;- color: var(--mb-color-text-disabled);-}-/* .react-draggable*, .react-resizable* are 3rd party library classes */.DashEditing .DashCard:global(.react-draggable-dragging) .Card {box-shadow: 3px 3px 8px var(--mb-color-shadow-default);diff --git a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobModal.tsx b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobModal.tsxindex 9b8075086ad..4b4301e341a 100644--- a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobModal.tsx+++ b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobModal.tsx@@ -10,7 +10,6 @@ import {import { Link } from "metabase/common/components/Link";import { ModalContent } from "metabase/common/components/ModalContent";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";-import ButtonsS from "metabase/css/components/buttons.module.css";import { Box, Button } from "metabase/ui";import { parseNumberParam } from "metabase/urls";@@ -51,11 +50,11 @@ export function ModelPersistenceLogJobModal({variant="filled"onClick={onRefreshClick}>{t`Retry now`}</Button>,- <Link+ <Buttonkey="edit"- className={ButtonsS.Button}+ component={Link}to={`/model/${persistedModel.card_id}/query`}- >{t`Edit model`}</Link>,+ >{t`Edit model`}</Button>,];}, [persistedModel, refreshModelCache]);diff --git a/frontend/src/metabase/query_builder/components/view/ViewSection.module.css b/frontend/src/metabase/query_builder/components/view/ViewSection.module.cssindex 413557a669e..03ce5850ef9 100644--- a/frontend/src/metabase/query_builder/components/view/ViewSection.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewSection.module.css@@ -1,7 +1,7 @@.ViewSectionRoot {display: flex;align-items: center;- padding: 0;+ padding: 0 0.5rem;@container query-builder (min-width: 70em) {padding-left: 2rem;diff --git a/frontend/src/metabase/querying/components/LimitInput.module.css b/frontend/src/metabase/querying/components/LimitInput.module.cssnew file mode 100644index 00000000000..2f963d4fdd5--- /dev/null+++ b/frontend/src/metabase/querying/components/LimitInput.module.css@@ -0,0 +1,3 @@+.small {+ padding: 0.45rem 1rem;+}diff --git a/frontend/src/metabase/querying/components/LimitInput.tsx b/frontend/src/metabase/querying/components/LimitInput.tsxindex db49d2981f1..7efe37744a5 100644--- a/frontend/src/metabase/querying/components/LimitInput.tsx+++ b/frontend/src/metabase/querying/components/LimitInput.tsx@@ -1,28 +1,24 @@import cx from "classnames";import { forwardRef } from "react";-import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";+import S from "./LimitInput.module.css";+const DEFAULT_STYLE = {borderWidth: 2,};interface LimitInputProps extends React.InputHTMLAttributes<HTMLInputElement> {small?: boolean;- medium?: boolean;}export const LimitInput = forwardRef<HTMLInputElement, LimitInputProps>(- function LimitInput({ className, small, medium, style = {}, ...props }, ref) {+ function LimitInput({ className, small, style = {}, ...props }, ref) {return (<inputref={ref}- className={cx(CS.input, className, CS.bgWhite, {- // HACK: reuse Button styles- [ButtonsS.ButtonSmall]: small,- [ButtonsS.ButtonMedium]: medium,- })}+ className={cx(CS.input, className, CS.bgWhite, { [S.small]: small })}style={{ ...DEFAULT_STYLE, ...style }}{...props}/>diff --git a/frontend/src/metabase/querying/components/QueryVisualization/RunButton.module.css b/frontend/src/metabase/querying/components/QueryVisualization/RunButton.module.cssindex 6dc7ee99753..07b74100eae 100644--- a/frontend/src/metabase/querying/components/QueryVisualization/RunButton.module.css+++ b/frontend/src/metabase/querying/components/QueryVisualization/RunButton.module.css@@ -5,7 +5,7 @@padding: 0.5rem 0.75rem;font-weight: bold;border: 1px solid var(--mb-color-border-neutral);- border-radius: var(--default-button-border-radius);+ border-radius: var(--mantine-radius-sm);opacity: 1;transition:transform 0.25s,diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.module.css b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.module.cssindex 56b1192e0e4..4bb08ce88a1 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.module.css+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.module.css@@ -4,7 +4,7 @@justify-content: center;border: none;font-weight: bold;- border-radius: var(--default-button-border-radius);+ border-radius: var(--mantine-radius-sm);transition: background 300ms;color: var(--notebook-action-button-color);background-color: color-mix(diff --git a/frontend/src/metabase/reference/components/ReferenceHeader.tsx b/frontend/src/metabase/reference/components/ReferenceHeader.tsxindex 73d813f2409..7c4b57a7bfb 100644--- a/frontend/src/metabase/reference/components/ReferenceHeader.tsx+++ b/frontend/src/metabase/reference/components/ReferenceHeader.tsx@@ -1,9 +1,6 @@import cx from "classnames";import { memo } from "react";-import { t } from "ttag";-import { Link } from "metabase/common/components/Link";-import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import L from "metabase/reference/components/List/List.module.css";import { Ellipsified, Icon } from "metabase/ui";@@ -13,17 +10,10 @@ import S from "./ReferenceHeader.module.css";interface ReferenceHeaderProps {name: string;- type?: string;headerIcon?: IconName;- headerLink?: string;}-const ReferenceHeader = ({- name,- type,- headerIcon,- headerLink,-}: ReferenceHeaderProps) => (+const ReferenceHeader = ({ name, headerIcon }: ReferenceHeaderProps) => (<div className={CS.wrapper}><div className={cx(CS.relative, L.header)}>{headerIcon && (@@ -32,29 +22,9 @@ const ReferenceHeader = ({</div>)}<div className={S.headerBody}>- <Ellipsified- key="1"- className={!headerLink ? CS.flexFull : undefined}- tooltipProps={{ w: "auto" }}- >+ <Ellipsified className={CS.flexFull} tooltipProps={{ w: "auto" }}>{name}</Ellipsified>-- {headerLink && (- <div key="2" className={cx(CS.flexFull)}>- <Link- to={headerLink}- className={cx(ButtonsS.Button, ButtonsS.ButtonBorderless, CS.ml3)}- >- <div className={cx(CS.flex, CS.alignCenter, CS.relative)}>- <span- className={cx(CS.mr1, CS.flexNoShrink)}- >{t`See this ${type}`}</span>- <Icon name="chevronright" size={16} />- </div>- </Link>- </div>- )}</div></div></div>diff --git a/frontend/src/metabase/reference/databases/TableList.tsx b/frontend/src/metabase/reference/databases/TableList.tsxindex 672cb16e85d..efdbdefc45d 100644--- a/frontend/src/metabase/reference/databases/TableList.tsx+++ b/frontend/src/metabase/reference/databases/TableList.tsx@@ -104,7 +104,6 @@ class TableList extends Component<TableListProps> {<div data-testid="table-list"><ReferenceHeadername={t`Tables in ${database.name}`}- type="tables"headerIcon="database"/><LoadingAndErrorWrapperdiff --git a/frontend/src/metabase/reference/databases/TableQuestions.tsx b/frontend/src/metabase/reference/databases/TableQuestions.tsxindex 6cc4496c483..2cd2589bd3a 100644--- a/frontend/src/metabase/reference/databases/TableQuestions.tsx+++ b/frontend/src/metabase/reference/databases/TableQuestions.tsx@@ -60,7 +60,6 @@ class TableQuestions extends Component<TableQuestionsProps> {<div><ReferenceHeadername={t`Questions about ${this.props.table.display_name}`}- type="questions"headerIcon="table2"/><LoadingAndErrorWrapperdiff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.tsx b/frontend/src/metabase/reference/segments/SegmentQuestions.tsxindex 42b199e3c44..d98f5f641de 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestions.tsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.tsx@@ -74,7 +74,6 @@ const SegmentQuestionsInner = ({<div style={style} className={CS.full}><ReferenceHeadername={t`Questions about ${segment.name}`}- type="questions"headerIcon={modelIconMap.segment}/><LoadingAndErrorWrapper loading={!error && isLoading} error={error}>diff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsxindex 100530f8c37..8ab598845b7 100644--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx+++ b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx@@ -1,8 +1,6 @@-import cx from "classnames";import { type ChangeEvent, useState } from "react";import { t } from "ttag";-import ButtonsS from "metabase/css/components/buttons.module.css";import { useDispatch, useSelector } from "metabase/redux";import { subscribeToNewsletter } from "metabase/setup/utils";import { Box, Button, Flex, Switch, Text, Title } from "metabase/ui";@@ -70,17 +68,15 @@ export const CompletedStep = (): JSX.Element | null => {/></StepBody><StepFooter>- <a- onClick={handleGoToMetabase}- className={cx(- ButtonsS.Button,- ButtonsS.ButtonPrimary,- ButtonsS.ButtonLarge,- )}+ <Button+ component="a"href={baseUrl}+ variant="filled"+ size="lg"+ onClick={handleGoToMetabase}>{t`Take me to Metabase`}- </a>+ </Button></StepFooter></StepRoot>);diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.styled.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.styled.tsxindex 4775c0346c6..4349a276398 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.styled.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.styled.tsx@@ -1,8 +1,6 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { Link } from "metabase/common/components/Link";-export const ModalRoot = styled.div`display: flex;flex-direction: column;@@ -15,14 +13,6 @@ export const ModalToolbar = styled.div`padding: 1rem 2rem 0;`;-export const ModalToolbarLink = styled(Link)`- display: flex;- flex: 0 0 auto;- align-items: center;- height: 2.5rem;- margin-left: 1rem;-`;-interface ModalBodyProps {isTopAligned?: boolean;}diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsxindex 9e4303117ec..1d534fb0741 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -5,9 +5,8 @@ import _ from "underscore";import { ForwardRefLink } from "metabase/common/components/Link";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { getTimelineName } from "metabase/common/utils/timelines";-import ButtonsS from "metabase/css/components/buttons.module.css";import ModalHeader from "metabase/timelines/common/components/ModalHeader";-import { ActionIcon, Icon, Menu, TextInput } from "metabase/ui";+import { ActionIcon, Button, Icon, Menu, TextInput } from "metabase/ui";import * as Urls from "metabase/urls";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import { parseTimestamp } from "metabase/utils/time-dayjs";@@ -21,7 +20,6 @@ import {ModalBody,ModalRoot,ModalToolbar,- ModalToolbarLink,} from "./TimelineDetailsModal.styled";export interface TimelineDetailsModalProps {@@ -99,11 +97,13 @@ const TimelineDetailsModal = ({onChange={handleSearchChange}/>{canWrite && !isArchive && (- <ModalToolbarLink- className={ButtonsS.Button}+ <Button+ component={ForwardRefLink}to={Urls.newEventInCollection(timeline)}role="button"- >{t`Create event`}</ModalToolbarLink>+ flex="0 0 auto"+ ml="md"+ >{t`Create event`}</Button>)}</ModalToolbar>)}diff --git a/frontend/src/metabase/visualizations/components/PinMap.module.css b/frontend/src/metabase/visualizations/components/PinMap.module.cssindex 3fcd7abbef2..fa6c8f4c8c9 100644--- a/frontend/src/metabase/visualizations/components/PinMap.module.css+++ b/frontend/src/metabase/visualizations/components/PinMap.module.css@@ -3,3 +3,9 @@margin-bottom: 0.5rem;pointer-events: all;}++/* the default variant's translucent hover would let the map bleed through */+.pinMapButton[data-variant="default"]:hover {+ opacity: 1;+ background-color: var(--mb-color-background_page-secondary);+}diff --git a/frontend/src/metabase/visualizations/components/PinMap.tsx b/frontend/src/metabase/visualizations/components/PinMap.tsxindex 3284a1ac360..cc7f70b94f4 100644--- a/frontend/src/metabase/visualizations/components/PinMap.tsx+++ b/frontend/src/metabase/visualizations/components/PinMap.tsx@@ -5,9 +5,9 @@ import { type ComponentClass, useCallback, useEffect, useState } from "react";import { t } from "ttag";import _ from "underscore";-import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import DashboardS from "metabase/css/dashboard.module.css";+import { Button } from "metabase/ui";import { sumMetric } from "metabase/visualizations/lib/dataset";import { unaggregatedDataWarningMap } from "metabase/visualizations/lib/warnings";import type { VisualizationProps } from "metabase/visualizations/types";@@ -340,31 +340,19 @@ export function PinMap(props: PinMapProps) {)}>{shouldShowDefaultViewChangeButton ? (- <div- className={cx(- "PinMapUpdateButton",- ButtonsS.Button,- ButtonsS.ButtonSmall,- ButtonsS.ButtonWhite,- S.pinMapButton,- {- [DashboardS.PinMapUpdateButtonDisabled]: disableUpdateButton,- },- )}+ <Button+ className={cx("PinMapUpdateButton", S.pinMapButton)}+ size="sm"+ disabled={disableUpdateButton}onClick={updateSettings}>{t`Set as default view`}- </div>+ </Button>) : null}{!isDashboard && mapInstance?.supportsFilter() && (- <div- className={cx(- "PinMapUpdateButton",- ButtonsS.Button,- ButtonsS.ButtonSmall,- ButtonsS.ButtonWhite,- S.pinMapButton,- )}+ <Button+ className={cx("PinMapUpdateButton", S.pinMapButton)}+ size="sm"onClick={() => {if (!mapInstance) {return;@@ -377,7 +365,7 @@ export function PinMap(props: PinMapProps) {}}>{filtering ? t`Cancel filter` : t`Draw box to filter`}- </div>+ </Button>)}</div></div>diff --git a/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsx b/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsxindex abcd912a041..4b4afa342d9 100644--- a/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsx@@ -1,7 +1,7 @@-import { render, screen } from "@testing-library/react";import userEvent from "@testing-library/user-event";import { createMockMetadata } from "__support__/metadata";+import { renderWithProviders, screen } from "__support__/ui";import MetabaseSettings from "metabase/utils/settings";import { createMockVisualizationProps } from "metabase/visualizations/types/mocks";import type {@@ -283,7 +283,9 @@ describe("PinMap", () => {onRender,});- const { rerender } = render(<PinMap {...props} token={token} />);+ const { rerender } = renderWithProviders(+ <PinMap {...props} token={token} />,+ );return { onRender, props, rerender };};@@ -304,14 +306,16 @@ describe("PinMap", () => {it("should render the 'Set as default view' button with the PinMapUpdateButton class", () => {setup();- const button = screen.getByText("Set as default view");+ const button = screen.getByRole("button", { name: "Set as default view" });expect(button).toHaveClass("PinMapUpdateButton");});it("should render the 'Draw box to filter' button outside dashboards", async () => {setup();- const button = await screen.findByText("Draw box to filter");+ const button = await screen.findByRole("button", {+ name: "Draw box to filter",+ });expect(button).toHaveClass("PinMapUpdateButton");});