Skip to content

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

Give the visualizations a question builder instead of the metadata object (#82158)

Romeo Van Snick4e4cbac853fc
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index a6fb5e6d82f..5f39c79429e 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -608,7 +608,6 @@ export function DashCardVisualization({
? rawSeries
: undefined
}
- metadata={metadata}
mode={clickActionMode ?? dashboardClickActionMode}
getHref={getHref}
gridSize={gridSize}
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
index d9a69b07702..6ee7e4cf608 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx
@@ -823,7 +823,6 @@ export const CardEmbedComponent = memo(
<ExplicitSizeRefreshModeContext.Provider value="layout">
<Visualization
rawSeries={series}
- metadata={metadata}
mode={visualizationMode}
hasColumnReordering
highlighted={highlighted}
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
index 171a24c4f9c..95be2b76e0e 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
@@ -418,7 +418,6 @@ export const NativeQueryModal = ({
<Box flex={1} mih="300px">
<Visualization
rawSeries={rawSeries}
- metadata={metadata}
mode={defaultClickActionMode}
onChangeCardAndRun={() => {}}
getExtraDataForClick={() => ({})}
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx
index 7624e1edd43..5c1b3aad685 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.tsx
@@ -132,7 +132,6 @@ export function PublicOrEmbeddedQuestionView({
// including the "No results" message
isDashboard
isStandaloneQuestion
- metadata={metadata}
onChangeCardAndRun={() => {}}
tableFooterExtraButtons={
downloadInFooter ? questionResultDownloadButton : null
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
index ecc3acf78c3..e7529fc477c 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.tsx
@@ -105,7 +105,6 @@ export function VisualizationResult(props: QueryVisualizationProps) {
queryBuilderMode={queryBuilderMode}
showTitle={false}
canToggleSeriesVisibility
- metadata={question.metadata()}
timelineEvents={timelineEvents}
selectedTimelineEventIds={selectedTimelineEventIds}
getExtraDataForClick={getExtraDataForClick}
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx
index 2f87c6ddd3b..3b29fd4de75 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.unit.spec.tsx
@@ -1,12 +1,14 @@
import userEvent from "@testing-library/user-event";
-import { createMockMetadata } from "__support__/metadata";
+import { createMockState } from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
import {
mockGetBoundingClientRect,
renderWithProviders,
screen,
within,
} from "__support__/ui";
+import { getMetadata } from "metabase/metadata-store";
import { registerVisualizations } from "metabase/visualizations/register";
import { loadVisualizationComponents } from "metabase/viz-core";
import Question from "metabase-lib/v1/Question";
@@ -38,9 +40,12 @@ beforeAll(() => {
return loadVisualizationComponents(["table"]);
});
-const metadata = createMockMetadata({
- databases: [createSampleDatabase()],
+const state = createMockState({
+ entities: createMockEntitiesState({
+ databases: [createSampleDatabase()],
+ }),
});
+const metadata = getMetadata(state);
const setup = (props: Partial<QueryVisualizationProps> = {}) => {
const question = new Question(
@@ -75,6 +80,7 @@ const setup = (props: Partial<QueryVisualizationProps> = {}) => {
navigateToNewCardInsideQB={jest.fn()}
{...props}
/>,
+ { storeInitialState: state },
);
};
diff --git a/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsx b/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsx
index 2a5d538469a..5c038ceb6e4 100644
--- a/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsx
@@ -9,7 +9,6 @@ import {
computeNumericDataInterval,
} from "metabase/viz-core";
import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
import { isMetric, isNumeric } from "metabase-lib/v1/types/utils/isa";
import type { DatasetColumn } from "metabase-types/api";
@@ -142,7 +141,7 @@ export class LeafletGridHeatMap extends LeafletMap<LeafletGridHeatMapProps> {
supportsFilter() {
const {
series: [{ card }],
- metadata,
+ buildQuestion,
token,
} = this.props;
@@ -152,7 +151,7 @@ export class LeafletGridHeatMap extends LeafletMap<LeafletGridHeatMapProps> {
return false;
}
- const question = new Question(card, metadata);
+ const question = buildQuestion(card);
const { isNative } = Lib.queryDisplayInfo(question.query());
return !isNative;
}
diff --git a/frontend/src/metabase/visualizations/components/LeafletMap.tsx b/frontend/src/metabase/visualizations/components/LeafletMap.tsx
index 48753e21986..824a61eb49e 100644
--- a/frontend/src/metabase/visualizations/components/LeafletMap.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletMap.tsx
@@ -6,12 +6,11 @@ import L from "leaflet";
import { Component, createRef } from "react";
import _ from "underscore";
+import type { CardQuestionBuilder } from "metabase/metadata-store";
import MetabaseSettings from "metabase/utils/settings";
import { isNullOrUndefined } from "metabase/utils/types";
import type { OnChangeCardAndRun } from "metabase/visualizations/types";
import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { Series, VisualizationSettings } from "metabase-types/api";
import type { Point } from "metabase-types/api/dataset";
import { isObject } from "metabase-types/guards/common";
@@ -53,7 +52,7 @@ export interface LeafletMapProps<TPoint extends AnyLeafletMapPoint = Point> {
settings: MapSettings;
points?: TPoint[] | null;
series: Series;
- metadata?: Metadata;
+ buildQuestion: CardQuestionBuilder;
token?: string | null;
zoomControl?: boolean;
zoom?: number | null;
@@ -239,7 +238,7 @@ export class LeafletMap<
supportsFilter() {
const {
series: [{ card }],
- metadata,
+ buildQuestion,
token,
} = this.props;
@@ -249,7 +248,7 @@ export class LeafletMap<
return false;
}
- const question = new Question(card, metadata);
+ const question = buildQuestion(card);
const { isNative } = Lib.queryDisplayInfo(question.query());
return !isNative || question.isSaved();
}
@@ -288,7 +287,7 @@ export class LeafletMap<
],
settings,
onChangeCardAndRun,
- metadata,
+ buildQuestion,
} = this.props;
const latitudeColumn = _.findWhere(cols, {
@@ -298,7 +297,7 @@ export class LeafletMap<
name: settings["map.longitude_column"],
});
- const question = new Question(card, metadata);
+ const question = buildQuestion(card);
if (this.supportsFilter() && latitudeColumn && longitudeColumn) {
const query = question.query();
const stageIndex = -1;
diff --git a/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx b/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx
index 2760a380992..5ad080be8db 100644
--- a/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx
@@ -3,6 +3,8 @@ import L from "leaflet";
import { createRef } from "react";
import MetabaseSettings from "metabase/utils/settings";
+import Question from "metabase-lib/v1/Question";
+import type { UnsavedCard } from "metabase-types/api";
import type { Point } from "metabase-types/api/dataset";
import {
createMockCard,
@@ -49,7 +51,7 @@ describe("LeafletMap", () => {
onRenderError: jest.fn(),
onFiltering: jest.fn(),
onChangeCardAndRun: jest.fn(),
- metadata: undefined,
+ buildQuestion: (card: UnsavedCard) => new Question(card),
...overrides,
});
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
index 0311ed6641f..44d42c4d208 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { t } from "ttag";
import { PaginationFooter } from "metabase/data-grid";
-import Question from "metabase-lib/v1/Question";
+import { useQuestionFromCard } from "metabase/metadata-store";
import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";
import S from "./ObjectDetail.module.css";
@@ -33,10 +33,9 @@ export function ObjectDetail({
}
}, [data.rows, currentObjectIndex]);
+ const buildQuestion = useQuestionFromCard();
const hasPagination = data?.rows?.length > 1;
- const resolvedQuestion =
- question ??
- (card && rest.metadata ? new Question(card, rest.metadata) : undefined);
+ const resolvedQuestion = question ?? (card ? buildQuestion(card) : undefined);
return (
<>
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts b/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts
index 0d47221a4a8..57a460001f1 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts
@@ -1,6 +1,5 @@
import type Question from "metabase-lib/v1/Question";
import type ForeignKey from "metabase-lib/v1/metadata/ForeignKey";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type Table from "metabase-lib/v1/metadata/Table";
import type {
Card,
@@ -26,7 +25,6 @@ export type OnVisualizationClickType =
export interface ObjectDetailProps {
data: DatasetData;
question?: Question;
- metadata?: Metadata;
card?: Card;
dashcard?: DashboardCard;
isObjectDetail?: boolean; // whether this should be shown in a modal
diff --git a/frontend/src/metabase/visualizations/components/PinMap.tsx b/frontend/src/metabase/visualizations/components/PinMap.tsx
index cfc19e14a26..da9b252c6b2 100644
--- a/frontend/src/metabase/visualizations/components/PinMap.tsx
+++ b/frontend/src/metabase/visualizations/components/PinMap.tsx
@@ -7,6 +7,7 @@ import _ from "underscore";
import CS from "metabase/css/core/index.css";
import DashboardS from "metabase/css/dashboard.module.css";
+import { useQuestionFromCard } from "metabase/metadata-store";
import { Button } from "metabase/ui";
import type { VisualizationProps } from "metabase/visualizations/types";
import { sumMetric, unaggregatedDataWarningMap } from "metabase/viz-core";
@@ -177,6 +178,7 @@ type PinMapChildProps = LeafletMapProps<PinMapPoint> & {
};
export function PinMap(props: PinMapProps) {
+ const buildQuestion = useQuestionFromCard();
const {
className,
settings,
@@ -299,6 +301,7 @@ export function PinMap(props: PinMapProps) {
{MapComponent ? (
<MapComponent
{...mapProps}
+ buildQuestion={buildQuestion}
ref={handleMapRef}
className={cx(
CS.absolute,
diff --git a/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsx b/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsx
index 4b4afa342d9..9a0793ec749 100644
--- a/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/PinMap.unit.spec.tsx
@@ -1,6 +1,5 @@
import userEvent from "@testing-library/user-event";
-import { createMockMetadata } from "__support__/metadata";
import { renderWithProviders, screen } from "__support__/ui";
import MetabaseSettings from "metabase/utils/settings";
import { createMockVisualizationProps } from "metabase/visualizations/types/mocks";
@@ -15,11 +14,7 @@ import {
createMockSingleSeries,
createMockStructuredDatasetQuery,
} from "metabase-types/api/mocks";
-import {
- ORDERS_ID,
- SAMPLE_DB_ID,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
+import { ORDERS_ID, SAMPLE_DB_ID } from "metabase-types/api/mocks/presets";
import { PinMap, getPoints } from "./PinMap";
@@ -277,7 +272,6 @@ describe("PinMap", () => {
data: series[0].data,
card: series[0].card,
settings,
- metadata: createMockMetadata({ databases: [createSampleDatabase()] }),
isDashboard,
height: 300,
onRender,
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 621145cdb4b..19fed931ac6 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -19,6 +19,8 @@ import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import type { ContentTranslationFunction } from "metabase/content-translation/types";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
+import type { CardQuestionBuilder } from "metabase/metadata-store";
+import { selectQuestionFromCardBuilder } from "metabase/metadata-store";
import { PLUGIN_CUSTOM_VIZ } from "metabase/plugins";
import { connect } from "metabase/redux";
import { getIsDownloadingToImage } from "metabase/redux/downloads";
@@ -59,7 +61,6 @@ import {
prefetchVisualizationComponent,
} from "metabase/viz-core";
import Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
CardId,
Dashboard,
@@ -92,6 +93,7 @@ type StateDispatchProps = {
};
type StateProps = {
+ buildQuestion: CardQuestionBuilder;
hasDevWatermark: boolean;
fontFamily: string;
isEmbeddingSdk: boolean;
@@ -151,7 +153,6 @@ type VisualizationOwnProps = {
renderLoadingView?: (props: LoadingViewProps) => JSX.Element | null;
/** Shown while a custom viz plugin loads. Documents supply their card-embed loading view here. */
customVizLoadingView?: ReactNode;
- metadata?: Metadata;
mode?: ClickActionsMode;
editSummary?: () => void;
rawSeries?: VisualizationRawSeries;
@@ -208,6 +209,7 @@ type VisualizationState = {
};
const mapStateToProps = (state: State): StateProps => ({
+ buildQuestion: selectQuestionFromCardBuilder(state),
hasDevWatermark: getTokenFeature(state, "development_mode"),
fontFamily: getFont(state),
isEmbeddingSdk: isEmbeddingSdk(),
@@ -426,13 +428,6 @@ class Visualization extends PureComponent<
}
};
- private static getQuestionForCard(
- metadata: Metadata | undefined,
- card: SeriesCard | undefined,
- ) {
- return !!card && !!metadata ? new Question(card, metadata) : undefined;
- }
-
// Memoized per instance. The cache keys on the arguments, and the object
// ones are held weakly, so entries go when the click context does.
private _getClickActionsCached = memoize(
@@ -440,8 +435,8 @@ class Visualization extends PureComponent<
clickedObject: ClickObject | null | undefined,
mode: ClickActionsMode | undefined,
computedSettings: Record<string, string>,
- dashcard?: DashboardCard,
- metadata?: Metadata,
+ dashcard: DashboardCard | undefined,
+ buildQuestion: CardQuestionBuilder,
rawSeries: VisualizationRawSeries = [],
visualizerRawSeries: RawSeries = [],
isRawTable = false,
@@ -467,7 +462,7 @@ class Visualization extends PureComponent<
if (!isQuestionCard(card)) {
return [];
}
- const question = Visualization.getQuestionForCard(metadata, card);
+ const question = buildQuestion(card);
return mode
? mode.actionsForClick(
@@ -488,7 +483,7 @@ class Visualization extends PureComponent<
const {
mode,
dashcard,
- metadata,
+ buildQuestion,
rawSeries,
visualizerRawSeries,
isRawTable,
@@ -503,7 +498,7 @@ class Visualization extends PureComponent<
mode,
computedSettings,
dashcard,
- metadata,
+ buildQuestion,
rawSeries,
visualizerRawSeries,
isRawTable,
@@ -670,7 +665,6 @@ class Visualization extends PureComponent<
isSlow,
isVisualizer,
isDownloadingToImage,
- metadata,
mode,
editSummary,
queryBuilderMode,
@@ -952,7 +946,6 @@ class Visualization extends PureComponent<
isSettings={!!isSettings}
isShowingDetailsOnlyColumns={isShowingDetailsOnlyColumns}
scrollToLastColumn={scrollToLastColumn}
- metadata={metadata}
mode={mode}
queryBuilderMode={queryBuilderMode}
// Unjustified type cast. FIXME
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 1bec347693d..21fcc572ee7 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -11,7 +11,6 @@ import type {
} from "metabase/viz-core";
import type { BrushClickObject } from "metabase-lib/query/types";
import type Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
Dashboard,
DashboardCard,
@@ -55,7 +54,6 @@ export interface VisualizationProps {
card: SeriesCard;
getHref?: () => string | undefined;
data: DatasetData;
- metadata?: Metadata;
rawSeries: RawSeries;
visualizerRawSeries?: RawSeries;
settings: ComputedVisualizationSettings;
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
index 9f4f3c5ed67..185869fe187 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
@@ -3,6 +3,8 @@ import _ from "underscore";
import { isNative } from "metabase/common/utils/card";
import { dayjs } from "metabase/dayjs";
+import { selectQuestionFromCard } from "metabase/metadata-store";
+import type { State } from "metabase/redux/store";
import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import { formatChangeWithSign, formatPercent } from "metabase/utils/formatting";
import { getObjectKeys } from "metabase/utils/objects";
@@ -59,8 +61,6 @@ import type {
ClickObjectDimension,
} from "metabase-lib";
import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import { isDate, isDateWithoutTime } from "metabase-lib/v1/types/utils/isa";
import type {
@@ -1064,8 +1064,8 @@ export const getBrushClickObject = (
};
export const getBrushData = (
+ state: State,
rawSeries: RawSeries,
- metadata: Metadata | undefined,
chartModel: BaseCartesianChartModel,
event: EChartsSeriesBrushEndEvent,
) => {
@@ -1081,7 +1081,7 @@ export const getBrushData = (
const column = chartModel.dimensionModel.column;
const card = rawSeries[0].card;
- const question = new Question(card, metadata);
+ const question = selectQuestionFromCard(state, card);
const query = question.query();
const stageIndex = -1;
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 a9a8d302431..af8aadb0f63 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
@@ -3,6 +3,7 @@ import type { EChartsType } from "echarts/core";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { useLatest } from "react-use";
+import { useStore } from "metabase/redux";
import { useChartYAxisVisibility } from "metabase/visualizations/hooks/use-chart-y-axis-visibility";
import type { VisualizationProps } from "metabase/visualizations/types";
import {
@@ -85,7 +86,6 @@ export const useChartEvents = (
onVisualizationClick,
onHoverChange,
clicked,
- metadata,
isDashboard,
}: VisualizationProps,
// The ECharts instance, mirrored into state by the caller. Used as a signal
@@ -94,6 +94,8 @@ export const useChartEvents = (
// has measured it.
chartInstance?: EChartsType,
) => {
+ // Read at call time so the handler list does not rebuild on metadata change.
+ const store = useStore();
const isBrushing = useRef<boolean>();
useTooltipMouseLeave(chartRef, onHoverChange, containerRef);
@@ -255,8 +257,8 @@ export const useChartEvents = (
}
} else {
const eventData = getBrushData(
+ store.getState(),
isVisualizerCard ? visualizerRawSeries : rawSeries,
- metadata,
chartModel,
adjustedBrushEndEvent,
);
@@ -285,7 +287,7 @@ export const useChartEvents = (
rawSeries,
visualizerRawSeries,
isVisualizerCard,
- metadata,
+ store,
onChangeCardAndRun,
onBrush,
],
diff --git a/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx b/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx
index 27881f48faa..e60e3d7dbac 100644
--- a/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx
@@ -1,13 +1,14 @@
import cx from "classnames";
import { useMemo } from "react";
+import { getShallowTables, useQuestionFromCard } from "metabase/metadata-store";
+import { useSelector } from "metabase/redux";
import { Box } from "metabase/ui";
import type {
VisualizationPassThroughProps,
VisualizationProps,
} from "metabase/visualizations/types";
import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
import type { DatasetColumn } from "metabase-types/api";
import { LIST_DEFINITION } from "../../definition";
@@ -17,7 +18,6 @@ import S from "./ListViz.module.css";
const ListVizComponent = ({
card,
- metadata,
data,
settings,
onVisualizationClick,
@@ -25,12 +25,12 @@ const ListVizComponent = ({
isDashboard,
onZoomRow,
}: VisualizationProps & VisualizationPassThroughProps) => {
- const question = useMemo(() => {
- if (!card || !metadata) {
- return null;
- }
- return new Question(card, metadata);
- }, [card, metadata]);
+ const buildQuestion = useQuestionFromCard();
+ const tables = useSelector(getShallowTables);
+ const question = useMemo(
+ () => (card ? buildQuestion(card) : null),
+ [card, buildQuestion],
+ );
const { sortedColumnName, sortingDirection } = useMemo(() => {
if (!question) {
@@ -56,17 +56,15 @@ const ListVizComponent = ({
try {
const query = question.query();
const sourceTableId = Lib.sourceTableOrCardId(query);
- const table = question.metadata().table(sourceTableId);
-
- // Return the entity type if available, otherwise undefined
- // Use type assertion since entity_type exists in the database but not in TypeScript types
- return (table as any)?.entity_type;
+ return sourceTableId != null
+ ? (tables[sourceTableId]?.entity_type ?? undefined)
+ : undefined;
} catch (error) {
// If there's an error getting the entity type, return undefined
console.warn("Could not determine entity type:", error);
return undefined;
}
- }, [question]);
+ }, [question, tables]);
const handleSort = (column: DatasetColumn) => {
onVisualizationClick({ column });
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
index 7577ade489a..acfb1bffd87 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
@@ -4,6 +4,7 @@ import { useLatest } from "react-use";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
+import { useQuestionFromCard } from "metabase/metadata-store";
import { getSubpathSafeUrl } from "metabase/urls";
import {
type VisibleTableData,
@@ -11,7 +12,6 @@ import {
} from "metabase/visualizations/lib/visible-table-data";
import { isPivoted as _isPivoted, getTitleForColumn } from "metabase/viz-core";
import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
import { TableInteractive } from "../../components/TableInteractive";
import type { VisualizationProps } from "../../types";
@@ -23,15 +23,9 @@ interface TableProps extends VisualizationProps {
}
function TableComponent(props: TableProps) {
- const {
- series,
- settings,
- metadata,
- isShowingDetailsOnlyColumns,
- isDashboard,
- } = props;
+ const { series, settings, isShowingDetailsOnlyColumns, isDashboard } = props;
- const question = useSyncedQuestion(series, metadata);
+ const question = useSyncedQuestion(series);
const data = useMemo<VisibleTableData>(
() =>
@@ -94,15 +88,12 @@ function TableComponent(props: TableProps) {
* question (and rebuild every column) mid-interaction; series changes on every
* query run, which is when fresh metadata actually needs to be picked up.
*/
-function useSyncedQuestion(
- series: VisualizationProps["series"],
- metadata: VisualizationProps["metadata"],
-) {
- const metadataRef = useLatest(metadata);
+function useSyncedQuestion(series: VisualizationProps["series"]) {
+ const buildQuestionRef = useLatest(useQuestionFromCard());
return useMemo(() => {
const [{ card }] = series;
- return new Question(card, metadataRef.current);
- }, [series, metadataRef]);
+ return buildQuestionRef.current(card);
+ }, [series, buildQuestionRef]);
}
function AllFieldsHiddenMessage({ isDashboard }: { isDashboard: boolean }) {