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
rework chart selection ui (#69289)
Aleksandr Lesnenkoe525135245a2
diff --git a/.loki/reference/chrome_laptop_EmbeddingSDK_SdkQuestion_ChartTypeDropdownInner_Question_Chart_Type_Selector_List.png b/.loki/reference/chrome_laptop_EmbeddingSDK_SdkQuestion_ChartTypeDropdownInner_Question_Chart_Type_Selector_List.pngindex 04c2f97045c..2406fcc8f14 100644Binary files a/.loki/reference/chrome_laptop_EmbeddingSDK_SdkQuestion_ChartTypeDropdownInner_Question_Chart_Type_Selector_List.png and b/.loki/reference/chrome_laptop_EmbeddingSDK_SdkQuestion_ChartTypeDropdownInner_Question_Chart_Type_Selector_List.png differdiff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Pin_To_Zero.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Pin_To_Zero.pngindex a407dd05066..15d4fd75e5c 100644Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Pin_To_Zero.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Pin_To_Zero.png differdiff --git a/docs/questions/visualizations/visualizing-results.md b/docs/questions/visualizations/visualizing-results.mdindex c5697079154..7be8dd7d2f3 100644--- a/docs/questions/visualizations/visualizing-results.md+++ b/docs/questions/visualizations/visualizing-results.md@@ -36,7 +36,7 @@ To change how the answer to your question is displayed, click on the **Visualiza-If a particular visualization doesn't make sense for your answer, that option will appear in the "Other charts" section. You can still select one of these other charts, though you might need to fiddle with the chart options to make the chart work with your data.+If a particular visualization doesn't make sense for your answer, that option will appear in the "More charts" section. You can still select one of these other charts, though you might need to fiddle with the chart options to make the chart work with your data.Not sure which visualization type to use? Check out [Which chart should you use?](https://www.metabase.com/learn/metabase-basics/querying-and-dashboards/visualization/chart-guide)diff --git a/e2e/test/scenarios/models/reproductions.cy.spec.ts b/e2e/test/scenarios/models/reproductions.cy.spec.tsindex 70562623a57..ad5d64ecbee 100644--- a/e2e/test/scenarios/models/reproductions.cy.spec.ts+++ b/e2e/test/scenarios/models/reproductions.cy.spec.ts@@ -1337,6 +1337,7 @@ describe("issue 46221", () => {cy.log("Change the viz type");H.openVizTypeSidebar();cy.findByTestId("sidebar-left").within(() => {+ cy.findByTestId("more-charts-toggle").click();cy.findByTestId("Table-button").click();});diff --git a/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.js b/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.jsindex 274302c2a48..340edb19640 100644--- a/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.js+++ b/e2e/test/scenarios/onboarding/setup/user_settings.cy.spec.js@@ -313,7 +313,7 @@ describe("user > settings", () => {cy.findByTestId("viz-type-button").click();cy.findByTestId("sidebar-left")- .findByText("Other charts")+ .findByText("More charts").then(($text) => {cy.wrap(win.getComputedStyle($text[0]).color).should("eq",@@ -345,7 +345,7 @@ describe("user > settings", () => {cy.findByTestId("viz-type-button").click();cy.findByTestId("sidebar-left")- .findByText("Other charts")+ .findByText("More charts").then(($text) => {cy.wrap(win.getComputedStyle($text[0]).color).should("eq",diff --git a/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.js b/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.jsindex 80837bd3eac..422650c491a 100644--- a/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.js+++ b/e2e/test/scenarios/permissions/permissions-reproductions.cy.spec.js@@ -290,10 +290,13 @@ describe("UI elements that make no sense for users without data permissions (metcy.findByText("Visualization").click();cy.findByTestId("display-options-sensible");- cy.icon("line").click();- cy.findByTestId("Line-button").realHover();- cy.findByTestId("Line-container").within(() => {- cy.icon("gear").click();+ H.leftSidebar().within(() => {+ cy.findByTestId("more-charts-toggle").click();+ cy.icon("line").click();+ cy.findByTestId("Line-button").realHover();+ cy.findByTestId("Line-container").within(() => {+ cy.icon("gear").click();+ });});cy.findByTextEnsureVisible("Line options");diff --git a/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js b/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.jsindex ea909022736..e295f0d39a7 100644--- a/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js+++ b/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js@@ -903,7 +903,10 @@ describe("issues 11914, 18978, 18977, 23857", () => {cy.log("Make sure user can change visualization but not save the question");H.openVizTypeSidebar();- cy.findByTestId("Number-button").click();+ H.leftSidebar().within(() => {+ cy.findByTestId("more-charts-toggle").click();+ cy.icon("number").click();+ });cy.findByTestId("scalar-value").should("exist");assertSaveIsDisabled();diff --git a/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.js b/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.jsindex ead06309811..fd3edc32559 100644--- a/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.js+++ b/e2e/test/scenarios/question-reproductions/reproductions-3.cy.spec.js@@ -1426,7 +1426,10 @@ describe("issue 44637", () => {H.assertQueryBuilderRowCount(0);H.queryBuilderMain().findByText("No results!").should("exist");H.queryBuilderFooter().button("Visualization").click();- H.leftSidebar().icon("bar").click();+ H.leftSidebar().within(() => {+ cy.findByTestId("more-charts-toggle").click();+ cy.icon("bar").click();+ });H.queryBuilderMain().within(() => {cy.findByText("No results!").should("exist");cy.findByText("Something's gone wrong").should("not.exist");diff --git a/e2e/test/scenarios/visualizations-charts/maps.cy.spec.js b/e2e/test/scenarios/visualizations-charts/maps.cy.spec.jsindex 96561f28ebd..86b2311f4cc 100644--- a/e2e/test/scenarios/visualizations-charts/maps.cy.spec.js+++ b/e2e/test/scenarios/visualizations-charts/maps.cy.spec.js@@ -22,7 +22,10 @@ describe("scenarios > visualizations > maps", () => {// switch to a pin map visualization// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.contains("Visualization").click();- cy.icon("pinmap").click();+ H.leftSidebar().within(() => {+ cy.findByTestId("more-charts-toggle").click();+ cy.icon("pinmap").click();+ });cy.findByTestId("Map-container").within(() => {cy.icon("gear").click();});@@ -76,9 +79,8 @@ describe("scenarios > visualizations > maps", () => {);cy.button("Visualization").click();- cy.findByTestId("display-options-sensible").as("sensibleOptions");- cy.get("@sensibleOptions").within(() => {+ cy.findByTestId("chart-type-settings").within(() => {cy.findByText("Map").should("be.visible");});});@@ -352,10 +354,7 @@ describe("scenarios > visualizations > maps", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("Visualization").click();- // Ensure the Map visualization is sensible- cy.findByTestId("display-options-sensible").as("sensibleOptions");-- cy.get("@sensibleOptions").within(() => {+ cy.findByTestId("chart-type-settings").within(() => {cy.findByTestId("Map-button").should("be.visible");});});diff --git a/e2e/test/scenarios/visualizations-charts/waterfall.cy.spec.js b/e2e/test/scenarios/visualizations-charts/waterfall.cy.spec.jsindex 362bd47f747..0d53d94b017 100644--- a/e2e/test/scenarios/visualizations-charts/waterfall.cy.spec.js+++ b/e2e/test/scenarios/visualizations-charts/waterfall.cy.spec.js@@ -481,7 +481,16 @@ describe("scenarios > visualizations > waterfall", () => {});const switchToWaterfallDisplay = () => {- cy.icon("waterfall").click();+ H.leftSidebar().within(() => {+ cy.findByTestId("more-charts-toggle").then(($toggle) => {+ if (+ $toggle.closest("[aria-expanded]").attr("aria-expanded") === "false"+ ) {+ cy.wrap($toggle).click();+ }+ });+ cy.icon("waterfall").click();+ });cy.findByTestId("Waterfall-container").within(() => {cy.icon("gear").click();});diff --git a/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.jsindex 8f469cea04a..a6b88e61a91 100644--- a/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.js+++ b/e2e/test/scenarios/visualizations-tabular/drillthroughs/chart_drill.cy.spec.js@@ -333,7 +333,10 @@ describe("scenarios > visualizations > drillthroughs > chart drill", () => {});H.visualize();cy.button("Visualization").click();- cy.icon("line").click();+ H.leftSidebar().within(() => {+ cy.findByTestId("more-charts-toggle").click();+ cy.icon("line").click();+ });cy.button("Done").click();cy.log("Mid-point assertion");// at this point, filter is displaying correctly with the name@@ -438,7 +441,10 @@ describe("scenarios > visualizations > drillthroughs > chart drill", () => {);cy.button("Visualization").click();- cy.findByTestId("Line-button").click();+ H.leftSidebar().within(() => {+ cy.findByTestId("more-charts-toggle").click();+ cy.icon("line").click();+ });cy.findByText("Cannot read properties of undefined (reading 'name')",).should("not.exist");diff --git a/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.jsindex 4d2d595d101..d46c961912a 100644--- a/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.js+++ b/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.js@@ -820,6 +820,7 @@ describe("scenarios > visualizations > pivot tables", { tags: "@slow" }, () => {// cy.findByText("Pivot Table")// .parent()// .should("have.css", "opacity", "1");+ cy.findByTestId("more-charts-toggle").click();cy.icon("pivot_table").click({ force: true });});diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsxindex 1626a4d4c49..5072961677c 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsx@@ -133,7 +133,7 @@ export const ChartTypeDropdownInner = (props: ChartTypeDropdownInnerProps) => {</Menu.Item>))}- <Menu.Label>{t`Other charts`}</Menu.Label>+ <Menu.Label>{t`More charts`}</Menu.Label>{nonsensibleItems.map(({ iconName, label, value }, index) => (<Menu.Itemkey={`${value}/${index}`}diff --git a/frontend/src/metabase-lib/v1/types/utils/isa.js b/frontend/src/metabase-lib/v1/types/utils/isa.jsindex 9971c8e99b3..fb140f4e981 100644--- a/frontend/src/metabase-lib/v1/types/utils/isa.js+++ b/frontend/src/metabase-lib/v1/types/utils/isa.js@@ -121,7 +121,11 @@ const hasNonMetricName = (col) => {export const isDimension = (col) =>col && (col.source !== "aggregation" || !!col.binning_info); // columns with binning_info are always dimensions (they represent categorical buckets)export const isMetric = (col) =>- col && col.source !== "breakout" && isSummable(col) && !hasNonMetricName(col);+ col &&+ col.source !== "breakout" &&+ isSummable(col) &&+ !hasNonMetricName(col) &&+ !col.binning_info; // do not treat column with binning_info as metric by default (metabase#10493)/*** @param {Field | DatasetColumn} fielddiff --git a/frontend/src/metabase-types/api/mocks/dataset.ts b/frontend/src/metabase-types/api/mocks/dataset.tsindex 858d5537dd7..03e460f3d93 100644--- a/frontend/src/metabase-types/api/mocks/dataset.ts+++ b/frontend/src/metabase-types/api/mocks/dataset.ts@@ -54,6 +54,22 @@ export const createMockNumericColumn = (data: Partial<DatasetColumn> = {}) =>...data,});+export const createMockLatitudeColumn = (data: Partial<DatasetColumn> = {}) =>+ createMockColumn({+ base_type: "type/Float",+ effective_type: "type/Float",+ semantic_type: "type/Latitude",+ ...data,+ });++export const createMockLongitudeColumn = (data: Partial<DatasetColumn> = {}) =>+ createMockColumn({+ base_type: "type/Float",+ effective_type: "type/Float",+ semantic_type: "type/Longitude",+ ...data,+ });+export const createMockDatasetData = ({cols = [createMockColumn({diff --git a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsxindex 2773ee64c93..08d1e8a06fe 100644--- a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx+++ b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx@@ -156,7 +156,7 @@ export const EmbedQuestionSettingsSidebar = ({{nonsensibleItems.length > 0 && (<>- <Menu.Label>{t`Other charts`}</Menu.Label>+ <Menu.Label>{t`More charts`}</Menu.Label>{nonsensibleItems.map(({ iconName, label, value }, index) => (<Menu.Itemdiff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.module.css b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.module.cssnew file mode 100644index 00000000000..7d75446efd2--- /dev/null+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.module.css@@ -0,0 +1,11 @@+.moreChartsHeader {+ width: fit-content;+ border-radius: var(--mantine-radius-md);+ padding: 0.25rem 0.75rem;+ color: var(--mb-color-text-secondary);++ &:hover {+ color: var(--mb-color-brand);+ background-color: var(--mb-color-background-hover);+ }+}diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsxindex ad4b62f6c22..fc1626248d2 100644--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsx+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsx@@ -1,9 +1,12 @@import { t } from "ttag";+import { CollapseSection } from "metabase/common/components/CollapseSection";import { Space, Stack, type StackProps, Text } from "metabase/ui";import { ChartTypeList, type ChartTypeListProps } from "../ChartTypeList";+import S from "./ChartTypeSettings.module.css";+export type ChartTypeSettingsProps = {sensibleVisualizations: ChartTypeListProps["visualizationList"];nonSensibleVisualizations: ChartTypeListProps["visualizationList"];@@ -20,33 +23,49 @@ export const ChartTypeSettings = ({nonSensibleVisualizations,onOpenSettings,...stackProps-}: ChartTypeSettingsProps) => (- <Stack data-testid="chart-type-settings" {...stackProps}>- <ChartTypeList- data-testid="display-options-sensible"- visualizationList={sensibleVisualizations}- onSelectVisualization={onSelectVisualization}- selectedVisualization={selectedVisualization}- onOpenSettings={onOpenSettings}- />-- <Space h="xl" />-- <Text- fw="bold"- color="text-secondary"- tt="uppercase"- fz="sm"- >{t`Other charts`}</Text>+}: ChartTypeSettingsProps) => {+ return (+ <Stack data-testid="chart-type-settings" {...stackProps}>+ <ChartTypeList+ data-testid="display-options-sensible"+ visualizationList={sensibleVisualizations}+ onSelectVisualization={onSelectVisualization}+ selectedVisualization={selectedVisualization}+ onOpenSettings={onOpenSettings}+ />- <Space h="sm" />+ <Space h="xl" />- <ChartTypeList- data-testid="display-options-not-sensible"- visualizationList={nonSensibleVisualizations}- onSelectVisualization={onSelectVisualization}- selectedVisualization={selectedVisualization}- onOpenSettings={onOpenSettings}- />- </Stack>-);+ <CollapseSection+ header={+ <Text+ fw="bold"+ c="inherit"+ tt="uppercase"+ fz="sm"+ data-testid="more-charts-toggle"+ >{t`More charts`}</Text>+ }+ headerClass={S.moreChartsHeader}+ initialState={+ nonSensibleVisualizations.includes(selectedVisualization)+ ? "expanded"+ : "collapsed"+ }+ iconPosition="right"+ iconSize={10}+ >+ <>+ <Space h="md" />+ <ChartTypeList+ data-testid="display-options-not-sensible"+ visualizationList={nonSensibleVisualizations}+ onSelectVisualization={onSelectVisualization}+ selectedVisualization={selectedVisualization}+ onOpenSettings={onOpenSettings}+ />+ </>+ </CollapseSection>+ </Stack>+ );+};diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsxindex 643e4e5cd20..5e4338aa06e 100644--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsx@@ -37,17 +37,41 @@ const setup = ({};describe("ChartTypeSettings", () => {- it("renders the sensible and non-sensible visualizations with an `Other charts` label", () => {+ it("renders the sensible visualizations and a `More charts` toggle", () => {setup();expect(screen.getByTestId("display-options-sensible")).toBeInTheDocument();- expect(screen.getByText("Other charts")).toBeInTheDocument();+ expect(screen.getByText("More charts")).toBeInTheDocument();+ });++ it("collapses the More charts section by default when selected viz is sensible", () => {+ setup({ selectedVisualization: "bar" });+ expect(+ screen.getByRole("button", { name: /more charts/i }),+ ).toBeInTheDocument();+ expect(getIcon("chevronright")).toBeInTheDocument();+ });++ it("expands the More charts section by default when selected viz is non-sensible", () => {+ setup({ selectedVisualization: "pie" });+ expect(getIcon("chevrondown")).toBeInTheDocument();expect(screen.getByTestId("display-options-not-sensible"),).toBeInTheDocument();});+ it("toggles the More charts section when the header is clicked", async () => {+ setup({ selectedVisualization: "bar" });+ expect(getIcon("chevronright")).toBeInTheDocument();++ await userEvent.click(screen.getByRole("button", { name: /more charts/i }));+ expect(getIcon("chevrondown")).toBeInTheDocument();++ await userEvent.click(screen.getByRole("button", { name: /more charts/i }));+ expect(getIcon("chevronright")).toBeInTheDocument();+ });+it("passes correct props to ChartTypeLists", () => {- setup();+ setup({ selectedVisualization: "pie" });const sensibleList = screen.getByTestId("display-options-sensible");const nonSensibleList = screen.getByTestId("display-options-not-sensible");@@ -74,8 +98,10 @@ describe("ChartTypeSettings", () => {});it("calls onSelectVisualization when a non-sensible visualization is selected", async () => {- const { onSelectVisualization } = setup();- await userEvent.click(getIcon("pie"));- expect(onSelectVisualization).toHaveBeenCalledWith("pie");+ const { onSelectVisualization } = setup({+ selectedVisualization: "pie",+ });+ await userEvent.click(getIcon("bubble"));+ expect(onSelectVisualization).toHaveBeenCalledWith("scatter");});});diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/index.ts b/frontend/src/metabase/query_builder/components/chart-type-selector/index.tsindex 7e2cf1a896c..ecba5a1ca8e 100644--- a/frontend/src/metabase/query_builder/components/chart-type-selector/index.ts+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/index.ts@@ -1,3 +1,4 @@+export * from "./sensibility-grouping";export * from "./ChartTypeList";export * from "./ChartTypeOption";export * from "./ChartTypeSettings";diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/sensibility-grouping.ts b/frontend/src/metabase/query_builder/components/chart-type-selector/sensibility-grouping.tsnew file mode 100644index 00000000000..cf7038205a5--- /dev/null+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/sensibility-grouping.ts@@ -0,0 +1,155 @@+import _ from "underscore";++import visualizations from "metabase/visualizations";+import {+ hasLatitudeAndLongitudeColumns,+ isCountry,+ isDate,+ isDimension,+ isLatitude,+ isLongitude,+ isMetric,+ isState,+} from "metabase-lib/v1/types/utils/isa";+import type { CardDisplayType, DatasetData } from "metabase-types/api";++const MAX_RECOMMENDED = 12;++export type VisualizationSensibility =+ | "recommended"+ | "sensible"+ | "nonsensible";++export type SensibilityGroups = Record<+ VisualizationSensibility,+ CardDisplayType[]+>;++export function groupVisualizationsBySensibility({+ orderedVizTypes,+ data,+}: {+ orderedVizTypes: CardDisplayType[];+ data: DatasetData;+}): SensibilityGroups {+ const groups: SensibilityGroups = {+ recommended: [],+ sensible: [],+ nonsensible: [],+ };++ for (const vizType of orderedVizTypes) {+ const viz = visualizations.get(vizType);+ if (viz?.isSensible?.(data)) {+ groups.sensible.push(vizType);+ } else {+ groups.nonsensible.push(vizType);+ }+ }++ const recommended = _.uniq(+ getRecommendedVisualizations(data, groups.sensible),+ ); //uniq just in case+ const sensibleRecommendations = recommended.filter((vizType) =>+ groups.sensible.includes(vizType),+ );+ groups.recommended = sensibleRecommendations;+ groups.sensible = groups.sensible.filter(+ (vizType) => !sensibleRecommendations.includes(vizType),+ );++ while (groups.recommended.length > MAX_RECOMMENDED) {+ const overflow = groups.recommended.pop()!;+ groups.sensible.unshift(overflow);+ }++ return groups;+}++function getRecommendedVisualizations(+ data: DatasetData,+ sensible: CardDisplayType[],+): CardDisplayType[] {+ const { cols, rows } = data;+ const metricCount = cols.filter(isMetric).length;+ const dimensionCount = cols.filter(isDimension).length;+ const hasGeo =+ hasLatitudeAndLongitudeColumns(cols) ||+ cols.some(isCountry) ||+ cols.some(isState);+ const nonLatLongDimensionCount = cols.filter(+ (col) => isDimension(col) && !isLatitude(col) && !isLongitude(col),+ ).length;+ const hasDateDimension = cols.some((col) => isDimension(col) && isDate(col));++ if (rows.length === 1 && cols.length === 1 && metricCount === 1) {+ return ["scalar", "gauge", "progress"];+ }+ if (rows.length === 1 && cols.length === 1 && metricCount === 0) {+ return ["table", "object", "scalar"];+ }+ if (+ rows.length === 1 &&+ cols.length > 1 &&+ (metricCount === 0 || dimensionCount === 0)+ ) {+ return ["table", "object"];+ }+ if (cols.length <= 1) {+ return ["table"];+ }+ if (metricCount === 0) {+ return ["table", "pivot"];+ }+ // recommended visualizations for unaggregated tables+ // for a native query, we don't know if there are aggregations, but we assume that there are+ // that means we may recommend an e.g. line chart even if the native query is just `select * from tbl`+ // but that's better than not recommending a relevant viz for a native query like `select c1, sum(c2) from tbl`+ if (+ !cols.some((col) => col.source === "aggregation" || col.source === "native")+ ) {+ return ["table", "object", "map", "scatter"];+ }+ const recommended: CardDisplayType[] = [];+ if (hasGeo) {+ recommended.push("map");+ // table, pivot, and scatter are also recommended for geo+ // but we'll add them below, because order is important+ // if we also have a date dimension, we want e.g. line to come before them+ }+ if (hasDateDimension) {+ recommended.push(+ "line",+ "area",+ "bar",+ "combo",+ "smartscalar",+ "row",+ "waterfall",+ "scatter",+ "pie",+ "table",+ "pivot",+ );+ } else if (nonLatLongDimensionCount > 0) {+ recommended.push(+ "bar",+ "row",+ "pie",+ "line",+ "area",+ "combo",+ "waterfall",+ "scatter",+ "table",+ "pivot",+ );+ } else if (hasGeo) {+ recommended.push("table", "pivot", "scatter");+ }+ if (sensible.includes("sankey")) {+ // the sankey sensibility check is quite robust, so we recommend it whenever it's sensible+ recommended.push("sankey");+ }+ return recommended;+}diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/sensibility-grouping.unit.spec.ts b/frontend/src/metabase/query_builder/components/chart-type-selector/sensibility-grouping.unit.spec.tsnew file mode 100644index 00000000000..adef15b415e--- /dev/null+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/sensibility-grouping.unit.spec.ts@@ -0,0 +1,289 @@+import registerVisualizations from "metabase/visualizations/register";+import {+ createMockCategoryColumn,+ createMockDatasetData,+ createMockDatetimeColumn,+ createMockLatitudeColumn,+ createMockLongitudeColumn,+ createMockNumericColumn,+} from "metabase-types/api/mocks";++import { groupVisualizationsBySensibility } from "./sensibility-grouping";+import { DEFAULT_VIZ_ORDER } from "./viz-order";++registerVisualizations();++function createMockMetrics(count: number, isNative: boolean) {+ return Array.from({ length: count }, (_, i) =>+ createMockNumericColumn({+ name: `Metric${i + 1}`,+ source: isNative ? "native" : "aggregation",+ }),+ );+}++function createMockMetricValues(i: number, count: number) {+ return Array.from({ length: count }, (_, j) => i * count + j);+}++function createMockDateDimensions(count: number, isNative: boolean) {+ return Array.from({ length: count }, (_, i) =>+ createMockDatetimeColumn({+ name: `Date${i + 1}`,+ display_name: `Date${i + 1}`,+ source: isNative ? "native" : "breakout",+ }),+ );+}++function createMockDateValues(i: number, count: number) {+ return Array.from({ length: count }, (_, j) =>+ new Date(2026, i * count + j, 1).toISOString(),+ );+}++function createMockStringDimensions(count: number, isNative: boolean) {+ return Array.from({ length: count }, (_, i) =>+ createMockCategoryColumn({+ name: `Category${i + 1}`,+ display_name: `Category${i + 1}`,+ source: isNative ? "native" : "breakout",+ semantic_type: isNative ? undefined : "type/Category",+ }),+ );+}++function createMockStringValues(i: number, count: number) {+ return Array.from({ length: count }, (_, j) => `String${i * count + j}`);+}++function createMockLatLongDimensions(latLong: boolean, isNative: boolean) {+ if (!latLong) {+ return [];+ }+ if (isNative) {+ return [+ createMockNumericColumn({+ name: "Latitude",+ display_name: "Latitude",+ source: "native",+ }),+ createMockNumericColumn({+ name: "Longitude",+ display_name: "Longitude",+ source: "native",+ }),+ ];+ }+ return [+ createMockLatitudeColumn({+ name: "Latitude",+ display_name: "Latitude",+ source: "breakout",+ }),+ createMockLongitudeColumn({+ name: "Longitude",+ display_name: "Longitude",+ source: "breakout",+ }),+ ];+}++function createMockLatLongValues(i: number, latLong: boolean) {+ return latLong ? [30 + i, -80 + i] : [];+}++function createMockData({+ numRows = 10,+ numMetrics = 0,+ numDateDimensions = 0,+ numStringDimensions = 0,+ latLong = false,+ isNative = false,+}: {+ numRows?: number;+ numMetrics?: number;+ numDateDimensions?: number;+ numStringDimensions?: number;+ latLong?: boolean;+ isNative?: boolean;+}) {+ const dateCols = createMockDateDimensions(numDateDimensions, isNative);+ return createMockDatasetData({+ cols: [+ ...createMockMetrics(numMetrics, isNative),+ ...dateCols,+ ...createMockStringDimensions(numStringDimensions, isNative),+ ...createMockLatLongDimensions(latLong, isNative),+ ],+ rows: Array.from({ length: numRows }, (_, i) => [+ ...createMockMetricValues(i, numMetrics),+ ...createMockDateValues(i, numDateDimensions),+ ...createMockStringValues(i, numStringDimensions),+ ...createMockLatLongValues(i, latLong),+ ]),+ insights: dateCols.map((col) => ({+ col: col.name,+ unit: "month",+ offset: 0,+ slope: 0,+ "last-change": 0,+ "last-value": 0,+ "previous-value": 0,+ })),+ });+}++const testCases = [+ {+ numRows: 1,+ numMetrics: 1,+ numDateDimensions: 0,+ numStringDimensions: 0,+ latLong: false,+ expectedRecommended: ["scalar", "gauge", "progress"],+ },+ {+ numRows: 10,+ numMetrics: 1,+ numDateDimensions: 1,+ numStringDimensions: 0,+ latLong: false,+ expectedRecommended: [+ "line",+ "area",+ "bar",+ "combo",+ "smartscalar",+ "row",+ "waterfall",+ "scatter",+ "pie",+ "table",+ "pivot",+ ],+ },+ {+ numRows: 10,+ numMetrics: 1,+ numDateDimensions: 0,+ numStringDimensions: 1,+ latLong: false,+ expectedRecommended: [+ "bar",+ "row",+ "pie",+ "line",+ "area",+ "combo",+ "waterfall",+ "scatter",+ "table",+ "pivot",+ ],+ },+ {+ numRows: 10,+ numMetrics: 1,+ numDateDimensions: 1,+ numStringDimensions: 1,+ latLong: false,+ expectedRecommended: [+ "line",+ "area",+ "bar",+ "combo",+ "row",+ "scatter",+ "pie",+ "table",+ "pivot",+ ],+ },+ {+ numRows: 10,+ numMetrics: 1,+ numDateDimensions: 0,+ numStringDimensions: 0,+ latLong: true,+ expectedRecommended: ["map", "table", "pivot", "scatter"],+ // lat/long looks the same as two metrics in a native query+ expectedNativeRecommended: [+ "bar",+ "row",+ "pie",+ "line",+ "area",+ "combo",+ "scatter",+ "table",+ ],+ },+];++describe("groupVisualizationsBySensibility", () => {+ describe.each([false, true])("isNative=%s", (isNative) => {+ it.each(testCases)(+ "recommends the correct visualizations for $numRows row(s), $numMetrics metric(s), $numDateDimensions date dim(s), $numStringDimensions string dim(s), $latLong lat/long dims",+ ({+ numRows,+ numMetrics,+ numDateDimensions,+ numStringDimensions,+ latLong,+ expectedRecommended,+ expectedNativeRecommended,+ }) => {+ const data = createMockData({+ numRows,+ numMetrics,+ numDateDimensions,+ numStringDimensions,+ latLong,+ isNative,+ });++ const { recommended } = groupVisualizationsBySensibility({+ orderedVizTypes: DEFAULT_VIZ_ORDER,+ data,+ });++ // pivot is not supported for native queries+ const finalExpectedRecommended = isNative+ ? (expectedNativeRecommended ??+ expectedRecommended.filter((v) => v !== "pivot"))+ : expectedRecommended;++ expect(recommended).toStrictEqual(finalExpectedRecommended);+ },+ );+ });+ it("recommends the correct visualizations for an unaggregated table", () => {+ const data = createMockDatasetData({+ cols: [+ createMockCategoryColumn({+ name: "Col1",+ display_name: "Col1",+ source: "fields",+ }),+ createMockNumericColumn({+ name: "Col2",+ display_name: "Col2",+ source: "fields",+ }),+ ],+ rows: [+ ["a", 2],+ ["b", 4],+ ["c", 6],+ ],+ });++ const { recommended } = groupVisualizationsBySensibility({+ orderedVizTypes: DEFAULT_VIZ_ORDER,+ data,+ });++ expect(recommended).toStrictEqual(["table", "object", "map", "scatter"]);+ });+});diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/use-question-visualization-state.ts b/frontend/src/metabase/query_builder/components/chart-type-selector/use-question-visualization-state.tsindex 17df994995d..a24e11b79dc 100644--- a/frontend/src/metabase/query_builder/components/chart-type-selector/use-question-visualization-state.ts+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/use-question-visualization-state.ts@@ -2,7 +2,7 @@ import { useCallback } from "react";import _ from "underscore";import visualizations from "metabase/visualizations";-import { sanatizeResultData } from "metabase/visualizations/shared/utils/data";+import { sanitizeResultData } from "metabase/visualizations/shared/utils/data";import type Question from "metabase-lib/v1/Question";import {type CardDisplayType,@@ -10,6 +10,7 @@ import {isCardDisplayType,} from "metabase-types/api";+import { groupVisualizationsBySensibility } from "./sensibility-grouping";import { DEFAULT_VIZ_ORDER } from "./viz-order";export type UseQuestionVisualizationStateProps = {@@ -47,23 +48,6 @@ export const useQuestionVisualizationState = ({};};-type IsSensibleVisualizationProps = {- result: Dataset | null;- vizType: CardDisplayType;-};--const isSensibleVisualization = ({- result,- vizType,-}: IsSensibleVisualizationProps) => {- const visualization = visualizations.get(vizType);- return (- (result?.data &&- visualization?.isSensible?.(sanatizeResultData(result.data))) ||- false- );-};-export type GetSensibleVisualizationsProps = {result: Dataset | null;};@@ -78,9 +62,27 @@ export const getSensibleVisualizations = ({const orderedVizTypes = _.union(DEFAULT_VIZ_ORDER, availableVizTypes);+ if (result?.data) {+ const sanitizedData = sanitizeResultData(result.data);++ const { recommended, sensible, nonsensible } =+ groupVisualizationsBySensibility({+ orderedVizTypes,+ data: sanitizedData,+ });++ return {+ sensibleVisualizations: recommended,+ nonSensibleVisualizations: [...sensible, ...nonsensible],+ };+ }+const [sensibleVisualizations, nonSensibleVisualizations] = _.partition(orderedVizTypes,- (vizType) => isSensibleVisualization({ result, vizType }),+ (vizType) => {+ const viz = visualizations.get(vizType);+ return Boolean(viz?.isSensible);+ },);return { sensibleVisualizations, nonSensibleVisualizations };diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/viz-order.ts b/frontend/src/metabase/query_builder/components/chart-type-selector/viz-order.tsindex c36f01293f6..ca9d9218cad 100644--- a/frontend/src/metabase/query_builder/components/chart-type-selector/viz-order.ts+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/viz-order.ts@@ -18,4 +18,6 @@ export const DEFAULT_VIZ_ORDER: CardDisplayType[] = ["map","scatter","waterfall",+ "boxplot",+ "sankey",] as const;diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsxindex e81c106c969..dc9a35d282b 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx@@ -602,6 +602,7 @@ describe("QueryBuilder - unsaved changes warning", () => {await userEvent.click(screen.getByRole("button", { name: "Visualization" }),);+ await userEvent.click(screen.getByTestId("more-charts-toggle"));await userEvent.click(screen.getByTestId("Detail-button"));await waitForSaveToBeEnabled();diff --git a/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts b/frontend/src/metabase/visualizations/components/EmptyVizState/utils.tsindex 8da8b7a8de4..d71147653ed 100644--- a/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts+++ b/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts@@ -205,10 +205,10 @@ const emptyVizConfig: Record<SupportedDisplayType, EmptyVizConfig> = {);},get primaryText() {- return t`Then pick a metric and a number columns to group by.`;+ return t`Then pick one or more metrics and a column to group by.`;},get secondaryText() {- return t`E.g. Count of orders grouped by Customer age`;+ return t`E.g. Count of orders and Sum of revenue grouped by Product category`;},},smartscalar: {diff --git a/frontend/src/metabase/visualizations/lib/utils.js b/frontend/src/metabase/visualizations/lib/utils.jsindex df514194d68..b8ec747dd08 100644--- a/frontend/src/metabase/visualizations/lib/utils.js+++ b/frontend/src/metabase/visualizations/lib/utils.js@@ -4,7 +4,12 @@ import _ from "underscore";import { isNotNull } from "metabase/lib/types";import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";-import { isDate, isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";+import {+ isCoordinate,+ isDate,+ isDimension,+ isMetric,+} from "metabase-lib/v1/types/utils/isa";export const MAX_SERIES = 100;export const MAX_REASONABLE_SANKEY_DIMENSION_CARDINALITY = 100;@@ -284,11 +289,9 @@ export function getSingleSeriesDimensionsAndMetrics(// in MBQL queries that are broken out, metrics and dimensions are mutually exclusive// in SQL queries and raw MBQL queries metrics are numeric, summable, non-PK/FK and dimensions can be anything- const metricColumns = cols.filter(- (col) => isMetric(col) && !col.binning_info, // do not treat column with binning_info as metric by default (metabase#10493)- );+ const metricColumns = cols.filter((col) => isMetric(col));const dimensionNotMetricColumns = cols.filter(- (col) => isDimension(col) && !metricColumns.find((item) => item === col),+ (col) => isDimension(col) && !isMetric(col),);if (dimensionNotMetricColumns.length <= maxDimensions &&@@ -470,7 +473,7 @@ export function findSensibleSankeyColumns(data) {if (!acc.metricColumn) {acc.metricColumn = col;}- } else if (isDimension(col) && !isDate(col)) {+ } else if (isDimension(col) && !isDate(col) && !isCoordinate(col)) {// Limited quick cardinality check before doing full computationconst uniqueValues = new Set();const rowsToQuickCheck = Math.min(diff --git a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.tsindex 6743aeae476..73c979eafd1 100644--- a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts+++ b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts@@ -11,7 +11,9 @@ import { getCardsSeriesModels } from "metabase/visualizations/echarts/cartesian/import { dimensionIsNumeric } from "metabase/visualizations/lib/numeric";import { dimensionIsTimeseries } from "metabase/visualizations/lib/timeseries";import {+ MAX_SERIES,columnsAreValid,+ getColumnCardinality,getDefaultDimensionsAndMetrics,preserveExistingColumnsOrder,} from "metabase/visualizations/lib/utils";@@ -377,22 +379,62 @@ export const getDefaultGoalLabel = () => t`Goal`;* @returns object containing column names*/export function getDefaultScatterColumns(data: DatasetData) {- const dimensions = data.cols.filter(isDimension);- const metrics = data.cols.filter(isMetric);+ const { cols, rows } = data;+ const dimensions = cols.filter(isDimension);+ const metrics = cols.filter(isMetric);++ let colorDimension; // used for color+ let xAxisDimension; // only used when there's only one metric+ if (dimensions.length === 2) {+ const cardinality0 = getColumnCardinality(+ cols,+ rows,+ cols.indexOf(dimensions[0]),+ );+ const cardinality1 = getColumnCardinality(+ cols,+ rows,+ cols.indexOf(dimensions[1]),+ );+ if (cardinality0 <= cardinality1 && cardinality0 <= MAX_SERIES) {+ colorDimension = dimensions[0].name;+ xAxisDimension = dimensions[1].name;+ } else if (cardinality0 <= cardinality1) {+ xAxisDimension = dimensions[0].name;+ } else if (cardinality1 <= MAX_SERIES) {+ colorDimension = dimensions[1].name;+ xAxisDimension = dimensions[0].name;+ } else {+ xAxisDimension = dimensions[1].name;+ }+ } else if (dimensions.length === 1) {+ xAxisDimension = dimensions[0].name;+ }- if (dimensions.length === 2 && metrics.length < 2) {+ if (metrics.length === 3 || metrics.length === 2) {return {- dimensions: [dimensions[0].name],- metrics: [dimensions[1].name],- bubble: metrics.length === 1 ? metrics[0].name : null,+ dimensions: colorDimension+ ? [metrics[0].name, colorDimension]+ : [metrics[0].name],+ metrics: [metrics[1].name],+ // we could use the third metric as the bubble, but it could break existing charts+ // since scatter.bubble doesn't have persistDefault set like graph.dimensions and graph.metrics+ bubble: null,};- } else {+ } else if (metrics.length === 1 && xAxisDimension) {return {- dimensions: [null],- metrics: [null],+ dimensions: colorDimension+ ? [xAxisDimension, colorDimension]+ : [xAxisDimension],+ metrics: [metrics[0].name],bubble: null,};}+ return {+ dimensions: [null],+ metrics: [null],+ bubble: null,+ };}/**diff --git a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.unit.spec.ts b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.unit.spec.tsindex 783ef135b54..c690efddddf 100644--- a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.unit.spec.ts+++ b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.unit.spec.ts@@ -100,6 +100,18 @@ describe("cartesian-chart defaults", () => {base_type: "type/Integer",source: "aggregation",}),+ createMockColumn({+ name: "m3",+ display_name: "M3",+ base_type: "type/Integer",+ source: "aggregation",+ }),+ createMockColumn({+ name: "m4",+ display_name: "M4",+ base_type: "type/Integer",+ source: "aggregation",+ }),];const series = createSeries({ display: "scatter", cols });@@ -123,6 +135,24 @@ describe("cartesian-chart defaults", () => {base_type: "type/Integer",source: "aggregation",}),+ createMockColumn({+ name: "m2",+ display_name: "M2",+ base_type: "type/Integer",+ source: "aggregation",+ }),+ createMockColumn({+ name: "m3",+ display_name: "M3",+ base_type: "type/Integer",+ source: "aggregation",+ }),+ createMockColumn({+ name: "m4",+ display_name: "M4",+ base_type: "type/Integer",+ source: "aggregation",+ }),];const series = createSeries({ display: "scatter", cols });diff --git a/frontend/src/metabase/visualizations/shared/utils/data.ts b/frontend/src/metabase/visualizations/shared/utils/data.tsindex f18b6582739..1ee9b74304d 100644--- a/frontend/src/metabase/visualizations/shared/utils/data.ts+++ b/frontend/src/metabase/visualizations/shared/utils/data.ts@@ -294,7 +294,7 @@ export const getOrderedSeries = (});};-export const sanatizeResultData = (data: DatasetData) => {+export const sanitizeResultData = (data: DatasetData) => {return {...data,cols: data.cols.filter((col) => col.name !== "pivot-grouping"),diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.tsindex bc6a7c65dc3..8061ccdffc5 100644--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.ts@@ -9,19 +9,22 @@ const categoryColumn = createMockColumn({name: "Category",display_name: "Category",base_type: "type/Text",+ source: "breakout",});const idColumn = createMockColumn({name: "ID",display_name: "ID",base_type: "type/Integer",+ semantic_type: "type/PK",+ source: "breakout",});const metricColumn = createMockColumn({name: "Value",display_name: "Value",base_type: "type/Number",- semantic_type: "type/Number",+ source: "aggregation",});const columns = [categoryColumn, idColumn, metricColumn];@@ -73,11 +76,13 @@ describe("BoxPlot", () => {name: "Category1",display_name: "Category1",base_type: "type/Text",+ source: "breakout",}),createMockColumn({name: "Category2",display_name: "Category2",base_type: "type/Text",+ source: "breakout",}),];diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsxindex 8df524c36c3..3de99cdc8e1 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx@@ -21,6 +21,7 @@ import type {VisualizationPassThroughProps,VisualizationProps,} from "metabase/visualizations/types";+import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";import { ScalarValueContainer } from "../Scalar/ScalarValueContainer";@@ -241,8 +242,11 @@ Object.assign(SmartScalar, {click_behavior: {},},- isSensible({ insights }) {- return !!insights && insights?.length > 0;+ isSensible({ cols, insights }) {+ const dimensionCount = cols.filter(+ (col) => isDimension(col) && !isMetric(col),+ ).length;+ return !!insights && insights?.length > 0 && dimensionCount === 1;},// Smart scalars need to have a breakoutdiff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsxindex 28f9f39e3c8..37c6bb2e648 100644--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx@@ -17,6 +17,7 @@ import type {VisualizationProps,VisualizationSettingsDefinitions,} from "metabase/visualizations/types";+import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";import { CartesianChart } from "../CartesianChart";import { getCartesianChartDefinition } from "../CartesianChart/chart-definition";@@ -27,6 +28,18 @@ Object.assign(getUiName: () => t`Waterfall`,identifier: "waterfall",iconName: "waterfall",+ isSensible: ({ cols, rows }) => {+ const dimensionCount = cols.filter(+ (col) => isDimension(col) && !isMetric(col),+ ).length;+ const metricCount = cols.filter(isMetric).length;+ return (+ rows.length > 1 &&+ cols.length >= 2 &&+ dimensionCount === 1 &&+ metricCount > 0+ );+ },// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045noun: t`waterfall chart`,minSize: getMinSize("waterfall"),diff --git a/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.tsx b/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.tsxindex 3bf5f00be5e..ab1f3439950 100644--- a/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.tsx@@ -1,10 +1,8 @@import { useMemo } from "react";import { trackSimpleEvent } from "metabase/lib/analytics";-import { useSelector } from "metabase/lib/redux";import { Center, Icon, SegmentedControl } from "metabase/ui";import visualizations from "metabase/visualizations";-import { getVisualizerRawSeries } from "metabase/visualizer/selectors";import type { VisualizationDisplay } from "metabase-types/api";import S from "./VisualizationPicker.module.css";@@ -17,11 +15,7 @@ export function VisualizationPicker({value,onChange,}: VisualizationPickerProps) {- const series = useSelector(getVisualizerRawSeries);-const options = useMemo(() => {- const [mainSeries] = series ?? [];- const { data } = mainSeries ?? {};return Array.from(visualizations).filter(([, viz]) => !viz.hidden && viz.supportsVisualizer).map(([vizType, viz]) => {@@ -29,10 +23,9 @@ export function VisualizationPicker({label: viz.getUiName(),value: vizType,icon: viz.iconName,- isSensible: Boolean(data && viz.isSensible?.(data)),};});- }, [series]);+ }, []);const selectedOption = useMemo(() => options.find((option) => option.value === value),