Skip to content

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

Build the dashcard question and metric series from the store (#82250)

Romeo Van Snick3403f82c0a57
diff --git a/frontend/src/metabase/common/utils/card.ts b/frontend/src/metabase/common/utils/card.ts
index da96a8d4bfc..85aa89d4f4a 100644
--- a/frontend/src/metabase/common/utils/card.ts
+++ b/frontend/src/metabase/common/utils/card.ts
@@ -11,7 +11,6 @@ import {
import { stableStringify } from "metabase/utils/objects";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import { deriveFieldOperatorFromParameter } from "metabase-lib/v1/parameters/utils/operators";
import { normalizeParameterValue } from "metabase-lib/v1/parameters/utils/parameter-values";
@@ -101,7 +100,7 @@ export function isEqualCard(card1?: Card | null, card2?: Card | null) {
export function getMetricSeriesWithDefaultDisplay(
series: DashCardSeries,
- metadata: Metadata,
+ metadataProvider: Lib.MetadataProvider,
): DashCardSeries {
if (series.length !== 1 || !isDashCardDataSeries(series)) {
return series;
@@ -112,7 +111,7 @@ export function getMetricSeriesWithDefaultDisplay(
return series;
}
- const query = Lib.fromJsQueryAndMetadata(metadata, metricSeries.json_query);
+ const query = Lib.fromJsQuery(metadataProvider, metricSeries.json_query);
const { display, settings = {} } = Lib.defaultDisplay(
query,
metricSeries.data.cols,
diff --git a/frontend/src/metabase/common/utils/card.unit.spec.ts b/frontend/src/metabase/common/utils/card.unit.spec.ts
index ef8320788f6..822c106fc69 100644
--- a/frontend/src/metabase/common/utils/card.unit.spec.ts
+++ b/frontend/src/metabase/common/utils/card.unit.spec.ts
@@ -4,7 +4,7 @@ import {
} from "metabase/common/utils/card";
import { utf8_to_b64url } from "metabase/utils/encoding";
import * as Lib from "metabase-lib";
-import { SAMPLE_METADATA, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
+import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import {
createMockCard,
createMockDashCardDataSeries,
@@ -60,7 +60,7 @@ describe("getMetricSeriesWithDefaultDisplay", () => {
const result = getMetricSeriesWithDefaultDisplay(
[createMetricSeries(query)],
- SAMPLE_METADATA,
+ SAMPLE_PROVIDER,
);
expect(result[0].card.display).toBe("bar");
@@ -81,7 +81,7 @@ describe("getMetricSeriesWithDefaultDisplay", () => {
const result = getMetricSeriesWithDefaultDisplay(
[createMetricSeries(query)],
- SAMPLE_METADATA,
+ SAMPLE_PROVIDER,
);
expect(result[0].card.display).toBe("line");
@@ -95,7 +95,7 @@ describe("getMetricSeriesWithDefaultDisplay", () => {
),
];
- expect(getMetricSeriesWithDefaultDisplay(series, SAMPLE_METADATA)).toBe(
+ expect(getMetricSeriesWithDefaultDisplay(series, SAMPLE_PROVIDER)).toBe(
series,
);
});
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
index ff8a1299eff..a7f65b315ed 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
@@ -16,7 +16,7 @@ import {
} from "metabase/dashboard/utils";
import EmbedFrameS from "metabase/embedding/theme.module.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { getMetadata } from "metabase/metadata-store";
+import { useQuestionFromCard } from "metabase/metadata-store";
import type { NewParameterOpts } from "metabase/parameters/utils/dashboards";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import { useDispatch, useSelector, useStore } from "metabase/redux";
@@ -34,7 +34,6 @@ import {
extendCardWithDashcardSettings,
getVisualizationRaw,
} from "metabase/viz-core";
-import Question from "metabase-lib/v1/Question";
import type {
Card,
DashCardId,
@@ -338,12 +337,10 @@ function DashCardInner({
? onEditVisualizationClick
: undefined;
- const metadata = useSelector(getMetadata);
+ const buildQuestion = useQuestionFromCard();
const question = useMemo(() => {
- return isQuestionCard(dashcard.card)
- ? new Question(dashcard.card, metadata)
- : null;
- }, [dashcard.card, metadata]);
+ return isQuestionCard(dashcard.card) ? buildQuestion(dashcard.card) : null;
+ }, [dashcard.card, buildQuestion]);
return (
<ErrorBoundary>
@@ -404,7 +401,6 @@ function DashCardInner({
<DashCardVisualization
dashcard={dashcard}
question={question}
- metadata={metadata}
series={series}
gridSize={gridSize}
gridItemWidth={gridItemWidth}
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index 5f39c79429e..4ee250725cb 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -19,6 +19,7 @@ import {
isDashcardAccessRestricted,
} from "metabase/dashboard/utils";
import { EmbeddingEntityContextProvider } from "metabase/embedding/context";
+import { useMetadataProvider } from "metabase/metadata-store";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { useDispatch, useSelector } from "metabase/redux";
import type { Path } from "metabase/router";
@@ -55,7 +56,6 @@ import {
isCartesianChart,
} from "metabase/viz-core";
import type Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import { STRUCTURED_QUERY_TEMPLATE } from "metabase-lib/v1/queries/StructuredQuery";
import type {
Card,
@@ -123,7 +123,6 @@ interface DashCardVisualizationProps {
dashcard: DashboardCard;
series: DashCardSeries;
question: Question | null;
- metadata: Metadata;
getHref?: () => string | undefined;
gridSize: {
@@ -164,7 +163,6 @@ export function DashCardVisualization({
dashcard,
series: rawSeries,
question,
- metadata,
getHref,
gridSize,
gridItemWidth,
@@ -244,13 +242,18 @@ export function DashCardVisualization({
}
}, [dashcard, rawSeries]);
+ // The metric's own database, which is the only one this component resolves.
+ const metadataProvider = useMetadataProvider(
+ rawSeries?.[0]?.json_query?.database ?? null,
+ );
+
const untranslatedSeries: DashCardSeries | VisualizerSeries = useMemo(() => {
if (!dashcard || !rawSeries || rawSeries.length === 0) {
return rawSeries;
}
if (!isVisualizerDashboardCard(dashcard)) {
- return getMetricSeriesWithDefaultDisplay(rawSeries, metadata);
+ return getMetricSeriesWithDefaultDisplay(rawSeries, metadataProvider);
}
const visualizerEntity = dashcard.visualization_settings.visualization;
@@ -339,7 +342,7 @@ export function DashCardVisualization({
}
return series;
- }, [rawSeries, dashcard, datasets, metadata]);
+ }, [rawSeries, dashcard, datasets, metadataProvider]);
const series = PLUGIN_CONTENT_TRANSLATION.useTranslateSeries<
DashCardSeriesItem | VisualizerSeriesItem