update Echarts to 6.1.0 (#75139)

* echarts 6.1.0

* adjusting BE test

bun.lock

@@ -96,7 +96,7 @@
         "detect-package-manager": "^3.0.2",
         "diff": "^5.2.2",
         "dompurify": "^3.4.11",
-        "echarts": "6.0.0",
+        "echarts": "6.1.0",
         "events": "^3.3.0",
         "fast-text-encoding": "^1.0.6",
         "formik": "^2.4.5",
@@ -2924,7 +2924,7 @@
 
     "ecdsa-sig-formatter": ["ecdsa-sig-formatter@1.0.11", "", { "dependencies": { "safe-buffer": "^5.0.1" } }, "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="],
 
-    "echarts": ["echarts@6.0.0", "", { "dependencies": { "tslib": "2.3.0", "zrender": "6.0.0" } }, "sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ=="],
+    "echarts": ["echarts@6.1.0", "", { "dependencies": { "tslib": "2.3.0", "zrender": "6.1.0" } }, "sha512-q0yaFPggC9FUdsWH4blavRWFmxdrIodbkoKNAjJudAI6CA9gNPxHtV2RcZNEepZVlk4yvBYkOkbk6HIVpIyHZA=="],
 
     "ee-first": ["ee-first@1.1.1", "", {}, "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="],
 
@@ -6220,6 +6220,8 @@
 
     "echarts/tslib": ["tslib@2.3.0", "", {}, "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="],
 
+    "echarts/zrender": ["zrender@6.1.0", "", { "dependencies": { "tslib": "2.3.0" } }, "sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ=="],
+
     "elliptic/bn.js": ["bn.js@4.11.9", "", {}, "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="],
 
     "endent/dedent": ["dedent@0.7.0", "", {}, "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="],

frontend/src/metabase/visualizations/echarts/cartesian/option/ticks.ts

@@ -119,6 +119,15 @@ export const getTicksOptions = (
     });
   }
 
+  // HACK: ECharts 6.1.0 emits intermediate (mid-year) ticks within the padded
+  // single-point year domain. Unlike week/month/quarter, the year path had no
+  // boundary guard, so two ticks in the same year both format as that year and
+  // duplicate the label (metabase#63671). Filter to start-of-year ticks only.
+  if (largestInterval.unit === "year") {
+    canRender = (date: Dayjs) =>
+      isWithinRange(date) && date.month() === 0 && date.date() === 1;
+  }
+
   if (!maxInterval) {
     minInterval = getTimeSeriesIntervalDuration(largestInterval);
   }

package.json

@@ -105,7 +105,7 @@
     "detect-package-manager": "^3.0.2",
     "diff": "^5.2.2",
     "dompurify": "^3.4.11",
-    "echarts": "6.0.0",
+    "echarts": "6.1.0",
     "events": "^3.3.0",
     "fast-text-encoding": "^1.0.6",
     "formik": "^2.4.5",

patches/echarts+6.0.0.patch

@@ -1,103 +0,0 @@
-diff --git a/node_modules/echarts/lib/chart/line/LineView.js b/node_modules/echarts/lib/chart/line/LineView.js
-index 79ac429..4075c93 100644
---- a/node_modules/echarts/lib/chart/line/LineView.js
-+++ b/node_modules/echarts/lib/chart/line/LineView.js
-@@ -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]);
-+    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 b9cef72..4729614 100644
---- a/node_modules/echarts/lib/chart/line/helper.js
-+++ b/node_modules/echarts/lib/chart/line/helper.js
-@@ -107,16 +107,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);
- }
-diff --git a/node_modules/echarts/lib/data/helper/dataStackHelper.js b/node_modules/echarts/lib/data/helper/dataStackHelper.js
-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,12 @@ 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 +101,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;
-       }
-     }
-@@ -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;
-+    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
-diff --git a/node_modules/echarts/lib/label/labelLayoutHelper.js b/node_modules/echarts/lib/label/labelLayoutHelper.js
-index 8927284..3ba88fc 100644
---- a/node_modules/echarts/lib/label/labelLayoutHelper.js
-+++ b/node_modules/echarts/lib/label/labelLayoutHelper.js
-@@ -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;
-+    }
-+
-     // 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

patches/echarts+6.1.0.patch

@@ -0,0 +1,62 @@
+diff --git a/node_modules/echarts/lib/chart/line/LineView.js b/node_modules/echarts/lib/chart/line/LineView.js
+index 3a5abc1..d976453 100644
+--- a/node_modules/echarts/lib/chart/line/LineView.js
++++ b/node_modules/echarts/lib/chart/line/LineView.js
+@@ -152,6 +152,9 @@ function turnPointsIntoStep(points, basePoints, coordSys, stepTurnAt, connectNul
+     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 298ce98..198716e 100644
+--- a/node_modules/echarts/lib/chart/line/helper.js
++++ b/node_modules/echarts/lib/chart/line/helper.js
+@@ -107,17 +107,21 @@ 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);
+ }
+ export function isPointIllegal(xOrY, yOrX) {
+diff --git a/node_modules/echarts/lib/label/labelLayoutHelper.js b/node_modules/echarts/lib/label/labelLayoutHelper.js
+index 1f2944e..112cc37 100644
+--- a/node_modules/echarts/lib/label/labelLayoutHelper.js
++++ b/node_modules/echarts/lib/label/labelLayoutHelper.js
+@@ -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;
++    }
++
+     // 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

test/metabase/channel/render/body_test.clj

@@ -1225,7 +1225,7 @@
             (let [doc            (render.tu/render-card-as-hickory! card-id)
                   first-day-text (->> (hik.s/select (hik.s/tag :text) doc)
                                       (map (fn [el] (-> el :content first)))
-                                      (take-last 6)
+                                      (take-last 4)
                                       (map str/trim)
                                       first)]
               (testing "Renders with correct day of week first"