Revert "Fix combined tooltip for charts (#17946)" (#18227)

frontend/src/metabase/visualizations/lib/apply_tooltips.js

@@ -32,17 +32,11 @@ export function getClickHoverObject(
   const isBar = classList.includes("bar");
   const isSingleSeriesBar = isBar && !isMultiseries;
 
-  function getColumnDisplayName(col, colIndex, card) {
-    // `visualization_settings.series_settings` use `card.name` and
-    // not `column.name` for renamed series when the `seriesIndex > 0`;
-    // check for `columnIndex === 1` because only the first metric column
-    // should be renamed by this setting
-    const colKey = seriesIndex > 0 && colIndex === 1 ? card.name : col.name;
-    const colTitle = getIn(settings, ["series_settings", colKey, "title"]);
-
+  function getColumnDisplayName(col) {
+    const title = getIn(settings, ["series_settings", col.name, "title"]);
     // don't replace with series title for breakout multiseries since the series title is shown in the breakout value
-    if (!isBreakoutMultiseries && colTitle) {
-      return colTitle;
+    if (!isBreakoutMultiseries && title) {
+      return title;
     }
 
     return getFriendlyName(col);
@@ -120,7 +114,7 @@ export function getClickHoverObject(
           };
         }
         return {
-          key: getColumnDisplayName(col, i, card),
+          key: getColumnDisplayName(col),
           value: formatNull(aggregatedRow[i]),
           col: col,
         };

frontend/test/metabase/scenarios/visualizations/line_chart.cy.spec.js

@@ -197,7 +197,7 @@ describe("scenarios > visualizations > line chart", () => {
       .should("have.length", 2);
   });
 
-  describe("tooltip of combined dashboard cards (multi-series) should show the correct column title (metabase#16249", () => {
+  describe.skip("tooltip of combined dashboard cards (multi-series) should show the correct column title (metabase#16249", () => {
     const RENAMED_FIRST_SERIES = "Foo";
     const RENAMED_SECOND_SERIES = "Bar";
 
@@ -437,5 +437,5 @@ function showTooltipForFirstCircleInSeries(series_index) {
     .as("firstSeries")
     .find("circle")
     .first()
-    .trigger("mousemove", { force: true });
+    .realHover();
 }