Skip to content

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

Read database, table, and field display data from RTK Query (#79810)

Romeo Van Snick3a065165fb6e
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx
index a796fb36c64..797d21e6412 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx
@@ -3,9 +3,9 @@ import { useMount } from "react-use";
import { updateDataPermission } from "metabase/admin/permissions/permissions";
import { DataPermissionType } from "metabase/admin/permissions/types";
+import { skipToken, useGetDatabaseQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import type { ModalComponentProps } from "metabase/common/components/ModalRoute";
-import { useDatabaseQuery } from "metabase/common/hooks";
import { useDispatch } from "metabase/redux";
import { parseIntParam } from "metabase/urls";
import { updateImpersonation } from "metabase-enterprise/advanced_permissions/reducer";
@@ -49,9 +49,7 @@ export const ImpersonationModal = ({
data: database,
isLoading: isDatabaseLoading,
error,
- } = useDatabaseQuery({
- id: databaseId,
- });
+ } = useGetDatabaseQuery(databaseId != null ? { id: databaseId } : skipToken);
const attributes = useEnterpriseSelector(getUserAttributes);
const draftImpersonation = useEnterpriseSelector(
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
index c964cd78636..e23439afa07 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
@@ -17,8 +17,7 @@ import {
import { Alert, Button, Icon, Stack, Text } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import { renderUserAttributesForSelect } from "metabase-enterprise/sandboxes/utils";
-import type Database from "metabase-lib/v1/metadata/Database";
-import type { UserAttributeKey } from "metabase-types/api";
+import type { Database, UserAttributeKey } from "metabase-types/api";
import { ImpersonationWarning } from "../ImpersonationWarning";
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
index 576e8588f0c..1d79b02ae2c 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
@@ -5,7 +5,7 @@ import CS from "metabase/css/core/index.css";
import { Alert, Box, Code, Icon } from "metabase/ui";
import * as Urls from "metabase/urls";
import { isEmpty } from "metabase/utils/validate";
-import type Database from "metabase-lib/v1/metadata/Database";
+import type { Database } from "metabase-types/api";
interface ImpersonationWarningProps {
database: Database;
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsx
index eb7bd08c50b..4fc1c174a74 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsx
@@ -1,21 +1,13 @@
import { renderWithProviders, screen } from "__support__/ui";
import { Route } from "metabase/router";
-import Database from "metabase-lib/v1/metadata/Database";
-import type { Database as IDatabase } from "metabase-types/api";
+import type { Database } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
import { ImpersonationWarning } from "./ImpersonationWarning";
-const setup = (database: IDatabase) => {
+const setup = (database: Database) => {
renderWithProviders(
- <Route
- path="*"
- element={
- <ImpersonationWarning
- database={new Database({ ...database, tables: [] })}
- />
- }
- />,
+ <Route path="*" element={<ImpersonationWarning database={database} />} />,
{
withRouter: true,
},
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx
index b52f1a0007f..966355572e6 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";
-import { useDatabaseListQuery } from "metabase/common/hooks";
+import { useListDatabasesQuery } from "metabase/api";
import {
isQuestionDirty,
isQuestionRunnable,
@@ -42,7 +42,7 @@ export const Editor = ({
hasVisualizeButton = true,
}: EditorProps) => {
// Loads databases and metadata so we can show notebook steps for the selected data source
- useDatabaseListQuery();
+ useListDatabasesQuery();
const {
question: rawQuestion,
diff --git a/frontend/src/metabase-lib/v1/actions/utils.ts b/frontend/src/metabase-lib/v1/actions/utils.ts
index b0b4bf495bc..31db168da15 100644
--- a/frontend/src/metabase-lib/v1/actions/utils.ts
+++ b/frontend/src/metabase-lib/v1/actions/utils.ts
@@ -1,13 +1,12 @@
import type Question from "metabase-lib/v1/Question";
-import type Database from "metabase-lib/v1/metadata/Database";
-import type { WritebackAction } from "metabase-types/api";
+import type { Database, WritebackAction } from "metabase-types/api";
export const canRunAction = (
action: WritebackAction,
- databases: Database[],
+ databases: Pick<Database, "id" | "settings">[],
) => {
const database = databases.find(({ id }) => id === action.database_id);
- return database != null && database.hasActionsEnabled();
+ return Boolean(database?.settings?.["database-enable-actions"]);
};
export const canEditAction = (action: WritebackAction, model: Question) => {
diff --git a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx
index 20950050702..eca8d45b5bc 100644
--- a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx
+++ b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx
@@ -1,6 +1,5 @@
import { useListDatabasesQuery } from "metabase/api";
import { useDispatch, useSelector } from "metabase/redux";
-import { getMetadata } from "metabase/selectors/metadata";
import { disableNotice } from "../../actions";
import DeprecationNotice from "../../components/DeprecationNotice";
@@ -10,10 +9,9 @@ import {
} from "../../selectors";
const DeprecationNoticeContainer = () => {
- useListDatabasesQuery();
- const databases = useSelector((state) => getMetadata(state).databasesList());
+ const { data: databasesData } = useListDatabasesQuery();
const hasDeprecated = useSelector((state) =>
- hasDeprecatedDatabase(state, { databases }),
+ hasDeprecatedDatabase(state, { databases: databasesData?.data }),
);
const isEnabled = useSelector(isDeprecationNoticeEnabled);
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/admin/app/selectors.ts b/frontend/src/metabase/admin/app/selectors.ts
index b1510fa2d1d..a636099e0ae 100644
--- a/frontend/src/metabase/admin/app/selectors.ts
+++ b/frontend/src/metabase/admin/app/selectors.ts
@@ -1,10 +1,10 @@
import { isDeprecatedEngine } from "metabase/databases/utils/engine";
import type { State } from "metabase/redux/store";
import { getSetting } from "metabase/settings";
-import type Database from "metabase-lib/v1/metadata/Database";
+import type { Database } from "metabase-types/api";
interface Props {
- databases?: Database[];
+ databases?: Pick<Database, "is_sample" | "engine">[];
}
export const hasDeprecatedDatabase = (state: State, props: Props): boolean => {
diff --git a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
index cd465fc0292..98db153daaa 100644
--- a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
+++ b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
@@ -6,10 +6,8 @@ import { skipToken, useGetTableQuery } from "metabase/api";
import { FieldSet } from "metabase/common/components/FieldSet";
import CS from "metabase/css/core/index.css";
import { DatabaseSchemaAndTableDataSelector } from "metabase/querying/common/components/DataSelector";
-import { useSelector } from "metabase/redux";
import type { Location } from "metabase/router";
import { queryToSearch, useNavigate } from "metabase/router";
-import { getMetadata } from "metabase/selectors/metadata";
import { Icon } from "metabase/ui";
import type { ConcreteTableId, Segment } from "metabase-types/api";
@@ -80,9 +78,8 @@ type TableSelectorProps = {
};
function TableSelector({ tableId, setTableId }: TableSelectorProps) {
- useGetTableQuery(tableId != null ? { id: tableId } : skipToken);
- const table = useSelector((state) =>
- tableId != null ? getMetadata(state).table(tableId) : null,
+ const { data: table } = useGetTableQuery(
+ tableId != null ? { id: tableId } : skipToken,
);
return (
@@ -108,7 +105,7 @@ function TableSelector({ tableId, setTableId }: TableSelectorProps) {
)}
data-testid="segment-list-table"
>
- {table ? table.displayName() : t`Filter by table`}
+ {table ? table.display_name : t`Filter by table`}
<Icon
name={table ? "close" : "chevrondown"}
size={12}
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx
index 1dd0522f415..bf09588dd2f 100644
--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx
+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx
@@ -11,6 +11,11 @@ import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
import { TableBrowser } from "./TableBrowser";
describe("TableBrowser", () => {
+ beforeEach(() => {
+ // The database breadcrumb reads the database list that the app fetches on launch.
+ fetchMock.get("path:/api/database", { data: [], total: 0 });
+ });
+
it("should poll until tables have completed initial sync", async () => {
// initially, initial_sync_status='incomplete'
fetchMock.get(
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts
index 8ce2e30db59..54321a11b9b 100644
--- a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts
+++ b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts
@@ -1,18 +1,22 @@
import { t } from "ttag";
-import { skipToken, useGetDatabaseQuery } from "metabase/api";
-import { useSelector } from "metabase/redux";
-import { getMetadata } from "metabase/selectors/metadata";
+import {
+ skipToken,
+ useGetDatabaseQuery,
+ useListDatabasesQuery,
+} from "metabase/api";
import * as Urls from "metabase/urls";
import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { DatabaseId } from "metabase-types/api";
export const useDatabaseCrumb = (id: DatabaseId) => {
- // We display what we already have in store to avoid showing loading state.
- // It's possible because GET /api/database is always dispatched on app launch.
- // We still re-fetch the database to get new data, just in case it changed.
- const cachedDatabase = useSelector((state) =>
- getMetadata(state).database(id),
+ // We display what the database list already holds to avoid showing a loading
+ // state. It's possible because GET /api/database is always dispatched on app
+ // launch. We still re-fetch the database to get new data, just in case it
+ // changed.
+ const { data: databasesResponse } = useListDatabasesQuery();
+ const cachedDatabase = databasesResponse?.data.find(
+ (database) => database.id === id,
);
const { data: fetchedDatabase } = useGetDatabaseQuery(
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx
index b04d3a381e4..f24fb83a7ba 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx
@@ -2,11 +2,10 @@ import {
useGetCollectionQuery,
useListBookmarksQuery,
useListCollectionsTreeQuery,
+ useListDatabasesQuery,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDatabaseListQuery } from "metabase/common/hooks";
import { useSelector } from "metabase/redux";
-import { getMetadata } from "metabase/selectors/metadata";
import { getUserIsAdmin } from "metabase/selectors/user";
import { getSetting } from "metabase/settings";
import type { CollectionId } from "metabase-types/api";
@@ -19,7 +18,9 @@ export function CollectionContent({
collectionId: CollectionId;
}) {
const { data: bookmarks, error: bookmarksError } = useListBookmarksQuery();
- const { data: databases, error: databasesError } = useDatabaseListQuery();
+ const { data: databasesResponse, error: databasesError } =
+ useListDatabasesQuery();
+ const databases = databasesResponse?.data;
const { data: collections, error: collectionsError } =
useListCollectionsTreeQuery({
@@ -36,11 +37,8 @@ export function CollectionContent({
);
const uploadsEnabled = !!uploadDbId;
- const canCreateUploadInDb = useSelector(
- (state) =>
- uploadDbId != null &&
- !!getMetadata(state).database(uploadDbId)?.canUpload(),
- );
+ const canCreateUploadInDb = !!databases?.find(({ id }) => id === uploadDbId)
+ ?.can_upload;
const isAdmin = useSelector(getUserIsAdmin);
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
index 751dfc6ec7e..20ab3334b3e 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
@@ -37,12 +37,12 @@ import {
} from "metabase/redux/uploads";
import { useNavigate } from "metabase/router";
import { Box } from "metabase/ui";
-import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
Collection,
CollectionId,
CollectionItem,
+ Database,
} from "metabase-types/api";
import { ModelUploadModal } from "../ModelUploadModal";
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx
index 8038d1f94d3..864c52de4f6 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx
@@ -32,13 +32,13 @@ import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { Box } from "metabase/ui";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
-import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
Collection,
CollectionId,
CollectionItem,
CollectionItemModel,
+ Database,
ListCollectionItemsRequest,
ListCollectionItemsSortColumn,
SortingOptions,
diff --git a/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx
index 84d0fd3c637..1b2de52b697 100644
--- a/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx
+++ b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx
@@ -14,12 +14,12 @@ import { isRootTrashCollection } from "metabase/common/collections/utils";
import { canSelectItems } from "metabase/common/components/ItemsTable/utils";
import { ItemDragSource } from "metabase/common/components/dnd/ItemDragSource";
import { Box, SimpleGrid, rem } from "metabase/ui";
-import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
Collection,
CollectionId,
CollectionItem,
+ Database,
} from "metabase-types/api";
import { useIsShiftPressed } from "./use-is-shift-pressed";
diff --git a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx
index 9436a9fe3f7..a425efbdf79 100644
--- a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx
+++ b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx
@@ -36,8 +36,12 @@ import {
import { connect } from "metabase/redux";
import type { State } from "metabase/redux/store";
import { getSetting } from "metabase/settings";
-import type Database from "metabase-lib/v1/metadata/Database";
-import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";
+import type {
+ Bookmark,
+ Collection,
+ CollectionItem,
+ Database,
+} from "metabase-types/api";
import S from "./ActionMenu.module.css";
diff --git a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
index 21eaed9c03d..8df3ac53ed2 100644
--- a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
+++ b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
@@ -8,7 +8,6 @@ import {
createMockSettingsState,
createMockState,
} from "metabase/redux/store/mocks";
-import { getMetadata } from "metabase/selectors/metadata";
import type { Collection, CollectionItem, Database } from "metabase-types/api";
import {
createMockCollection,
@@ -46,7 +45,6 @@ const setup = ({
}),
});
- const metadata = getMetadata(storeInitialState);
const onCopy = jest.fn();
const onMove = jest.fn();
const createBookmark = withBookmarks ? jest.fn() : undefined;
@@ -56,7 +54,7 @@ const setup = ({
<ActionMenu
item={item}
collection={collection}
- databases={metadata.databasesList()}
+ databases={databases}
onCopy={onCopy}
onMove={onMove}
createBookmark={createBookmark}
diff --git a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.tsx b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.tsx
index e9030dce722..e850ca7cb28 100644
--- a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.tsx
+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.tsx
@@ -16,12 +16,12 @@ import { useGetIcon } from "metabase/hooks/use-icon";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { Box, Card, Checkbox, Ellipsified, Group } from "metabase/ui";
import { modelToUrl } from "metabase/urls";
-import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
Collection,
CollectionItem,
CollectionItemModel,
+ Database,
RecentCollectionItem,
} from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/InfoText/InfoTextAssetLink.tsx b/frontend/src/metabase/common/components/InfoText/InfoTextAssetLink.tsx
index abd56d2765b..a35b7499b32 100644
--- a/frontend/src/metabase/common/components/InfoText/InfoTextAssetLink.tsx
+++ b/frontend/src/metabase/common/components/InfoText/InfoTextAssetLink.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
+import { skipToken, useGetDatabaseQuery, useGetTableQuery } from "metabase/api";
import { SearchResultLink } from "metabase/common/components/SearchResultLink";
-import { useDatabaseQuery, useTableQuery } from "metabase/common/hooks";
import { Box, Icon, Text } from "metabase/ui";
import {
browseDatabase,
@@ -9,8 +9,11 @@ import {
tableRowsQuery,
table as tableUrl,
} from "metabase/urls";
-import type Database from "metabase-lib/v1/metadata/Database";
-import { type SearchResult, isConcreteTableId } from "metabase-types/api";
+import {
+ type Database,
+ type SearchResult,
+ isConcreteTableId,
+} from "metabase-types/api";
import type { InfoTextData } from "./get-info-text";
import { getInfoText } from "./get-info-text";
@@ -44,9 +47,9 @@ export const InfoTextTableLink = ({
data: table,
isLoading,
error,
- } = useTableQuery({
- id: result.table_id,
- });
+ } = useGetTableQuery(
+ result.table_id != null ? { id: result.table_id } : skipToken,
+ );
if (error) {
return null;
@@ -101,9 +104,9 @@ export const InfoTextTablePath = ({
data: database,
isLoading: isDatabaseLoading,
error: databaseError,
- } = useDatabaseQuery({
- id: result.database_id,
- });
+ } = useGetDatabaseQuery(
+ result.database_id != null ? { id: result.database_id } : skipToken,
+ );
if (databaseError) {
return null;
diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx
index e96a95151ea..aed254539ec 100644
--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx
@@ -14,11 +14,11 @@ import { BaseItemsTableBody } from "metabase/common/components/ItemsTable/BaseIt
import type { ItemRendererProps } from "metabase/common/components/ItemsTable/DefaultItemRenderer";
import { DefaultItemRenderer } from "metabase/common/components/ItemsTable/DefaultItemRenderer";
import { canSelectItems } from "metabase/common/components/ItemsTable/utils";
-import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
Collection,
CollectionItem,
+ Database,
ListCollectionItemsSortColumn,
SortDirection,
SortingOptions,
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx
index 68a649ad0a3..9d989774ea0 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.tsx
@@ -1,8 +1,6 @@
import { msgid, ngettext, t } from "ttag";
-import { useGetFieldValuesQuery } from "metabase/api";
-import { useSelector } from "metabase/redux";
-import { getMetadata } from "metabase/selectors/metadata";
+import { useGetFieldQuery, useGetFieldValuesQuery } from "metabase/api";
import { Flex, Loader } from "metabase/ui";
import { formatNumber } from "metabase/utils/formatting";
import type { FieldId, FieldValue } from "metabase-types/api";
@@ -29,8 +27,7 @@ export function GlobalFingerprint({
fieldId,
showAllFieldValues,
}: GlobalFingerprintProps) {
- const metadata = useSelector(getMetadata);
- const field = metadata.field(fieldId);
+ const { data: field } = useGetFieldQuery({ id: fieldId });
const hasListValues = field?.has_field_values === "list";
const { data: fieldData, isLoading } = useGetFieldValuesQuery(fieldId, {
skip: !hasListValues,
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx
index 3a20edb6ba6..b98f12ae3a4 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/GlobalFingerprint.unit.spec.tsx
@@ -1,7 +1,10 @@
-import { setupFieldValuesEndpoint } from "__support__/server-mocks";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
+import fetchMock from "fetch-mock";
+
+import {
+ setupFieldEndpoints,
+ setupFieldValuesEndpoint,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { FieldId } from "metabase-types/api";
import {
PEOPLE,
@@ -12,28 +15,28 @@ import {
import { GlobalFingerprint } from "./GlobalFingerprint";
-const state = createMockState({
- entities: createMockEntitiesState({
- databases: [createSampleDatabase()],
- }),
-});
+const SAMPLE_DATABASE_FIELDS = createSampleDatabase().tables?.flatMap(
+ (table) => table.fields ?? [],
+);
+
+const MISSING_FIELD_ID = 99942;
function setup(fieldId: FieldId) {
setupFieldValuesEndpoint(PRODUCT_CATEGORY_VALUES);
+ SAMPLE_DATABASE_FIELDS?.forEach((field) => setupFieldEndpoints(field));
+ fetchMock.get(`path:/api/field/${MISSING_FIELD_ID}`, 404);
- renderWithProviders(<GlobalFingerprint fieldId={fieldId} />, {
- storeInitialState: state,
- });
+ renderWithProviders(<GlobalFingerprint fieldId={fieldId} />);
}
describe("GlobalFingerprint", () => {
describe("when the field does not have a `has_field_values` value of 'list'", () => {
- it("should not fetch field values when field values are empty", () => {
+ it("should not fetch field values when field values are empty", async () => {
setup(PEOPLE.ADDRESS);
+ expect(await screen.findByText(/distinct values/)).toBeInTheDocument();
expect(
screen.queryByText("Getting distinct values..."),
).not.toBeInTheDocument();
- expect(screen.getByText(/distinct values/)).toBeInTheDocument();
});
});
@@ -42,14 +45,19 @@ describe("GlobalFingerprint", () => {
setup(PRODUCTS.CATEGORY);
expect(
- screen.getByText("Getting distinct values..."),
+ await screen.findByText("Getting distinct values..."),
).toBeInTheDocument();
expect(await screen.findByText("4 distinct values")).toBeInTheDocument();
});
});
- it("should not throw an error when the field cannot be found", () => {
- setup(99942);
+ it("should not throw an error when the field cannot be found", async () => {
+ setup(MISSING_FIELD_ID);
+ await waitFor(() =>
+ expect(
+ fetchMock.callHistory.called(`path:/api/field/${MISSING_FIELD_ID}`),
+ ).toBe(true),
+ );
expect(
screen.queryByText("Getting distinct values..."),
).not.toBeInTheDocument();
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx
index 104ca12488e..401ab8cf09d 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx
@@ -1,4 +1,7 @@
-import { setupFieldsValuesEndpoints } from "__support__/server-mocks";
+import {
+ setupFieldEndpoints,
+ setupFieldsValuesEndpoints,
+} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
@@ -56,26 +59,28 @@ const setup = ({ columnName, fingerprint, timezone }: SetupOpts) => {
setupFieldsValuesEndpoints([]);
const sampleDatabase = createSampleDatabase();
+ const database = {
+ ...sampleDatabase,
+ tables: sampleDatabase.tables?.map((table) =>
+ table.id === PRODUCTS_ID
+ ? {
+ ...table,
+ fields: table.fields?.map((field) =>
+ field.name === columnName && fingerprint !== undefined
+ ? { ...field, fingerprint }
+ : field,
+ ),
+ }
+ : table,
+ ),
+ };
+
+ database.tables?.forEach((table) =>
+ table.fields?.forEach((field) => setupFieldEndpoints(field)),
+ );
+
const state = createMockState({
- entities: createMockEntitiesState({
- databases: [
- {
- ...sampleDatabase,
- tables: sampleDatabase.tables?.map((table) =>
- table.id === PRODUCTS_ID
- ? {
- ...table,
- fields: table.fields?.map((field) =>
- field.name === columnName && fingerprint !== undefined
- ? { ...field, fingerprint }
- : field,
- ),
- }
- : table,
- ),
- },
- ],
- }),
+ entities: createMockEntitiesState({ databases: [database] }),
});
const provider = Lib.metadataProvider(SAMPLE_DB_ID, getMetadata(state));
@@ -195,7 +200,7 @@ describe("QueryColumnFingerprintInfo", () => {
});
describe("ID column", () => {
- it("should render the distinct count instead of the number fingerprint", () => {
+ it("should render the distinct count instead of the number fingerprint", async () => {
setup({
columnName: "ID",
fingerprint: createMockFingerprint({
@@ -204,7 +209,9 @@ describe("QueryColumnFingerprintInfo", () => {
}),
});
- expect(screen.getByText("123 distinct values")).toBeInTheDocument();
+ expect(
+ await screen.findByText("123 distinct values"),
+ ).toBeInTheDocument();
expect(screen.queryByText("Average")).not.toBeInTheDocument();
});
diff --git a/frontend/src/metabase/common/hooks/entity-framework/index.ts b/frontend/src/metabase/common/hooks/entity-framework/index.ts
index 2bdb31628e4..8fa30eed8c8 100644
--- a/frontend/src/metabase/common/hooks/entity-framework/index.ts
+++ b/frontend/src/metabase/common/hooks/entity-framework/index.ts
@@ -3,8 +3,6 @@
* Use "metabase/api" instead.
*/
-export * from "./use-database-list-query";
-export * from "./use-database-query";
export * from "./use-question-list-query";
export * from "./use-question-query";
export * from "./use-table-query";
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/index.ts b/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/index.ts
deleted file mode 100644
index e5e35864196..00000000000
--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./use-database-list-query";
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.ts
deleted file mode 100644
index 46060b99607..00000000000
--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { skipToken, useListDatabasesQuery } from "metabase/api";
-import type {
- UseEntityListQueryProps,
- UseEntityListQueryResult,
-} from "metabase/common/hooks/entity-framework/use-entity-list-query";
-import { useSelector } from "metabase/redux";
-import { getMetadata } from "metabase/selectors/metadata";
-import type Database from "metabase-lib/v1/metadata/Database";
-import type { ListDatabasesRequest } from "metabase-types/api";
-
-/**
- * @deprecated use "metabase/api" instead
- */
-export const useDatabaseListQuery = ({
- query,
- reload = false,
- enabled = true,
-}: UseEntityListQueryProps<ListDatabasesRequest> = {}): UseEntityListQueryResult<Database> => {
- const {
- data: response,
- isFetching,
- isSuccess,
- error,
- } = useListDatabasesQuery(enabled ? (query ?? undefined) : skipToken, {
- refetchOnMountOrArgChange: reload,
- });
- const data = useSelector((state) => {
- if (!response) {
- return undefined;
- }
- const metadata = getMetadata(state);
- return response.data
- .map(({ id }) => metadata.database(id))
- .filter((database): database is Database => database != null);
- });
- return {
- data,
- isLoading: isFetching,
- isLoaded: isSuccess,
- error,
- };
-};
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.unit.spec.tsx
deleted file mode 100644
index 77de18269fe..00000000000
--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.unit.spec.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { setupDatabasesEndpoints } from "__support__/server-mocks";
-import {
- renderWithProviders,
- screen,
- waitForLoaderToBeRemoved,
-} from "__support__/ui";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { createMockDatabase } from "metabase-types/api/mocks";
-
-import { useDatabaseListQuery } from "./use-database-list-query";
-
-const TEST_DB = createMockDatabase();
-
-const TestComponent = () => {
- const { data = [], isLoading, error } = useDatabaseListQuery();
-
- if (isLoading || error) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- return (
- <div>
- {data.map((database) => (
- <div key={database.id}>{database.name}</div>
- ))}
- </div>
- );
-};
-
-const setup = () => {
- setupDatabasesEndpoints([TEST_DB]);
- renderWithProviders(<TestComponent />);
-};
-
-describe("useDatabaseListQuery", () => {
- it("should be initially loading", () => {
- setup();
- expect(screen.getByTestId("loading-indicator")).toBeInTheDocument();
- });
-
- it("should show data from the response", async () => {
- setup();
- await waitForLoaderToBeRemoved();
- expect(screen.getByText(TEST_DB.name)).toBeInTheDocument();
- });
-});
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/index.ts b/frontend/src/metabase/common/hooks/entity-framework/use-database-query/index.ts
deleted file mode 100644
index 8236c950f91..00000000000
--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./use-database-query";
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.ts
deleted file mode 100644
index 8157a088a63..00000000000
--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { skipToken, useGetDatabaseQuery } from "metabase/api";
-import type {
- UseEntityQueryProps,
- UseEntityQueryResult,
-} from "metabase/common/hooks/entity-framework/use-entity-query";
-import { useSelector } from "metabase/redux";
-import { getMetadata } from "metabase/selectors/metadata";
-import type Database from "metabase-lib/v1/metadata/Database";
-import type { DatabaseId, GetDatabaseRequest } from "metabase-types/api";
-
-/**
- * @deprecated use "metabase/api" instead
- */
-export const useDatabaseQuery = ({
- id,
- query,
- reload = false,
- enabled = true,
-}: UseEntityQueryProps<
- DatabaseId,
- Omit<GetDatabaseRequest, "id">
->): UseEntityQueryResult<Database> => {
- const isActive = enabled && id != null;
- const { isFetching, error } = useGetDatabaseQuery(
- isActive ? { id, ...query } : skipToken,
- { refetchOnMountOrArgChange: reload },
- );
- const data = useSelector((state) =>
- id != null ? (getMetadata(state).database(id) ?? undefined) : undefined,
- );
- return {
- data,
- isLoading: isFetching || (isActive && data == null),
- error,
- };
-};
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.unit.spec.tsx
deleted file mode 100644
index 9ba7352dcf7..00000000000
--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.unit.spec.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import {
- PERMISSION_ERROR,
- setupDatabasesEndpoints,
- setupUnauthorizedDatabasesEndpoints,
-} from "__support__/server-mocks";
-import {
- renderWithProviders,
- screen,
- waitForLoaderToBeRemoved,
-} from "__support__/ui";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { createMockDatabase } from "metabase-types/api/mocks";
-
-import { useDatabaseQuery } from "./use-database-query";
-
-const TEST_DATABASE = createMockDatabase();
-
-const TestComponent = () => {
- const { data, isLoading, error } = useDatabaseQuery({
- id: TEST_DATABASE.id,
- });
-
- if (isLoading || error || !data) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
- return <div>{data.name}</div>;
-};
-
-interface SetupOpts {
- hasDataAccess?: boolean;
-}
-
-const setup = ({ hasDataAccess = true }: SetupOpts = {}) => {
- if (hasDataAccess) {
- setupDatabasesEndpoints([TEST_DATABASE]);
- } else {
- setupUnauthorizedDatabasesEndpoints([TEST_DATABASE]);
- }
-
- renderWithProviders(<TestComponent />);
-};
-
-describe("useDatabaseQuery", () => {
- it("should be initially loading", () => {
- setup();
- expect(screen.getByTestId("loading-indicator")).toBeInTheDocument();
- });
-
- it("should show data from the response", async () => {
- setup();
- await waitForLoaderToBeRemoved();
- expect(screen.getByText(TEST_DATABASE.name)).toBeInTheDocument();
- });
-
- it("should show error from the response", async () => {
- setup({ hasDataAccess: false });
- await waitForLoaderToBeRemoved();
- expect(screen.getByText(PERMISSION_ERROR)).toBeInTheDocument();
- });
-});
diff --git a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
index 15d6e64a527..51bddf44587 100644
--- a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
+++ b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
@@ -1,14 +1,21 @@
import { useMemo } from "react";
-import { useListPopularItemsQuery, useListRecentsQuery } from "metabase/api";
+import {
+ useListDatabasesQuery,
+ useListPopularItemsQuery,
+ useListRecentsQuery,
+} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDatabaseListQuery } from "metabase/common/hooks";
import { useSelector } from "metabase/redux";
import { getUser } from "metabase/selectors/user";
import { useSetting } from "metabase/settings";
import { isSyncCompleted } from "metabase/utils/syncing";
-import type Database from "metabase-lib/v1/metadata/Database";
-import type { PopularItem, RecentItem, User } from "metabase-types/api";
+import type {
+ Database,
+ PopularItem,
+ RecentItem,
+ User,
+} from "metabase-types/api";
import { isWithinWeeks } from "../../utils";
import { EmbedHomepage } from "../EmbedHomepage";
@@ -21,7 +28,9 @@ export const HomeContent = (): JSX.Element | null => {
const embeddingHomepage = useSetting("embedding-homepage");
const isXrayEnabled = useSetting("enable-xrays");
- const { data: databases, error: databasesError } = useDatabaseListQuery();
+ const { data: databasesResponse, error: databasesError } =
+ useListDatabasesQuery();
+ const databases = databasesResponse?.data;
const { data: recentItemsRaw, error: recentItemsError } = useListRecentsQuery(
undefined,
{ refetchOnMountOrArgChange: true },
diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx
index d97279e1037..5dd4684ef93 100644
--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx
+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx
@@ -10,8 +10,6 @@ import {
import { useSetArchive } from "metabase/archive/hooks";
import { Link } from "metabase/common/components/Link";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import { useSelector } from "metabase/redux";
-import { getMetadata } from "metabase/selectors/metadata";
import { ActionIcon, Alert, Button, Icon, Menu } from "metabase/ui";
import * as Urls from "metabase/urls";
import { parseTimestamp } from "metabase/utils/time-dayjs";
@@ -21,7 +19,7 @@ import {
canEditAction,
canRunAction,
} from "metabase-lib/v1/actions/utils";
-import type { WritebackAction } from "metabase-types/api";
+import type { Database, WritebackAction } from "metabase-types/api";
import {
EmptyStateActionContainer,
@@ -40,9 +38,11 @@ interface OwnProps {
type Props = OwnProps;
+const EMPTY_DATABASE_LIST: Database[] = [];
+
function ModelActionDetails({ model }: Props) {
- useListDatabasesQuery();
- const databases = useSelector((state) => getMetadata(state).databasesList());
+ const { data: databasesResponse } = useListDatabasesQuery();
+ const databases = databasesResponse?.data ?? EMPTY_DATABASE_LIST;
const { data: actions = [] } = useListActionsQuery({
"model-id": model.id(),
});
diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
index 4c45fa05aa3..62b5b52aba1 100644
--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
@@ -3,12 +3,11 @@ import { useCallback, useMemo } from "react";
import { useLatest } from "react-use";
import { t } from "ttag";
-import { skipToken, useSearchQuery } from "metabase/api";
+import { skipToken, useListDatabasesQuery, useSearchQuery } from "metabase/api";
import type { UseInitialCollectionIdProps } from "metabase/common/collections/hooks";
import { useInitialCollectionId } from "metabase/common/collections/hooks";
import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";
import { canAccessDataStudio } from "metabase/common/data-studio/selectors";
-import { useDatabaseListQuery } from "metabase/common/hooks";
import { getHasDatabaseWithActionsEnabled } from "metabase/databases/utils/predicates";
import { useDispatch, useSelector } from "metabase/redux";
import { openDiagnostics } from "metabase/redux/app";
@@ -82,9 +81,10 @@ export const useCommandPaletteBasicActions = ({
const navigate = useNavigate();
const collectionId = useInitialCollectionId(props) ?? undefined;
- const { data: databases = [] } = useDatabaseListQuery({
- enabled: isLoggedIn,
- });
+ const { data: databasesResponse } = useListDatabasesQuery(
+ isLoggedIn ? undefined : skipToken,
+ );
+ const databases = databasesResponse?.data ?? [];
const { data: searchResults } = useSearchQuery(
isLoggedIn
? { models: ["dataset"], limit: 1, context: "basic-actions" }
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx
index a5e9c5744c7..a75d98f1765 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailPanel.tsx
@@ -11,10 +11,10 @@ import {
datasetApi,
skipToken,
useListActionsQuery,
+ useListDatabasesQuery,
} from "metabase/api";
import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";
import { NotFound } from "metabase/common/components/ErrorPages";
-import { useDatabaseListQuery } from "metabase/common/hooks";
import { useDispatch } from "metabase/redux";
import { Loader, Modal } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -263,9 +263,10 @@ export function ObjectDetailPanel({
: skipToken,
);
- const { data: databases = [] } = useDatabaseListQuery({
- enabled: areImplicitActionsEnabled,
- });
+ const { data: databasesResponse } = useListDatabasesQuery(
+ areImplicitActionsEnabled ? undefined : skipToken,
+ );
+ const databases = databasesResponse?.data ?? [];
const actionItems = areImplicitActionsEnabled
? getActionItems({