Skip to content

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

Read the picked table's database from the RTK cache, not the metadata mirror (#80972)

Romeo Van Snick518f75d5f57b
diff --git a/frontend/src/metabase/api/table.ts b/frontend/src/metabase/api/table.ts
index 15b9ee59ff7..ef37013e308 100644
--- a/frontend/src/metabase/api/table.ts
+++ b/frontend/src/metabase/api/table.ts
@@ -286,6 +286,13 @@ export const {
useDiscardTablesFieldValuesMutation,
} = tableApi;
+/**
+ * Reads a table's already-fetched `query_metadata` out of the RTK cache. Use it
+ * after awaiting the fetch, where a hook is not an option.
+ */
+export const selectTableQueryMetadata =
+ tableApi.endpoints.getTableQueryMetadata.select;
+
/**
* Fetches metadata for all foreign tables referenced by the given table's foreign key fields.
* Dispatches queries to load metadata for each related table.
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
index dd3d541c7d3..41c536c40ad 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
@@ -2,6 +2,7 @@ import { useMemo, useState } from "react";
import { useLatest } from "react-use";
import { t } from "ttag";
+import { selectTableQueryMetadata } from "metabase/api";
import type { OmniPickerItem } from "metabase/common/components/Pickers";
import {
DataPickerModal,
@@ -87,9 +88,15 @@ export function NotebookDataPicker({
const handleChange = async (tableId: TableId) => {
await dispatch(loadMetadataForTable(tableId));
- const metadata = getMetadata(store.getState());
- const databaseId = checkNotNull(metadata.table(tableId)).db_id;
- const metadataProvider = Lib.metadataProvider(databaseId, metadata);
+ const state = store.getState();
+ const { data: tableMetadata } = selectTableQueryMetadata({ id: tableId })(
+ state,
+ );
+ const databaseId = checkNotNull(tableMetadata).db_id;
+ const metadataProvider = Lib.metadataProvider(
+ databaseId,
+ getMetadata(state),
+ );
const table = Lib.tableOrCardMetadata(metadataProvider, tableId);
if (table) {
onChangeRef.current?.(table, metadataProvider);
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
index 1b13b7d1a1d..e7b3c474145 100644
--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
@@ -1,6 +1,7 @@
import { useState } from "react";
import { t } from "ttag";
+import { selectTableQueryMetadata } from "metabase/api";
import {
DataPickerModal,
getDataPickerValue,
@@ -42,9 +43,15 @@ export function DataStep({
const handleChange = async (tableId: TableId) => {
await dispatch(fetchTableMetadataAndForeignKeys({ id: tableId }));
- const metadata = getMetadata(store.getState());
- const databaseId = checkNotNull(metadata.table(tableId)).db_id;
- const metadataProvider = Lib.metadataProvider(databaseId, metadata);
+ const state = store.getState();
+ const { data: tableMetadata } = selectTableQueryMetadata({ id: tableId })(
+ state,
+ );
+ const databaseId = checkNotNull(tableMetadata).db_id;
+ const metadataProvider = Lib.metadataProvider(
+ databaseId,
+ getMetadata(state),
+ );
const table = Lib.tableOrCardMetadata(metadataProvider, tableId);
if (table) {
const newQuery = Lib.queryFromTableOrCardMetadata(