Fix scalar series splitting and D-M-M series names

frontend/src/metabase/visualizations/components/LineAreaBarChart.jsx

@@ -9,7 +9,8 @@ import lineAreaBarRenderer from "metabase/visualizations/lib/LineAreaBarRenderer
 import { isNumeric, isDate } from "metabase/lib/schema_metadata";
 import {
     isSameSeries,
-    getChartTypeFromData
+    getChartTypeFromData,
+    getFriendlyName
 } from "metabase/visualizations/lib/utils";
 
 import Urls from "metabase/lib/urls";
@@ -19,7 +20,6 @@ import { MinRowsError, ChartSettingsError } from "metabase/visualizations/lib/er
 import crossfilter from "crossfilter";
 import _ from "underscore";
 import cx from "classnames";
-import i from "icepick";
 
 export default class LineAreaBarChart extends Component {
     static noHeader = true;
@@ -128,13 +128,13 @@ export default class LineAreaBarChart extends Component {
                 const dimensionIndex = dimensionIndexes[0];
 
                 nextState.isMultiseries = true;
-                nextState.series = metrics.map((col, index) => {
-                    let metricIndex = metricIndexes[index];
+                nextState.series = metricIndexes.map(metricIndex => {
+                    const col = cols[metricIndex];
                     return {
                         card: {
                             ...s.card,
                             id: null,
-                            name: col.display_name || col.name
+                            name: getFriendlyName(col)
                         },
                         data: {
                             rows: rows.map(row => [row[dimensionIndex], row[metricIndex]]),
@@ -239,7 +239,7 @@ export default class LineAreaBarChart extends Component {
                 <CardRenderer
                     {...this.props}
                     chartType={this.getChartType()}
-                    series={i.assocIn(series, [0, "card", "visualization_settings"], settings)}
+                    settings={settings}
                     className="flex-full"
                     renderer={lineAreaBarRenderer}
                 />

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

@@ -436,8 +436,7 @@ function lineAndBarOnRender(chart, settings) {
     chart.render();
 }
 
-export default function lineAreaBar(element, { series, onHoverChange, onRender, chartType, isScalarSeries }) {
-    const settings = series[0].card.visualization_settings;
+export default function lineAreaBar(element, { series, onHoverChange, onRender, chartType, isScalarSeries, settings }) {
     const colors = settings["graph.colors"];
 
     const isTimeseries = dimensionIsTimeseries(series[0].data);
@@ -490,7 +489,7 @@ export default function lineAreaBar(element, { series, onHoverChange, onRender,
 
         let yExtents = groups.map(group => d3.extent(group[0].all(), d => d.value));
 
-        if (settings["graph.y_axis.auto_split"] !== false) {
+        if (!isScalarSeries && settings["graph.y_axis.auto_split"] !== false) {
             yAxisSplit = computeSplit(yExtents);
         } else {
             yAxisSplit = [series.map((s,i) => i)];