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
Migrate underlined Radio usages to Mantine Tabs (#76535)
Oleh Kf00423cbd51a
diff --git a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.tsindex 9171df5093c..1c211ba1286 100644--- a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts@@ -4207,7 +4207,7 @@ describe("scenarios > data studio > transforms > permissions", () => {"Ensure that transform permissions are visible when instance is hosted and transform feature is present",);- cy.findByRole("radio", { name: "Data" }).click({ force: true });+ cy.findByRole("tab", { name: "Data" }).click({ force: true });cy.findByRole("menuitem", { name: "All Users" }).click();cy.findByRole("columnheader", { name: /Transforms/ })diff --git a/e2e/test/scenarios/onboarding/command-palette.cy.spec.js b/e2e/test/scenarios/onboarding/command-palette.cy.spec.jsindex b6f408b3c99..17a2817421c 100644--- a/e2e/test/scenarios/onboarding/command-palette.cy.spec.js+++ b/e2e/test/scenarios/onboarding/command-palette.cy.spec.js@@ -316,7 +316,7 @@ describe("command palette", () => {H.saveChangesToPermissions();- cy.findByRole("radiogroup").findByText("Data").click();+ cy.findByRole("tab", { name: "Data" }).click();cy.findByRole("menuitem", { name: "All Users" }).click();const TABLE_METADATA_INDEX = 3;diff --git a/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js b/e2e/test/scenarios/permissions/admin-permissions.cy.spec.jsindex c821122fe34..75da1683380 100644--- a/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js+++ b/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js@@ -88,7 +88,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {H.modal().should("not.exist");// Switching to data permissions page- cy.get("label").contains("Data").click();+ cy.findByRole("tab", { name: "Data" }).click();H.modal().within(() => {cy.findByText("Discard your changes?");@@ -102,7 +102,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {cy.url().should("include", "/admin/permissions/collections/root");// Switching to data permissions page again- cy.get("label").contains("Data").click();+ cy.findByRole("tab", { name: "Data" }).click();H.modal().button("Discard changes").click();@@ -288,7 +288,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {H.modal().should("not.exist");// Switching to collection permissions page- cy.get("label").contains("Collection").click();+ cy.findByRole("tab", { name: "Collections" }).click();H.modal().within(() => {cy.findByText("Discard your changes?");@@ -302,7 +302,7 @@ describe("scenarios > admin > permissions", { tags: "@OSS" }, () => {cy.url().should("include", "/admin/permissions/data/database");// Switching to collection permissions page again- cy.get("label").contains("Collection").click();+ cy.findByRole("tab", { name: "Collections" }).click();H.modal().button("Discard changes").click();diff --git a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.tsindex 84969b0f6d0..d11502d301e 100644--- a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts+++ b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts@@ -754,7 +754,7 @@ describe("UXW-2696", () => {H.popover().findByText("Edit Visualization").click();H.getDocumentSidebar().within(() => {- cy.findByRole("radio", { name: /axes/i }).click({ force: true });+ cy.findByRole("tab", { name: /axes/i }).click({ force: true });cy.findByLabelText("Auto y-axis range").should("have.attr","data-checked",@@ -798,7 +798,7 @@ describe("UXW-2696", () => {H.showDashcardVisualizerModalSettings(0, { isVisualizerCard: false });H.modal().within(() => {- cy.findByRole("radio", { name: /axes/i }).click({ force: true });+ cy.findByRole("tab", { name: /axes/i }).click({ force: true });cy.findByLabelText("Auto y-axis range").should("have.attr","data-checked",diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.module.css b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.module.cssindex 287df9d67b5..661159b0fa4 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.module.css+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.module.css@@ -1,9 +1,3 @@.panel {border-bottom: 1px solid var(--mb-color-border-neutral);}--.tabs {- &:before {- display: none;- }-}diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.tsxindex 49faa6b4c6c..c3f984a5bb7 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/TabPanel/TabPanel.tsx@@ -27,8 +27,8 @@ export function TabPanel({return (<Box className={S.panel} px="lg" bg="background_page-primary">- <Tabs value={selectedTab} onChange={handleChange}>- <Tabs.List className={S.tabs}>+ <Tabs value={selectedTab} onChange={handleChange} listBorder={false}>+ <Tabs.List><Tabs.Tab value="column-mappings">{t`Column comparison`}</Tabs.Tab>{canReplace && (<Tabs.Tab value="dependents">diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.module.css b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.module.cssdeleted file mode 100644index 56e849a0eff..00000000000--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.module.css+++ /dev/null@@ -1,5 +0,0 @@-.tabs {- &:before {- display: none;- }-}diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsxindex e1d30ac46b2..e5349bc4ef3 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx@@ -16,8 +16,6 @@ import { EditUserStrategySettingsButton } from "../EditUserStrategySettingsButtoimport { TenantsDocsButton } from "../TenantsDocsButton";import { TenantsListing } from "../components/TenantsListing";-import S from "./TenantsListingApp.module.css";-export const TenantsListingApp = ({children,}: {@@ -70,8 +68,13 @@ export const TenantsListingApp = ({</Group>{isAdmin && hasDeactivatedTenants && (- <Tabs value={status} onChange={handleTabChange} pl="md">- <Tabs.List className={S.tabs}>+ <Tabs+ value={status}+ onChange={handleTabChange}+ pl="md"+ listBorder={false}+ >+ <Tabs.List><Tabs.Tab value={ACTIVE_STATUS.active}>{t`Active`}</Tabs.Tab><Tabs.Tabdiff --git a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsxindex 89d51e74831..97a7e7d9b74 100644--- a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx+++ b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx@@ -2,10 +2,9 @@ import type { Path } from "history";import { useMemo } from "react";import { t } from "ttag";-import { Radio } from "metabase/common/components/Radio";import { UserAvatar } from "metabase/common/components/UserAvatar";import { PLUGIN_IS_PASSWORD_USER } from "metabase/plugins";-import { Box, Flex, Title, rem } from "metabase/ui";+import { Box, Flex, Tabs, Title, rem } from "metabase/ui";import { getFullName } from "metabase/utils/user";import type { User } from "metabase-types/api";@@ -64,12 +63,19 @@ export const AccountHeader = ({{user.email}</Title></Flex>- <Radio- value={path}- variant="underlined"- options={tabs}- onChange={onChangeLocation}- />+ <Tabs+ listBorder={false}+ value={path ?? null}+ onChange={(value) => value && onChangeLocation?.(value)}+ >+ <Tabs.List>+ {tabs.map((tab) => (+ <Tabs.Tab key={tab.value} value={tab.value}>+ {tab.name}+ </Tabs.Tab>+ ))}+ </Tabs.List>+ </Tabs></Flex>);};diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.module.css b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.module.cssdeleted file mode 100644index 56e849a0eff..00000000000--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.module.css+++ /dev/null@@ -1,5 +0,0 @@-.tabs {- &:before {- display: none;- }-}diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsxindex 6eaa01d5867..a67cd4626b3 100644--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx@@ -17,8 +17,6 @@ import { SearchFilter } from "../../components/SearchFilter";import { ACTIVE_STATUS, type ActiveStatus } from "../../constants";import { usePeopleQuery } from "../../hooks/use-people-query";-import S from "./PeopleListingApp.module.css";-const PAGE_SIZE = 25;const DEFAULT_NO_RESULTS_MESSAGE = () => t`No results found`;@@ -110,8 +108,13 @@ export function PeopleListingApp({</Group>{isAdmin && hasDeactivatedUsers && (- <Tabs value={status} onChange={handleTabChange} pl="md">- <Tabs.List className={S.tabs}>+ <Tabs+ value={status}+ onChange={handleTabChange}+ pl="md"+ listBorder={false}+ >+ <Tabs.List><Tabs.Tab value={ACTIVE_STATUS.active}>{t`Active`}</Tabs.Tab><Tabs.Tabvalue={ACTIVE_STATUS.deactivated}diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsxindex 1ae3a252b38..cb5ce3aa1c5 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx@@ -32,6 +32,7 @@ export const TabsContainer = styled.div`display: flex;justify-content: space-between;align-items: center;+ border-bottom: 1px solid var(--mb-color-border-neutral);`;export const FullHeightContainer = styled.div`diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsxindex 8ab6389d13e..3788ec97842 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx@@ -18,7 +18,6 @@ import type { PermissionsGraphDiff } from "metabase/admin/permissions/types";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { useToggle } from "metabase/common/hooks/use-toggle";-import CS from "metabase/css/core/index.css";import { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";import {@@ -134,7 +133,7 @@ export function PermissionsPageLayout({closeButtonText={null}/>- <TabsContainer className={CS.borderBottom}>+ <TabsContainer><PermissionsTabs tab={tab} onChangeTab={navigateToTab} /><ToolbarButtonsContainer>{helpContent && !isHelpReferenceOpen && (diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsxindex 14af9c2f85d..09a303e564f 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx@@ -1,13 +1,11 @@-import cx from "classnames";import { t } from "ttag";-import { Radio } from "metabase/common/components/Radio";import { useSetting } from "metabase/common/hooks";-import CS from "metabase/css/core/index.css";import {PLUGIN_ADMIN_PERMISSIONS_TABS,PLUGIN_APPLICATION_PERMISSIONS,} from "metabase/plugins";+import { Box, Tabs } from "metabase/ui";import type { PermissionsPageTab } from "./PermissionsPageLayout";@@ -27,20 +25,28 @@ export const PermissionsTabs = ({ tab, onChangeTab }: PermissionsTabsProps) => {tab.value !== "tenant-specific-collections",);+ const tabs = [+ { name: t`Data`, value: "data" },+ { name: t`Collections`, value: "collections" },+ ...adminPermissionsTabs,+ ...PLUGIN_APPLICATION_PERMISSIONS.tabs,+ ];+return (- <div className={cx(CS.px3, CS.mt1)}>- <Radio- colorScheme="accent7"+ <Box mt="sm">+ <Tabs+ listBorder={false}value={tab}- options={[- { name: t`Data`, value: "data" },- { name: t`Collections`, value: "collections" },- ...adminPermissionsTabs,- ...PLUGIN_APPLICATION_PERMISSIONS.tabs,- ]}- onOptionClick={onChangeTab}- variant="underlined"- />- </div>+ onChange={(value) => value && onChangeTab(value as PermissionsPageTab)}+ >+ <Tabs.List pl="xl">+ {tabs.map((tabOption) => (+ <Tabs.Tab key={tabOption.value} value={tabOption.value}>+ {tabOption.name}+ </Tabs.Tab>+ ))}+ </Tabs.List>+ </Tabs>+ </Box>);};diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/common.unit.spec.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/common.unit.spec.tsxindex 69f45fac52f..86006a6d551 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/common.unit.spec.tsx@@ -225,7 +225,7 @@ describe("Admin > CollectionPermissionsPage", () => {setup();expect(- screen.queryByRole("radio", { name: "Shared collections" }),+ screen.queryByRole("tab", { name: "Shared collections" }),).not.toBeInTheDocument();});});diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsxindex 9aaed1d93b7..e5ab79da7b9 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/enterprise.unit.spec.tsx@@ -25,7 +25,7 @@ describe("Admin > CollectionPermissionsPage (enterprise)", () => {});expect(- await screen.findByRole("radio", { name: "Shared collections" }),+ await screen.findByRole("tab", { name: "Shared collections" }),).toBeInTheDocument();});@@ -37,7 +37,7 @@ describe("Admin > CollectionPermissionsPage (enterprise)", () => {});expect(- screen.queryByRole("radio", { name: "Shared collections" }),+ screen.queryByRole("tab", { name: "Shared collections" }),).not.toBeInTheDocument();});});diff --git a/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.css b/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.cssindex df8cd27b0cd..7e0be804951 100644--- a/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.css+++ b/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.css@@ -16,6 +16,10 @@}}+[data-list-border-hidden] .list::before {+ border-width: 0;+}+.tab {color: var(--mb-color-text-primary);max-width: 100%;@@ -26,8 +30,8 @@background-color: var(--mb-color-background_surface-hover);}- &:focus:not([data-css-specificity-hack]) {- outline: none;+ &:focus-visible {+ outline: 2px solid var(--mb-color-focus);}&:disabled {diff --git a/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsx b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsxindex d6bf6b90028..01d7a19cbd5 100644--- a/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsx+++ b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsx@@ -2,6 +2,7 @@ import { Icon, Tabs, type TabsProps } from "metabase/ui";const args = {orientation: "horizontal",+ listBorder: true,};const argTypes = {@@ -9,6 +10,9 @@ const argTypes = {options: ["horizontal", "vertical"],control: { type: "inline-radio" },},+ listBorder: {+ control: { type: "boolean" },+ },};const tabs = [@@ -88,3 +92,11 @@ export const VerticalOrientationIcons = {orientation: "vertical",},};++export const NoListBorder = {+ render: DefaultTemplate,+ name: "Without list border",+ args: {+ listBorder: false,+ },+};diff --git a/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.tsx b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.tsxnew file mode 100644index 00000000000..484b050005e--- /dev/null+++ b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.tsx@@ -0,0 +1,31 @@+import {+ Tabs as MantineTabs,+ type TabsProps as MantineTabsProps,+} from "@mantine/core";++export interface TabsProps extends MantineTabsProps {+ /**+ * Whether the tab list renders its own divider line. Only applies to the+ * default (underlined) variant; ignored for `pills`, `outline`, etc.+ */+ listBorder?: boolean;+}++function TabsRoot({ listBorder = true, variant, ...props }: TabsProps) {+ const isUnderlinedVariant = variant == null || variant === "default";+ const hideListBorder = isUnderlinedVariant && !listBorder;++ return (+ <MantineTabs+ {...props}+ variant={variant}+ data-list-border-hidden={hideListBorder || undefined}+ />+ );+}++export const Tabs = Object.assign(TabsRoot, {+ List: MantineTabs.List,+ Tab: MantineTabs.Tab,+ Panel: MantineTabs.Panel,+});diff --git a/frontend/src/metabase/ui/components/navigation/Tabs/index.ts b/frontend/src/metabase/ui/components/navigation/Tabs/index.tsindex 6fb21c43e81..1565fa2db20 100644--- a/frontend/src/metabase/ui/components/navigation/Tabs/index.ts+++ b/frontend/src/metabase/ui/components/navigation/Tabs/index.ts@@ -1,6 +1,6 @@-export { Tabs } from "@mantine/core";+export { Tabs } from "./Tabs";+export type { TabsProps } from "./Tabs";export type {- TabsProps,TabsTabProps,TabsListProps,TabsPanelProps,diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.styled.tsxindex b23f3394dc9..f77e240cb3a 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.styled.tsx@@ -1,33 +1,10 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { Radio } from "metabase/common/components/Radio";-export const SectionContainer = styled.div`width: 100%;-- ${Radio.RadioGroupVariants.join(", ")} {- padding-top: 1rem;- padding-inline: 1.5rem;- border-bottom: 1px solid var(--mb-color-border-neutral);- }-- ${Radio.RadioContainerVariants.join(", ")} {- padding-left: 1rem;- padding-right: 1rem;- padding-block: 0.5rem;- }-- ${Radio.RadioLabelVariants.join(", ")} {- /* flex-grow: 1; */- margin-right: 0;- display: flex;- justify-content: center;-- &:not(:last-child) {- margin-right: 0;- }- }+ padding: 1rem 1.5rem 0;+ border-bottom: 1px solid var(--mb-color-border-neutral);`;export const ChartSettingsListContainer = styled.div`diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsxindex 41a969fd0c6..1c6ca810624 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx@@ -2,9 +2,8 @@ import cx from "classnames";import { useCallback, useMemo, useState } from "react";import _ from "underscore";-import { Radio } from "metabase/common/components/Radio";import CS from "metabase/css/core/index.css";-import { Stack } from "metabase/ui";+import { Stack, Tabs } from "metabase/ui";import { updateSeriesColor } from "metabase/visualizations/lib/series";import {getComputedSettings,@@ -206,15 +205,19 @@ export const BaseChartSettings = ({>{showSectionPicker && (<SectionContainer>- <Radio- value={chartSettingCurrentSection ?? undefined}+ <Tabs+ listBorder={false}+ value={chartSettingCurrentSection ?? null}onChange={handleShowSection}- options={orderedSectionNames}- optionNameFn={(v) => v}- optionValueFn={(v) => v}- optionKeyFn={(v) => v}- variant="underlined"- />+ >+ <Tabs.List>+ {orderedSectionNames.map((sectionName) => (+ <Tabs.Tab key={sectionName} value={sectionName}>+ {sectionName}+ </Tabs.Tab>+ ))}+ </Tabs.List>+ </Tabs></SectionContainer>)}<ChartSettingsListContainer data-testid="chartsettings-list-container">diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsxindex 38ff2d7b9af..21e8780fc32 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsx@@ -58,8 +58,14 @@ describe("ChartSettings", () => {setup({widgets: [widget({ section: "Foo" }), widget({ section: "Bar" })],});- expect(screen.getByLabelText("Foo")).toBeChecked();- expect(screen.getByLabelText("Bar")).not.toBeChecked();+ expect(screen.getByRole("tab", { name: "Foo" })).toHaveAttribute(+ "aria-selected",+ "true",+ );+ expect(screen.getByRole("tab", { name: "Bar" })).toHaveAttribute(+ "aria-selected",+ "false",+ );});it("should default to the DEFAULT_TAB_PRIORITY", () => {@@ -70,8 +76,14 @@ describe("ChartSettings", () => {],});- expect(screen.getByLabelText("Foo")).not.toBeChecked();- expect(screen.getByLabelText("Display")).toBeChecked();+ expect(screen.getByRole("tab", { name: "Foo" })).toHaveAttribute(+ "aria-selected",+ "false",+ );+ expect(screen.getByRole("tab", { name: "Display" })).toHaveAttribute(+ "aria-selected",+ "true",+ );});it("should be able to switch sections", () => {@@ -79,11 +91,23 @@ describe("ChartSettings", () => {widgets: [widget({ section: "Foo" }), widget({ section: "Bar" })],});- expect(screen.getByLabelText("Foo")).toBeChecked();- expect(screen.getByLabelText("Bar")).not.toBeChecked();+ expect(screen.getByRole("tab", { name: "Foo" })).toHaveAttribute(+ "aria-selected",+ "true",+ );+ expect(screen.getByRole("tab", { name: "Bar" })).toHaveAttribute(+ "aria-selected",+ "false",+ );fireEvent.click(screen.getByText("Bar"));- expect(screen.getByLabelText("Foo")).not.toBeChecked();- expect(screen.getByLabelText("Bar")).toBeChecked();+ expect(screen.getByRole("tab", { name: "Foo" })).toHaveAttribute(+ "aria-selected",+ "false",+ );+ expect(screen.getByRole("tab", { name: "Bar" })).toHaveAttribute(+ "aria-selected",+ "true",+ );});it("should show widget names", () => {@@ -199,9 +223,18 @@ describe("ChartSettings", () => {});// Data is first in the priority order, so its localized label ("Datos") is the active tab- expect(screen.getByLabelText("Datos")).toBeChecked();- expect(screen.getByLabelText("Ejes")).not.toBeChecked();- expect(screen.getByLabelText("Formato")).not.toBeChecked();+ expect(screen.getByRole("tab", { name: "Datos" })).toHaveAttribute(+ "aria-selected",+ "true",+ );+ expect(screen.getByRole("tab", { name: "Ejes" })).toHaveAttribute(+ "aria-selected",+ "false",+ );+ expect(screen.getByRole("tab", { name: "Formato" })).toHaveAttribute(+ "aria-selected",+ "false",+ );});it("should put unsectioned widgets into the highest-priority translated section", () => {diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsxindex cb7079f8d8a..a3bb4c42009 100644--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx@@ -141,8 +141,8 @@ describe("scalar viz settings", () => {renderWithProviders(<QuestionChartSettings series={series} />);expect(- await screen.findByRole("radio", { name: "Formatting" }),- ).toBeChecked();+ await screen.findByRole("tab", { name: "Formatting" }),+ ).toHaveAttribute("aria-selected", "true");expect(await screen.findByText("Field to show")).toBeInTheDocument();const getFieldSelect = async () =>@@ -177,8 +177,8 @@ describe("scalar viz settings", () => {renderWithProviders(<QuestionChartSettings series={series} />);expect(- await screen.findByRole("radio", { name: "Formatting" }),- ).toBeChecked();+ await screen.findByRole("tab", { name: "Formatting" }),+ ).toHaveAttribute("aria-selected", "true");expect(screen.queryByTestId("chart-settings-widget-scalar.field"),