Skip to content

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

Uxw 2696 handle charts where manual y axis hides all data (#68156)

Nick Fitzpatrick731f564a0483
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Custom_Y_Axis_Range_Off_Screen_High.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Custom_Y_Axis_Range_Off_Screen_High.png
new file mode 100644
index 00000000000..da67f93d634
Binary files /dev/null and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Custom_Y_Axis_Range_Off_Screen_High.png differ
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Custom_Y_Axis_Range_Off_Screen_Low.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Custom_Y_Axis_Range_Off_Screen_Low.png
new file mode 100644
index 00000000000..ed384659f2b
Binary files /dev/null and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Custom_Y_Axis_Range_Off_Screen_Low.png differ
diff --git a/e2e/support/helpers/e2e-dashboard-helpers.ts b/e2e/support/helpers/e2e-dashboard-helpers.ts
index 50dca75e8dc..6a8dec0e63f 100644
--- a/e2e/support/helpers/e2e-dashboard-helpers.ts
+++ b/e2e/support/helpers/e2e-dashboard-helpers.ts
@@ -370,6 +370,10 @@ export const dashboardGrid = () => {
return cy.findByTestId("dashboard-grid");
};
+export function dashboardCancelButton() {
+ return cy.findByTestId("edit-bar").findByRole("button", { name: "Cancel" });
+}
+
export function dashboardSaveButton() {
return cy.findByTestId("edit-bar").findByRole("button", { name: "Save" });
}
diff --git a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts
index d150060bff3..735b11f40c7 100644
--- a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts
@@ -680,3 +680,172 @@ describe("issue 10493", () => {
H.chartPathWithFillColor("#509EE3").should("exist");
});
});
+
+describe("UXW-2696", () => {
+ const getChartPoints = () =>
+ H.echartsContainer().get("path[fill='hsla(0, 0%, 100%, 1.00)']");
+ const getNoPointsMessage = () =>
+ cy.findByRole("dialog", { name: /data points are off screen/i });
+
+ const assertNoPoints = (assertMessage = true) => {
+ getChartPoints().should("have.length", 0);
+ if (assertMessage) {
+ getNoPointsMessage().should("exist");
+ }
+ };
+
+ const assertDataVisible = () => {
+ getChartPoints().should("have.length.greaterThan", 0);
+ getNoPointsMessage().should("not.exist");
+ };
+
+ const QUESTION_NAME = "Count of orders by month";
+
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+
+ H.createQuestion(
+ {
+ name: QUESTION_NAME,
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ breakout: [
+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "month" }],
+ ],
+ },
+ display: "line",
+ visualization_settings: {
+ "graph.y_axis.min": 700,
+ "graph.y_axis.max": 1000,
+ "graph.y_axis.auto_range": false,
+ },
+ },
+ { wrapId: true },
+ );
+ });
+
+ it("should show you a popover when all data points are outside the y-axis range in the notebook editor", () => {
+ cy.get<number>("@questionId").then((id) => H.visitQuestion(id));
+
+ assertNoPoints();
+
+ // Check that message is displayed
+ cy.findByRole("dialog", { name: /data points are off screen/i });
+
+ H.openVizSettingsSidebar();
+
+ H.vizSettingsSidebar().findByText("Axes").click();
+ H.vizSettingsSidebar().findByLabelText("Min").clear().type("70").blur();
+
+ assertDataVisible();
+
+ H.vizSettingsSidebar().findByLabelText("Min").clear().type("700").blur();
+
+ assertNoPoints();
+
+ cy.findByRole("switch", { name: /auto y-axis range/i }).click({
+ force: true,
+ });
+
+ assertDataVisible();
+ });
+
+ it("should show the message on pinned cards", () => {
+ H.visitCollection("root");
+ H.openCollectionItemMenu(QUESTION_NAME);
+ H.popover().findByText("Pin this").click();
+
+ H.getPinnedSection().within(() => {
+ assertNoPoints();
+ });
+ // assert that the menu trigger is not covered
+ H.openPinnedItemMenu(QUESTION_NAME);
+ H.popover().should("exist");
+ });
+
+ it("should show the message in documents", () => {
+ //setup a document
+ cy.visit("/document/new");
+ H.documentContent().click();
+
+ H.addToDocument("/ord", false);
+ H.commandSuggestionItem(new RegExp(QUESTION_NAME)).click();
+
+ H.getDocumentCard(QUESTION_NAME).within(() => {
+ assertNoPoints();
+ });
+
+ H.openDocumentCardMenu(QUESTION_NAME);
+ H.popover().findByText("Edit Visualization").click();
+
+ H.getDocumentSidebar().within(() => {
+ cy.findByRole("radio", { name: /axes/i }).click({ force: true });
+ cy.findByRole("switch", { name: /auto y-axis range/i }).should(
+ "not.have.attr",
+ "data-checked",
+ );
+
+ cy.findByLabelText("Min").clear().type("70");
+ });
+
+ H.getDocumentCard(QUESTION_NAME).within(() => {
+ assertDataVisible();
+ });
+ });
+
+ describe("dashcard", () => {
+ beforeEach(() => {
+ cy.get<number>("@questionId").then((cardId) => {
+ H.createDashboard(
+ {
+ name: "Test Dashboard",
+ },
+ {
+ wrapId: true,
+ },
+ );
+
+ cy.get<number>("@dashboardId").then((dashboardId) =>
+ H.addQuestionToDashboard({ dashboardId, cardId }),
+ );
+ });
+ });
+
+ it("should show you a message on a dashboard", () => {
+ cy.get<number>("@dashboardId").then((id) => H.visitDashboard(id));
+
+ cy.findByTestId("dashcard").within(() => {
+ assertNoPoints();
+ });
+
+ H.editDashboard();
+ H.showDashcardVisualizerModalSettings(0, { isVisualizerCard: false });
+
+ H.modal().within(() => {
+ cy.findByRole("radio", { name: /axes/i }).click({ force: true });
+ cy.findByRole("switch", { name: /auto y-axis range/i }).should(
+ "not.have.attr",
+ "data-checked",
+ );
+
+ assertNoPoints(false);
+ getNoPointsMessage().should("not.exist");
+
+ cy.findByLabelText("Min").clear().type("70").blur();
+
+ assertDataVisible();
+ });
+ H.saveDashcardVisualizerModal();
+
+ H.dashboardSaveButton().click();
+
+ cy.findByTestId("edit-bar").should("not.exist");
+
+ cy.findByTestId("dashcard").within(() => {
+ getChartPoints().should("have.length.greaterThan", 0);
+ });
+ });
+ });
+});
diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.ts
index a305d5b8e6a..9b6940d6d5d 100644
--- a/frontend/src/metabase-types/api/card.ts
+++ b/frontend/src/metabase-types/api/card.ts
@@ -270,6 +270,7 @@ export type VisualizationSettings = {
| "rotate-90";
// Y-axis
+ "graph.y_axis.auto_range"?: boolean;
"graph.y_axis.title_text"?: string;
"graph.y_axis.scale"?: YAxisScale;
"graph.y_axis.axis_enabled"?: boolean;
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
index e0c633604b0..919157c9e95 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
@@ -309,22 +309,21 @@ function DashCardInner({
dispatch(duplicateCard({ id: dashcard.id }));
}, [dashcard.id, dispatch]);
- const onEditVisualizationClick = useCallback(() => {
- let initialState: VisualizerVizDefinitionWithColumns;
-
+ const getVisualizerInitialState = useCallback(() => {
if (isVisualizerDashboardCard(dashcard)) {
- initialState = getInitialStateForVisualizerCard(dashcard, datasets);
+ return getInitialStateForVisualizerCard(dashcard, datasets);
} else if (series.length > 1) {
- initialState = getInitialStateForMultipleSeries(series);
+ return getInitialStateForMultipleSeries(series);
} else {
- initialState = getInitialStateForCardDataSource(
- series[0].card,
- series[0],
- );
+ return getInitialStateForCardDataSource(series[0].card, series[0]);
}
+ }, [dashcard, datasets, series]);
+
+ const onEditVisualizationClick = useCallback(() => {
+ const initialState = getVisualizerInitialState();
onEditVisualization(dashcard, initialState);
- }, [dashcard, series, onEditVisualization, datasets]);
+ }, [dashcard, onEditVisualization, getVisualizerInitialState]);
const metadata = useSelector(getMetadata);
const question = useMemo(() => {
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index d750ad10b63..57ba8c50859 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -545,7 +545,11 @@ export function DashCardVisualization({
result={result}
dashcard={dashcard}
canEdit={!isVisualizerDashboardCard(dashcard)}
- onEditVisualization={onEditVisualization}
+ onEditVisualization={
+ isVisualizerDashboardCard(dashcard)
+ ? onEditVisualization
+ : undefined
+ }
openUnderlyingQuestionItems={
onChangeCardAndRun && (cardTitle ? undefined : titleMenuItems)
}
diff --git a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx
index 8d370dcc3b1..cec45154c1d 100644
--- a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx
+++ b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx
@@ -1,4 +1,5 @@
import type { StoryFn } from "@storybook/react";
+import { updateIn } from "icepick";
import { color } from "metabase/lib/colors";
import {
@@ -131,6 +132,30 @@ export const LineCustomYAxisRangeEqualsExtents = {
},
};
+export const LineCustomYAxisRangeOffScreenHigh = {
+ render: Template,
+ args: {
+ rawSeries: updateIn(
+ data.lineCustomYAxisRangeEqualsExtents,
+ [0, "card", "visualization_settings"],
+ (val) => ({ ...val, "graph.y_axis.max": 1000, "graph.y_axis.min": 200 }),
+ ) as any,
+ renderingContext,
+ },
+};
+
+export const LineCustomYAxisRangeOffScreenLow = {
+ render: Template,
+ args: {
+ rawSeries: updateIn(
+ data.lineCustomYAxisRangeEqualsExtents,
+ [0, "card", "visualization_settings"],
+ (val) => ({ ...val, "graph.y_axis.max": 0, "graph.y_axis.min": -100 }),
+ ) as any,
+ renderingContext,
+ },
+};
+
export const CustomYAxisRangeWithColumnScaling = {
render: Template,
args: {
diff --git a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx
index 02816714c1b..22522572198 100644
--- a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx
+++ b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx
@@ -1,5 +1,6 @@
import { Group } from "@visx/group";
import { init } from "echarts/core";
+import { t } from "ttag";
import type { StaticChartProps } from "metabase/static-viz/components/StaticVisualization";
import { sanitizeSvgForBatik } from "metabase/static-viz/lib/svg";
@@ -8,6 +9,7 @@ import { getChartMeasurements } from "metabase/visualizations/echarts/cartesian/
import { getCartesianChartModel } from "metabase/visualizations/echarts/cartesian/model";
import { getLegendItems } from "metabase/visualizations/echarts/cartesian/model/legend";
import { getCartesianChartOption } from "metabase/visualizations/echarts/cartesian/option";
+import { useAreAllDataPointsOutOfRange } from "metabase/visualizations/visualizations/CartesianChart/use-data-points-visible";
import Watermark from "../../watermark.svg?component";
import { Legend } from "../Legend";
@@ -17,6 +19,11 @@ const WIDTH = 540;
const HEIGHT = 360;
const LEGEND_PADDING = 8;
+const DATA_OUT_OF_RANGE_RECT = {
+ height: 40,
+ width: 210,
+};
+
registerEChartsModules();
export const ComboChart = ({
@@ -76,28 +83,53 @@ export const ComboChart = ({
chart.setOption(option);
const chartSvg = sanitizeSvgForBatik(chart.renderToSVGString(), isStorybook);
+ const allPointsOutOfRange = useAreAllDataPointsOutOfRange(
+ chartModel,
+ settings,
+ );
+
+ const totalHeight = height + legendHeight;
return (
- <svg
- xmlns="http://www.w3.org/2000/svg"
- width={width}
- height={height + legendHeight}
- >
- <Legend items={legendLayoutItems} />
- <Group top={legendHeight}>
- <g dangerouslySetInnerHTML={{ __html: chartSvg }}></g>
- </Group>
- {hasDevWatermark && (
- <Watermark
- x="0"
- y="0"
- height={height}
- width={width}
- preserveAspectRatio="xMinYMin slice"
- fill={renderingContext.getColor("text-secondary")}
- opacity={0.2}
- />
- )}
- </svg>
+ <>
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ width={width}
+ height={totalHeight}
+ >
+ <Legend items={legendLayoutItems} />
+ <Group top={legendHeight}>
+ <g dangerouslySetInnerHTML={{ __html: chartSvg }}></g>
+ </Group>
+ {hasDevWatermark && (
+ <Watermark
+ x="0"
+ y="0"
+ height={height}
+ width={width}
+ preserveAspectRatio="xMinYMin slice"
+ fill={renderingContext.getColor("text-secondary")}
+ opacity={0.2}
+ />
+ )}
+ {allPointsOutOfRange && (
+ <g>
+ <rect
+ x={width / 2 - DATA_OUT_OF_RANGE_RECT.width / 2}
+ y={totalHeight / 2 - DATA_OUT_OF_RANGE_RECT.height / 2}
+ fill={renderingContext.getColor("background-primary")}
+ stroke={renderingContext.getColor("border")}
+ strokeWidth="1"
+ width={DATA_OUT_OF_RANGE_RECT.width}
+ height={DATA_OUT_OF_RANGE_RECT.height}
+ rx="8"
+ />
+ <text x="50%" y={totalHeight / 2 + 4} textAnchor="middle">
+ {t`Every data point is out of range`}
+ </text>
+ </g>
+ )}
+ </svg>
+ </>
);
};
diff --git a/frontend/src/metabase/visualizations/components/DataPointsVisiblePopover/DataPointsVisiblePopover.tsx b/frontend/src/metabase/visualizations/components/DataPointsVisiblePopover/DataPointsVisiblePopover.tsx
new file mode 100644
index 00000000000..3f555883195
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/DataPointsVisiblePopover/DataPointsVisiblePopover.tsx
@@ -0,0 +1,56 @@
+import { t } from "ttag";
+
+import { Card, Center, Text } from "metabase/ui";
+import type { BaseCartesianChartModel } from "metabase/visualizations/echarts/cartesian/model/types";
+import { useAreAllDataPointsOutOfRange } from "metabase/visualizations/visualizations/CartesianChart/use-data-points-visible";
+import type { VisualizationSettings } from "metabase-types/api";
+
+export interface DataPointsVisiblePopoverProps {
+ isDashboard: boolean;
+ isVisualizer: boolean;
+ chartModel: BaseCartesianChartModel;
+ settings: VisualizationSettings;
+}
+
+export const DataPointsVisiblePopover = ({
+ isDashboard,
+ isVisualizer,
+ chartModel,
+ settings,
+}: DataPointsVisiblePopoverProps) => {
+ const allPointsHidden = useAreAllDataPointsOutOfRange(chartModel, settings);
+
+ if (!allPointsHidden || isVisualizer) {
+ return null;
+ }
+
+ return (
+ <Center
+ pos="absolute"
+ right={0}
+ left={0}
+ top={0}
+ bottom={isDashboard ? 0 : undefined}
+ role="dialog"
+ aria-label={t`data points are off screen`}
+ >
+ {/* Adjust position of the card so that it is centered in the dashcard. we need to account for height of card title */}
+ {isDashboard ? (
+ <Card
+ withBorder
+ py="sm"
+ maw="9rem"
+ pos="relative"
+ top={-10}
+ shadow="none"
+ >
+ <Text ta="center">{t`Every data point is out of range`}</Text>
+ </Card>
+ ) : (
+ <Card withBorder py="sm" shadow="none">
+ <Text>{t`Every data point is off-screen because of your y-axis settings`}</Text>
+ </Card>
+ )}
+ </Center>
+ );
+};
diff --git a/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx b/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx
index a0e4f21b74a..bddd6b58aae 100644
--- a/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx
+++ b/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx
@@ -6,7 +6,8 @@ import type { EChartsRendererProps } from "metabase/visualizations/components/EC
import { EChartsRenderer } from "metabase/visualizations/components/EChartsRenderer/EChartsRenderer";
import { ResponsiveEChartsRendererStyled } from "metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.styled";
-export interface ResponsiveEChartsRendererProps extends EChartsRendererProps {
+export interface ResponsiveEChartsRendererProps
+ extends React.PropsWithChildren<EChartsRendererProps> {
onResize?: (width: number, height: number) => void;
}
@@ -18,6 +19,7 @@ const _ResponsiveEChartsRenderer = forwardRef<
onResize,
width,
height,
+ children,
...echartsRenderedProps
}: ResponsiveEChartsRendererProps,
ref,
@@ -40,6 +42,7 @@ const _ResponsiveEChartsRenderer = forwardRef<
width={width}
height={height}
/>
+ {children}
</ResponsiveEChartsRendererStyled>
);
});
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 173919af96c..c5d910804bc 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -144,6 +144,7 @@ type VisualizationOwnProps = {
isShowingSummarySidebar?: boolean;
isSlow?: CardSlownessStatus;
isVisible?: boolean;
+ isVisualizer?: boolean;
renderLoadingView?: (props: LoadingViewProps) => JSX.Element | null;
metadata?: Metadata;
mode?: ClickActionModeGetter | Mode | QueryClickActionsMode;
@@ -522,8 +523,8 @@ class Visualization extends PureComponent<
)[] = [],
visualizerRawSeries: RawSeries = [],
) {
- const isVisualizerViz = isVisualizerDashboardCard(dashcard);
- const lookupSeries = isVisualizerViz ? visualizerRawSeries : rawSeries;
+ const isVisualizerDashCard = isVisualizerDashboardCard(dashcard);
+ const lookupSeries = isVisualizerDashCard ? visualizerRawSeries : rawSeries;
return (
lookupSeries.find((series) => series.card.id === cardId)?.card ??
lookupSeries[0].card
@@ -661,6 +662,7 @@ class Visualization extends PureComponent<
isShowingDetailsOnlyColumns,
isShowingSummarySidebar,
isSlow,
+ isVisualizer,
isDownloadingToImage,
metadata,
mode,
@@ -803,7 +805,7 @@ class Visualization extends PureComponent<
const CardVisualization = visualization as VisualizationType;
- const isVisualizerViz = isVisualizerDashboardCard(dashcard);
+ const isVisualizerDashCard = isVisualizerDashboardCard(dashcard);
const title = settings["card.title"];
const hasHeaderContent = title || extra;
@@ -820,7 +822,7 @@ class Visualization extends PureComponent<
const canSelectTitle =
this.props.onChangeCardAndRun &&
!replacementContent &&
- (!isVisualizerViz || React.Children.count(titleMenuItems) === 1);
+ (!isVisualizerDashCard || React.Children.count(titleMenuItems) === 1);
return (
<ErrorBoundary
@@ -918,7 +920,8 @@ class Visualization extends PureComponent<
isEmbeddingSdk={isEmbeddingSdk}
isFullscreen={!!isFullscreen}
isMobile={!!isMobile}
- isVisualizerViz={isVisualizerViz}
+ isVisualizer={!!isVisualizer}
+ isVisualizerCard={isVisualizerDashCard}
isObjectDetail={isObjectDetail}
isPreviewing={isPreviewing}
isRawTable={isRawTable}
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 6c450754511..e9d4b33eb08 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -129,7 +129,10 @@ export interface VisualizationProps {
showTitle: boolean;
isDashboard: boolean;
isDocument: boolean;
- isVisualizerViz: boolean;
+ // Is this the visualization *inside* the visualizer
+ isVisualizer: boolean;
+ // Is this visualization made by the visualizer
+ isVisualizerCard: boolean;
isEditing: boolean;
isMobile: boolean;
isSettings: boolean;
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
index 4e49fb61dbb..7bb5ed08ba0 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
@@ -5,6 +5,7 @@ import { useSet } from "react-use";
import { isWebkit } from "metabase/lib/browser";
import { ChartRenderingErrorBoundary } from "metabase/visualizations/components/ChartRenderingErrorBoundary";
+import { DataPointsVisiblePopover } from "metabase/visualizations/components/DataPointsVisiblePopover/DataPointsVisiblePopover";
import { ResponsiveEChartsRenderer } from "metabase/visualizations/components/EChartsRenderer";
import { LegendCaption } from "metabase/visualizations/components/legend/LegendCaption";
import { getLegendItems } from "metabase/visualizations/echarts/cartesian/model/legend";
@@ -48,8 +49,9 @@ function _CartesianChart(props: VisualizationProps) {
actionButtons,
isDashboard,
isEditing,
+ isVisualizer,
isQueryBuilder,
- isVisualizerViz,
+ isVisualizerCard,
isFullscreen,
hovered,
onChangeCardAndRun,
@@ -138,7 +140,7 @@ function _CartesianChart(props: VisualizationProps) {
// so title selection is disabled in this case
const canSelectTitle =
!!onChangeCardAndRun &&
- (!isVisualizerViz || React.Children.count(titleMenuItems) === 1);
+ (!isVisualizerCard || React.Children.count(titleMenuItems) === 1);
const seriesColorsCss = useCartesianChartSeriesColorsClasses(
chartModel,
@@ -186,7 +188,14 @@ function _CartesianChart(props: VisualizationProps) {
eventHandlers={eventHandlers}
onResize={handleResize}
onInit={handleInit}
- />
+ >
+ <DataPointsVisiblePopover
+ isDashboard={isDashboard}
+ isVisualizer={isVisualizer}
+ chartModel={chartModel}
+ settings={settings}
+ />
+ </ResponsiveEChartsRenderer>
</CartesianChartLegendLayout>
{seriesColorsCss}
</CartesianChartRoot>
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
index bf993eaed3f..3ce4ea3361c 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
@@ -54,7 +54,7 @@ export const useChartEvents = (
{
card,
rawSeries,
- isVisualizerViz,
+ isVisualizerCard,
visualizerRawSeries = [],
selectedTimelineEventIds,
settings,
@@ -76,7 +76,7 @@ export const useChartEvents = (
const onOpenQuestion = useCallback(
(cardId?: CardId) => {
- if (isVisualizerViz) {
+ if (isVisualizerCard) {
const index = getVisualizerSeriesCardIndex(cardId);
const nextCard = visualizerRawSeries[index].card;
onChangeCardAndRun?.({ nextCard });
@@ -86,7 +86,13 @@ export const useChartEvents = (
onChangeCardAndRun?.({ nextCard });
}
},
- [card, rawSeries, visualizerRawSeries, isVisualizerViz, onChangeCardAndRun],
+ [
+ card,
+ rawSeries,
+ visualizerRawSeries,
+ isVisualizerCard,
+ onChangeCardAndRun,
+ ],
);
const hoveredSeriesDataKey = useMemo(
@@ -245,7 +251,7 @@ export const useChartEvents = (
eventName: "brushEnd",
handler: (event: EChartsSeriesBrushEndEvent) => {
const eventData = getBrushData(
- isVisualizerViz ? visualizerRawSeries : rawSeries,
+ isVisualizerCard ? visualizerRawSeries : rawSeries,
metadata,
chartModel,
event,
@@ -280,7 +286,7 @@ export const useChartEvents = (
onOpenQuestion,
rawSeries,
visualizerRawSeries,
- isVisualizerViz,
+ isVisualizerCard,
metadata,
onChangeCardAndRun,
],
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-data-points-visible.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-data-points-visible.ts
new file mode 100644
index 00000000000..4f67ec61016
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-data-points-visible.ts
@@ -0,0 +1,28 @@
+import type { BaseCartesianChartModel } from "metabase/visualizations/echarts/cartesian/model/types";
+import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
+
+export const useAreAllDataPointsOutOfRange = (
+ chartModel: BaseCartesianChartModel,
+ settings: ComputedVisualizationSettings,
+) => {
+ if (settings["graph.y_axis.auto_range"]) {
+ return false;
+ }
+
+ const { "graph.y_axis.min": yMin, "graph.y_axis.max": yMax } = settings;
+
+ if (yMax === undefined || yMin === undefined) {
+ return false;
+ }
+
+ const dataKeys = chartModel.seriesModels.map(
+ (seriesModel) => seriesModel.dataKey,
+ );
+
+ return chartModel.dataset.every((data) =>
+ dataKeys.every((key) => {
+ const value = data[key] as number;
+ return value === null || value < yMin || yMax < value;
+ }),
+ );
+};
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
index c4e40a5e239..871f4a553ea 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
@@ -190,7 +190,7 @@ export function Funnel(props: VisualizationProps) {
headerIcon,
settings,
showTitle,
- isVisualizerViz,
+ isVisualizerCard,
actionButtons,
className,
onChangeCardAndRun,
@@ -225,7 +225,7 @@ export function Funnel(props: VisualizationProps) {
// so title selection is disabled in this case
const canSelectTitle =
!!onChangeCardAndRun &&
- (!isVisualizerViz || React.Children.count(titleMenuItems) === 1);
+ (!isVisualizerCard || React.Children.count(titleMenuItems) === 1);
return (
<div className={cx(className, CS.flex, CS.flexColumn, CS.p1)}>
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
index 8a013a35e2b..ba09d4a5982 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
@@ -110,6 +110,7 @@ export function VisualizationCanvas({ className }: VisualizationCanvasProps) {
rawSeries={rawSeries}
// TableInteractive crashes when trying to use metabase-lib
isDashboard
+ isVisualizer
/>
</Box>