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
Correctly render empty series in static viz (#63987)
John Swansone5309113059d
diff --git a/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx b/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsxindex a0f7752d059..9f3ee1e0e9f 100644--- a/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx+++ b/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx@@ -1,11 +1,6 @@import { Group } from "@visx/group";import type { StaticChartProps } from "metabase/static-viz/components/StaticVisualization";-import {- getColumnValueStaticFormatter,- getLabelsStaticFormatter,- getStaticFormatters,-} from "metabase/static-viz/lib/format";import { measureTextWidth } from "metabase/static-viz/lib/text";import { extractRemappedColumns } from "metabase/visualizations";import { getChartGoal } from "metabase/visualizations/lib/settings/goal";@@ -21,6 +16,11 @@ import {} from "metabase/visualizations/shared/utils/data";import { getTwoDimensionalChartSeries } from "metabase/visualizations/shared/utils/series";import type { RemappingHydratedChartData } from "metabase/visualizations/types";+import {+ getColumnValueFormatter,+ getFormatters,+ getLabelsFormatter,+} from "metabase/visualizations/visualizations/RowChart/utils/format";import { getLegendItems } from "metabase/visualizations/visualizations/RowChart/utils/legend";import {getAxesVisibility,@@ -67,7 +67,7 @@ export const StaticRowChart = ({rawSeries[0].data,) as RemappingHydratedChartData;const { getColor } = renderingContext;- const columnValueFormatter = getColumnValueStaticFormatter();+ const columnValueFormatter = getColumnValueFormatter();const { chartColumns, series, seriesColors } = getTwoDimensionalChartSeries(data,@@ -80,12 +80,12 @@ export const StaticRowChart = ({settings,columnValueFormatter,);- const labelsFormatter = getLabelsStaticFormatter(chartColumns, settings);+ const labelsFormatter = getLabelsFormatter(chartColumns, settings);const goal = getChartGoal(settings);const theme = getStaticChartTheme(getColor);const stackOffset = getStackOffset(settings);- const tickFormatters = getStaticFormatters(chartColumns, settings);+ const tickFormatters = getFormatters(chartColumns, settings);const { xLabel, yLabel } = getLabels(settings);diff --git a/frontend/src/metabase/static-viz/lib/format.ts b/frontend/src/metabase/static-viz/lib/format.tsdeleted file mode 100644index 65faec70794..00000000000--- a/frontend/src/metabase/static-viz/lib/format.ts+++ /dev/null@@ -1,101 +0,0 @@-import type { NumberLike, StringLike } from "@visx/scale";--import { formatValue } from "metabase/lib/formatting";-import { getFormattingOptionsWithoutScaling } from "metabase/visualizations/echarts/cartesian/model/util";-import type { CartesianChartColumns } from "metabase/visualizations/lib/graph/columns";-import { getStackOffset } from "metabase/visualizations/lib/settings/stacking";-import type {- ChartTicksFormatters,- ValueFormatter,-} from "metabase/visualizations/shared/types/format";-import { getLabelsMetricColumn } from "metabase/visualizations/shared/utils/series";-import { getColumnSettings } from "metabase-lib/v1/queries/utils/column-key";-import type {- DatasetColumn,- RowValue,- VisualizationSettings,-} from "metabase-types/api";--export const getStaticFormatters = (- chartColumns: CartesianChartColumns,- settings: VisualizationSettings,-): ChartTicksFormatters => {- const yTickFormatter = (value: StringLike) => {- const column = chartColumns.dimension.column;- const columnSettings = getColumnSettings(settings, column);-- const options = getFormattingOptionsWithoutScaling({- column,- ...columnSettings,- jsx: false,- });-- return String(formatValue(value, options));- };-- const metricColumn = getLabelsMetricColumn(chartColumns);-- const percentXTicksFormatter = (percent: NumberLike) => {- const column = metricColumn.column;- const number_separators = getColumnSettings(- settings,- column,- )?.number_separators;-- const options = getFormattingOptionsWithoutScaling({- column,- number_separators,- jsx: false,- number_style: "percent",- decimals: 2,- });-- return String(formatValue(percent, options));- };-- const xTickFormatter = (value: NumberLike) => {- const column = metricColumn.column;- const columnSettings = getColumnSettings(settings, column);-- const options = getFormattingOptionsWithoutScaling({- column,- ...columnSettings,- jsx: false,- });-- return String(formatValue(value, options));- };-- const shouldFormatXTicksAsPercent = getStackOffset(settings) === "expand";-- return {- yTickFormatter,- xTickFormatter: shouldFormatXTicksAsPercent- ? percentXTicksFormatter- : xTickFormatter,- };-};--export const getLabelsStaticFormatter = (- chartColumns: CartesianChartColumns,- settings: VisualizationSettings,-): ValueFormatter => {- const column = getLabelsMetricColumn(chartColumns).column;- const columnSettings = getColumnSettings(settings, column);- const options = getFormattingOptionsWithoutScaling({- column,- ...columnSettings,- jsx: false,- compact: settings["graph.label_value_formatting"] === "compact",- });-- const labelsFormatter = (value: any) => String(formatValue(value, options));-- return labelsFormatter;-};--export const getColumnValueStaticFormatter = () => {- return (value: RowValue, column: DatasetColumn) => {- return String(formatValue(value, { column }));- };-};