Skip to content

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

GDGT-1785 Load cards in batches in the Transform Inspector (#70129)

Egor Grushin14740891cdb9
diff --git a/frontend/src/metabase/common/hooks/index.ts b/frontend/src/metabase/common/hooks/index.ts
index 5b7cfbd53de..fa91bb48e5d 100644
--- a/frontend/src/metabase/common/hooks/index.ts
+++ b/frontend/src/metabase/common/hooks/index.ts
@@ -11,3 +11,6 @@ export * from "./use-temporary-state";
export * from "./use-toast";
export * from "./use-url-with-utm";
export { useStoreUrl } from "./use-store-url/use-store-url";
+export * from "./use-progressive-loader";
+export * from "./use-snapshot-selector";
+export * from "./use-subscriber";
diff --git a/frontend/src/metabase/common/hooks/use-progressive-loader.ts b/frontend/src/metabase/common/hooks/use-progressive-loader.ts
new file mode 100644
index 00000000000..fa5f9333073
--- /dev/null
+++ b/frontend/src/metabase/common/hooks/use-progressive-loader.ts
@@ -0,0 +1,64 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+
+type UseProgressiveLoaderOptions<T> = {
+ items: T[];
+ getItemId: (item: T) => string;
+ chunkSize: number;
+};
+
+export const useProgressiveLoader = <T>({
+ items,
+ getItemId,
+ chunkSize,
+}: UseProgressiveLoaderOptions<T>) => {
+ const getItemIdRef = useRef(getItemId);
+ getItemIdRef.current = getItemId;
+ const [currentChunkIndex, setCurrentChunkIndex] = useState(0);
+ const readyIdsRef = useRef(new Set<string>());
+
+ const chunks = useMemo(() => {
+ const result: T[][] = [];
+ for (let i = 0; i < items.length; i += chunkSize) {
+ result.push(items.slice(i, i + chunkSize));
+ }
+ return result;
+ }, [items, chunkSize]);
+
+ useEffect(() => {
+ readyIdsRef.current = new Set<string>();
+ setCurrentChunkIndex(0);
+ }, [items]);
+
+ const tryProceedToNextChunk = useCallback(
+ (prev: number) => {
+ let nextIndex = prev;
+ while (nextIndex < chunks.length) {
+ const chunk = chunks[nextIndex];
+ const allReady = chunk.every((item) =>
+ readyIdsRef.current.has(getItemIdRef.current(item)),
+ );
+ if (!allReady) {
+ break;
+ }
+ nextIndex++;
+ }
+ return nextIndex;
+ },
+ [chunks],
+ );
+
+ const markItemAsReady = useCallback(
+ (id: string) => {
+ readyIdsRef.current.add(id);
+ setCurrentChunkIndex(tryProceedToNextChunk);
+ },
+ [tryProceedToNextChunk],
+ );
+
+ const visibleItems = useMemo(
+ () => items.slice(0, (currentChunkIndex + 1) * chunkSize),
+ [items, currentChunkIndex, chunkSize],
+ );
+
+ return [visibleItems, markItemAsReady] as const;
+};
diff --git a/frontend/src/metabase/common/hooks/use-snapshot-selector.ts b/frontend/src/metabase/common/hooks/use-snapshot-selector.ts
new file mode 100644
index 00000000000..d818a70ca2d
--- /dev/null
+++ b/frontend/src/metabase/common/hooks/use-snapshot-selector.ts
@@ -0,0 +1,23 @@
+import { type DependencyList, useEffect, useRef } from "react";
+
+import { useStore } from "metabase/lib/redux";
+import type { State } from "metabase-types/store";
+
+/**
+ * This hook is similar to useSelector, but it doesn't trigger re-renders when the slice changes.
+ * Instead, it uses the deps array as a signal to capture a snapshot of the slice.
+ * This is especially useful when working with frequent or expensive selectors like getMetadata.
+ */
+export const useSnapshotSelector = <T>(
+ selector: (state: State) => T,
+ deps: DependencyList,
+): T => {
+ const store = useStore();
+ const valueRef = useRef(selector(store.getState()));
+
+ useEffect(() => {
+ valueRef.current = selector(store.getState());
+ }, [store, ...deps]); // eslint-disable-line react-hooks/exhaustive-deps
+
+ return valueRef.current;
+};
diff --git a/frontend/src/metabase/common/hooks/use-subscriber.ts b/frontend/src/metabase/common/hooks/use-subscriber.ts
new file mode 100644
index 00000000000..e9268884096
--- /dev/null
+++ b/frontend/src/metabase/common/hooks/use-subscriber.ts
@@ -0,0 +1,42 @@
+import { useCallback, useRef } from "react";
+
+type Subscriber<T> = (event: T) => void;
+
+type UseSubscriberOptions = {
+ /** When true, all emitted events are buffered and replayed to new subscribers */
+ withBuffer?: boolean;
+};
+
+export const useSubscriber = <T>({ withBuffer }: UseSubscriberOptions = {}) => {
+ const subscribersRef = useRef<Set<Subscriber<T>>>(new Set());
+ const bufferRef = useRef<T[]>([]);
+
+ const emit = useCallback(
+ (event: T) => {
+ if (withBuffer) {
+ bufferRef.current.push(event);
+ }
+ for (const subscriber of subscribersRef.current) {
+ subscriber(event);
+ }
+ },
+ [withBuffer],
+ );
+
+ const subscribe = useCallback(
+ (cb: Subscriber<T>) => {
+ subscribersRef.current.add(cb);
+ if (withBuffer) {
+ for (const event of bufferRef.current) {
+ cb(event);
+ }
+ }
+ return () => {
+ subscribersRef.current.delete(cb);
+ };
+ },
+ [withBuffer],
+ );
+
+ return { emit, subscribe };
+};
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContent.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContent.tsx
index 8ffd5e81347..69cbd45c4e5 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContent.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContent.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from "react";
+import { useCallback, useEffect, useMemo } from "react";
import { match } from "ts-pattern";
import _ from "underscore";
@@ -73,15 +73,15 @@ export const LensContent = ({
collectedCardStats,
} = useTriggerEvaluation(lens);
- const { markCardLoaded, markCardStartedLoading } = useCardLoadingTracker(
- lens,
- () => {
- if (lens) {
- onAllCardsLoaded(lens.id);
- trackLensLoaded();
- }
- },
- );
+ const onAllCardsLoadedCallback = useCallback(() => {
+ if (lens) {
+ onAllCardsLoaded(lens.id);
+ trackLensLoaded();
+ }
+ }, [lens, trackLensLoaded, onAllCardsLoaded]);
+
+ const { markCardLoaded, markCardStartedLoading, subscribeToCardLoaded } =
+ useCardLoadingTracker(onAllCardsLoadedCallback);
const cardsBySection = useMemo(
() => _.groupBy(lens?.cards ?? [], (c) => c.section_id ?? "default"),
@@ -105,9 +105,10 @@ export const LensContent = ({
drillLensesByCardId={drillLensesByCardId}
collectedCardStats={collectedCardStats}
navigateToLens={navigateToLens}
- onStatsReady={pushNewStats}
- onCardStartedLoading={markCardStartedLoading}
- onCardLoaded={markCardLoaded}
+ pushNewStats={pushNewStats}
+ markCardStartedLoading={markCardStartedLoading}
+ markCardLoaded={markCardLoaded}
+ subscribeToCardLoaded={subscribeToCardLoaded}
>
<Stack gap="xl">
{match(lens.id)
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx
index 7f287fcf925..6ea20a7f83d 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContentContext.tsx
@@ -18,15 +18,16 @@ import type { LensHandle } from "../../types";
type LensContentContextValue = {
transform: Transform;
- lens: InspectorLens;
+ lens: InspectorLens | undefined;
lensHandle: LensHandle;
alertsByCardId: Record<InspectorCardId, InspectorAlertTrigger[]>;
drillLensesByCardId: Record<InspectorCardId, InspectorDrillLensTrigger[]>;
collectedCardStats: Record<InspectorCardId, CardStats>;
navigateToLens: (lensHandle: LensHandle) => void;
- onStatsReady: (cardId: InspectorCardId, stats: CardStats | null) => void;
- onCardStartedLoading: (cardId: InspectorCardId) => void;
- onCardLoaded: (cardId: InspectorCardId) => void;
+ pushNewStats: (cardId: InspectorCardId, stats: CardStats | null) => void;
+ markCardStartedLoading: (cardId: InspectorCardId) => void;
+ markCardLoaded: (cardId: InspectorCardId) => void;
+ subscribeToCardLoaded: (cb: (cardId: InspectorCardId) => void) => () => void;
};
const LensEvaluationContext = createContext<
@@ -50,9 +51,10 @@ export const LensContentProvider = ({
alertsByCardId,
drillLensesByCardId,
collectedCardStats,
- onStatsReady,
- onCardStartedLoading,
- onCardLoaded,
+ pushNewStats,
+ markCardStartedLoading,
+ markCardLoaded,
+ subscribeToCardLoaded,
navigateToLens,
children,
}: PropsWithChildren<LensContentContextValue>) => {
@@ -64,9 +66,10 @@ export const LensContentProvider = ({
alertsByCardId,
drillLensesByCardId,
collectedCardStats,
- onStatsReady,
- onCardStartedLoading,
- onCardLoaded,
+ pushNewStats,
+ markCardStartedLoading,
+ markCardLoaded,
+ subscribeToCardLoaded,
navigateToLens,
}),
[
@@ -76,9 +79,10 @@ export const LensContentProvider = ({
alertsByCardId,
drillLensesByCardId,
collectedCardStats,
- onStatsReady,
- onCardStartedLoading,
- onCardLoaded,
+ pushNewStats,
+ markCardStartedLoading,
+ markCardLoaded,
+ subscribeToCardLoaded,
navigateToLens,
],
);
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.tsx
index 80de9c4c5fa..f05693f4a27 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.tsx
@@ -1,5 +1,7 @@
+import { useEffect } from "react";
import { match } from "ts-pattern";
+import { useLensContentContext } from "metabase/transforms/pages/TransformInspectPage/components/LensContent/LensContentContext";
import { Box, Stack, Title } from "metabase/ui";
import type {
InspectorCard,
@@ -25,6 +27,16 @@ export const DefaultLensSections = ({
sources,
visitedFields,
}: DefaultLensSectionsProps) => {
+ const { markCardStartedLoading, lens } = useLensContentContext();
+
+ /**
+ * Mark all cards as loading because the underlying components use useProgressiveLoader.
+ * Without this, useCardLoadingTracker emits an event for each batch instead of only when all cards are loaded.
+ */
+ useEffect(() => {
+ lens?.cards.forEach((card) => markCardStartedLoading(card.id));
+ }, [lens, markCardStartedLoading]);
+
return (
<Box>
{sections.map((section) => {
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx
index 28d3faa8940..e2ee03e002b 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/DefaultLensSections.unit.spec.tsx
@@ -107,9 +107,10 @@ function setup({
drillLensesByCardId={drillLensesByCardId}
collectedCardStats={{}}
navigateToLens={jest.fn()}
- onStatsReady={jest.fn()}
- onCardStartedLoading={jest.fn()}
- onCardLoaded={jest.fn()}
+ pushNewStats={jest.fn()}
+ markCardStartedLoading={jest.fn()}
+ markCardLoaded={jest.fn()}
+ subscribeToCardLoaded={jest.fn(() => jest.fn())}
>
<DefaultLensSections
sections={sections}
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.tsx
index 9d0b08d6808..39b69f20fd3 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/ComparisonLayout.tsx
@@ -1,6 +1,7 @@
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
import { match } from "ts-pattern";
+import { useProgressiveLoader } from "metabase/common/hooks";
import { SimpleGrid, Stack } from "metabase/ui";
import type {
InspectorCard,
@@ -8,10 +9,16 @@ import type {
InspectorVisitedFields,
} from "metabase-types/api";
+import { useLensContentContext } from "../../../../LensContent/LensContentContext";
import { ScalarCard } from "../ScalarCard";
import { VisualizationCard } from "../VisualizationCard";
-import { groupCardsBySource, sortGroupsByScore } from "./utils";
+import {
+ getAllCards,
+ getVisibleGroups,
+ groupCardsBySource,
+ sortGroupsByScore,
+} from "./utils";
type ComparisonLayoutProps = {
cards: InspectorCard[];
@@ -24,6 +31,8 @@ export const ComparisonLayout = ({
sources,
visitedFields,
}: ComparisonLayoutProps) => {
+ const { subscribeToCardLoaded } = useLensContentContext();
+
const groups = useMemo(
() => groupCardsBySource(cards, sources),
[cards, sources],
@@ -34,6 +43,24 @@ export const ComparisonLayout = ({
[groups, sources, visitedFields],
);
+ const allCards = useMemo(() => getAllCards(sortedGroups), [sortedGroups]);
+
+ const [visibleCards, markCardAsReady] = useProgressiveLoader({
+ items: allCards,
+ getItemId: (card) => card.id,
+ chunkSize: 4,
+ });
+
+ useEffect(
+ () => subscribeToCardLoaded(markCardAsReady),
+ [subscribeToCardLoaded, markCardAsReady],
+ );
+
+ const visibleGroups = useMemo(
+ () => getVisibleGroups(sortedGroups, visibleCards),
+ [sortedGroups, visibleCards],
+ );
+
const renderCard = (card: InspectorCard) =>
match(card.display)
.with("scalar", () => <ScalarCard card={card} key={card.id} />)
@@ -41,7 +68,7 @@ export const ComparisonLayout = ({
return (
<Stack gap="lg">
- {sortedGroups.map((group) => (
+ {visibleGroups.map((group) => (
<SimpleGrid key={group.groupId} cols={2} spacing="md">
<Stack gap="sm">{group.inputCards.map(renderCard)}</Stack>
<Stack gap="sm">{group.outputCards.map(renderCard)}</Stack>
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts
index 1005983733a..c8f2327c1e7 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/ComparisonLayout/utils.ts
@@ -97,3 +97,17 @@ const getTableOrderInSources = (
tableOrdersInSources: Map<number | undefined, number>,
): number =>
tableOrdersInSources.get(card.metadata.table_id) ?? Number.POSITIVE_INFINITY;
+
+export const getAllCards = (groups: CardGroup[]): InspectorCard[] =>
+ groups.flatMap((group) => group.inputCards.concat(group.outputCards));
+
+export const getVisibleGroups = (
+ groups: CardGroup[],
+ visibleCards: InspectorCard[],
+): CardGroup[] => {
+ const visibleCardIds = new Set(visibleCards.map(({ id }) => id));
+ return groups.filter((group) => {
+ const allCards = group.inputCards.concat(group.outputCards);
+ return allCards.every(({ id }) => visibleCardIds.has(id));
+ });
+};
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/FlatLayout.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/FlatLayout.tsx
index b34ed202932..53081ed4abf 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/FlatLayout.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/FlatLayout.tsx
@@ -1,6 +1,11 @@
+import { useEffect } from "react";
+
+import { useProgressiveLoader } from "metabase/common/hooks";
import { SimpleGrid, Stack } from "metabase/ui";
import type { InspectorCard } from "metabase-types/api";
+import { useLensContentContext } from "../../../LensContent/LensContentContext";
+
import { ScalarCard } from "./ScalarCard";
import { VisualizationCard } from "./VisualizationCard";
@@ -9,8 +14,20 @@ type FlatLayoutProps = {
};
export const FlatLayout = ({ cards }: FlatLayoutProps) => {
- const scalarCards = cards.filter((c) => c.display === "scalar");
- const otherCards = cards.filter((c) => c.display !== "scalar");
+ const { subscribeToCardLoaded } = useLensContentContext();
+ const [visibleCards, markCardAsReady] = useProgressiveLoader({
+ items: cards,
+ getItemId: (card) => card.id,
+ chunkSize: 4,
+ });
+
+ useEffect(
+ () => subscribeToCardLoaded(markCardAsReady),
+ [subscribeToCardLoaded, markCardAsReady],
+ );
+
+ const scalarCards = visibleCards.filter((c) => c.display === "scalar");
+ const otherCards = visibleCards.filter((c) => c.display !== "scalar");
return (
<Stack gap="md">
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
index a0cbf7df0e8..9de1d11f0cd 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
@@ -1,10 +1,13 @@
+import { memo } from "react";
+
import { useGetAdhocQueryMetadataQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
+import { useSnapshotSelector } from "metabase/common/hooks";
import * as Urls from "metabase/lib/urls";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Card, Loader, Stack } from "metabase/ui";
import Visualization from "metabase/visualizations/components/Visualization";
import * as Lib from "metabase-lib";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
import { defaultDisplay } from "metabase-lib/viz/display";
import type {
CardDisplayType,
@@ -28,77 +31,78 @@ type VisualizationCardProps = {
const DEFAULT_HEIGHT = 235;
-export const VisualizationCard = ({
- card,
- height = DEFAULT_HEIGHT,
-}: VisualizationCardProps) => {
- const { alertsByCardId, drillLensesByCardId } = useLensContentContext();
- const { data, isLoading: isDataLoading } = useLensCardLoader({ card });
-
- const { isLoading: isMetadataLoading } = useGetAdhocQueryMetadataQuery(
- card.dataset_query,
- );
- const metadata = useSelector(getMetadata);
-
- if (card.display === "hidden") {
- return null;
- }
-
- const alerts = alertsByCardId[card.id] ?? [];
- const drillLenses = drillLensesByCardId[card.id] ?? [];
-
- const { displayType, displaySettings } = getDisplayConfig(
- metadata,
- card,
- isMetadataLoading,
- );
-
- const rawSeries = buildRawSeries(data, card, displayType, displaySettings);
- const isLoading = isMetadataLoading || isDataLoading;
-
- const questionUrl = rawSeries?.[0]?.card
- ? Urls.serializedQuestion(rawSeries[0].card)
- : undefined;
-
- const getHref = questionUrl ? () => questionUrl : undefined;
-
- const onChangeCardAndRun = questionUrl
- ? () => Urls.openInNewTab(questionUrl)
- : undefined;
-
- return (
- <Card p="md" shadow="none" withBorder>
- <Stack gap="sm">
- {isLoading || !rawSeries ? (
- <Stack gap="sm" align="center" justify="center" h={height}>
- <Loader size="sm" />
- </Stack>
- ) : (
- <Box h={height}>
- <Visualization
- rawSeries={rawSeries}
- showTitle={true}
- // we want to have dashboard like experience: e.g. leaner UI, no column reordering, prevent row detail clicks
- isDashboard={true}
- getHref={getHref}
- onChangeCardAndRun={onChangeCardAndRun}
- />
- </Box>
- )}
-
- <CardAlerts alerts={alerts} />
-
- <CardDrills drillLenses={drillLenses} />
- </Stack>
- </Card>
- );
-};
-
-function getDisplayConfig(
- metadata: ReturnType<typeof getMetadata>,
+export const VisualizationCard = memo(
+ ({ card, height = DEFAULT_HEIGHT }: VisualizationCardProps) => {
+ const { alertsByCardId, drillLensesByCardId } = useLensContentContext();
+ const { data, isLoading: isDataLoading } = useLensCardLoader({ card });
+
+ const { isLoading: isMetadataLoading } = useGetAdhocQueryMetadataQuery(
+ card.dataset_query,
+ );
+
+ const metadata = useSnapshotSelector(getMetadata, [isMetadataLoading]);
+
+ if (card.display === "hidden") {
+ return null;
+ }
+
+ const alerts = alertsByCardId[card.id] ?? [];
+ const drillLenses = drillLensesByCardId[card.id] ?? [];
+
+ const { displayType, displaySettings } = getDisplayConfig(
+ metadata,
+ card,
+ isMetadataLoading,
+ );
+
+ const rawSeries = buildRawSeries(data, card, displayType, displaySettings);
+ const isLoading = isMetadataLoading || isDataLoading;
+
+ const questionUrl = rawSeries?.[0]?.card
+ ? Urls.serializedQuestion(rawSeries[0].card)
+ : undefined;
+
+ const getHref = questionUrl ? () => questionUrl : undefined;
+
+ const onChangeCardAndRun = questionUrl
+ ? () => Urls.openInNewTab(questionUrl)
+ : undefined;
+
+ return (
+ <Card p="md" shadow="none" withBorder>
+ <Stack gap="sm">
+ {isLoading || !rawSeries ? (
+ <Stack gap="sm" align="center" justify="center" h={height}>
+ <Loader size="sm" />
+ </Stack>
+ ) : (
+ <Box h={height}>
+ <Visualization
+ rawSeries={rawSeries}
+ showTitle={true}
+ isDashboard={true}
+ getHref={getHref}
+ onChangeCardAndRun={onChangeCardAndRun}
+ />
+ </Box>
+ )}
+
+ <CardAlerts alerts={alerts} />
+
+ <CardDrills drillLenses={drillLenses} />
+ </Stack>
+ </Card>
+ );
+ },
+);
+
+VisualizationCard.displayName = "VisualizationCard";
+
+const getDisplayConfig = (
+ metadata: Metadata,
card: InspectorCard,
isMetadataLoading: boolean,
-) {
+) => {
if (isMetadataLoading) {
return { displayType: card.display, displaySettings: {} };
}
@@ -112,14 +116,14 @@ function getDisplayConfig(
} catch {
return { displayType: card.display, displaySettings: {} };
}
-}
+};
-function buildRawSeries(
+const buildRawSeries = (
dataset: Dataset | undefined,
card: InspectorCard,
displayType: InspectorCardDisplayType,
displaySettings: Partial<VisualizationSettings>,
-): RawSeries | undefined {
+): RawSeries | undefined => {
if (!dataset) {
return;
}
@@ -137,7 +141,7 @@ function buildRawSeries(
visualization_settings: {
"graph.y_axis.labels_enabled": false,
"graph.x_axis.labels_enabled": false,
- "table.row_index": false, // hide row index column
+ "table.row_index": false,
...displaySettings,
...card.visualization_settings,
},
@@ -145,4 +149,4 @@ function buildRawSeries(
data: dataset.data,
},
];
-}
+};
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useCardLoadingTracker.ts b/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useCardLoadingTracker.ts
index 9b9c6868436..3e4272b10f7 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useCardLoadingTracker.ts
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useCardLoadingTracker.ts
@@ -1,46 +1,37 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useRef } from "react";
-import type {
- InspectorCardId,
- InspectorLens,
- InspectorLensId,
-} from "metabase-types/api";
+import { useSubscriber } from "metabase/common/hooks";
+import type { InspectorCardId } from "metabase-types/api";
-type CardState = "loading" | "loaded";
+export const useCardLoadingTracker = (onAllCardsLoaded: () => void) => {
+ const startedRef = useRef(new Set<InspectorCardId>());
+ const loadedRef = useRef(new Set<InspectorCardId>());
-export const useCardLoadingTracker = (
- lens: InspectorLens | undefined,
- onAllCardsLoaded: (lensId: InspectorLensId) => void,
-) => {
- const [cardsStates, setCardsStates] = useState<
- Record<InspectorCardId, CardState>
- >({});
+ const { emit, subscribe } = useSubscriber<InspectorCardId>({
+ withBuffer: true,
+ });
- useEffect(() => {
- if (!lens) {
- return;
- }
- const states = Object.values(cardsStates);
- const isSomethingLoading = states.includes("loading");
- if (states.length > 0 && !isSomethingLoading) {
- onAllCardsLoaded(lens.id);
- }
- }, [lens, cardsStates, onAllCardsLoaded]);
+ const markCardStartedLoading = useCallback((cardId: InspectorCardId) => {
+ startedRef.current.add(cardId);
+ }, []);
- const markCard = useCallback(
- (state: CardState) => (cardId: InspectorCardId) => {
- setCardsStates((prev) =>
- prev[cardId] === state ? prev : { ...prev, [cardId]: state },
- );
+ const markCardLoaded = useCallback(
+ (cardId: InspectorCardId) => {
+ loadedRef.current.add(cardId);
+ emit(cardId);
+ if (
+ startedRef.current.size > 0 &&
+ startedRef.current.size === loadedRef.current.size
+ ) {
+ onAllCardsLoaded();
+ }
},
- [],
+ [emit, onAllCardsLoaded],
);
- return useMemo(
- () => ({
- markCardLoaded: markCard("loaded"),
- markCardStartedLoading: markCard("loading"),
- }),
- [markCard],
- );
+ return {
+ markCardLoaded,
+ markCardStartedLoading,
+ subscribeToCardLoaded: subscribe,
+ };
};
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useLensCardLoader.ts b/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useLensCardLoader.ts
index 68eeb910cdd..0da5f634015 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useLensCardLoader.ts
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/hooks/useLensCardLoader.ts
@@ -17,9 +17,9 @@ export const useLensCardLoader = ({ card }: UseLensCardLoaderOptions) => {
const {
lensHandle,
transform,
- onStatsReady,
- onCardStartedLoading,
- onCardLoaded,
+ pushNewStats,
+ markCardStartedLoading,
+ markCardLoaded,
} = useLensContentContext();
const { data, isLoading } = useRunInspectorQueryQuery({
transformId: transform.id,
@@ -30,8 +30,8 @@ export const useLensCardLoader = ({ card }: UseLensCardLoaderOptions) => {
const [stats, setStats] = useState<CardStats | null>();
useEffect(() => {
- onCardStartedLoading(card.id);
- }, [card.id, onCardStartedLoading]);
+ markCardStartedLoading(card.id);
+ }, [card.id, markCardStartedLoading]);
useEffect(() => {
if (isLoading) {
@@ -39,9 +39,9 @@ export const useLensCardLoader = ({ card }: UseLensCardLoaderOptions) => {
}
const stats = computeCardStats(lensHandle.id, card, data?.data?.rows);
setStats(stats);
- onStatsReady(card.id, stats);
- onCardLoaded(card.id);
- }, [card, lensHandle, data, isLoading, onStatsReady, onCardLoaded]);
+ pushNewStats(card.id, stats);
+ markCardLoaded(card.id);
+ }, [card, lensHandle, data, isLoading, pushNewStats, markCardLoaded]);
return { data, isLoading, stats };
};