Skip to content

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

Derive the Tabs value type from the tab values (#78934)

Stas Gavrylov850763504b9d
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx
index 22d401b6343..546a4824f12 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx
@@ -121,8 +121,7 @@ export function GroupLimitsSettingsSection() {
<SettingsSection title={t`Group and tenant limits`}>
<Tabs
value={activeTab}
- // Unjustified type cast. FIXME
- onChange={(value) => setActiveTab(value as GroupLimitsTabValue)}
+ onChange={(value) => value && setActiveTab(value)}
>
<Tabs.List mb="md">
<Tabs.Tab value="user-groups">{t`User groups`}</Tabs.Tab>
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.tsx
index 93d996658f1..5d5f9ec8446 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.tsx
@@ -18,7 +18,6 @@ import { useAuditTable } from "../../metabot-analytics/hooks/useAuditTable";
import { VIEW_AGENT_API_CALLS, VIEW_GROUP_MEMBERS } from "../constants";
import { useCliHasData } from "../hooks/useCliHasData";
import { buildCallsByDayByStatusQuery } from "../query-utils";
-import type { CliTab } from "../url-state";
import { cliUrlStateConfig } from "../url-state";
import { CliAnalyticsEmptyState } from "./CliAnalyticsEmptyState";
@@ -124,8 +123,7 @@ export function CliAnalyticsPage() {
.otherwise(() => (
<Tabs
value={tab}
- // tab/val _is_ a CliTab, but Mantine's Tab only deals with strings ¯\_(ツ)_/¯
- onChange={(val) => patchUrlState({ tab: val as CliTab })}
+ onChange={(value) => patchUrlState({ tab: value ?? undefined })}
keepMounted={false}
>
<Tabs.List mb="lg">
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.tsx
index 1a643165242..ecf24261209 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.tsx
@@ -18,7 +18,6 @@ import { useAuditTable } from "../../metabot-analytics/hooks/useAuditTable";
import { VIEW_GROUP_MEMBERS, VIEW_MCP_TOOL_CALLS } from "../constants";
import { useMcpHasData } from "../hooks/useMcpHasData";
import { buildCallsByDayByStatusQuery } from "../query-utils";
-import type { McpTab } from "../url-state";
import { mcpUrlStateConfig } from "../url-state";
import { McpAnalyticsEmptyState } from "./McpAnalyticsEmptyState";
@@ -130,8 +129,7 @@ export function McpAnalyticsPage() {
.otherwise(() => (
<Tabs
value={tab}
- // Unjustified type cast. FIXME
- onChange={(val) => patchUrlState({ tab: val as McpTab })}
+ onChange={(value) => patchUrlState({ tab: value ?? undefined })}
keepMounted={false}
>
<Tabs.List mb="lg">
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
index c339ea763db..53a6f8922ca 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
@@ -296,8 +296,7 @@ export function ConversationStatsPage() {
<Tabs
variant="pills"
value={metric}
- // Unjustified type cast. FIXME
- onChange={(val) => patchUrlState({ metric: val as UsageStatsMetric })}
+ onChange={(value) => patchUrlState({ metric: value ?? undefined })}
>
<Tabs.List className={S.metricTabs}>
<Tabs.Tab
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.tsx
index c3f984a5bb7..6dad69521d4 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
@@ -19,8 +19,8 @@ export function TabPanel({
dependentsCount,
onTabChange,
}: TabPanelProps) {
- const handleChange = (value: string | null) => {
- if (value === "column-mappings" || value === "dependents") {
+ const handleChange = (value: TabType | null) => {
+ if (value) {
onTabChange(value);
}
};
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx
index 778b29a9265..c17c528a55c 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx
@@ -38,10 +38,9 @@ export const TenantsListingApp = () => {
[data?.data],
);
- const handleTabChange = (tab: string | null) => {
+ const handleTabChange = (tab: ActiveStatus | null) => {
if (tab) {
- // Unjustified type cast. FIXME
- setStatus(tab as ActiveStatus);
+ setStatus(tab);
}
};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
index 24dd8c4749a..346f9b078e6 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
@@ -83,8 +83,7 @@ function ExecutionResultTabs({
value={tab}
onChange={(value) => {
if (value) {
- // Unjustified type cast. FIXME
- onTabChange(value as ResultsTab);
+ onTabChange(value);
}
}}
>
diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
index d490e35b147..7ce60b8f6d8 100644
--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
@@ -75,10 +75,9 @@ export function PeopleListingApp({
: t`Invite someone`
: undefined;
- const handleTabChange = (tab: string | null) => {
+ const handleTabChange = (tab: ActiveStatus | null) => {
if (tab) {
- // Unjustified type cast. FIXME
- updateStatus(tab as ActiveStatus);
+ updateStatus(tab);
}
};
diff --git a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx b/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx
index 4e0b6f9feaa..af794e4172f 100644
--- a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx
+++ b/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx
@@ -8,7 +8,7 @@ type EntityView = "group" | "database";
interface EntityViewSwitchProps {
value: EntityView;
- onChange: (value: string) => void;
+ onChange: (value: EntityView) => void;
}
export const EntityViewSwitch = ({
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx
index 1f067068272..4c51012f67c 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx
@@ -37,8 +37,7 @@ export const PermissionsTabs = ({ tab, onChangeTab }: PermissionsTabsProps) => {
<Tabs
listBorder={false}
value={tab}
- // Unjustified type cast. FIXME
- onChange={(value) => value && onChangeTab(value as PermissionsPageTab)}
+ onChange={(value) => value && onChangeTab(value)}
>
<Tabs.List pl="xl">
{tabs.map((tabOption) => (
diff --git a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx
index 6f38f38d0b7..9a95df55ecd 100644
--- a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx
@@ -222,12 +222,10 @@ export const ParameterSidebar = (): JSX.Element | null => {
}
};
- const handleTabChange = (newTab: string | null) => {
- if (!newTab || (newTab !== "settings" && newTab !== "filters")) {
- return;
+ const handleTabChange = (newTab: "filters" | "settings" | null) => {
+ if (newTab) {
+ setTab(newTab);
}
-
- return setTab(newTab);
};
if (!dashboard || !editingParameter || !parameter) {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
index aa0fe209772..ed932b4e28b 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -100,8 +100,8 @@ const TableSectionBase = ({
const dispatch = useDispatch();
const handleTabChange = useCallback(
- (tab: string | null) => {
- if (!Urls.isDataStudioTableMetadataTab(tab)) {
+ (tab: DataStudioTableMetadataTab | null) => {
+ if (tab == null) {
return;
}
diff --git a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx
index 9ccf511209f..c39e4364b6a 100644
--- a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx
+++ b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx
@@ -213,13 +213,7 @@ export const CommentsSidesheet = ({ params, onClose }: Props) => {
</ActionIcon>
</Flex>
- <Tabs
- value={activeTab}
- onChange={(value) => {
- // Unjustified type cast. FIXME
- setActiveTab(value as SidesheetTab);
- }}
- >
+ <Tabs value={activeTab} onChange={setActiveTab}>
{availableTabs.length > 0 && (
<Tabs.List px="1.625rem" className={S.tabsList}>
<Tabs.Tab value="open" data-testid="comments-open-tab">
diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsx
index 7966b9d9073..fa4f7843826 100644
--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsx
+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsTabs/NotificationsTabs.tsx
@@ -70,7 +70,7 @@ export const NotificationsTabs = ({
});
}
- const handleTabChange = (value: string | null) => {
+ const handleTabChange = (value: NotificationsTab | null) => {
const next = tabs.find((config) => config.value === value);
if (next !== undefined) {
trackAlertsManagementTabClicked(next.value);
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx
index 220f406b274..e4134606d63 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx
@@ -14,7 +14,7 @@ import { DatabasesPanel } from "./Panels/DatabasesPanel";
import { PanelsHeader } from "./Panels/PanelsHeader";
import { trackAddDataEvent } from "./analytics";
import { useAddDataState } from "./use-add-data-state";
-import { type AddDataTab, isValidTab } from "./utils";
+import type { AddDataTab } from "./utils";
interface AddDataModalProps {
opened: boolean;
@@ -88,8 +88,8 @@ const AddDataModalContent = ({
return result;
}, [isHosted]);
- const handleTabChange = (tabValue: string | null) => {
- if (tabValue === activeTab || !isValidTab(tabValue)) {
+ const handleTabChange = (tabValue: AddDataTab | null) => {
+ if (tabValue === null || tabValue === activeTab) {
return;
}
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/utils.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/utils.ts
index a1f64e367fb..bd2118e271c 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/utils.ts
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/utils.ts
@@ -1,7 +1 @@
-const validTabArray = ["db", "csv", "gsheets"] as const;
-const validTabs = new Set<string>(validTabArray);
-
-export type AddDataTab = (typeof validTabArray)[number];
-
-export const isValidTab = (v: string | null): v is AddDataTab =>
- typeof v === "string" && validTabs.has(v);
+export type AddDataTab = "db" | "csv" | "gsheets";
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx
index c8bb3d72b73..29d2231fead 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx
@@ -106,7 +106,9 @@ const VIEW_AS_RELATED_FORMATTING_OPTIONS = new Set(VIEW_AS_FIELDS);
const TAB = {
SETTINGS: "settings",
FORMATTING: "formatting",
-};
+} as const;
+
+type DatasetFieldTab = (typeof TAB)[keyof typeof TAB];
const TAB_OPTIONS = [
{
@@ -154,7 +156,7 @@ function DatasetFieldMetadataSidebarInner({
return values;
}, [field, dataset, modelIndexes]);
- const [tab, setTab] = useState<string>(TAB.SETTINGS);
+ const [tab, setTab] = useState<DatasetFieldTab>(TAB.SETTINGS);
const handleFormattingSettingsChange = useCallback(
(settings: ColumnSettingsType) => {
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx
index b4e2a9a0171..bbd4445f85f 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx
@@ -52,10 +52,9 @@ export function RelativeDatePicker({
const tabs = getAvailableTabs(initialValue, availableDirections);
const direction = getDirection(value);
- const handleTabChange = (tabValue: string | null) => {
- const tab = tabs.find((tab) => tab.direction === tabValue);
- if (tab) {
- setValue(setDirection(value, tab.direction));
+ const handleTabChange = (nextDirection: RelativeIntervalDirection | null) => {
+ if (nextDirection) {
+ setValue(setDirection(value, nextDirection));
}
};
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx
index 4177d9ae65b..691a03f6028 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx
@@ -3,6 +3,7 @@ import { type ReactNode, useMemo, useState } from "react";
import type {
DatePickerOperator,
DatePickerUnit,
+ SpecificDatePickerOperator,
SpecificDatePickerValue,
} from "metabase/querying/common/types";
import { Divider, Flex, PopoverBackButton, Tabs } from "metabase/ui";
@@ -56,10 +57,9 @@ export function SpecificDatePicker({
const hasTimeToggle = canSetTime(value, availableUnits);
const coercedValue = coerceValue(value);
- const handleTabChange = (tabValue: string | null) => {
- const tab = tabs.find((tab) => tab.operator === tabValue);
- if (tab) {
- setValue(setOperator(value, tab.operator));
+ const handleTabChange = (operator: SpecificDatePickerOperator | null) => {
+ if (operator) {
+ setValue(setOperator(value, operator));
}
};
diff --git a/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.tsx
index d51ef6fede5..73215e63767 100644
--- a/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.tsx
+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.tsx
@@ -68,10 +68,9 @@ export function TagEditorSidebar({
const parameters = question.parameters();
const parametersById = _.indexBy(parameters, "id");
- const handleTabChange = (tab: string | null) => {
+ const handleTabChange = (tab: TabId | null) => {
if (tab) {
- // Unjustified type cast. FIXME
- setSection(tab as TabId);
+ setSection(tab);
}
};
diff --git a/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsx b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsx
index 4dff77ff105..7be0737abee 100644
--- a/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsx
+++ b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.stories.tsx
@@ -1,4 +1,5 @@
import { Icon, Tabs, type TabsProps } from "metabase/ui";
+import type { IconName } from "metabase-types/api";
const args = {
orientation: "horizontal",
@@ -25,7 +26,12 @@ const tabs = [
{ value: "segments", label: "Segments", icon: "segment" },
{ value: "actions", label: "Actions", icon: "bolt", disabled: true },
{ value: "filters", label: "Filters", icon: "filter" },
-];
+] satisfies {
+ value: string;
+ label: string;
+ icon: IconName;
+ disabled?: boolean;
+}[];
const DefaultTemplate = (args: TabsProps) => (
<Tabs {...args}>
@@ -52,8 +58,7 @@ const IconsTemplate = (args: TabsProps) => (
key={tab.value}
value={tab.value}
disabled={tab.disabled}
- // Unjustified type cast. FIXME
- leftSection={<Icon name={tab.icon as keyof typeof Icon} />}
+ leftSection={<Icon name={tab.icon} />}
>
{tab.label}
</Tabs.Tab>
diff --git a/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.tsx b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.tsx
index 484b050005e..47b0a874725 100644
--- a/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.tsx
+++ b/frontend/src/metabase/ui/components/navigation/Tabs/Tabs.tsx
@@ -3,7 +3,15 @@ import {
type TabsProps as MantineTabsProps,
} from "@mantine/core";
-export interface TabsProps extends MantineTabsProps {
+export interface TabsProps<T extends string = string> extends Omit<
+ MantineTabsProps,
+ "value" | "defaultValue" | "onChange"
+> {
+ value?: T | null;
+ defaultValue?: T | null;
+ // Need to keep 'null' option here, because Tabs has `allowTabDeactivation`
+ // prop which leads to null value being passed to onChange.
+ onChange?: (value: T | null) => void;
/**
* Whether the tab list renders its own divider line. Only applies to the
* default (underlined) variant; ignored for `pills`, `outline`, etc.
@@ -11,7 +19,12 @@ export interface TabsProps extends MantineTabsProps {
listBorder?: boolean;
}
-function TabsRoot({ listBorder = true, variant, ...props }: TabsProps) {
+function TabsRoot<T extends string = string>({
+ listBorder = true,
+ variant,
+ onChange,
+ ...props
+}: TabsProps<T>) {
const isUnderlinedVariant = variant == null || variant === "default";
const hideListBorder = isUnderlinedVariant && !listBorder;
@@ -19,6 +32,10 @@ function TabsRoot({ listBorder = true, variant, ...props }: TabsProps) {
<MantineTabs
{...props}
variant={variant}
+ // Mantine types the change value as `string | null` because it cannot see
+ // the `Tabs.Tab` values. But we know that the emitted value is always one of those,
+ // so we can safely cast it to the expected type.
+ onChange={onChange as MantineTabsProps["onChange"]}
data-list-border-hidden={hideListBorder || undefined}
/>
);
diff --git a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsx b/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsx
index f2f8d884d8b..3c65c7c3356 100644
--- a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartSettingsWidgetPopover.tsx
@@ -98,7 +98,7 @@ export const ChartSettingsWidgetPopover = ({
px="md"
pt="xs"
value={currentSection}
- onChange={(section) => setCurrentSection(String(section))}
+ onChange={(section) => setCurrentSection(section ?? undefined)}
>
<Tabs.List grow>
{sections.current.map((sectionName) => (