Skip to content

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

Fix caching with drills (#64723)

Alexander Polyankin309e69774ef7
diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
index 601aedc4bf0..75738430a33 100644
--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
@@ -341,15 +341,15 @@ class ChoroplethMapInner extends Component {
const onClickFeature =
isClickable &&
((click) => {
- if (visualizationIsClickable(getFeatureClickObject(rows[0]))) {
- const featureKey = getFeatureKey(click.feature);
- const row = rowByFeatureKey.get(featureKey);
- if (onVisualizationClick) {
- onVisualizationClick({
- ...getFeatureClickObject(row, click.feature),
- event: click.event,
- });
- }
+ const featureKey = getFeatureKey(click.feature);
+ const row = rowByFeatureKey.get(featureKey);
+ const clickData = {
+ ...getFeatureClickObject(row, click.feature),
+ event: click.event,
+ };
+
+ if (onVisualizationClick && visualizationIsClickable(clickData)) {
+ onVisualizationClick(clickData);
}
});
const onHoverFeature =
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
index eb3031c9ae5..77d15aa0008 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
@@ -105,8 +105,9 @@ export function DetailsTableCell({
value.startsWith("http");
const handleClick = (e: MouseEvent<HTMLSpanElement>) => {
- if (onVisualizationClick && visualizationIsClickable(clicked)) {
- onVisualizationClick({ ...clicked, element: e.currentTarget });
+ const clickData = { ...clicked, element: e.currentTarget };
+ if (onVisualizationClick && visualizationIsClickable(clickData)) {
+ onVisualizationClick(clickData);
}
};
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 823fd3ed155..8340285f7a5 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -396,14 +396,67 @@ class Visualization extends PureComponent<
}
};
- _getQuestionForCardCached(
+ private static getQuestionForCard(
metadata: Metadata | undefined,
card: Card | undefined,
) {
return !!card && !!metadata ? new Question(card, metadata) : undefined;
}
- getMode(
+ _getClickActionsCached(
+ clickedObject: ClickObject | null | undefined,
+ mode: ClickActionModeGetter | Mode | QueryClickActionsMode | undefined,
+ computedSettings: Record<string, string>,
+ dashcard?: DashboardCard,
+ metadata?: Metadata,
+ rawSeries: (
+ | SingleSeries
+ | {
+ card: Card;
+ }
+ )[] = [],
+ visualizerRawSeries: RawSeries = [],
+ isRawTable = false,
+ getExtraDataForClick: (
+ clicked: ClickObject | null,
+ ) => Record<string, unknown> = () => ({}),
+ ) {
+ if (!clickedObject) {
+ return [];
+ }
+
+ const clicked = isVisualizerDashboardCard(dashcard)
+ ? formatVisualizerClickObject(
+ clickedObject,
+ visualizerRawSeries,
+ dashcard.visualization_settings.visualization.columnValuesMapping,
+ )
+ : clickedObject;
+
+ const card = Visualization.findCardById(
+ clicked.cardId,
+ dashcard,
+ rawSeries,
+ visualizerRawSeries,
+ );
+ const question = Visualization.getQuestionForCard(metadata, card);
+ const modeInstance = Visualization.getMode(mode, question);
+
+ return modeInstance
+ ? modeInstance.actionsForClick(
+ {
+ ...clicked,
+ extraData: {
+ ...getExtraDataForClick(clicked),
+ isRawTable,
+ },
+ },
+ computedSettings,
+ )
+ : [];
+ }
+
+ private static getMode(
modeOrModeGetter:
| ClickActionModeGetter
| Mode
@@ -432,54 +485,49 @@ class Visualization extends PureComponent<
}
getClickActions(clickedObject?: ClickObject | null) {
- if (!clickedObject) {
- return [];
- }
-
const {
+ mode,
dashcard,
metadata,
- visualizerRawSeries = [],
+ rawSeries,
+ visualizerRawSeries,
isRawTable,
- getExtraDataForClick = () => ({}),
+ getExtraDataForClick,
} = this.props;
- const clicked = isVisualizerDashboardCard(dashcard)
- ? formatVisualizerClickObject(
- clickedObject,
- visualizerRawSeries,
- dashcard.visualization_settings.visualization.columnValuesMapping,
- )
- : clickedObject;
-
- const card = this.findCardById(clicked.cardId);
-
- const question = this._getQuestionForCardCached(metadata, card);
- const mode = this.getMode(this.props.mode, question);
+ const { computedSettings } = this.state;
- return mode
- ? mode.actionsForClick(
- {
- ...clicked,
- extraData: {
- ...getExtraDataForClick(clicked),
- isRawTable,
- },
- },
- this.state.computedSettings,
- )
- : [];
+ return this._getClickActionsCached(
+ clickedObject,
+ mode,
+ computedSettings,
+ dashcard,
+ metadata,
+ rawSeries,
+ visualizerRawSeries,
+ isRawTable,
+ getExtraDataForClick,
+ );
}
- findCardById = (cardId?: CardId | null) => {
- const { dashcard, rawSeries = [], visualizerRawSeries = [] } = this.props;
+ private static findCardById(
+ cardId?: CardId | null,
+ dashcard?: DashboardCard,
+ rawSeries: (
+ | SingleSeries
+ | {
+ card: Card;
+ }
+ )[] = [],
+ visualizerRawSeries: RawSeries = [],
+ ) {
const isVisualizerViz = isVisualizerDashboardCard(dashcard);
const lookupSeries = isVisualizerViz ? visualizerRawSeries : rawSeries;
return (
lookupSeries.find((series) => series.card.id === cardId)?.card ??
lookupSeries[0].card
);
- };
+ }
getNormalizedSizes = () => {
const { width, height } = this.props;
@@ -534,8 +582,16 @@ class Visualization extends PureComponent<
nextCard,
objectId,
}: Pick<OnChangeCardAndRunOpts, "nextCard" | "objectId">) => {
- this.props.onChangeCardAndRun?.({
- previousCard: this.findCardById(nextCard?.id),
+ const { dashcard, rawSeries, visualizerRawSeries, onChangeCardAndRun } =
+ this.props;
+
+ onChangeCardAndRun?.({
+ previousCard: Visualization.findCardById(
+ nextCard?.id,
+ dashcard,
+ rawSeries,
+ visualizerRawSeries,
+ ),
nextCard,
objectId,
});
@@ -937,7 +993,7 @@ class Visualization extends PureComponent<
}
const VisualizationMemoized = memoizeClass<Visualization>(
- "_getQuestionForCardCached",
+ "_getClickActionsCached",
)(Visualization);
// eslint-disable-next-line import/no-default-export
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 5e39f294091..088da89417e 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
@@ -412,13 +412,11 @@ export const useChartEvents = (
cardId: seriesModel.cardId,
dimensions,
settings,
+ element: event.currentTarget,
};
if (hasBreakout && visualizationIsClickable(clickData)) {
- onVisualizationClick({
- ...clickData,
- element: event.currentTarget,
- });
+ onVisualizationClick(clickData);
} else if (isDashboard) {
onOpenQuestion(seriesModel.cardId);
}
diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsx b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsx
index f481309685e..3f425ff1381 100644
--- a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsx
@@ -367,16 +367,24 @@ const GaugeArc = ({
.outerRadius(OUTER_RADIUS)
.innerRadius(OUTER_RADIUS * INNER_RADIUS_RATIO);
- const clicked = segment && { value: segment.min, column, settings };
- const isClickable = clicked && onVisualizationClick != null;
+ const isClickable = segment != null && onVisualizationClick != null;
const options = column && settings?.column ? settings.column(column) : {};
const range = segment ? [segment.min, segment.max] : [];
const value = range.map((v) => formatValue(v, options)).join(" - ");
const hovered = segment ? { data: [{ key: segment.label, value }] } : {};
const handleClick = (e) => {
- if (onVisualizationClick && visualizationIsClickable(clicked)) {
- onVisualizationClick({ ...clicked, event: e.nativeEvent });
+ if (!segment) {
+ return;
+ }
+ const clickData = {
+ value: segment.min,
+ column,
+ settings,
+ event: e.nativeEvent,
+ };
+ if (onVisualizationClick && visualizationIsClickable(clickData)) {
+ onVisualizationClick(clickData);
}
};
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.jsx b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.jsx
index 0c54a27c778..2d5464f0318 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.jsx
@@ -221,12 +221,12 @@ export default class Progress extends Component {
const barMessage = getProgressMessage(metrics);
- const clicked = { value, column, settings };
const isClickable = onVisualizationClick != null;
const handleClick = (e) => {
- if (onVisualizationClick && visualizationIsClickable(clicked)) {
- onVisualizationClick({ ...clicked, event: e.nativeEvent });
+ const clickData = { value, column, settings, event: e.nativeEvent };
+ if (onVisualizationClick && visualizationIsClickable(clickData)) {
+ onVisualizationClick(clickData);
}
};
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
index 0c191ffb058..44d6a0e3198 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
@@ -209,12 +209,10 @@ const RowChartVisualization = ({
};
const handleSelectSeries = (event: React.MouseEvent, seriesIndex: number) => {
- const clickData = getLegendClickData(
- seriesIndex,
- series,
- settings,
- chartColumns,
- );
+ const clickData = {
+ ...getLegendClickData(seriesIndex, series, settings, chartColumns),
+ element: event.currentTarget,
+ };
const areMultipleCards = rawMultipleSeries.length > 1;
if (areMultipleCards) {
@@ -223,10 +221,7 @@ const RowChartVisualization = ({
}
if ("breakout" in chartColumns && visualizationIsClickable(clickData)) {
- onVisualizationClick({
- ...clickData,
- element: event.currentTarget,
- });
+ onVisualizationClick(clickData);
} else if (isDashboard) {
openQuestion();
}
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
index 77c75a70c45..8ec21c29d62 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
@@ -180,21 +180,27 @@ export class Scalar extends Component<
formatOptions,
);
- const clicked = {
- value,
- column,
- data: rows[0]?.map((value, index) => ({ value, col: cols[index] })),
- settings,
- };
const isClickable = onVisualizationClick != null;
const handleClick = () => {
+ if (this._scalar == null) {
+ return;
+ }
+
+ const clickData = {
+ value,
+ column,
+ data: rows[0]?.map((value, index) => ({ value, col: cols[index] })),
+ settings,
+ element: this._scalar,
+ };
+
if (
this._scalar &&
onVisualizationClick &&
- visualizationIsClickable(clicked)
+ visualizationIsClickable(clickData)
) {
- onVisualizationClick({ ...clicked, element: this._scalar });
+ onVisualizationClick(clickData);
}
};
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
index 27c2bb90e55..8720ea573ed 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
@@ -85,12 +85,18 @@ export function SmartScalar({
const isClickable = onVisualizationClick != null;
const handleClick = () => {
+ if (scalarRef.current == null) {
+ return;
+ }
+
+ const clickData = { ...clicked, element: scalarRef.current };
+
if (
scalarRef.current &&
onVisualizationClick &&
- visualizationIsClickable(clicked)
+ visualizationIsClickable(clickData)
) {
- onVisualizationClick({ ...clicked, element: scalarRef.current });
+ onVisualizationClick(clickData);
}
};