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
Do not render tabs in ParameterSidebar if there's only 1 tab (#63815)
Kamil Mielnikf567aeece159
diff --git a/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsx b/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsxindex 879acf60430..9eb87157245 100644--- a/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsx+++ b/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsx@@ -12,7 +12,7 @@ import { slugify } from "metabase/lib/formatting";import { useSelector } from "metabase/lib/redux";import { hasMapping } from "metabase/parameters/utils/dashboards";import type { IconName } from "metabase/ui";-import { Tabs, Text } from "metabase/ui";+import { Tabs } from "metabase/ui";import { isFilterParameter } from "metabase-lib/v1/parameters/utils/parameter-type";import { parameterHasNoDisplayValue } from "metabase-lib/v1/parameters/utils/parameter-values";import type {@@ -209,36 +209,22 @@ export const ParameterSidebar = (): JSX.Element | null => {data-testid="dashboard-parameter-sidebar"><Tabs radius={0} value={tab} onChange={handleTabChange}>- <Tabs.List grow>- {tabs.length > 1 &&- tabs.map((tab) => {- return (- <Tabs.Tab- pl={0}- pr={0}- pt="md"- pb="md"- value={tab.value}- key={tab.value}- >- {tab.name}- </Tabs.Tab>- );- })}- {tabs.length === 1 && (- <Text- lh="1rem"- pb="md"- pt="md"- fz="md"- fw="bold"- w="100%"- ta="center"- >- {tabs[0].name}- </Text>- )}- </Tabs.List>+ {tabs.length > 1 && (+ <Tabs.List grow>+ {tabs.map((tab) => (+ <Tabs.Tab+ pl={0}+ pr={0}+ pt="md"+ pb="md"+ value={tab.value}+ key={tab.value}+ >+ {tab.name}+ </Tabs.Tab>+ ))}+ </Tabs.List>+ )}<Tabs.Panel pr="md" pl="md" value="settings" key="settings"><ParameterSettingsdiff --git a/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.unit.spec.tsx b/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.unit.spec.tsxindex ad1bb4b5df0..e0e197011ba 100644--- a/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.unit.spec.tsx+++ b/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.unit.spec.tsx@@ -185,10 +185,13 @@ describe("ParameterSidebar", () => {await clickNextParameterButton();- // verify Linked filters tab is not rendered+ // verify tabs are not rendered if there's only 1 tabexpect(screen.queryByRole("tab", { name: "Linked filters" }),).not.toBeInTheDocument();+ expect(+ screen.queryByRole("tab", { name: "Filter settings" }),+ ).not.toBeInTheDocument();// verify tab content corresponds to Filter settingsexpect(