Skip to content

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

Let the measure and segment query hooks reach the store themselves (#82152)

Romeo Van Snick2a35f6390bcb
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts b/frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts
index 815ad42ac62..b2d65c3c415 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-measure-query.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
+import { useMetadataProviderFactory } from "metabase/metadata-store";
import * as Lib from "metabase-lib";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { DatasetQuery } from "metabase-types/api";
type UseMeasureQueryResult = {
@@ -11,18 +11,15 @@ type UseMeasureQueryResult = {
export function useMeasureQuery(
definition: DatasetQuery | null,
- metadata: Metadata,
): UseMeasureQueryResult {
+ const getMetadataProvider = useMetadataProviderFactory();
const query = useMemo(() => {
if (!definition?.database) {
return undefined;
}
- const metadataProvider = Lib.metadataProvider(
- definition.database,
- metadata,
- );
+ const metadataProvider = getMetadataProvider(definition.database);
return Lib.fromJsQuery(metadataProvider, definition);
- }, [metadata, definition]);
+ }, [getMetadataProvider, definition]);
const aggregations = useMemo(
() => (query ? Lib.aggregations(query, -1) : []),
diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
index cea1e6895c0..8a5f81425df 100644
--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
@@ -7,7 +7,7 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { getUserCanWriteMeasures } from "metabase/common/data-studio/selectors";
import { useMetadataToasts } from "metabase/common/hooks";
-import { getMetadata } from "metabase/metadata-store";
+import { getShallowTables } from "metabase/metadata-store";
import { useSelector } from "metabase/redux";
import { Button, Group } from "metabase/ui";
import * as Urls from "metabase/urls";
@@ -32,8 +32,8 @@ export function MeasureDetailPage({
breadcrumbs,
onRemove,
}: MeasureDetailPageProps) {
- const metadata = useSelector(getMetadata);
- const table = metadata.tables[measure.table_id];
+ const tables = useSelector(getShallowTables);
+ const table = tables[measure.table_id];
const canWriteMeasures = useSelector((state) =>
getUserCanWriteMeasures(state, !!table?.is_published),
);
@@ -43,7 +43,7 @@ export function MeasureDetailPage({
const [definition, setDefinition] = useState(measure.definition);
const [savedMeasure, setSavedMeasure] = useState(measure);
- const { query, aggregations } = useMeasureQuery(definition, metadata);
+ const { query, aggregations } = useMeasureQuery(definition);
const isDirty = useMemo(
() =>
diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
index 233d9d630ca..0d26fe72f69 100644
--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
@@ -49,7 +49,7 @@ export function NewMeasurePage({
}
}, [table, metadata]);
- const { query, aggregations } = useMeasureQuery(definition, metadata);
+ const { query, aggregations } = useMeasureQuery(definition);
const isDirty =
!savedMeasure &&
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts b/frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts
index 5aed9fc82e9..4ed34dcd389 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-segment-query.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
+import { useMetadataProviderFactory } from "metabase/metadata-store";
import * as Lib from "metabase-lib";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { DatasetQuery } from "metabase-types/api";
type UseSegmentQueryResult = {
@@ -11,18 +11,15 @@ type UseSegmentQueryResult = {
export function useSegmentQuery(
definition: DatasetQuery | null,
- metadata: Metadata,
): UseSegmentQueryResult {
+ const getMetadataProvider = useMetadataProviderFactory();
const query = useMemo(() => {
if (!definition?.database) {
return undefined;
}
- const metadataProvider = Lib.metadataProvider(
- definition.database,
- metadata,
- );
+ const metadataProvider = getMetadataProvider(definition.database);
return Lib.fromJsQuery(metadataProvider, definition);
- }, [metadata, definition]);
+ }, [getMetadataProvider, definition]);
const filters = useMemo(() => (query ? Lib.filters(query, -1) : []), [query]);
diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
index ae793b06d3f..b77f7f96ad1 100644
--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
@@ -49,7 +49,7 @@ export function NewSegmentPage({
}
}, [table, metadata]);
- const { query, filters } = useSegmentQuery(definition, metadata);
+ const { query, filters } = useSegmentQuery(definition);
const isDirty =
!savedSegment &&
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
index 929bf473874..89908fce9a9 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
@@ -8,7 +8,7 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContai
import { getUserCanWriteSegments } from "metabase/common/data-studio/selectors";
import { useMetadataToasts } from "metabase/common/hooks";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
-import { getMetadata } from "metabase/metadata-store";
+import { getShallowTables } from "metabase/metadata-store";
import { useSelector } from "metabase/redux";
import { Button, Group } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -32,8 +32,8 @@ export function SegmentDetailPage({
breadcrumbs,
onRemove,
}: SegmentDetailPageProps) {
- const metadata = useSelector(getMetadata);
- const table = metadata.tables[segment.table_id];
+ const tables = useSelector(getShallowTables);
+ const table = tables[segment.table_id];
const canWriteSegments = useSelector((state) =>
getUserCanWriteSegments(state, !!table?.is_published),
);
@@ -43,7 +43,7 @@ export function SegmentDetailPage({
const [definition, setDefinition] = useState(segment.definition);
const [savedSegment, setSavedSegment] = useState(segment);
- const { query, filters } = useSegmentQuery(definition, metadata);
+ const { query, filters } = useSegmentQuery(definition);
const isDirty = useMemo(
() =>