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
Make metric viewer controls responsive (#75250)
Anderson938ce52bb032
diff --git a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.tsindex 11e0b153239..f49c4f31f9e 100644--- a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts+++ b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts@@ -329,6 +329,16 @@ const addOrdersProductsExpression = () => {cy.wait("@dataset");};+const assertMetricControlsDoNotOverflowViewport = () => {+ H.MetricsViewer.getMetricControls().then(($controls) => {+ const rect = $controls[0].getBoundingClientRect();+ const viewportWidth = Cypress.config("viewportWidth");++ expect(Math.floor(rect.left)).to.be.at.least(0);+ expect(Math.ceil(rect.right)).to.be.at.most(viewportWidth);+ });+};+const openTimeDimensionConfiguration = () => {H.MetricsViewer.dimensionPickerSidebar().findByRole("button", { name: "Time" })@@ -2213,6 +2223,57 @@ describe("scenarios > metrics > explorer", () => {});});+ describe("Responsive viewer controls", () => {+ const setupTimeControls = (width: number) => {+ cy.viewport(1280, 900);+ interceptDatasetQuery();+ H.MetricsViewer.goToViewer();+ H.MetricsViewer.searchInput().type("{end}, Count of orders", {+ waitForAnimations: true,+ });+ H.MetricsViewer.searchResults()+ .findByText("Count of orders")+ .closest("[role='menuitem']")+ .click();+ runFormula();+ cy.wait("@dataset");+ cy.viewport(width, 900);+ };++ it("shows compact controls at phone widths and keeps them interactive", () => {+ setupTimeControls(480);++ H.MetricsViewer.getMetricControls()+ .findByTestId("metrics-viewer-compact-chart-controls")+ .should("be.visible");+ H.MetricsViewer.getMetricControls()+ .findByTestId("metrics-viewer-x-axis-controls")+ .should("be.visible");++ H.MetricsViewer.getMetricControls()+ .findByTestId("metrics-viewer-compact-chart-controls")+ .click();+ H.popover().findByText("Visualization").should("be.visible");+ H.popover().findByRole("menuitem", { name: "Bar chart" }).click();+ H.MetricsViewer.assertVizType("Bar");++ H.MetricsViewer.getMetricControls()+ .findByTestId("metrics-viewer-x-axis-controls")+ .click();+ H.popover()+ .findByRole("button", { name: "Change column" })+ .should("be.visible")+ .should("contain.text", "Time");+ H.popover()+ .findByRole("button", { name: /by month/i })+ .should("be.visible");+ H.popover().findByRole("button", { name: "Change column" }).click();+ H.MetricsViewer.dimensionPickerSidebar().should("be.visible");+ cy.get(H.POPOVER_ELEMENT).should("not.exist");+ assertMetricControlsDoNotOverflowViewport();+ });+ });+describe("metric math", () => {beforeEach(() => {interceptDatasetQuery();diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsxindex b13c3aa1b19..080c1a4e386 100644--- a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsx+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.tsx@@ -54,7 +54,7 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {sourceColors,sourceDataById,selectDimensionBreakout: onSelectDimensionBreakout,- updateActiveDimensionBreakout: onUpdateActiveDimensionBreakout,+ updateActiveDimensionBreakout,closeSidebar,} = useMetricsViewerContext();const [searchText, setSearchText] = useState("");@@ -100,10 +100,11 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {activeDimensionBreakout.type === item.dimensionBreakoutInfo.type &&dimensionBreakoutConfig.matchMode === "aggregate") {- onUpdateActiveDimensionBreakout({+ updateActiveDimensionBreakout((prev) => ({+ ...prev,dimensionMapping: item.dimensionBreakoutInfo.dimensionMapping,label: item.dimensionBreakoutInfo.label,- });+ }));trackMetricsViewerDimensionSelected();return;}@@ -113,7 +114,7 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {},[activeDimensionBreakout,- onUpdateActiveDimensionBreakout,+ updateActiveDimensionBreakout,onSelectDimensionBreakout,],);@@ -138,10 +139,11 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {activeDimensionBreakout.type === item.dimensionBreakoutInfo.type &&dimensionBreakoutConfig.matchMode === "aggregate") {- onUpdateActiveDimensionBreakout({+ updateActiveDimensionBreakout((prev) => ({+ ...prev,dimensionMapping,label: item.dimensionBreakoutInfo.label,- });+ }));trackMetricsViewerDimensionSelected();return;}@@ -155,7 +157,7 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {},[activeDimensionBreakout,- onUpdateActiveDimensionBreakout,+ updateActiveDimensionBreakout,onSelectDimensionBreakout,sections,metricSlots,@@ -202,7 +204,10 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {...activeDimensionBreakout.dimensionMapping,[slotIndex]: dimensionId,};- onUpdateActiveDimensionBreakout({ dimensionMapping });+ updateActiveDimensionBreakout((prev) => ({+ ...prev,+ dimensionMapping,+ }));return;}@@ -222,7 +227,7 @@ export function DimensionPickerSidebar(props: DimensionPickerSidebarProps) {[activeDimensionBreakout,onSelectDimensionBreakout,- onUpdateActiveDimensionBreakout,+ updateActiveDimensionBreakout,],);diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.unit.spec.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.unit.spec.tsxindex 61a26fadadd..a23b5094b43 100644--- a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.unit.spec.tsx+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/DimensionPickerSidebar.unit.spec.tsx@@ -332,7 +332,9 @@ describe("DimensionPickerSidebar", () => {await userEvent.click(screen.getByRole("button", { name: "Order Date" }));expect(onSelectDimensionBreakout).not.toHaveBeenCalled();- expect(onUpdateActiveDimensionBreakout).toHaveBeenCalledWith({+ expect(onUpdateActiveDimensionBreakout).toHaveBeenCalled();+ const updaterFn = onUpdateActiveDimensionBreakout.mock.calls[0][0];+ expect(updaterFn(timeDimensionBreakout)).toMatchObject({label: "Order Date",dimensionMapping: { 0: "dim-order-date" },});@@ -394,7 +396,21 @@ describe("DimensionPickerSidebar", () => {await userEvent.click(screen.getByRole("button", { name: "See all" }));await userEvent.click(screen.getByRole("button", { name: "Birth Date" }));- expect(onUpdateActiveDimensionBreakout).toHaveBeenCalledWith({+ expect(onUpdateActiveDimensionBreakout).toHaveBeenCalled();+ const updaterFn = onUpdateActiveDimensionBreakout.mock.calls[0][0];+ expect(+ updaterFn({+ id: "dim-created-at",+ type: "time",+ label: "Created At",+ display: "line",+ dimensionMapping: {+ 0: "dim-created-at",+ 1: "second-dim-created-at",+ },+ projectionConfig: {},+ }),+ ).toMatchObject({label: "Birth Date",dimensionMapping: {0: "dim-birth-date",@@ -457,7 +473,21 @@ describe("DimensionPickerSidebar", () => {await userEvent.click(screen.getByRole("button", { name: "See all" }));await userEvent.click(screen.getByRole("button", { name: "Birth Date" }));- expect(onUpdateActiveDimensionBreakout).toHaveBeenCalledWith({+ expect(onUpdateActiveDimensionBreakout).toHaveBeenCalled();+ const updaterFn = onUpdateActiveDimensionBreakout.mock.calls[0][0];+ expect(+ updaterFn({+ id: "second-dim-created-at",+ type: "time",+ label: "Created At",+ display: "line",+ dimensionMapping: {+ 0: "dim-birth-date",+ 1: "second-dim-created-at",+ },+ projectionConfig: {},+ }),+ ).toMatchObject({label: "Birth Date",dimensionMapping: {0: "dim-birth-date",@@ -1493,7 +1523,9 @@ describe("DimensionPickerSidebar", () => {);await userEvent.click(screen.getByRole("button", { name: "Order Date" }));- expect(onUpdateActiveDimensionBreakout).toHaveBeenCalledWith({+ expect(onUpdateActiveDimensionBreakout).toHaveBeenCalled();+ const updaterFn = onUpdateActiveDimensionBreakout.mock.calls[0][0];+ expect(updaterFn(timeDimensionBreakout)).toMatchObject({dimensionMapping: { 0: "dim-order-date" },});expect(onSelectDimensionBreakout).not.toHaveBeenCalled();diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.module.cssnew file mode 100644index 00000000000..1fb56572b0e--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.module.css@@ -0,0 +1,82 @@+.centerCluster {+ left: 50%;+ max-width: 100%;+ position: absolute;+ top: 0;+ transform: translateX(-50%);+}++.centerControlsContent {+ align-items: center;+ display: inline-flex;+ gap: var(--mantine-spacing-sm);+ position: relative;+}++.centerControls {+ background: var(--mb-color-background-primary);+ border-radius: 0.75rem;+ border: 1px solid var(--mb-color-border);+ box-sizing: border-box;+ height: 2.5rem;+ overflow: hidden;+}++.controlSection {+ display: flex;+ align-items: center;+ padding: 0.25rem;+}++.controlSection + .controlSection {+ border-left: 1px solid var(--mb-color-border);+}++.controlButton {+ height: 2rem;+ padding-inline: 1rem;+ border-radius: 0.5rem;++ &.controlButton:hover {+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-hover);+ }+}++.compactCenterControls {+ display: none;+}++.centerControlsPopoverDropdown {+ border-radius: var(--mantine-radius-lg);+}++.xAxisButton {+ background: var(--mb-color-background-primary);+ border-radius: 0.75rem;+ border: 1px solid var(--mb-color-border);+ color: var(--mb-color-text-primary);+ font-weight: 700;+ height: 2.5rem;+ width: 100%;++ &.xAxisButton:hover {+ background-color: var(--mb-color-background-hover);+ }+}++@container metric-controls (max-width: 36rem) {+ .centerCluster:not(.noBreakout) {+ display: none;+ }++ .compactCenterControls {+ display: flex;+ left: 50%;+ margin-left: var(--mantine-spacing-sm);+ position: absolute;+ top: 0;+ transform: translateX(-50%);+ width: min(14rem, calc(100% - 5rem));+ }+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.tsxnew file mode 100644index 00000000000..5cbc236cc3f--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/CenterControls.tsx@@ -0,0 +1,85 @@+import { type ComponentProps, useMemo, useState } from "react";+import { t } from "ttag";++import { useMetricsViewerContext } from "metabase/metrics-viewer/context";+import { getProjectionInfo } from "metabase/metrics-viewer/utils";+import { Box, Button, Icon, Popover } from "metabase/ui";++import S from "./CenterControls.module.css";+import { ControlsContent } from "./components/ControlsContent";+import { NoBreakoutControls } from "./components/NoBreakoutControls";+import { hasCenterControls } from "./utils";++type CenterControlsProps = Pick<+ ComponentProps<typeof ControlsContent>,+ "canToggleColumnLabels" | "definition" | "allFilterDimensions"+>;++export function CenterControls(props: CenterControlsProps) {+ const { definition } = props;+ const [isXAxisPopoverOpen, setIsXAxisPopoverOpen] = useState(false);+ const { activeDimensionBreakout: dimensionBreakout } =+ useMetricsViewerContext();+ const projectionInfo = useMemo(+ () => getProjectionInfo(definition),+ [definition],+ );++ if (!dimensionBreakout) {+ return null;+ }++ if (dimensionBreakout.type === "scalar") {+ return <NoBreakoutControls />;+ }++ if (!hasCenterControls(projectionInfo)) {+ return null;+ }++ return (+ <>+ <Box className={S.centerCluster}>+ <ControlsContent+ setIsXAxisPopoverOpen={setIsXAxisPopoverOpen}+ variant="floating"+ {...props}+ />+ </Box>+ <Box className={S.compactCenterControls}>+ <Popover+ onChange={setIsXAxisPopoverOpen}+ opened={isXAxisPopoverOpen}+ position="top"+ shadow="md"+ withinPortal+ >+ <Popover.Target>+ <Button+ className={S.xAxisButton}+ aria-label={t`X-axis controls`}+ variant="subtle"+ color="text-primary"+ leftSection={<Icon name="gear" size={16} />}+ onClick={() => setIsXAxisPopoverOpen(!isXAxisPopoverOpen)}+ data-testid="metrics-viewer-x-axis-controls"+ >+ {t`X-axis`}+ </Button>+ </Popover.Target>+ <Popover.Dropdown+ className={S.centerControlsPopoverDropdown}+ p="md"+ bg="background-primary"+ >+ <ControlsContent+ setIsXAxisPopoverOpen={setIsXAxisPopoverOpen}+ variant="inline"+ {...props}+ />+ </Popover.Dropdown>+ </Popover>+ </Box>+ </>+ );+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/BinningButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/BinningButton.tsxsimilarity index 96%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/BinningButton.tsxrename to frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/BinningButton.tsxindex 6225cde8854..4a0d47b11aa 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/BinningButton.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/BinningButton.tsx@@ -1,6 +1,7 @@import { useMemo, useState } from "react";import { t } from "ttag";+import { UNBINNED } from "metabase/metrics-viewer/constants";import { Box, Button, DefaultSelectItem, Popover } from "metabase/ui";import type {DimensionMetadata,@@ -9,8 +10,7 @@ import type {} from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";-import { UNBINNED } from "../../../constants";-import S from "../MetricControls.module.css";+import S from "../../../CenterControls.module.css";const MIN_WIDTH = "11.25rem";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/index.tssimilarity index 100%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/index.tsrename to frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BinningButton/index.tsdiff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsxsimilarity index 97%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsxrename to frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsxindex 000694d670b..cd10ed5bc67 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/BucketButton.tsx@@ -13,7 +13,7 @@ import type {import * as LibMetric from "metabase-lib/metric";import type { TemporalUnit } from "metabase-types/api";-import S from "../MetricControls.module.css";+import S from "../../../CenterControls.module.css";type BucketButtonProps = {definition: MetricDefinition;diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/index.tssimilarity index 100%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/index.tsrename to frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/BucketButton/index.tsdiff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.module.cssnew file mode 100644index 00000000000..25df5a63d1a--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.module.css@@ -0,0 +1,24 @@+.ellipsisMenuButton {+ --ellipsis-button-size: 2rem;++ border-radius: 0.5rem;+ height: var(--ellipsis-button-size);+ width: var(--ellipsis-button-size);++ &.ellipsisMenuButton:hover {+ background-color: var(--mb-color-background-hover);+ }+}++.ellipsisMenuButtonFloating {+ position: absolute;+ /** Make the container be centered without taking the ellipsis menu button into consideration */+ right: calc(+ -1 * calc(var(--mantine-spacing-sm) + var(--ellipsis-button-size))+ );+ top: 0.25rem;+}++.ellipsisMenuButtonInline {+ flex: 0 0 auto;+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.tsxnew file mode 100644index 00000000000..e75a334ab23--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.tsx@@ -0,0 +1,47 @@+import cx from "classnames";+import { t } from "ttag";++import { useMetricsViewerContext } from "metabase/metrics-viewer/context";+import { ActionIcon, Icon, Popover, Switch } from "metabase/ui";++import S from "./ColumnLabelOptions.module.css";++type ColumnLabelOptionsProps = {+ variant?: "floating" | "inline";+};++export function ColumnLabelOptions(props: ColumnLabelOptionsProps) {+ const { variant = "floating" } = props;+ const { showColumnLabels, setShowColumnLabels } = useMetricsViewerContext();++ return (+ <Popover+ floatingStrategy="fixed"+ shadow="md"+ /* Should not be in a portal to avoid click-outside issues on parent popover */+ withinPortal={false}+ >+ <Popover.Target>+ <ActionIcon+ className={cx(S.ellipsisMenuButton, {+ [S.ellipsisMenuButtonFloating]: variant === "floating",+ [S.ellipsisMenuButtonInline]: variant === "inline",+ })}+ aria-label={t`Column label options`}+ variant="subtle"+ >+ <Icon name="ellipsis" c="text-primary" />+ </ActionIcon>+ </Popover.Target>+ <Popover.Dropdown p="md">+ <Switch+ label={t`Show column labels`}+ size="sm"+ labelPosition="right"+ checked={showColumnLabels}+ onChange={(event) => setShowColumnLabels(event.currentTarget.checked)}+ />+ </Popover.Dropdown>+ </Popover>+ );+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/index.tsnew file mode 100644index 00000000000..6d281c39e99--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/index.ts@@ -0,0 +1 @@+export { ColumnLabelOptions } from "./ColumnLabelOptions";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ControlsContent.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ControlsContent.tsxnew file mode 100644index 00000000000..7578ca11eb2--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ControlsContent.tsx@@ -0,0 +1,175 @@+import { useCallback, useMemo } from "react";+import { t } from "ttag";++import { useMetricsViewerContext } from "metabase/metrics-viewer/context";+import type { MetricsViewerDimensionBreakoutProjectionConfig } from "metabase/metrics-viewer/types";+import {+ type DimensionFilterValue,+ getDimensionIcon,+ getProjectionInfo,+} from "metabase/metrics-viewer/utils";+import { Box, Button, Flex, Icon } from "metabase/ui";+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";+import type { TemporalUnit } from "metabase-types/api";++import S from "../../CenterControls.module.css";+import {+ hasBinningControls,+ hasBucketControls,+ hasCenterControls,+ hasFilterControls,+} from "../../utils";++import { BinningButton } from "./BinningButton";+import { BucketButton } from "./BucketButton";+import { ColumnLabelOptions } from "./ColumnLabelOptions";+import { DimensionFilterButton } from "./DimensionFilterButton";++type ControlsContentProps = {+ definition: MetricDefinition;+ allFilterDimensions?: DimensionMetadata[];+ canToggleColumnLabels?: boolean;+ setIsXAxisPopoverOpen: (opened: boolean) => void;+ variant: "inline" | "floating";+};++export function ControlsContent(props: ControlsContentProps) {+ const {+ allFilterDimensions,+ canToggleColumnLabels,+ definition,+ setIsXAxisPopoverOpen,+ variant,+ } = props;+ const {+ activeDimensionBreakout: dimensionBreakout,+ availableDimensions,+ sourceOrder,+ openSidebar,+ updateActiveDimensionBreakout,+ } = useMetricsViewerContext();+ const projectionInfo = useMemo(+ () => getProjectionInfo(definition),+ [definition],+ );++ const hasSharedDimensions = availableDimensions.shared.length > 0;+ const hasAnySourceDimensions = sourceOrder.some(+ (sourceId) => (availableDimensions.bySource[sourceId]?.length ?? 0) > 0,+ );+ const hasAvailableDimensions = hasSharedDimensions || hasAnySourceDimensions;+ const columnPickerIcon = projectionInfo.projectionDimension+ ? getDimensionIcon(projectionInfo.projectionDimension)+ : undefined;++ const handleOpenSidebar = () => {+ setIsXAxisPopoverOpen(false);+ openSidebar();+ };++ const updateProjectionConfig = useCallback(+ (updates: Partial<MetricsViewerDimensionBreakoutProjectionConfig>) => {+ updateActiveDimensionBreakout((prev) => ({+ ...prev,+ projectionConfig: {+ ...prev?.projectionConfig,+ ...updates,+ },+ }));+ },+ [updateActiveDimensionBreakout],+ );++ const handleDimensionFilterChange = useCallback(+ (value: DimensionFilterValue | undefined) => {+ updateProjectionConfig({ dimensionFilter: value });+ },+ [updateProjectionConfig],+ );++ const handleTemporalUnitChange = useCallback(+ (unit: TemporalUnit | undefined) => {+ updateProjectionConfig({ temporalUnit: unit });+ },+ [updateProjectionConfig],+ );++ const handleBinningChange = useCallback(+ (binningStrategy: string | undefined) => {+ updateProjectionConfig({ binningStrategy });+ },+ [updateProjectionConfig],+ );++ const columnPickerLabel =+ dimensionBreakout?.type === "time"+ ? t`Time`+ : (dimensionBreakout?.label ?? t`Select column`);+ const dimensionFilter = dimensionBreakout?.projectionConfig.dimensionFilter;++ return (+ <Box className={S.centerControlsContent}>+ {hasCenterControls(projectionInfo) && (+ <Flex className={S.centerControls} align="center">+ {hasFilterControls(projectionInfo) &&+ projectionInfo.filterDimension && (+ <>+ {hasAvailableDimensions && (+ <Box className={S.controlSection}>+ <Button+ className={S.controlButton}+ justify="space-between"+ fw="bold"+ aria-label={t`Change column`}+ variant="subtle"+ color="text-primary"+ leftSection={+ columnPickerIcon ? (+ <Icon c="brand" name={columnPickerIcon} size={16} />+ ) : undefined+ }+ onClick={handleOpenSidebar}+ >+ {columnPickerLabel}+ </Button>+ </Box>+ )}+ <Box className={S.controlSection}>+ <DimensionFilterButton+ definition={definition}+ filterDimension={projectionInfo.filterDimension}+ dimensionFilter={dimensionFilter}+ allFilterDimensions={allFilterDimensions}+ onChange={handleDimensionFilterChange}+ />+ </Box>+ </>+ )}+ {hasBucketControls(projectionInfo) &&+ projectionInfo.projectionDimension && (+ <Box className={S.controlSection}>+ <BucketButton+ definition={definition}+ dimension={projectionInfo.projectionDimension}+ projection={projectionInfo.projection!}+ onChange={handleTemporalUnitChange}+ />+ </Box>+ )}+ {hasBinningControls(projectionInfo) &&+ projectionInfo.projectionDimension && (+ <Box className={S.controlSection}>+ <BinningButton+ definition={definition}+ dimension={projectionInfo.projectionDimension}+ projection={projectionInfo.projection!}+ onBinningChange={handleBinningChange}+ />+ </Box>+ )}+ </Flex>+ )}+ {canToggleColumnLabels && <ColumnLabelOptions variant={variant} />}+ </Box>+ );+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsxsimilarity index 94%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsxrename to frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsxindex 57766515672..98f04da9c1d 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/DimensionFilterButton.tsx@@ -7,6 +7,11 @@ import {trackMetricsViewerFilterEdited,trackMetricsViewerFilterRemoved,} from "metabase/metrics-viewer/analytics";+import {+ type DimensionFilterValue,+ buildDimensionFilterClause,+ parseFilter,+} from "metabase/metrics-viewer/utils";import { Button, Popover } from "metabase/ui";import type {DimensionMetadata,@@ -15,12 +20,7 @@ import type {} from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";-import type { DimensionFilterValue } from "../../../utils/dimension-filters";-import {- buildDimensionFilterClause,- parseFilter,-} from "../../../utils/dimension-filters";-import S from "../MetricControls.module.css";+import S from "../../../CenterControls.module.css";import { getFilterDisplayName } from "./utils";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/index.tssimilarity index 100%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/index.tsrename to frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/index.tsdiff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/utils.tssimilarity index 96%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/utils.tsrename to frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/utils.tsindex db5fe38e1b9..c48e593a3de 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/utils.ts+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/DimensionFilterButton/utils.ts@@ -1,12 +1,11 @@import { match } from "ts-pattern";import { t } from "ttag";+import type { DimensionFilterValue } from "metabase/metrics-viewer/utils";import type { DatePickerValue } from "metabase/querying/common/types";import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";import * as Lib from "metabase-lib";-import type { DimensionFilterValue } from "../../../utils/dimension-filters";-function toDatePickerValue(filter: Extract<DimensionFilterValue,diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/index.tsnew file mode 100644index 00000000000..9e4c538454c--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/index.ts@@ -0,0 +1 @@+export { ControlsContent } from "./ControlsContent";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/NoBreakoutControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/NoBreakoutControls.tsxnew file mode 100644index 00000000000..b7cb3da7a53--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/NoBreakoutControls.tsx@@ -0,0 +1,31 @@+import cx from "classnames";+import { t } from "ttag";++import { useMetricsViewerContext } from "metabase/metrics-viewer/context";+import { Box, Button, Flex, Icon } from "metabase/ui";++import S from "../CenterControls.module.css";++export function NoBreakoutControls() {+ const { openSidebar } = useMetricsViewerContext();++ return (+ <Flex className={cx(S.centerCluster, S.noBreakout)}>+ <Flex className={S.centerControls} align="center">+ <Box className={S.controlSection}>+ <Button+ className={S.controlButton}+ fw="bold"+ aria-label={t`No breakout`}+ variant="subtle"+ color="text-primary"+ leftSection={<Icon c="brand" name="unreferenced" size={16} />}+ onClick={openSidebar}+ >+ {t`No breakout`}+ </Button>+ </Box>+ </Flex>+ </Flex>+ );+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/index.tsnew file mode 100644index 00000000000..b0cf2bedbbf--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/index.ts@@ -0,0 +1 @@+export { CenterControls } from "./CenterControls";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/utils.tsnew file mode 100644index 00000000000..487dc98f800--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/utils.ts@@ -0,0 +1,28 @@+import type { ProjectionInfo } from "metabase/metrics-viewer/utils";++export const hasFilterControls = (projectionInfo: ProjectionInfo) => {+ return !!projectionInfo.projection && !!projectionInfo.filterDimension;+};++export const hasBucketControls = (projectionInfo: ProjectionInfo) => {+ return (+ hasFilterControls(projectionInfo) && projectionInfo.isTemporalBucketable+ );+};++export const hasBinningControls = (projectionInfo: ProjectionInfo) => {+ return (+ !hasBucketControls(projectionInfo) &&+ !!projectionInfo.projection &&+ !!projectionInfo.projectionDimension &&+ (projectionInfo.isBinnable || projectionInfo.hasBinning)+ );+};++export const hasCenterControls = (projectionInfo: ProjectionInfo) => {+ return (+ hasFilterControls(projectionInfo) ||+ hasBucketControls(projectionInfo) ||+ hasBinningControls(projectionInfo)+ );+};diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/index.tsdeleted file mode 100644index b33f2c7a814..00000000000--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export { ChartTypePicker } from "./ChartTypePicker";-export type { ChartTypeOption } from "../../../utils/dimension-breakout-config";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartLayoutPicker/ChartLayoutPicker.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.module.csssimilarity index 100%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/ChartLayoutPicker/ChartLayoutPicker.module.cssrename to frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.module.cssdiff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartLayoutPicker/ChartLayoutPicker.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.tsxsimilarity index 100%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/ChartLayoutPicker/ChartLayoutPicker.tsxrename to frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.tsxdiff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartLayoutPicker/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/index.tssimilarity index 100%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/ChartLayoutPicker/index.tsrename to frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/index.tsdiff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.module.csssimilarity index 72%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.module.cssrename to frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.module.cssindex 5108f8e181e..e9a7905c209 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.module.css+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.module.css@@ -3,7 +3,7 @@}.root button:not(.selected):hover {- background-color: rgba(7, 23, 34, 0.05);+ background-color: var(--mb-color-background-hover);}.selected {diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.tsxsimilarity index 86%rename from frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.tsxrename to frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.tsxindex b28bd929644..26709037e25 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.tsx@@ -1,8 +1,7 @@+import type { MetricsViewerDisplayType } from "metabase/metrics-viewer/types";+import type { ChartTypeOption } from "metabase/metrics-viewer/utils";import { ActionIcon, Flex, Icon } from "metabase/ui";-import type { MetricsViewerDisplayType } from "../../../types/viewer-state";-import type { ChartTypeOption } from "../../../utils/dimension-breakout-config";-import S from "./ChartTypePicker.module.css";type ChartTypePickerProps = {diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/index.tsnew file mode 100644index 00000000000..b5e8208e8f2--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/index.ts@@ -0,0 +1 @@+export { ChartTypePicker } from "./ChartTypePicker";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.module.cssnew file mode 100644index 00000000000..8192c7e518b--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.module.css@@ -0,0 +1,54 @@+.leftControls {+ position: absolute;+ top: 0.25rem;+ left: 0;+}++.leftControlsCompact {+ display: none;+}++.compactChartTypeButton {+ background: var(--mb-color-background-primary);+ border: 1px solid var(--mb-color-border);+ border-radius: 0.75rem;+ color: var(--mb-color-text-primary);+ height: 2.5rem;+ width: 2.5rem;++ &.compactChartTypeButton:hover {+ background-color: var(--mb-color-background-hover);+ }+}++.compactChartMenuDropdown {+ border-radius: var(--mantine-radius-lg);+ min-width: 14rem;+}++.compactChartMenuItem {+ border-radius: var(--mantine-radius-md);+ color: var(--mb-color-text-primary);+ min-height: 2rem;++ &.compactChartMenuItem:hover {+ background-color: var(--mb-color-background-hover);+ }+}++.compactChartMenuItemSelected,+.compactChartMenuItemSelected.compactChartMenuItem:hover {+ background-color: var(--mb-color-background-selected);+ color: var(--mb-color-brand);+}++@container metric-controls (max-width: 56rem) {+ .leftControlsFull {+ display: none;+ }++ .leftControlsCompact {+ display: flex;+ top: auto;+ }+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.tsxnew file mode 100644index 00000000000..261ba196068--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.tsx@@ -0,0 +1,166 @@+import cx from "classnames";+import { useCallback } from "react";+import { t } from "ttag";++import { trackStackedSeriesEnabled } from "metabase/metrics-viewer/analytics";+import { useMetricsViewerContext } from "metabase/metrics-viewer/context";+import type { MetricsViewerDisplayType } from "metabase/metrics-viewer/types";+import { getDimensionBreakoutConfig } from "metabase/metrics-viewer/utils";+import { ActionIcon, Box, Flex, Icon, Menu } from "metabase/ui";++import { ChartLayoutPicker } from "./ChartLayoutPicker";+import { ChartTypePicker } from "./ChartTypePicker";+import S from "./LeftControls.module.css";+import {+ getDisplayTypeLabel,+ isValidDisplayTypeForDimensionBreakout,+} from "./utils";++type LeftControlsProps = {+ showStackSeries?: boolean;+};++export function LeftControls({ showStackSeries }: LeftControlsProps) {+ const {+ activeDimensionBreakout: dimensionBreakout,+ updateActiveDimensionBreakout,+ } = useMetricsViewerContext();++ const handleDisplayTypeChange = useCallback(+ (display: MetricsViewerDisplayType) => {+ updateActiveDimensionBreakout((prev) => ({ ...prev, display }));+ },+ [updateActiveDimensionBreakout],+ );++ const handleSplitChannelsChange = useCallback(+ (splitChannels: boolean) => {+ updateActiveDimensionBreakout((prev) => ({+ ...prev,+ visualizationSettings: {+ ...prev.visualizationSettings,+ "graph.split_panels": splitChannels,+ },+ }));+ },+ [updateActiveDimensionBreakout],+ );++ if (!dimensionBreakout || dimensionBreakout.type === "scalar") {+ return null;+ }++ const config = getDimensionBreakoutConfig(dimensionBreakout.type);+ const chartTypes = config.availableDisplayTypes;+ const value = isValidDisplayTypeForDimensionBreakout(+ dimensionBreakout.display,+ dimensionBreakout.type,+ )+ ? dimensionBreakout.display+ : config.defaultDisplayType;+ const isStacked =+ !!dimensionBreakout.visualizationSettings?.["graph.split_panels"];+ const selectedChartType = chartTypes.find(({ type }) => type === value);++ return (+ <>+ <Flex+ className={cx(S.leftControls, S.leftControlsFull)}+ align="center"+ gap="md"+ >+ <ChartTypePicker+ chartTypes={chartTypes}+ value={value}+ onChange={handleDisplayTypeChange}+ />+ {showStackSeries && (+ <ChartLayoutPicker+ isStacked={isStacked}+ onToggle={handleSplitChannelsChange}+ />+ )}+ </Flex>+ <Box className={cx(S.leftControls, S.leftControlsCompact)}>+ <Menu position="top-start" withinPortal>+ <Menu.Target>+ <ActionIcon+ className={S.compactChartTypeButton}+ aria-label={t`Change visualization type`}+ variant="subtle"+ data-testid="metrics-viewer-compact-chart-controls"+ >+ {selectedChartType && (+ <Icon name={selectedChartType.icon} c="text-primary" />+ )}+ </ActionIcon>+ </Menu.Target>+ <Menu.Dropdown className={S.compactChartMenuDropdown} p="sm">+ <Menu.Label c="text-secondary" pt="sm" mb="xs">+ {t`Visualization`}+ </Menu.Label>+ {chartTypes.map(({ type, icon }) => (+ <Menu.Item+ key={type}+ className={cx(S.compactChartMenuItem, {+ [S.compactChartMenuItemSelected]: value === type,+ })}+ leftSection={+ <Icon+ aria-hidden+ name={icon}+ c={value === type ? "brand" : "text-primary"}+ />+ }+ onClick={() => handleDisplayTypeChange(type)}+ >+ {getDisplayTypeLabel(type)}+ </Menu.Item>+ ))}+ {showStackSeries && (+ <>+ <Menu.Divider mx={0} />+ <Menu.Label c="text-secondary" pt="sm" mb="xs">+ {t`Layout`}+ </Menu.Label>+ <Menu.Item+ className={cx(S.compactChartMenuItem, {+ [S.compactChartMenuItemSelected]: !isStacked,+ })}+ leftSection={+ <Icon+ aria-hidden+ name="chart_layout_default"+ c={!isStacked ? "brand" : "text-primary"}+ />+ }+ onClick={() => handleSplitChannelsChange(false)}+ >+ {t`Default`}+ </Menu.Item>+ <Menu.Item+ className={cx(S.compactChartMenuItem, {+ [S.compactChartMenuItemSelected]: isStacked,+ })}+ leftSection={+ <Icon+ aria-hidden+ name="chart_layout_stack"+ c={isStacked ? "brand" : "text-primary"}+ />+ }+ onClick={() => {+ handleSplitChannelsChange(true);+ trackStackedSeriesEnabled();+ }}+ >+ {t`Stacked`}+ </Menu.Item>+ </>+ )}+ </Menu.Dropdown>+ </Menu>+ </Box>+ </>+ );+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/index.tsnew file mode 100644index 00000000000..e250d6e23a0--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/index.ts@@ -0,0 +1 @@+export { LeftControls } from "./LeftControls";diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/utils.tsnew file mode 100644index 00000000000..a776c270f15--- /dev/null+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/utils.ts@@ -0,0 +1,36 @@+import { t } from "ttag";++import type {+ MetricsViewerDimensionBreakoutType,+ MetricsViewerDisplayType,+} from "metabase/metrics-viewer/types";+import { getDimensionBreakoutConfig } from "metabase/metrics-viewer/utils";++export { LeftControls } from "./LeftControls";++export function isValidDisplayTypeForDimensionBreakout(+ displayType: MetricsViewerDisplayType,+ dimensionBreakoutType: MetricsViewerDimensionBreakoutType,+): boolean {+ const config = getDimensionBreakoutConfig(dimensionBreakoutType);+ return config.availableDisplayTypes.some((t) => t.type === displayType);+}++export function getDisplayTypeLabel(type: MetricsViewerDisplayType) {+ switch (type) {+ case "line":+ return t`Line chart`;+ case "area":+ return t`Area chart`;+ case "bar":+ return t`Bar chart`;+ case "map":+ return t`Map`;+ case "scatter":+ return t`Scatter plot`;+ case "scalar":+ return t`Scalar`;+ default:+ return type;+ }+}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.cssindex 71c2d22ca90..83b7e6f1c19 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css@@ -1,68 +1,7 @@.root {- --control-hover-color: rgba(7, 23, 34, 0.05);- --ellipsis-button-size: 2rem;-+ container-name: metric-controls;+ container-type: inline-size;position: relative;width: 100%;height: 2.5rem;}--.leftControls {- position: absolute;- top: 0.25rem;- left: 0;-}--.centerCluster {- left: 50%;- max-width: 100%;- position: absolute;- top: 0;- transform: translateX(-50%);-}--.centerControls {- background: var(--mb-color-background-primary);- border-radius: 0.75rem;- border: 1px solid var(--mb-color-border);- box-sizing: border-box;- height: 2.5rem;- overflow: hidden;-}--.controlSection {- display: flex;- align-items: center;- padding: 0.25rem;-}--.controlSection + .controlSection {- border-left: 1px solid var(--mb-color-border);-}--.controlButton {- height: 2rem;- padding-inline: 1rem;- border-radius: 0.5rem;-- &.controlButton:hover {- color: var(--mb-color-text-primary);- background-color: var(--control-hover-color);- }-}--.ellipsisMenuButton {- border-radius: 0.5rem;- height: var(--ellipsis-button-size);- position: absolute;- /** Make the container be centered without taking the ellipsis menu button into consideration */- right: calc(- -1 * calc(var(--mantine-spacing-sm) + var(--ellipsis-button-size))- );- top: 0.25rem;- width: var(--ellipsis-button-size);-- &.ellipsisMenuButton:hover {- background-color: var(--control-hover-color);- }-}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsxindex 7bc44125864..facb4c431b2 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx@@ -1,38 +1,11 @@-import type { ReactNode } from "react";-import { useCallback, useMemo } from "react";-import { t } from "ttag";-import { useMetricsViewerContext } from "metabase/metrics-viewer/context";-import type {- MetricsViewerDimensionBreakoutProjectionConfig,- MetricsViewerDimensionBreakoutType,- MetricsViewerDisplayType,-} from "metabase/metrics-viewer/types";-import {- type DimensionFilterValue,- getDimensionBreakoutConfig,- getDimensionIcon,- getProjectionInfo,-} from "metabase/metrics-viewer/utils";-import { ActionIcon, Box, Button, Flex, Icon, Menu, Switch } from "metabase/ui";+import { Box } from "metabase/ui";import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";-import type { TemporalUnit, VisualizationSettings } from "metabase-types/api";-import { BinningButton } from "./BinningButton";-import { BucketButton } from "./BucketButton";-import { ChartLayoutPicker } from "./ChartLayoutPicker";-import { ChartTypePicker } from "./ChartTypePicker";-import { DimensionFilterButton } from "./DimensionFilterButton";+import { CenterControls } from "./CenterControls";+import { LeftControls } from "./LeftControls";import S from "./MetricControls.module.css";-function isValidDisplayTypeForDimensionBreakout(- displayType: MetricsViewerDisplayType,- dimensionBreakoutType: MetricsViewerDimensionBreakoutType,-): boolean {- const config = getDimensionBreakoutConfig(dimensionBreakoutType);- return config.availableDisplayTypes.some((t) => t.type === displayType);-}-type MetricControlsProps = {definition: MetricDefinition;allFilterDimensions?: DimensionMetadata[];@@ -40,268 +13,26 @@ type MetricControlsProps = {canToggleColumnLabels?: boolean;};-function ControlSection({ children }: { children: ReactNode }) {- return <Box className={S.controlSection}>{children}</Box>;-}-export function MetricControls({definition,allFilterDimensions,showStackSeries,canToggleColumnLabels,}: MetricControlsProps) {- const {- activeDimensionBreakout: dimensionBreakout,- availableDimensions,- sourceOrder,- showColumnLabels,- setShowColumnLabels,- updateActiveDimensionBreakout: onDimensionBreakoutUpdate,- openSidebar,- } = useMetricsViewerContext();-- const updateProjectionConfig = useCallback(- (updates: Partial<MetricsViewerDimensionBreakoutProjectionConfig>) => {- onDimensionBreakoutUpdate({- projectionConfig: {- ...dimensionBreakout?.projectionConfig,- ...updates,- },- });- },- [onDimensionBreakoutUpdate, dimensionBreakout?.projectionConfig],- );-- const handleDisplayTypeChange = useCallback(- (display: MetricsViewerDisplayType) => {- onDimensionBreakoutUpdate({ display });- },- [onDimensionBreakoutUpdate],- );-- const handleDimensionFilterChange = useCallback(- (value: DimensionFilterValue | undefined) => {- updateProjectionConfig({ dimensionFilter: value });- },- [updateProjectionConfig],- );-- const handleTemporalUnitChange = useCallback(- (unit: TemporalUnit | undefined) => {- updateProjectionConfig({ temporalUnit: unit });- },- [updateProjectionConfig],- );-- const handleBinningChange = useCallback(- (binningStrategy: string | undefined) => {- updateProjectionConfig({ binningStrategy });- },- [updateProjectionConfig],- );+ const { activeDimensionBreakout } = useMetricsViewerContext();- const handleShowColumnLabelsChange = useCallback(- (showColumnLabels: boolean) => {- setShowColumnLabels(showColumnLabels);- },- [setShowColumnLabels],- );-- const handleVisualizationSettingsChange = useCallback(- (updates: Partial<VisualizationSettings>) => {- onDimensionBreakoutUpdate({- visualizationSettings: {- ...dimensionBreakout?.visualizationSettings,- ...updates,- },- });- },- [onDimensionBreakoutUpdate, dimensionBreakout?.visualizationSettings],- );-- const projectionInfo = useMemo(- () => getProjectionInfo(definition),- [definition],- );-- if (!dimensionBreakout) {+ if (!activeDimensionBreakout) {return null;}- const {- type: dimensionBreakoutType,- label: dimensionBreakoutLabel,- display: displayType,- projectionConfig,- visualizationSettings,- } = dimensionBreakout;- const dimensionFilter = projectionConfig.dimensionFilter;-- const hasFilterControls =- projectionInfo.projection && projectionInfo.filterDimension;-- const hasBucketControls =- hasFilterControls && projectionInfo.isTemporalBucketable;-- const hasBinningControls =- !hasBucketControls &&- projectionInfo.projection &&- projectionInfo.projectionDimension &&- (projectionInfo.isBinnable || projectionInfo.hasBinning);-- const config = getDimensionBreakoutConfig(dimensionBreakoutType);- const chartTypes = config.availableDisplayTypes;- const effectiveDisplayType = isValidDisplayTypeForDimensionBreakout(- displayType,- dimensionBreakoutType,- )- ? displayType- : config.defaultDisplayType;-- const hasSharedDimensions = availableDimensions.shared.length > 0;- const hasAnySourceDimensions = sourceOrder.some(- (sourceId) => (availableDimensions.bySource[sourceId]?.length ?? 0) > 0,- );- const hasAvailableDimensions = hasSharedDimensions || hasAnySourceDimensions;- const columnPickerLabel =- dimensionBreakoutType === "time"- ? t`Time`- : (dimensionBreakoutLabel ?? t`Select column`);- const columnPickerIcon = projectionInfo.projectionDimension- ? getDimensionIcon(projectionInfo.projectionDimension)- : undefined;-- const hasCenterControls =- hasFilterControls || hasBucketControls || hasBinningControls;-- if (dimensionBreakoutType === "scalar") {- return (- <Box className={S.root} data-testid="metrics-viewer-controls">- <Flex className={S.centerCluster}>- <Flex className={S.centerControls} align="center">- <ControlSection>- <Button- className={S.controlButton}- fw="bold"- aria-label={t`No breakout`}- variant="subtle"- color="text-primary"- leftSection={<Icon c="brand" name="unreferenced" size={16} />}- onClick={openSidebar}- >- {t`No breakout`}- </Button>- </ControlSection>- </Flex>- </Flex>- </Box>- );- }-return (<Box className={S.root} data-testid="metrics-viewer-controls">- <Flex className={S.leftControls} align="center" gap="md">- <ChartTypePicker- chartTypes={chartTypes}- value={effectiveDisplayType}- onChange={handleDisplayTypeChange}- />- {showStackSeries && (- <ChartLayoutPicker- isStacked={!!visualizationSettings?.["graph.split_panels"]}- onToggle={(stacked) =>- handleVisualizationSettingsChange({- "graph.split_panels": stacked,- })- }- />- )}- </Flex>- {(hasCenterControls || canToggleColumnLabels) && (- <Box className={S.centerCluster}>- {hasCenterControls && (- <Flex className={S.centerControls} align="center">- {hasFilterControls && projectionInfo.filterDimension && (- <>- {hasAvailableDimensions && (- <ControlSection>- <Button- className={S.controlButton}- justify="space-between"- fw="bold"- aria-label={t`Change column`}- variant="subtle"- color="text-primary"- leftSection={- columnPickerIcon ? (- <Icon c="brand" name={columnPickerIcon} size={16} />- ) : undefined- }- onClick={openSidebar}- >- {columnPickerLabel}- </Button>- </ControlSection>- )}- <ControlSection>- <DimensionFilterButton- definition={definition}- filterDimension={projectionInfo.filterDimension}- dimensionFilter={dimensionFilter}- allFilterDimensions={allFilterDimensions}- onChange={handleDimensionFilterChange}- />- </ControlSection>- </>- )}- {hasBucketControls && projectionInfo.projectionDimension && (- <ControlSection>- <BucketButton- definition={definition}- dimension={projectionInfo.projectionDimension}- projection={projectionInfo.projection!}- onChange={handleTemporalUnitChange}- />- </ControlSection>- )}- {hasBinningControls && projectionInfo.projectionDimension && (- <ControlSection>- <BinningButton- definition={definition}- dimension={projectionInfo.projectionDimension}- projection={projectionInfo.projection!}- onBinningChange={handleBinningChange}- />- </ControlSection>- )}- </Flex>- )}- {canToggleColumnLabels && (- <Menu position="bottom-start" withinPortal>- <Menu.Target>- <ActionIcon- className={S.ellipsisMenuButton}- aria-label={t`Column label options`}- variant="subtle"- >- <Icon name="ellipsis" c="text-primary" />- </ActionIcon>- </Menu.Target>- <Menu.Dropdown p="md">- <Switch- label={t`Show column labels`}- size="sm"- labelPosition="right"- checked={showColumnLabels}- onChange={(event) =>- handleShowColumnLabelsChange(event.currentTarget.checked)- }- />- </Menu.Dropdown>- </Menu>- )}- </Box>- )}+ <LeftControls showStackSeries={showStackSeries} />+ <CenterControls+ definition={definition}+ allFilterDimensions={allFilterDimensions}+ canToggleColumnLabels={canToggleColumnLabels}+ /></Box>);}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerDimensionBreakoutContent/MetricsViewerDimensionBreakoutContent.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerDimensionBreakoutContent/MetricsViewerDimensionBreakoutContent.tsxindex 76e897e21f7..5c52cac48d5 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerDimensionBreakoutContent/MetricsViewerDimensionBreakoutContent.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerDimensionBreakoutContent/MetricsViewerDimensionBreakoutContent.tsx@@ -24,15 +24,12 @@ export function MetricsViewerDimensionBreakoutContent() {definitions,formulaEntities,activeDimensionBreakout: dimensionBreakout,- queriesAreLoading,- queriesError,modifiedDefinitionsBySlotIndex,metricSlots,series: rawSeries,- cardIdToEntityIndex,sourceColors,showColumnLabels,- updateActiveDimensionBreakout: onDimensionBreakoutUpdate,+ updateActiveDimensionBreakout,} = useMetricsViewerContext();const dimensionItems = useMemo(@@ -108,9 +105,10 @@ export function MetricsViewerDimensionBreakoutContent() {const handleBrush = useCallback(({ start, end }: { start: number; end: number }) => {- onDimensionBreakoutUpdate({+ updateActiveDimensionBreakout((prev) => ({+ ...prev,projectionConfig: {- ...dimensionBreakout?.projectionConfig,+ ...prev.projectionConfig,dimensionFilter: {type: "specific-date",operator: "between",@@ -118,9 +116,9 @@ export function MetricsViewerDimensionBreakoutContent() {hasTime: true,},},- });+ }));},- [onDimensionBreakoutUpdate, dimensionBreakout?.projectionConfig],+ [updateActiveDimensionBreakout],);if (!dimensionBreakout) {@@ -155,16 +153,7 @@ export function MetricsViewerDimensionBreakoutContent() {return (<Stack flex="1 0 auto" gap={0}><MetricsViewerVisualization- rawSeries={rawSeries}onBrush={isTimeDimensionBreakout ? handleBrush : undefined}- definitions={definitions}- formulaEntities={formulaEntities}- metricSlots={metricSlots}- dimensionBreakout={dimensionBreakout}- onDimensionBreakoutUpdate={onDimensionBreakoutUpdate}- cardIdToEntityIndex={cardIdToEntityIndex}- queriesAreLoading={queriesAreLoading}- queriesError={queriesError}chartColumnLabelsByEntityIndex={showPerMapColumnLabels ? dimensionItemsByEntityIndex : undefined}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsxindex 558461ac06a..8fbae83213e 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx@@ -1,4 +1,3 @@-import cx from "classnames";import { useMemo } from "react";import { t } from "ttag";import { noop } from "underscore";@@ -10,69 +9,59 @@ import {DimensionPillBar,type DimensionPillBarItem,} from "metabase/metrics-viewer/components/DimensionPillBar";+import type { MetricsViewerDimensionBreakoutState } from "metabase/metrics-viewer/types/viewer-state";import { DISPLAY_TYPE_REGISTRY } from "metabase/metrics-viewer/utils";import { MetricsViewerClickActionsMode } from "metabase/metrics-viewer/utils/MetricsViewerClickActionsMode";import { getGridColumns } from "metabase/metrics-viewer/utils/grid-columns";-import type { MetricSlot } from "metabase/metrics-viewer/utils/metric-slots";import { Center, Flex, SimpleGrid, Stack, useElementSize } from "metabase/ui";import Visualization from "metabase/visualizations/components/Visualization";import { datasetContainsNoResults } from "metabase-lib/v1/queries/utils/dataset";-import type { CardId, SingleSeries } from "metabase-types/api";+import type { CardId } from "metabase-types/api";-import type {- MetricSourceId,- MetricsViewerDefinitionEntry,- MetricsViewerDimensionBreakoutState,- MetricsViewerFormulaEntity,-} from "../../types/viewer-state";+import { useMetricsViewerContext } from "../../context";import S from "./MetricsViewerVisualization.module.css";type MetricsViewerVisualizationProps = {- rawSeries: SingleSeries[];onBrush?: (range: { start: number; end: number }) => void;- className?: string;- definitions: Record<MetricSourceId, MetricsViewerDefinitionEntry>;- formulaEntities: MetricsViewerFormulaEntity[];- metricSlots: MetricSlot[];- dimensionBreakout: MetricsViewerDimensionBreakoutState;- onDimensionBreakoutUpdate: (- updates: Partial<MetricsViewerDimensionBreakoutState>,- ) => void;- cardIdToEntityIndex: Record<CardId, number>;- interactive?: boolean;- queriesAreLoading: boolean;- queriesError: string | null;chartColumnLabelsByEntityIndex?: Map<number, DimensionPillBarItem>;};export function MetricsViewerVisualization({- rawSeries,onBrush,- className,- definitions,- formulaEntities,- metricSlots,- dimensionBreakout,- onDimensionBreakoutUpdate,- cardIdToEntityIndex,- interactive = true,- queriesAreLoading,- queriesError,chartColumnLabelsByEntityIndex,}: MetricsViewerVisualizationProps) {+ const {+ definitions,+ formulaEntities,+ activeDimensionBreakout: dimensionBreakout,+ queriesAreLoading,+ queriesError,+ metricSlots,+ series: rawSeries,+ cardIdToEntityIndex,+ updateActiveDimensionBreakout,+ } = useMetricsViewerContext();+const { ref, width } = useElementSize();const cols = getGridColumns(width, rawSeries.length);const clickActionsMode = useMemo(() =>- interactive+ dimensionBreakout? new MetricsViewerClickActionsMode({definitions,formulaEntities,metricSlots,dimensionBreakout,- onDimensionBreakoutUpdate,+ onDimensionBreakoutUpdate: (+ partial: Partial<MetricsViewerDimensionBreakoutState>,+ ) => {+ updateActiveDimensionBreakout((prev) => ({+ ...prev,+ ...partial,+ }));+ },cardIdToEntityIndex,}): undefined,@@ -81,8 +70,7 @@ export function MetricsViewerVisualization({cardIdToEntityIndex,formulaEntities,metricSlots,- interactive,- onDimensionBreakoutUpdate,+ updateActiveDimensionBreakout,dimensionBreakout,],);@@ -119,14 +107,12 @@ export function MetricsViewerVisualization({);}+ if (!dimensionBreakout) {+ return null;+ }+return (- <Flex- ref={ref}- direction="column"- flex="1 0 auto"- gap="sm"- className={className}- >+ <Flex ref={ref} direction="column" flex="1 0 auto" gap="sm">{rawSeries.length > 1 &&!DISPLAY_TYPE_REGISTRY[dimensionBreakout.display].supportsMultipleSeries ? (@@ -134,7 +120,7 @@ export function MetricsViewerVisualization({{rawSeries.map((series, i) => (<Stackgap="sm"- className={cx(className, S.gridChart)}+ className={S.gridChart}key={`series-${i}`}data-in-grid>@@ -144,7 +130,7 @@ export function MetricsViewerVisualization({rawSeries={[series]}isQueryBuilder={false}hideLegend- onBrush={interactive ? onBrush : undefined}+ onBrush={onBrush}mode={clickActionsMode}onChangeCardAndRun={noop}autoAdjustSettings@@ -166,7 +152,7 @@ export function MetricsViewerVisualization({rawSeries={rawSeries}isQueryBuilder={false}hideLegend- onBrush={interactive ? onBrush : undefined}+ onBrush={onBrush}mode={clickActionsMode}onChangeCardAndRun={noop}/>diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.unit.spec.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.unit.spec.tsxindex a70954744ae..36d13063055 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.unit.spec.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.unit.spec.tsx@@ -2,6 +2,8 @@ import { screen } from "@testing-library/react";import { renderWithProviders } from "__support__/ui";import type { DimensionPillBarItem } from "metabase/metrics-viewer/components/DimensionPillBar";+import { MetricsViewerProvider } from "metabase/metrics-viewer/context";+import { createMockMetricsViewerResult } from "metabase/metrics-viewer/test-utils";import type { MetricsViewerDimensionBreakoutState } from "metabase/metrics-viewer/types/viewer-state";import { createMockColumn } from "metabase-types/api/mocks";import { createMockSingleSeries } from "metabase-types/api/mocks/series";@@ -63,27 +65,28 @@ describe("MetricsViewerVisualization", () => {availableOptions: [],};+ const chartColumnLabelsByEntityIndex = new Map([+ [0, firstLabel],+ [1, secondLabel],+ ]);++ const metricsViewerResult = createMockMetricsViewerResult({+ series: [createMapSeries(100, "Orders"), createMapSeries(200, "ARR")],+ definitions: {},+ formulaEntities: [],+ metricSlots: [],+ activeDimensionBreakout: dimensionBreakout,+ cardIdToEntityIndex: { 100: 0, 200: 1 },+ queriesAreLoading: false,+ queriesError: null,+ });+renderWithProviders(- <MetricsViewerVisualization- rawSeries={[- createMapSeries(100, "Orders"),- createMapSeries(200, "ARR"),- ]}- definitions={{}}- formulaEntities={[]}- metricSlots={[]}- dimensionBreakout={dimensionBreakout}- onDimensionBreakoutUpdate={jest.fn()}- cardIdToEntityIndex={{ 100: 0, 200: 1 }}- queriesAreLoading={false}- queriesError={null}- chartColumnLabelsByEntityIndex={- new Map([- [0, firstLabel],- [1, secondLabel],- ])- }- />,+ <MetricsViewerProvider value={metricsViewerResult}>+ <MetricsViewerVisualization+ chartColumnLabelsByEntityIndex={chartColumnLabelsByEntityIndex}+ />+ </MetricsViewerProvider>,);expect(screen.getAllByTestId("visualization")).toHaveLength(2);diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.tsindex 6c487821793..70c861c22f0 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts@@ -743,11 +743,18 @@ export function useViewerState({);const updateActiveDimensionBreakout = useCallback(- (updates: Partial<MetricsViewerDimensionBreakoutState>) => {+ (+ setterFn: (+ prev: MetricsViewerDimensionBreakoutState,+ ) => MetricsViewerDimensionBreakoutState,+ ) => {if (!derivedData.activeDimensionBreakout) {return;}- updateDimensionBreakout(derivedData.activeDimensionBreakout.id, updates);+ updateDimensionBreakout(+ derivedData.activeDimensionBreakout.id,+ setterFn(derivedData.activeDimensionBreakout),+ );},[derivedData.activeDimensionBreakout, updateDimensionBreakout],);diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.tsindex 1832163110d..3f77bb3d260 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts@@ -88,11 +88,6 @@ export function useViewerUrl(if (serializedState.dimensionBreakouts.length > 0) {const dimensionBreakouts: MetricsViewerDimensionBreakoutState[] =serializedState.dimensionBreakouts.map(deserializeDimensionBreakout);- const showColumnLabels =- serializedState.showColumnLabels ??- dimensionBreakouts.some(- (dimensionBreakout) => dimensionBreakout.showColumnLabels === true,- );initialize({definitions: {},@@ -100,7 +95,7 @@ export function useViewerUrl(dimensionBreakouts,selectedDimensionBreakoutId:serializedState.selectedDimensionBreakoutId,- showColumnLabels,+ showColumnLabels: serializedState.showColumnLabels ?? false,});}diff --git a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts b/frontend/src/metabase/metrics-viewer/types/viewer-state.tsindex f66d4ea17fb..d3224bb8aaf 100644--- a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts+++ b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts@@ -120,7 +120,6 @@ export interface MetricsViewerDimensionBreakoutState {type: MetricsViewerDimensionBreakoutType;label: string | null;display: MetricsViewerDisplayType;- showColumnLabels?: boolean;visualizationSettings?: Partial<VisualizationSettings>;dimensionMapping: Record<number, DimensionId | null>;projectionConfig: MetricsViewerDimensionBreakoutProjectionConfig;@@ -232,7 +231,9 @@ export interface UseViewerStateResult {options?: { updateExisting?: boolean },) => void;updateActiveDimensionBreakout: (- updates: Partial<MetricsViewerDimensionBreakoutState>,+ setterFn: (+ prev: MetricsViewerDimensionBreakoutState,+ ) => MetricsViewerDimensionBreakoutState,) => void;setShowColumnLabels: (showColumnLabels: boolean) => void;setBreakoutDimension: (