Skip to content

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

fix: y axis not shown even if it would fit (#68861)

Maksym Yakubychb4cf7383a4e4
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
index 7bb5ed08ba0..373f4d42911 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
@@ -22,10 +22,12 @@ import { useChartEvents } from "metabase/visualizations/visualizations/Cartesian
import { useChartDebug } from "./use-chart-debug";
import { useModelsAndOption } from "./use-models-and-option";
-import { getGridSizeAdjustedSettings } from "./utils";
-const HIDE_X_AXIS_LABEL_WIDTH_THRESHOLD = 360;
-const HIDE_Y_AXIS_LABEL_WIDTH_THRESHOLD = 200;
+const HIDE_Y_AXIS_LABEL_WIDTH_THRESHOLD = 360;
+const HIDE_X_AXIS_LABEL_HEIGHT_THRESHOLD = 200;
+
+const HIDE_Y_AXIS_HEIGHT_THRESHOLD = 150;
+const INTERPOLATE_LINE_THRESHOLD = 150;
function _CartesianChart(props: VisualizationProps) {
const containerRef = useRef<HTMLDivElement>(null);
@@ -41,7 +43,6 @@ function _CartesianChart(props: VisualizationProps) {
settings: originalSettings,
card,
getHref,
- gridSize,
width: outerWidth,
height: outerHeight,
showTitle,
@@ -61,17 +62,29 @@ function _CartesianChart(props: VisualizationProps) {
} = props;
const settings = useMemo(() => {
- const settings = getGridSizeAdjustedSettings(originalSettings, gridSize);
+ const settings = { ...originalSettings };
if (isDashboard) {
- if (outerWidth <= HIDE_X_AXIS_LABEL_WIDTH_THRESHOLD) {
+ if (
+ outerWidth <= INTERPOLATE_LINE_THRESHOLD ||
+ outerHeight <= INTERPOLATE_LINE_THRESHOLD
+ ) {
+ settings["line.interpolate"] = "cardinal";
+ }
+
+ if (outerWidth <= HIDE_Y_AXIS_LABEL_WIDTH_THRESHOLD) {
settings["graph.y_axis.labels_enabled"] = false;
}
- if (outerHeight <= HIDE_Y_AXIS_LABEL_WIDTH_THRESHOLD) {
+
+ if (outerHeight <= HIDE_X_AXIS_LABEL_HEIGHT_THRESHOLD) {
settings["graph.x_axis.labels_enabled"] = false;
}
+
+ if (outerHeight <= HIDE_Y_AXIS_HEIGHT_THRESHOLD) {
+ settings["graph.y_axis.axis_enabled"] = false;
+ }
}
return settings;
- }, [originalSettings, gridSize, isDashboard, outerWidth, outerHeight]);
+ }, [originalSettings, isDashboard, outerWidth, outerHeight]);
const { chartModel, timelineEventsModel, option } = useModelsAndOption(
{
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts
index 623d68a3b80..ef48122fbcd 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts
@@ -5,53 +5,7 @@ import type {
DataKey,
SeriesModel,
} from "metabase/visualizations/echarts/cartesian/model/types";
-import type {
- ComputedVisualizationSettings,
- HoveredObject,
- VisualizationGridSize,
-} from "metabase/visualizations/types";
-
-const getFidelity = (gridSize?: VisualizationGridSize) => {
- const fidelity = { x: 0, y: 0 };
- const size = gridSize || { width: Infinity, height: Infinity };
- if (size.width >= 5) {
- fidelity.x = 2;
- } else if (size.width >= 4) {
- fidelity.x = 1;
- }
- if (size.height >= 5) {
- fidelity.y = 2;
- } else if (size.height >= 4) {
- fidelity.y = 1;
- }
-
- return fidelity;
-};
-
-export const getGridSizeAdjustedSettings = (
- settings: ComputedVisualizationSettings,
- gridSize?: VisualizationGridSize,
-) => {
- const fidelity = getFidelity(gridSize);
- const newSettings = { ...settings };
-
- // smooth interpolation at smallest x/y fidelity
- if (fidelity.x === 0 && fidelity.y === 0) {
- newSettings["line.interpolate"] = "cardinal";
- }
-
- // no axis in < 1 fidelity
- if (fidelity.x < 1 || fidelity.y < 1) {
- newSettings["graph.y_axis.axis_enabled"] = false;
- }
-
- // no labels in < 2 fidelity
- if (fidelity.x < 2 || fidelity.y < 2) {
- newSettings["graph.y_axis.labels_enabled"] = false;
- }
-
- return newSettings;
-};
+import type { HoveredObject } from "metabase/visualizations/types";
export const getHoveredSeriesDataKey = (
seriesModels: SeriesModel[],