Merge pull request #4573 from metabase/issue-4512

Fix multiseries scalar/funnels. 

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

@@ -244,7 +244,7 @@ export default class Visualization extends Component<*, Props, State> {
 
         return (
             <div className={cx(className, "flex flex-column")}>
-                { showTitle && (settings["card.title"] || extra) && (loading || error || !(CardVisualization && CardVisualization.noHeader)) || replacementContent ?
+                { showTitle && (settings["card.title"] || extra) && (loading || error || noResults || !(CardVisualization && CardVisualization.noHeader)) || replacementContent ?
                     <div className="p1 flex-no-shrink">
                         <LegendHeader
                             series={

frontend/src/metabase/visualizations/visualizations/Funnel.jsx

@@ -33,7 +33,12 @@ export default class Funnel extends Component<*, VisualizationProps, *> {
         return cols.length === 2;
     }
 
-    static checkRenderable([{ data: { cols, rows} }], settings) {
+    static checkRenderable(series, settings) {
+        const [{ data: { rows} }] = series;
+        if (series.length > 1) {
+            return;
+        }
+
         if (rows.length < 1) {
             throw new MinRowsError(1, rows.length);
         }