Skip to content

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

Fix Visualizer crash when opening an unrenderable dashcard (#83540) (#84763)

Denis Berezin239c72301b92
diff --git a/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.ts b/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.ts
index 2cb6cde300b..f5e66c978e0 100644
--- a/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.ts
+++ b/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.ts
@@ -22,11 +22,17 @@ export function getInitialStateForVisualizerCard(
createDataSource("card", card.id, card.name),
);
+ // the dashboard's dataset cache may still hold cards removed from this dashcard
+ const dashcardDatasets: Record<number, Dataset | null | undefined> =
+ Object.fromEntries(
+ cards.map((card) => [card.id, preloadedDatasets?.[card.id]]),
+ );
+
const dataSourceDatasets: Record<
VisualizerDataSourceId,
Dataset | null | undefined
> = Object.fromEntries(
- Object.entries(preloadedDatasets ?? {}).map(([cardId, dataset]) => [
+ Object.entries(dashcardDatasets).map(([cardId, dataset]) => [
`card:${cardId}`,
dataset,
]),
@@ -38,5 +44,9 @@ export function getInitialStateForVisualizerCard(
dataSources,
);
- return { ...visualizationEntity, columns, preloadedDatasets };
+ return {
+ ...visualizationEntity,
+ columns,
+ preloadedDatasets: dashcardDatasets,
+ };
}
diff --git a/frontend/src/metabase/visualizer/visualizer.slice.ts b/frontend/src/metabase/visualizer/visualizer.slice.ts
index 638ecffb130..6b5eedd690b 100644
--- a/frontend/src/metabase/visualizer/visualizer.slice.ts
+++ b/frontend/src/metabase/visualizer/visualizer.slice.ts
@@ -130,23 +130,26 @@ const initializeFromState = async (
const columnRefs = initialState.columnValuesMapping
? extractReferencedColumns(initialState.columnValuesMapping)
: [];
- const dataSourceIds = Array.from(
- new Set(columnRefs.map((ref) => ref.sourceId)),
+ const referencedCardIds = columnRefs.map(
+ (ref) => parseDataSourceId(ref.sourceId).sourceId,
+ );
+ const preloadedCardIds = Object.keys(
+ initialState.preloadedDatasets ?? {},
+ ).map(Number);
+ const cardIds = Array.from(
+ new Set([...referencedCardIds, ...preloadedCardIds]),
);
await Promise.all(
- dataSourceIds
- .map((sourceId) => {
- const [, cardId] = sourceId.split(":");
- return [
- dispatch(fetchCard(Number(cardId))),
- dispatch(
- fetchCardQuery({
- cardId: Number(cardId),
- preloadedDatasets: initialState.preloadedDatasets,
- }),
- ),
- ];
- })
+ cardIds
+ .map((cardId) => [
+ dispatch(fetchCard(cardId)),
+ dispatch(
+ fetchCardQuery({
+ cardId,
+ preloadedDatasets: initialState.preloadedDatasets,
+ }),
+ ),
+ ])
.flat(),
);
return clone(initialState);
diff --git a/frontend/src/metabase/visualizer/visualizer.slice.unit.spec.ts b/frontend/src/metabase/visualizer/visualizer.slice.unit.spec.ts
index 38b37f993ab..340b8710c47 100644
--- a/frontend/src/metabase/visualizer/visualizer.slice.unit.spec.ts
+++ b/frontend/src/metabase/visualizer/visualizer.slice.unit.spec.ts
@@ -13,6 +13,7 @@ import {
createMockDatasetData,
} from "metabase-types/api/mocks";
+import { getVisualizerRawSeries } from "./selectors";
import {
initializeVisualizer,
reducer as visualizerReducer,
@@ -96,5 +97,43 @@ describe("visualizer slice", () => {
fetchMock.callHistory.called(`path:/api/card/${card.id}/query`),
).toBe(false);
});
+
+ it("should load the card as a data source when no columns are mapped (metabase#83540)", async () => {
+ const card = createMockCard({
+ id: 1,
+ name: "Unrenderable bar card",
+ display: "bar",
+ });
+ const dataset = createMockDataset({
+ data: createMockDatasetData({
+ rows: [[1, "Gadget"]],
+ cols: [
+ createMockColumn({ name: "ID" }),
+ createMockColumn({ name: "Category" }),
+ ],
+ }),
+ });
+
+ setupCardEndpoints(card);
+
+ const store = setup();
+
+ await store.dispatch(
+ initializeVisualizer({
+ state: {
+ display: "bar",
+ columns: [],
+ columnValuesMapping: {},
+ settings: {},
+ preloadedDatasets: { [card.id]: dataset },
+ },
+ }),
+ );
+
+ const state = store.getState();
+ expect(state.visualizer.present.cards).toEqual([card]);
+ expect(state.visualizer.present.datasets["card:1"]).toEqual(dataset);
+ expect(() => getVisualizerRawSeries(state)).not.toThrow();
+ });
});
});