Skip to content

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

upgrade to echarts v6 (#64139)

Aleksandr Lesnenko71eb726eb576
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Area_Stack_Linear_X_Axis.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Area_Stack_Linear_X_Axis.png
index 733e7a27fc0..6033dfa0303 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Area_Stack_Linear_X_Axis.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Area_Stack_Linear_X_Axis.png differ
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Stack_Linear_X_Axis.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Stack_Linear_X_Axis.png
index 995b3bb9b90..e26032e8293 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Stack_Linear_X_Axis.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Stack_Linear_X_Axis.png differ
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Log_X_Scale.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Log_X_Scale.png
index e47f0277c4a..aeade75ba06 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Log_X_Scale.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ScatterPlot_Log_X_Scale.png differ
diff --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.png
index 2078be8ddd1..a407dd05066 100644
Binary 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 differ
diff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.png
index f1352babfb7..33e8252538c 100644
Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.png differ
diff --git a/e2e/support/helpers/e2e-visual-tests-helpers.js b/e2e/support/helpers/e2e-visual-tests-helpers.js
index d03e55ae78e..d1fc7edcbd5 100644
--- a/e2e/support/helpers/e2e-visual-tests-helpers.js
+++ b/e2e/support/helpers/e2e-visual-tests-helpers.js
@@ -69,7 +69,7 @@ export function echartsIcon(name, isSelected = false) {
export function chartGridLines() {
return echartsContainer().find(
- "path[stroke='var(--mb-color-cartesian-grid-line)'][fill='transparent']",
+ "path[stroke='var(--mb-color-cartesian-grid-line)'][fill='none']",
);
}
diff --git a/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js b/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js
index 10b681d233a..1328079c432 100644
--- a/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js
+++ b/e2e/test/scenarios/binning/qb-explicit-joins.cy.spec.js
@@ -174,7 +174,7 @@ describe("scenarios > binning > from a saved QB question with explicit joins", (
assertQueryBuilderState({
mode: "notebook",
title: "Count by Products → Price: 50 bins",
- values: ["14", "18", "20", "100"],
+ values: ["14", "20", "24", "100"],
});
});
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
index 244aaaff757..e3927d12b28 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
@@ -187,6 +187,7 @@ const getCommonDimensionAxisOptions = (
: undefined,
),
mainType: "xAxis" as const,
+ nameMoveOverlap: false,
axisTick: {
show: false,
},
@@ -398,6 +399,7 @@ export const buildMetricAxis = (
return {
show: true,
+ nameMoveOverlap: false,
scale: !!settings["graph.y_axis.unpin_from_zero"],
type: "value",
splitNumber: axisModel.splitNumber,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts
index 6d447339951..aaa835336e6 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts
@@ -1,4 +1,5 @@
import type { EChartsCoreOption } from "echarts/core";
+import type { YAXisOption } from "echarts/types/dist/shared";
import type { OptionSourceData } from "echarts/types/src/util/types";
import {
@@ -44,6 +45,11 @@ export const getSharedEChartsOptions = (isAnimated: boolean) => ({
type Axes = ReturnType<typeof buildAxes>;
+type NonCategoryYAxisOption = Exclude<YAXisOption, { type?: "category" }>;
+const isNonCategoryYAxisOption = (
+ axis: YAXisOption,
+): axis is NonCategoryYAxisOption => axis.type !== "category";
+
export const ensureRoomForLabels = (
axes: Axes,
{ leftAxisModel, rightAxisModel }: CartesianChartModel,
@@ -68,6 +74,12 @@ export const ensureRoomForLabels = (
const innerHeight = Math.abs(bounds.bottom - bounds.top);
const labelPct = CHART_STYLE.seriesLabels.size / innerHeight;
const lowerBoundaryGap = labelPct / 2; // `/ 2` because it's okay if the bar label overlaps the axis *line*, we just don't want it to overlap the axis *labels*
+
+ // Only apply numeric boundaryGap to non-category axes
+ if (!isNonCategoryYAxisOption(axis)) {
+ return axis;
+ }
+
return { ...axis, boundaryGap: [lowerBoundaryGap, 0] };
}
return axis;
@@ -154,6 +166,7 @@ export const getCartesianChartOption = (
...getSharedEChartsOptions(isAnimated),
grid: {
...chartMeasurements.padding,
+ outerBoundsMode: "none",
},
dataset: echartsDataset,
series: seriesOption,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts
index ddb27268e02..8182150aef1 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts
@@ -96,6 +96,7 @@ export function getScatterPlotOption(
...getSharedEChartsOptions(isAnimated),
grid: {
...chartMeasurements.padding,
+ outerBoundsMode: "none",
},
dataset: echartsDataset,
series: seriesOption,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts
index 7771feff3c0..dbf67a6941c 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts
@@ -246,6 +246,7 @@ export const getWaterfallChartOption = (
...getSharedEChartsOptions(isAnimated),
grid: {
...chartMeasurements.padding,
+ outerBoundsMode: "none",
},
dataset: echartsDataset,
series: seriesOption,
diff --git a/package.json b/package.json
index 26ad11ea049..368ebd77cfc 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
"dayjs": "^1.11.18",
"detect-package-manager": "^3.0.2",
"diff": "^5.2.0",
- "echarts": "^5.5.1-rc.1",
+ "echarts": "6.0.0",
"fast-text-encoding": "^1.0.6",
"formik": "^2.4.5",
"frimousse": "^0.3.0",
diff --git a/patches/echarts+5.5.1-rc.1.patch b/patches/echarts+5.5.1-rc.1.patch
deleted file mode 100644
index 9f2af018fde..00000000000
--- a/patches/echarts+5.5.1-rc.1.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/node_modules/echarts/lib/chart/line/LineView.js b/node_modules/echarts/lib/chart/line/LineView.js
-index 9da26b6..c49566f 100644
---- a/node_modules/echarts/lib/chart/line/LineView.js
-+++ b/node_modules/echarts/lib/chart/line/LineView.js
-@@ -140,6 +140,9 @@ function turnPointsIntoStep(points, coordSys, stepTurnAt, connectNulls) {
- pt[0] = points[i];
- pt[1] = points[i + 1];
- stepPoints.push(pt[0], pt[1]);
-+ if (isNaN(nextPt[1 - baseIndex])) {
-+ continue;
-+ }
- switch (stepTurnAt) {
- case 'end':
- stepPt[baseIndex] = nextPt[baseIndex];
-diff --git a/node_modules/echarts/lib/chart/line/helper.js b/node_modules/echarts/lib/chart/line/helper.js
-index fa02e2f..eee577a 100644
---- a/node_modules/echarts/lib/chart/line/helper.js
-+++ b/node_modules/echarts/lib/chart/line/helper.js
-@@ -108,16 +108,20 @@ function getValueStart(valueAxis, valueOrigin) {
- return valueStart;
- }
- export function getStackedOnPoint(dataCoordInfo, coordSys, data, idx) {
-- var value = NaN;
-+ let stackedOverValue = NaN;
-+ let stackResultValue = NaN;
- if (dataCoordInfo.stacked) {
-- value = data.get(data.getCalculationInfo('stackedOverDimension'), idx);
-+ stackedOverValue = data.get(data.getCalculationInfo('stackedOverDimension'), idx);
-+ stackResultValue = data.get(data.getCalculationInfo('stackResultDimension'), idx);
-+ } else {
-+ stackResultValue = data.get(dataCoordInfo.valueDim, idx);
- }
-- if (isNaN(value)) {
-- value = dataCoordInfo.valueStart;
-+ if (isNaN(stackedOverValue) && !isNaN(stackResultValue)) {
-+ stackedOverValue = dataCoordInfo.valueStart;
- }
- var baseDataOffset = dataCoordInfo.baseDataOffset;
- var stackedData = [];
- stackedData[baseDataOffset] = data.get(dataCoordInfo.baseDim, idx);
-- stackedData[1 - baseDataOffset] = value;
-+ stackedData[1 - baseDataOffset] = stackedOverValue;
- return coordSys.dataToPoint(stackedData);
- }
-\ No newline at end of file
-diff --git a/node_modules/echarts/lib/data/helper/dataStackHelper.js b/node_modules/echarts/lib/data/helper/dataStackHelper.js
-index c25de1b..a3ced22 100644
---- a/node_modules/echarts/lib/data/helper/dataStackHelper.js
-+++ b/node_modules/echarts/lib/data/helper/dataStackHelper.js
-@@ -83,6 +83,13 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
- var stackedDimInfo;
- var stackResultDimension;
- var stackedOverDimension;
-+
-+ var yCoordDimension = dimensionDefineList.find(
-+ dimensionInfo => !isString(dimensionInfo) && dimensionInfo.coordDim === 'y'
-+ );
-+ var isYCoordDimensionStackable = yCoordDimension != null
-+ && yCoordDimension.type !== 'ordinal' && yCoordDimension.type !== 'time';
-+
- each(dimensionDefineList, function (dimensionInfo, index) {
- if (isString(dimensionInfo)) {
- dimensionDefineList[index] = dimensionInfo = {
-@@ -95,7 +102,10 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
- stackedByDimInfo = dimensionInfo;
- }
- // Find the first stackable dimension as the stackedDimInfo.
-- if (!stackedDimInfo && dimensionInfo.type !== 'ordinal' && dimensionInfo.type !== 'time' && (!stackedCoordDimension || stackedCoordDimension === dimensionInfo.coordDim)) {
-+ if (!stackedDimInfo && dimensionInfo.type !== 'ordinal'
-+ && dimensionInfo.type !== 'time'
-+ && (yCoordDimension == null || (dimensionInfo.coordDim !== 'x' && isYCoordDimensionStackable))
-+ && (!stackedCoordDimension || stackedCoordDimension === dimensionInfo.coordDim)) {
- stackedDimInfo = dimensionInfo;
- }
- }
-@@ -105,6 +115,11 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
- // It may make sense if the user provides elaborately constructed data.
- byIndex = true;
- }
-+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
-+ // Compatible with previous design, value axis (time axis) only stack by index.
-+ // It may make sense if the user provides elaborately constructed data.
-+ byIndex = true;
-+ }
- // Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
- // That put stack logic in List is for using conveniently in echarts extensions, but it
- // might not be a good way.
-diff --git a/node_modules/echarts/lib/label/labelLayoutHelper.js b/node_modules/echarts/lib/label/labelLayoutHelper.js
-index a75f606..52c5a0b 100644
---- a/node_modules/echarts/lib/label/labelLayoutHelper.js
-+++ b/node_modules/echarts/lib/label/labelLayoutHelper.js
-@@ -256,6 +256,13 @@ export function hideOverlap(labelList) {
- var transform = labelItem.transform;
- var label = labelItem.label;
- var labelLine = labelItem.labelLine;
-+
-+ if (label.style.text === "") {
-+ hideEl(label);
-+ labelLine && hideEl(labelLine);
-+ continue;
-+ }
-+
- globalRect.copy(labelItem.rect);
- // Add a threshold because layout may be aligned precisely.
- globalRect.width -= 0.1;
diff --git a/patches/echarts+5.5.0.patch b/patches/echarts+6.0.0.patch
similarity index 76%
rename from patches/echarts+5.5.0.patch
rename to patches/echarts+6.0.0.patch
index 0d48e35d575..adf53cdb7ee 100644
--- a/patches/echarts+5.5.0.patch
+++ b/patches/echarts+6.0.0.patch
@@ -1,8 +1,8 @@
diff --git a/node_modules/echarts/lib/chart/line/LineView.js b/node_modules/echarts/lib/chart/line/LineView.js
-index 9da26b6..edf6ed7 100644
+index 79ac429..4075c93 100644
--- a/node_modules/echarts/lib/chart/line/LineView.js
+++ b/node_modules/echarts/lib/chart/line/LineView.js
-@@ -140,6 +140,9 @@ function turnPointsIntoStep(points, coordSys, stepTurnAt, connectNulls) {
+@@ -156,6 +156,9 @@ function turnPointsIntoStep(points, basePoints, coordSys, stepTurnAt, connectNul
pt[0] = points[i];
pt[1] = points[i + 1];
stepPoints.push(pt[0], pt[1]);
@@ -13,10 +13,10 @@ index 9da26b6..edf6ed7 100644
case 'end':
stepPt[baseIndex] = nextPt[baseIndex];
diff --git a/node_modules/echarts/lib/chart/line/helper.js b/node_modules/echarts/lib/chart/line/helper.js
-index fa02e2f..c84b0ac 100644
+index b9cef72..4729614 100644
--- a/node_modules/echarts/lib/chart/line/helper.js
+++ b/node_modules/echarts/lib/chart/line/helper.js
-@@ -108,16 +108,20 @@ function getValueStart(valueAxis, valueOrigin) {
+@@ -107,16 +107,20 @@ function getValueStart(valueAxis, valueOrigin) {
return valueStart;
}
export function getStackedOnPoint(dataCoordInfo, coordSys, data, idx) {
@@ -43,14 +43,13 @@ index fa02e2f..c84b0ac 100644
return coordSys.dataToPoint(stackedData);
}
diff --git a/node_modules/echarts/lib/data/helper/dataStackHelper.js b/node_modules/echarts/lib/data/helper/dataStackHelper.js
-index c25de1b..a3ced22 100644
+index c25de1b..454a3d3 100644
--- a/node_modules/echarts/lib/data/helper/dataStackHelper.js
+++ b/node_modules/echarts/lib/data/helper/dataStackHelper.js
-@@ -83,6 +83,13 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
+@@ -83,6 +83,12 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
var stackedDimInfo;
var stackResultDimension;
var stackedOverDimension;
-+
+ var yCoordDimension = dimensionDefineList.find(
+ dimensionInfo => !isString(dimensionInfo) && dimensionInfo.coordDim === 'y'
+ );
@@ -60,7 +59,7 @@ index c25de1b..a3ced22 100644
each(dimensionDefineList, function (dimensionInfo, index) {
if (isString(dimensionInfo)) {
dimensionDefineList[index] = dimensionInfo = {
-@@ -95,7 +102,10 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
+@@ -95,7 +101,10 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
stackedByDimInfo = dimensionInfo;
}
// Find the first stackable dimension as the stackedDimInfo.
@@ -72,33 +71,33 @@ index c25de1b..a3ced22 100644
stackedDimInfo = dimensionInfo;
}
}
-@@ -105,6 +115,11 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
+@@ -103,7 +112,11 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
// It may make sense if the user provides elaborately constructed data.
- byIndex = true;
+- byIndex = true;
++ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
++ // Compatible with previous design, value axis (time axis) only stack by index.
++ // It may make sense if the user provides elaborately constructed data.
++ byIndex = true;
++ }
}
-+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
-+ // Compatible with previous design, value axis (time axis) only stack by index.
-+ // It may make sense if the user provides elaborately constructed data.
-+ byIndex = true;
-+ }
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
- // might not be a good way.
diff --git a/node_modules/echarts/lib/label/labelLayoutHelper.js b/node_modules/echarts/lib/label/labelLayoutHelper.js
-index a75f606..52c5a0b 100644
+index 8927284..3ba88fc 100644
--- a/node_modules/echarts/lib/label/labelLayoutHelper.js
+++ b/node_modules/echarts/lib/label/labelLayoutHelper.js
-@@ -256,6 +256,13 @@ export function hideOverlap(labelList) {
- var transform = labelItem.transform;
+@@ -411,6 +411,12 @@ export function hideOverlap(labelList) {
+ }
var label = labelItem.label;
var labelLine = labelItem.labelLine;
-+
+ if (label.style.text === "") {
+ hideEl(label);
+ labelLine && hideEl(labelLine);
+ continue;
+ }
-+
- globalRect.copy(labelItem.rect);
- // Add a threshold because layout may be aligned precisely.
- globalRect.width -= 0.1;
++
+ // NOTICE: even when the with/height of globalRect of a label is 0, the label line should
+ // still be displayed, since we should follow the concept of "truncation", meaning that
+ // something exists even if it cannot be fully displayed. A visible label line is necessary
diff --git a/test/metabase/channel/render/body_test.clj b/test/metabase/channel/render/body_test.clj
index aff7b21b72b..0b644fa511d 100644
--- a/test/metabase/channel/render/body_test.clj
+++ b/test/metabase/channel/render/body_test.clj
@@ -808,7 +808,7 @@
;; the series bars each have distinct colours, so we can group by those attrs to get a count.
;; and remove any paths that are 'transparent'
series-counts (-> (group-by #(get-in % [:attrs :fill]) dashcard-path-elements)
- (dissoc "transparent")
+ (dissoc "none")
(update-vals count))]
;; The series count should be 1 for each series, since we're filtering by a single month of the year
;; and each question is set up with a breakout on :created_at by :month, so filtering on a single month produces just 1 bar.
diff --git a/yarn.lock b/yarn.lock
index cec4701ceeb..8a51d920184 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10100,13 +10100,13 @@ [email protected]:
dependencies:
safe-buffer "^5.0.1"
-echarts@^5.5.1-rc.1:
- version "5.5.1-rc.1"
- resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.5.1-rc.1.tgz#2fb9ab08b3021a60ff9e3c1d5ec08d7406e68b10"
- integrity sha512-x+IwxSpVOhlSovphKE8j7KiqkPOGxy1fEGNFHKE9rhgVyHu3dpPv2i5yf7dYXrqaSDcq/wA9VRGJLboxWtEPGA==
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/echarts/-/echarts-6.0.0.tgz#2935aa7751c282d1abbbf7d719d397199a15b9e7"
+ integrity sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ==
dependencies:
tslib "2.3.0"
- zrender "5.6.0"
+ zrender "6.0.0"
version "1.1.1"
@@ -22540,10 +22540,10 @@ yup@^0.32.11:
property-expr "^2.0.4"
toposort "^2.0.2"
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.6.0.tgz#01325b0bb38332dd5e87a8dbee7336cafc0f4a5b"
- integrity sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/zrender/-/zrender-6.0.0.tgz#947077bc69cdea744134984927f132f3727f8079"
+ integrity sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==
dependencies:
tslib "2.3.0"