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
chore: replace easy deprecated Button call sites with metabase/ui Button (#75790)
Uladzimir Havenchyk1e99cb10aa21
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsxindex 98d027fbd12..a249c8edf6c 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx@@ -284,7 +284,7 @@ const EditSandboxingModal = ({<ActionButtonclassName={CS.ml1}actionFn={savePolicy}- primary+ variant="filled"disabled={!canSave}>{t`Save`}diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsxindex 3ae7c899c2b..2b0eac37863 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx@@ -1,11 +1,10 @@import { useDisclosure } from "@mantine/hooks";-import cx from "classnames";import { t } from "ttag";import type { PermissionsGraphDiff } from "metabase/admin/permissions/types";-import { Button } from "metabase/common/components/Button";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { EditBar } from "metabase/common/components/EditBar";+import { Button } from "metabase/ui";import { PermissionsConfirm } from "../PermissionsConfirm";@@ -27,14 +26,16 @@ export function PermissionsEditBar({<Buttonkey="save"onClick={openModal}- className={cx({ disabled: !isDirty })}- primary- small+ disabled={!isDirty}+ variant="filled"+ size="sm">{t`Save changes`}</Button>);const cancelButton = (- <Button small onClick={onCancel} key="cancel">{t`Cancel`}</Button>+ <Button variant="subtle" size="sm" onClick={onCancel} key="cancel">+ {t`Cancel`}+ </Button>);return (diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsxindex 7a9938673d7..32f3ddcc235 100644--- a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx@@ -238,7 +238,7 @@ export function UploadSettingsFormView({disabled={!hasValidSettings}failedText={t`Failed to save upload settings`}actionFn={handleEnableUploads}- primary+ variant="filled"useLoadingSpinnertype="submit"/>@@ -252,7 +252,8 @@ export function UploadSettingsFormView({failedText={t`Failed to disable uploads`}actionFn={handleDisableUploads}type="button"- danger+ variant="filled"+ color="error"useLoadingSpinner/>)@@ -265,7 +266,7 @@ export function UploadSettingsFormView({}failedText={t`Failed to enable uploads`}actionFn={handleEnableUploads}- primary={!!hasValidSettings}+ variant={hasValidSettings ? "filled" : "default"}disabled={!hasValidSettings || !hasValidDatabases}useLoadingSpinnertype="submit"diff --git a/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx b/frontend/src/metabase/common/components/ActionButton/ActionButton.tsxindex 28ec48856e7..59608c1d0c7 100644--- a/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx+++ b/frontend/src/metabase/common/components/ActionButton/ActionButton.tsx@@ -9,10 +9,15 @@ import {} from "react";import { t } from "ttag";-import { Button, type ButtonProps } from "metabase/common/components/Button";-import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";-import { Center, Group, Icon, Loader } from "metabase/ui";+import {+ Button,+ type ButtonProps,+ Center,+ Group,+ Icon,+ Loader,+} from "metabase/ui";export interface ActionButtonProps extends Omit<ButtonProps, "onClick"> {// need to expose this ref to allow Tooltip to bind to the correct element@@ -24,8 +29,6 @@ export interface ActionButtonProps extends Omit<ButtonProps, "onClick"> {useLoadingSpinner?: boolean;actionFn: () => Promise<unknown>;className?: string;- successClassName?: string;- failedClassName?: string;children?: React.ReactNode;}@@ -42,9 +45,7 @@ export const ActionButton = forwardRef<ActionButtonHandle, ActionButtonProps>(successText = t`Saved`,useLoadingSpinner = false,actionFn,- className = ButtonsS.Button,- successClassName = ButtonsS.ButtonSuccess, // not used- failedClassName = ButtonsS.ButtonDanger, // not used+ className,children,innerRef,...buttonProps@@ -113,15 +114,20 @@ export const ActionButton = forwardRef<ActionButtonHandle, ActionButtonProps>(};const isActionDisabled = active || result === "success";const actionStatus = active ? "pending" : (result ?? "idle");+ const resultProps: Partial<ButtonProps> =+ result === "success"+ ? { variant: "filled", color: "success" }+ : result === "failed"+ ? { variant: "filled", color: "error" }+ : {};return (<Button{...buttonProps}+ {...resultProps}ref={innerRef}data-action-status={actionStatus}className={cx(className, {- [successClassName]: result === "success",- [failedClassName]: result === "failed",[CS.pointerEventsNone]: isActionDisabled,})}onClick={handleClick}diff --git a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsxindex 74a3a03e088..9073fc44627 100644--- a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx+++ b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx@@ -2,7 +2,6 @@ import isPropValid from "@emotion/is-prop-valid";// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import ButtonsS from "metabase/css/components/buttons.module.css";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Icon } from "metabase/ui";import { alpha } from "metabase/ui/colors";@@ -19,8 +18,22 @@ export const Root = styled(FullWidthContainer, {padding-bottom: 0.5rem;background-color: ${(props) =>alpha(props.admin ? "accent7" : "core-brand", 0.85)};+`;++export const EditIcon = styled(Icon)`+ color: var(--mb-color-text-primary-inverse);+`;++export const Title = styled.span`+ color: var(--mb-color-text-primary-inverse);+ font-weight: 700;+`;++/* restyles metabase/ui buttons for the colored bar: filled = primary, subtle = secondary */+export const ButtonsContainer = styled.div<{ admin: boolean }>`+ display: flex;- .${ButtonsS.Button} {+ button[data-variant] {color: var(--mb-color-text-primary-inverse);background-color: ${() => alpha("background-primary", 0.1)};border: none;@@ -28,27 +41,14 @@ export const Root = styled(FullWidthContainer, {margin-left: 0.75em;}- .${ButtonsS.ButtonPrimary} {+ button[data-variant="filled"] {color: ${(props) => color(props.admin ? "text-primary" : "core-brand")};background-color: var(--mb-color-background-primary);}- .${ButtonsS.Button}:hover {+ button[data-variant]:hover {color: var(--mb-color-text-primary-inverse);background-color: ${(props) =>color(props.admin ? "accent7" : "core-brand")};}`;--export const EditIcon = styled(Icon)`- color: var(--mb-color-text-primary-inverse);-`;--export const Title = styled.span`- color: var(--mb-color-text-primary-inverse);- font-weight: 700;-`;--export const ButtonsContainer = styled.div`- display: flex;-`;diff --git a/frontend/src/metabase/common/components/EditBar/EditBar.tsx b/frontend/src/metabase/common/components/EditBar/EditBar.tsxindex d99ae1d96a0..790e4197244 100644--- a/frontend/src/metabase/common/components/EditBar/EditBar.tsx+++ b/frontend/src/metabase/common/components/EditBar/EditBar.tsx@@ -32,7 +32,7 @@ export function EditBar({<Title>{title}</Title></Group>{center && <div>{center}</div>}- <ButtonsContainer>{buttons}</ButtonsContainer>+ <ButtonsContainer admin={admin}>{buttons}</ButtonsContainer></Root>);}diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperButton.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperButton.tsxindex 2399d2806d8..2872a6ed1b3 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperButton.tsx@@ -1,11 +1,19 @@import cx from "classnames";-import { useMemo, useState } from "react";+import type { MouseEventHandler } from "react";+import { useCallback, useMemo, useState } from "react";import { t } from "ttag";-import { Button } from "metabase/common/components/Button";import { ParameterTargetList } from "metabase/parameters/components/ParameterTargetList";import type { ParameterMappingOption } from "metabase/parameters/utils/mapping-options";-import { Box, Ellipsified, Flex, Icon, Popover, Tooltip } from "metabase/ui";+import {+ ActionIcon,+ Box,+ Ellipsified,+ Flex,+ Icon,+ Popover,+ Tooltip,+} from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { Card, ParameterTarget, VirtualCard } from "metabase-types/api";@@ -39,6 +47,15 @@ export const DashCardCardParameterMapperButton = ({}: DashCardCardParameterMapperButtonProps) => {const [isDropdownVisible, setIsDropdownVisible] = useState(false);+ const handleDisconnect: MouseEventHandler<HTMLButtonElement> = useCallback(+ (event) => {+ // we have a click listener on the parent+ event.stopPropagation();+ handleChangeTarget(null);+ },+ [handleChangeTarget],+ );+const hasPermissionsToMap = useMemo(() => {if (isVirtual) {return true;@@ -72,16 +89,7 @@ export const DashCardCardParameterMapperButton = ({buttonVariant: "invalid",buttonText: t`Unknown Field`,buttonIcon: (- <Button- icon="close"- iconSize={12}- className={S.CloseIconButton}- aria-label={t`Disconnect`}- onClick={(e) => {- handleChangeTarget(null);- e.stopPropagation();- }}- />+ <DisconnectButton iconSize={12} onClick={handleDisconnect} />),};}@@ -100,18 +108,7 @@ export const DashCardCardParameterMapperButton = ({buttonVariant: "mapped",buttonTooltip: null,buttonText: formatSelected(selectedMappingOption),- buttonIcon: (- <Button- icon="close"- className={S.CloseIconButton}- role="button"- aria-label={t`Disconnect`}- onClick={(e) => {- handleChangeTarget(null);- e.stopPropagation();- }}- />- ),+ buttonIcon: <DisconnectButton onClick={handleDisconnect} />,};}@@ -127,7 +124,7 @@ export const DashCardCardParameterMapperButton = ({isVirtual,selectedMappingOption,target,- handleChangeTarget,+ handleDisconnect,]);return (@@ -191,6 +188,26 @@ export const DashCardCardParameterMapperButton = ({);};+function DisconnectButton({+ iconSize,+ onClick,+}: {+ iconSize?: number;+ onClick: MouseEventHandler<HTMLButtonElement>;+}) {+ return (+ <ActionIcon+ variant="subtle"+ size="sm"+ className={S.CloseIconButton}+ aria-label={t`Disconnect`}+ onClick={onClick}+ >+ <Icon name="close" size={iconSize} />+ </ActionIcon>+ );+}+function formatSelected({name,sectionName,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.css b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.cssindex 7425123529f..7a62337a027 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.css@@ -61,11 +61,8 @@overflow: hidden;}-.CloseIconButton {+.CloseIconButton[data-variant="subtle"] {color: var(--mb-color-text-primary-inverse);- background-color: transparent;- border: none;- padding: 0.25rem !important;&:hover {color: var(--mb-color-text-primary-inverse);diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsxindex d5468aae927..85997d95ca7 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CancelEditButton.tsx@@ -1,10 +1,7 @@-import cx from "classnames";import { t } from "ttag";-import { Button } from "metabase/common/components/Button";-import ButtonsS from "metabase/css/components/buttons.module.css";-import CS from "metabase/css/core/index.css";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";+import { Button } from "metabase/ui";export const CancelEditButton = (props: { onClick: () => void }) => {useRegisterShortcut([@@ -15,11 +12,7 @@ export const CancelEditButton = (props: { onClick: () => void }) => {]);return (- <Button- key="cancel"- className={cx(ButtonsS.Button, ButtonsS.ButtonSmall, CS.mr1)}- onClick={props.onClick}- >+ <Button key="cancel" variant="subtle" size="sm" onClick={props.onClick}>{t`Cancel`}</Button>);diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsxindex cf9dbc6686a..1cfb9e81267 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx@@ -1,8 +1,6 @@-import cx from "classnames";import { msgid, ngettext, t } from "ttag";import { ActionButton } from "metabase/common/components/ActionButton";-import ButtonsS from "metabase/css/components/buttons.module.css";import { useDashboardContext } from "metabase/dashboard/context/context";import { getMissingRequiredParameters } from "metabase/dashboard/selectors";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";@@ -52,11 +50,8 @@ export const SaveEditButton = () => {<span><ActionButtonactionFn={onSave}- className={cx(- ButtonsS.Button,- ButtonsS.ButtonPrimary,- ButtonsS.ButtonSmall,- )}+ variant="filled"+ size="sm"normalText={t`Save`}activeText={t`Saving…`}failedText={t`Save failed`}diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.module.css b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.module.cssindex e7db73c752a..438fc4df3ca 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.module.css+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.module.css@@ -12,8 +12,6 @@}.createTabButton {- border: none;- padding: 0.25rem;margin-top: auto;margin-bottom: auto;position: relative;diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsxindex dee29bfb4fb..9891ab7ea0f 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx@@ -1,7 +1,6 @@import { t } from "ttag";import { uniq } from "underscore";-import { Button } from "metabase/common/components/Button";import { Link } from "metabase/common/components/Link";import { Sortable } from "metabase/common/components/Sortable";import type { TabButtonMenuItem } from "metabase/common/components/TabButton";@@ -12,7 +11,7 @@ import CS from "metabase/css/core/index.css";import { useDashboardContext } from "metabase/dashboard/context";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import type { SelectedTabId } from "metabase/redux/store";-import { Flex, List } from "metabase/ui";+import { ActionIcon, Flex, Icon, List } from "metabase/ui";import { isVirtualDashCard } from "metabase/utils/dashboard";import S from "./DashboardTabs.module.css";@@ -152,13 +151,14 @@ export function DashboardTabs() {)))}{isEditing && (- <Button- icon="add"- iconSize={12}+ <ActionIcon+ variant="viewHeader"onClick={createNewTab}aria-label={t`Create new tab`}className={S.createTabButton}- />+ >+ <Icon name="add" size={12} />+ </ActionIcon>)}</TabRow>{modalContent}diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsxindex 4e474f1a5d7..b191f8ff6e8 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx@@ -144,8 +144,8 @@ const AutomaticDashboardAppInner = () => {) : (<ActionButtonclassName={cx(CS.mlAuto, CS.textNoWrap)}- success- borderless+ variant="filled"+ color="success"// The dashboard isn't always loaded when the header first// renders. Without this guard, "Save this" is clickable while// `dashboard` is undefined, which fires a false `x-ray_saved`diff --git a/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.module.css b/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.module.cssdeleted file mode 100644index a5e8b82d2bd..00000000000--- a/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.module.css+++ /dev/null@@ -1,10 +0,0 @@-.sectionButton {- color: var(--mb-color-brand);- padding: 0;- border: none;- border-radius: 0;-- &:hover {- background-color: transparent;- }-}diff --git a/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsx b/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsxindex 274515f175f..82f27170030 100644--- a/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseSectionField/DatabaseSectionField.tsx@@ -2,10 +2,8 @@ import { useField } from "formik";import { useCallback } from "react";import { t } from "ttag";-import { Button } from "metabase/common/components/Button";import { FormField } from "metabase/common/components/FormField";--import S from "./DatabaseSectionField.module.css";+import { Button, Icon } from "metabase/ui";export interface DatabaseSectionFieldProps {name: string;@@ -23,9 +21,11 @@ const DatabaseSectionField = ({return (<FormField><Button- className={S.sectionButton}+ w="fit-content"type="button"- iconRight={value ? "chevronup" : "chevrondown"}+ variant="subtle"+ size="compact-sm"+ rightSection={<Icon name={value ? "chevronup" : "chevrondown"} />}onClick={handleClick}>{value ? t`Hide advanced options` : t`Show advanced options`}diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsxindex be742464211..bacd0b34363 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx@@ -17,12 +17,10 @@ import {ActionButton,type ActionButtonHandle,} from "metabase/common/components/ActionButton";-import { Button } from "metabase/common/components/Button";import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";import { EditBar } from "metabase/common/components/EditBar";import { LeaveConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { getSemanticTypeIcon } from "metabase/common/utils/fields";-import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import {setDatasetEditorTab,@@ -53,7 +51,7 @@ import { connect, useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";-import { Box, Flex, Icon, Tooltip } from "metabase/ui";+import { Box, Button, Flex, Icon, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";@@ -682,7 +680,8 @@ const DatasetEditorInnerView = (props: DatasetEditorInnerProps) => {buttons={[<Buttonkey="cancel"- small+ variant="subtle"+ size="sm"onClick={handleCancelClick}>{t`Cancel`}</Button>,<Tooltip@@ -700,11 +699,8 @@ const DatasetEditorInnerView = (props: DatasetEditorInnerProps) => {activeText={t`Saving…`}failedText={t`Save failed`}successText={t`Saved`}- className={cx(- ButtonsS.Button,- ButtonsS.ButtonPrimary,- ButtonsS.ButtonSmall,- )}+ variant="filled"+ size="sm"/></Tooltip>,]}diff --git a/frontend/src/metabase/querying/components/ResponsiveParametersList.module.css b/frontend/src/metabase/querying/components/ResponsiveParametersList.module.cssindex 062923c7e0a..07769c1b2ea 100644--- a/frontend/src/metabase/querying/components/ResponsiveParametersList.module.css+++ b/frontend/src/metabase/querying/components/ResponsiveParametersList.module.css@@ -1,8 +1,3 @@-.filterButton {- color: var(--mb-color-core-brand);- margin: 0.5rem;-}-.StyledParametersList {margin: 0 1rem;}diff --git a/frontend/src/metabase/querying/components/ResponsiveParametersList.tsx b/frontend/src/metabase/querying/components/ResponsiveParametersList.tsxindex 69d8954db7a..1abacaa2426 100644--- a/frontend/src/metabase/querying/components/ResponsiveParametersList.tsx+++ b/frontend/src/metabase/querying/components/ResponsiveParametersList.tsx@@ -2,9 +2,8 @@ import cx from "classnames";import { useCallback, useMemo, useState } from "react";import { msgid, ngettext, t } from "ttag";-import { Button } from "metabase/common/components/Button";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";-import { Box, Flex } from "metabase/ui";+import { ActionIcon, Box, Button, Flex, Icon } from "metabase/ui";import type { CardId, DashboardId, Parameter } from "metabase-types/api";import ResponsiveParametersListS from "./ResponsiveParametersList.module.css";@@ -54,10 +53,9 @@ export const ResponsiveParametersList = ({>{parameters.length > 0 && isSmallScreen && (<Button- className={ResponsiveParametersListS.filterButton}- borderless- primary- icon="filter"+ m="sm"+ variant="subtle"+ leftSection={<Icon name="filter" />}onClick={handleFilterButtonClick}>{activeFilters > 0@@ -84,12 +82,13 @@ export const ResponsiveParametersList = ({{parameters.length > 0 && isSmallScreen && (<Flex p="0.75rem 1rem" align="center" justify="space-between"><h3>{t`Filters`}</h3>- <Button- onlyIcon- borderless- icon="close"+ <ActionIcon+ variant="viewHeader"+ aria-label={t`Close`}onClick={handleFilterButtonClick}- />+ >+ <Icon name="close" />+ </ActionIcon></Flex>)}<SyncedParametersListdiff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.module.css b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.module.cssindex f68afbc02fd..ac4447a9b2b 100644--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.module.css+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.module.css@@ -1,5 +1,4 @@-.SnippetButton {- color: var(--mb-color-core-brand);+.SnippetButton[data-variant="subtle"] {background-color: var(--mb-color-background-secondary);margin-top: 0.5rem;diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.tsxindex cd6aee99aaf..8c34ed0cb7a 100644--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.tsx+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.tsx@@ -3,9 +3,8 @@ import { useState } from "react";import { t } from "ttag";import { useUpdateSnippetMutation } from "metabase/api";-import { Button } from "metabase/common/components/Button";import CS from "metabase/css/core/index.css";-import { Ellipsified, Flex, Icon } from "metabase/ui";+import { Button, Ellipsified, Flex, Icon } from "metabase/ui";import type { NativeQuerySnippet } from "metabase-types/api";import SnippetRowS from "./SnippetRow.module.css";@@ -107,14 +106,15 @@ export function SnippetRow({{canWrite && (<ButtonclassName={SnippetRowS.SnippetButton}+ variant="subtle"+ leftSection={+ <Icon name={snippet.archived ? "unarchive" : "pencil"} />+ }onClick={snippet.archived? () => updateSnippet({ id: snippet.id, archived: false }): () => setModalSnippet?.(snippet)}- borderless- medium- icon={snippet.archived ? "unarchive" : "pencil"}>{snippet.archived ? t`Unarchive` : t`Edit`}</Button>diff --git a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.cssindex 7f070d2fd91..05de1e5d18d 100644--- a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css+++ b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css@@ -6,7 +6,7 @@align-items: center;height: 3rem;- .HeaderButton {+ .HeaderButton[data-variant="subtle"] {color: var(--mb-color-text-tertiary);&:not(:disabled):hover {diff --git a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsxindex e0a868e3351..6b26da2ebd7 100644--- a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx+++ b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx@@ -1,7 +1,6 @@import { t } from "ttag";-import { Button } from "metabase/common/components/Button";-import { Flex } from "metabase/ui";+import { Button, Flex, Icon } from "metabase/ui";import ExpressionWidgetHeaderS from "./ExpressionWidgetHeader.module.css";@@ -22,8 +21,8 @@ export const ExpressionWidgetHeader = ({<Flex className={ExpressionWidgetHeaderS.Header}><ButtonclassName={ExpressionWidgetHeaderS.HeaderButton}- icon={onBack ? "chevronleft" : undefined}- onlyText+ variant="subtle"+ leftSection={onBack ? <Icon name="chevronleft" /> : undefined}onClick={onBack}disabled={!onBack}>diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsxindex 835a181e047..c7a67e08ba6 100644--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsx+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorHeader/MetricEditorHeader.tsx@@ -1,4 +1,3 @@-import cx from "classnames";import { useRef } from "react";import { t } from "ttag";@@ -6,9 +5,8 @@ import {ActionButton,type ActionButtonHandle,} from "metabase/common/components/ActionButton";-import { Button } from "metabase/common/components/Button";import { EditBar } from "metabase/common/components/EditBar";-import ButtonsS from "metabase/css/components/buttons.module.css";+import { Button } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import S from "./MetricEditorHeader.module.css";@@ -39,9 +37,16 @@ export function MetricEditorHeader({className={S.root}title={question.displayName() ?? t`New metric`}buttons={[- <Button key="cancel" small onClick={onCancel}>{t`Cancel`}</Button>,+ <Button key="cancel" variant="subtle" size="sm" onClick={onCancel}>+ {t`Cancel`}+ </Button>,!question.isSaved() ? (- <Button key="create" primary small onClick={handleCreate}>+ <Button+ key="create"+ variant="filled"+ size="sm"+ onClick={handleCreate}+ >{t`Save`}</Button>) : (@@ -54,11 +59,8 @@ export function MetricEditorHeader({activeText={t`Saving…`}failedText={t`Save failed`}successText={t`Saved`}- className={cx(- ButtonsS.Button,- ButtonsS.ButtonPrimary,- ButtonsS.ButtonSmall,- )}+ variant="filled"+ size="sm"/>),]}diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.jsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.jsxindex e51f53cc107..e670b1950bf 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.jsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.jsx@@ -4,10 +4,9 @@ import { useMemo, useState } from "react";import { t } from "ttag";import { getErrorMessage } from "metabase/api/utils";-import { Button } from "metabase/common/components/Button";import { QuestionResultLoader } from "metabase/common/components/QuestionResultLoader";import CS from "metabase/css/core/index.css";-import { Box, Flex, Icon } from "metabase/ui";+import { Box, Button, Flex, Icon } from "metabase/ui";import Visualization from "metabase/visualizations/components/Visualization";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsxindex 55e980c3be5..5aaef50dca7 100644--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx@@ -98,7 +98,7 @@ export const DataUsageStep = ({activeText={t`Finishing…`}failedText={t`Failed`}successText={t`Success`}- primary+ variant="filled"type="button"actionFn={handleStepSubmit}/>diff --git a/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx b/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsxindex 6bcd563c7d9..aad8507f3d7 100644--- a/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx+++ b/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx@@ -2,11 +2,10 @@ import { useState } from "react";import { useInterval } from "react-use";import { t } from "ttag";-import { Button } from "metabase/common/components/Button";import { Link } from "metabase/common/components/Link";import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";import { type FileUpload, UploadMode } from "metabase/redux/store/upload";-import { Box, Stack } from "metabase/ui";+import { Box, Button, Stack } from "metabase/ui";import type Table from "metabase-lib/v1/metadata/Table";import type { Collection } from "metabase-types/api";@@ -143,7 +142,14 @@ const UploadErrorDisplay = ({ upload }: { upload: FileUpload }) => {}return (<>- <Button onClick={() => setShowErrorModal(true)} onlyText>+ <Button+ variant="subtle"+ size="xs"+ h="1rem"+ p={0}+ fz="sm"+ onClick={() => setShowErrorModal(true)}+ >{t`Show error details`}</Button>{showErrorModal && (diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.styled.tsxdeleted file mode 100644index 40d557aeb11..00000000000--- a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.styled.tsx+++ /dev/null@@ -1,13 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Button } from "metabase/common/components/Button";--export const ChartSettingsFooterRoot = styled.div`- display: flex;- justify-content: flex-end;- padding: 1rem 2rem;- ${Button} {- margin-left: 1rem;- }-`;diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsxindex ac7730345d6..3993b324065 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsFooter/ChartSettingsFooter.tsx@@ -1,8 +1,6 @@import { t } from "ttag";-import { Button } from "metabase/common/components/Button";--import { ChartSettingsFooterRoot } from "./ChartSettingsFooter.styled";+import { Button, Flex, Icon } from "metabase/ui";export type ChartSettingsFooterProps = {onDone: () => void;@@ -15,15 +13,16 @@ export const ChartSettingsFooter = ({onCancel,onReset,}: ChartSettingsFooterProps) => (- <ChartSettingsFooterRoot>+ <Flex justify="flex-end" gap="md" py="md" px="xl">{onReset && (<Button- borderless- icon="refresh"+ variant="subtle"+ color="text-secondary"+ leftSection={<Icon name="refresh" />}onClick={onReset}>{t`Reset to defaults`}</Button>)}<Button onClick={onCancel}>{t`Cancel`}</Button>- <Button primary onClick={onDone}>{t`Done`}</Button>- </ChartSettingsFooterRoot>+ <Button variant="filled" onClick={onDone}>{t`Done`}</Button>+ </Flex>);