The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Give the metadata mirror an enforced public API at metabase/metadata/store (#81272)
Romeo Van Snick2bd8150f2c32
diff --git a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-query/tests/setup.tsx b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-query/tests/setup.tsxindex e23ff62d159..6e3433216ae 100644--- a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-query/tests/setup.tsx+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-query/tests/setup.tsx@@ -8,8 +8,8 @@ import { useSdkLoadingState } from "embedding-sdk-shared/hooks/use-sdk-loading-simport { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";import { SdkLoadingState } from "embedding-sdk-shared/types/sdk-loading";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";+import { getMetadataUnfiltered } from "metabase/metadata-store";import { fetchTableMetadata } from "metabase/redux/tables";-import { getMetadataUnfiltered } from "metabase/selectors/metadata";import type { DatasetQuery } from "metabase-types/api";import { TEST_METADATA } from "./fixtures";@@ -49,7 +49,7 @@ jest.mock("metabase/redux/tables", () => ({})),}));-jest.mock("metabase/selectors/metadata", () => ({+jest.mock("metabase/metadata-store", () => ({getMetadataUnfiltered: jest.fn(),}));diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsxindex 5890e231c5a..e812956d234 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsx@@ -18,10 +18,10 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport CS from "metabase/css/core/index.css";import { canUserCreateQueries } from "metabase/current-user";import type { DataSourceSelectorProps } from "metabase/embedding-sdk/types/components/data-picker";+import { getMetadata } from "metabase/metadata-store";import { connect } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";import { fetchTableMetadata } from "metabase/redux/tables";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import { Box, Popover } from "metabase/ui";import type Question from "metabase-lib/v1/Question";diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsxindex 6613ccad7e6..ece9e27ece2 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import { createMockDatabase } from "metabase-types/api/mocks";diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsxindex cc33e9051aa..ddf1c3d1127 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { render, renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";import type { Database } from "metabase-types/api";diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsxindex 18985a82e89..b6b3b4479fe 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { render, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsxindex 3d596c9f69d..00d2b9af88d 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Database, InitialSyncStatus } from "metabase-types/api";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsxindex 2c727252e94..a8a057bd73a 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx@@ -1,8 +1,8 @@import { useMemo } from "react";import { OverviewVisualization } from "metabase/common/data-studio/components/OverviewVisualization";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Flex, Stack } from "metabase/ui";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxindex f20c59ef7e9..6eaa31f5105 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx@@ -18,12 +18,12 @@ import type {MetabotDebugToolCallMessage,} from "metabase/metabot/state/types";import { normalizeFetchedChatMessages } from "metabase/metabot/utils/normalize-fetched-chat-messages";+import { getMetadata } from "metabase/metadata-store";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { Sidebar } from "metabase/monitor/components/MonitorLayout/Sidebar";import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useSelector } from "metabase/redux";import { useParams } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import {Badge,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable.tsindex 887915bf76d..8b8a5687e69 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable.ts@@ -5,8 +5,8 @@ import {useGetAdhocQueryMetadataQuery,useGetDatabaseMetadataQuery,} from "metabase/api";+import { getMetadataUnfiltered } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadataUnfiltered } from "metabase/selectors/metadata";import type {CardMetadata,MetadataProvider,diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.tsindex ea028f1a809..c16a616be56 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts@@ -1,10 +1,10 @@import { useCallback, useEffect, useMemo } from "react";+import { getMetadata } from "metabase/metadata-store";import { loadMetadataForTable } from "metabase/questions/actions";import { useDispatch, useSelector } from "metabase/redux";import type { Location } from "metabase/router";import { useNavigate } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { b64url_to_utf8, utf8_to_b64url } from "metabase/utils/encoding";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsxindex 6db74170cd2..ddafbbe5b30 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx@@ -2,7 +2,7 @@ import { memo } from "react";import { useGetAdhocQueryMetadataQuery } from "metabase/api";import { useSnapshotSelector } from "metabase/common/hooks";-import { getMetadata } from "metabase/selectors/metadata";+import { getMetadata } from "metabase/metadata-store";import { Box, Card, Loader, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import Visualization from "metabase/visualizations/components/Visualization";diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex 4a3aad47cd2..3a366a1f498 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -214,6 +214,14 @@ const elements = [createElement({ type: "shared", name: "hooks", enforceSharedTiers: false }),createElement({ type: "shared", name: "content-translation" }),createElement({ type: "shared", name: "metabot", enforceSharedTiers: false }),+ // The app-wide mirror of table and field metadata. Separate from+ // `shared/metadata`, which is the Semantic Layer UI: 147 files read the store,+ // 115 use the UI, and 8 do both.+ createElement({+ type: "shared",+ name: "metadata-store",+ enforcePublicApi: true,+ }),createElement({ type: "shared", name: "metadata" }),createElement({ type: "feature", name: "models" }),createElement({ type: "feature", name: "monitor" }),diff --git a/frontend/lint/shared-tiers.mjs b/frontend/lint/shared-tiers.mjsindex 4b337d160b1..41a8c77e036 100644--- a/frontend/lint/shared-tiers.mjs+++ b/frontend/lint/shared-tiers.mjs@@ -27,6 +27,7 @@ const SHARED_UTILS_LEVELS = [["shared/current-user"],// U5 — app services over the store, registry and current user.[+ "shared/metadata-store","shared/selectors","shared/content-translation","shared/error-boundary",diff --git a/frontend/lint/side-effect-files.json b/frontend/lint/side-effect-files.jsonindex e27ac2641d4..378f54e317d 100644--- a/frontend/lint/side-effect-files.json+++ b/frontend/lint/side-effect-files.json@@ -81,7 +81,6 @@"frontend/src/embedding-sdk-bundle/embedding-sdk-bootstrap.ts": "entry","frontend/src/embedding-sdk-bundle/index.ts": "entry","frontend/src/embedding-sdk-bundle/lib/sdk-public-path.ts": "global",- "frontend/src/embedding-sdk-bundle/store/index.ts": "self","frontend/src/embedding-sdk-bundle/store/listener-middleware.ts": "self","frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts": "self","frontend/src/embedding-sdk-bundle/test/CommonSdkCorsStoryWrapper.tsx": "entry",@@ -158,9 +157,7 @@"frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx": "self","frontend/src/metabase/querying/expressions/pratt/syntax.ts": "self","frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx": "self",- "frontend/src/metabase/reducers-common.ts": "self","frontend/src/metabase/redux/embed/embed.ts": "self",- "frontend/src/metabase/redux/entities/index.ts": "self","frontend/src/metabase/redux/hooks.ts": "self","frontend/src/metabase/redux/store/mocks/api.ts": "self","frontend/src/metabase/redux/utils.ts": "self",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.tsxindex 966355572e6..796e68002d2 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@@ -2,13 +2,13 @@ import { useMemo } from "react";import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";import { useListDatabasesQuery } from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import {isQuestionDirty,isQuestionRunnable,} from "metabase/querying/common/utils/question";import { Notebook as QBNotebook } from "metabase/querying/notebook/components/Notebook";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import { ScrollArea } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsxindex d8865065863..1416cdb54d3 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx@@ -2,9 +2,9 @@ import { useMemo } from "react";import { useLatest } from "react-use";import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";+import { getMetadata } from "metabase/metadata-store";import { ResponsiveParametersList } from "metabase/querying/components/ResponsiveParametersList";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Box } from "metabase/ui";import * as Lib from "metabase-lib";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsxindex ff2da033dfc..95e6bf3f94d 100644--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx@@ -4,13 +4,13 @@ import { usePrevious, useUnmount } from "react-use";import { useSdkDispatch, useSdkStore } from "embedding-sdk-bundle/store";import { getNewCardUrl } from "metabase/dashboard/actions/getNewCardUrl";import type { NavigateToNewCardFromDashboardOpts } from "metabase/dashboard/components/DashCard/types";+import { getMetadata } from "metabase/metadata-store";import { navigateBackToDashboard } from "metabase/query_builder";import {NAVIGATE_TO_NEW_CARD,reset as dashboardReset,} from "metabase/redux/dashboard";import type { StoreDashboard } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { isJWT } from "metabase/utils/jwt";import { parseNumber } from "metabase/utils/number";diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.tsindex 5f969d5f533..2d55c31698f 100644--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.ts+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.ts@@ -7,8 +7,8 @@ import {buildParametersPayload,} from "embedding-sdk-bundle/lib/controlled-parameters";import type { SqlParameterChangePayload } from "embedding-sdk-bundle/types/question";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import type Question from "metabase-lib/v1/Question";import type { UiParameter } from "metabase-lib/v1/parameters/types";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.unit.spec.tsxindex d6a3207f102..b95de7bce1d 100644--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.unit.spec.tsx+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-controlled-sql-parameters.unit.spec.tsx@@ -13,7 +13,7 @@ import { useSdkControlledSqlParameters } from "./use-sdk-controlled-sql-parametejest.mock("metabase/redux", () => ({useSelector: jest.fn(),}));-jest.mock("metabase/selectors/metadata", () => ({+jest.mock("metabase/metadata-store", () => ({getMetadata: jest.fn(),}));jest.mock("metabase-lib/v1/parameters/utils/cards", () => ({diff --git a/frontend/src/embedding-sdk-bundle/lib/create-metabase-query/index.ts b/frontend/src/embedding-sdk-bundle/lib/create-metabase-query/index.tsindex 08117117208..e81b7ab5f31 100644--- a/frontend/src/embedding-sdk-bundle/lib/create-metabase-query/index.ts+++ b/frontend/src/embedding-sdk-bundle/lib/create-metabase-query/index.ts@@ -7,8 +7,8 @@ import {} from "embedding-sdk-shared/lib/create-metabase-query/input-guards";import { cardApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";+import { getMetadataUnfiltered } from "metabase/metadata-store";import { fetchTableMetadata } from "metabase/redux/tables";-import { getMetadataUnfiltered } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import type {DatasetQuery,diff --git a/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.ts b/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.tsindex aba0f7e937b..34144026fa0 100644--- a/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.ts+++ b/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.ts@@ -7,6 +7,7 @@ import type {LoadSdkQuestionParams,SdkQuestionState,} from "embedding-sdk-bundle/types/question";+import { getMetadata } from "metabase/metadata-store";import {getParameterValuesForQuestion,resolveCards,@@ -14,7 +15,6 @@ import {import { loadMetadataForCard } from "metabase/questions/actions";import { updateMetadata } from "metabase/redux/metadata";import { FieldSchema } from "metabase/schema";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type { Card } from "metabase-types/api/card";import type { EntityToken } from "metabase-types/api/entity";diff --git a/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-on-navigate.ts b/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-on-navigate.tsindex 4aa590890e3..e3b1bd6a523 100644--- a/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-on-navigate.ts+++ b/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-on-navigate.ts@@ -4,10 +4,10 @@ import type {SdkQuestionState,} from "embedding-sdk-bundle/types/question";import { cardIsEquivalent } from "metabase/common/utils/card";+import { getMetadata } from "metabase/metadata-store";import { loadCard } from "metabase/query_builder";import { loadMetadataForCard } from "metabase/questions/actions";import type { Dispatch, GetState } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import { getCardAfterVisualizationClick } from "metabase/viz-core";import Question from "metabase-lib/v1/Question";import type { ParameterValuesMap } from "metabase-types/api";diff --git a/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts b/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.tsindex ded91bf3e28..33414a57df5 100644--- a/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts+++ b/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts@@ -1,13 +1,13 @@import _ from "underscore";import type { SdkQuestionState } from "embedding-sdk-bundle/types/question";+import { getMetadata } from "metabase/metadata-store";import {computeQuestionPivotTable,getAdHocQuestionWithVizSettings,} from "metabase/query_builder";import { loadMetadataForCard } from "metabase/questions/actions";import type { Dispatch, GetState } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import { createRawSeries } from "metabase/viz-core";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsxindex 2e2dd5a4e4a..8fc1e4c4507 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx@@ -5,6 +5,7 @@ import { t } from "ttag";import { FieldSet } from "metabase/common/components/FieldSet";import { Link } from "metabase/common/components/Link";+import { getMetadata } from "metabase/metadata-store";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { SegmentEditor } from "metabase/querying/segments/components/SegmentEditor";import {@@ -12,7 +13,6 @@ import {getSegmentQueryDefinition,} from "metabase/querying/segments/utils";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Alert, Button } from "metabase/ui";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsxindex 67948dfb791..d8544a2c94c 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx@@ -12,10 +12,10 @@ import { trackSegmentCreateStarted } from "metabase/common/data-studio/analyticsimport AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { getUserIsAdmin } from "metabase/current-user";+import { getShallowTables } from "metabase/metadata-store";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";import { useLocation } from "metabase/router";-import { getShallowTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import * as Urls from "metabase/urls";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsxindex 895baee6193..9834d97d433 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx@@ -6,8 +6,8 @@ import {useListDatabaseSchemaTablesQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { isSyncInProgress } from "metabase/utils/syncing";diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsxindex 34d6694a592..572a3812cdd 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx@@ -7,9 +7,9 @@ import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { getUserIsAdmin } from "metabase/current-user";+import { getShallowDatabases as getDatabases } from "metabase/metadata-store";import { PLUGIN_TABLE_EDITING } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getShallowDatabases as getDatabases } from "metabase/selectors/metadata";import { ActionIcon, Flex, Group, Icon, Loader, Paper } from "metabase/ui";import { isSyncInProgress } from "metabase/utils/syncing";import type Metadata from "metabase-lib/v1/metadata/Metadata";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.tsxindex 5cbc3deb0d9..f1700c7a02b 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@@ -6,8 +6,8 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";import { columnFinder } from "metabase-lib/test-helpers";diff --git a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsxindex 9c2017ce63b..2b0e5bbd340 100644--- a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { getIcon, renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import {ORDERS,PRODUCTS,diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsxindex 4a6f18aa0e9..b58129d5641 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Table } from "metabase-types/api";import { createMockField, createMockTable } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsxindex 00dbb81d317..2646fe0531b 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Table } from "metabase-types/api";import {diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsxindex dc8af79ca47..998e249c2b2 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx@@ -2,13 +2,13 @@ import { useEffect, useState } from "react";import { useAsyncFn } from "react-use";import { t } from "ttag";+import { getMetadata } from "metabase/metadata-store";import { connect } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";import {fetchTableForeignKeys,fetchTableMetadata,} from "metabase/redux/tables";-import { getMetadata } from "metabase/selectors/metadata";import { Loader } from "metabase/ui";import type Table from "metabase-lib/v1/metadata/Table";diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsxindex 6306920e684..bd83765357e 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import type { Table, TableId } from "metabase-types/api";import {createMockField,diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsxindex 64acbbb6dc2..bf15694ed6b 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Table } from "metabase-types/api";import { createMockTable } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.tsx b/frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.tsxindex a25d2ecdb06..68e9f165548 100644--- a/frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.tsx+++ b/frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";+import { getMetadata } from "metabase/metadata-store";import { QueryVisualization } from "metabase/querying/components/QueryVisualization";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type { Card, Dataset } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/actions/data-fetching.ts b/frontend/src/metabase/dashboard/actions/data-fetching.tsindex e22b0120247..27d55e90696 100644--- a/frontend/src/metabase/dashboard/actions/data-fetching.ts+++ b/frontend/src/metabase/dashboard/actions/data-fetching.ts@@ -33,6 +33,7 @@ import {getAllDashboardCards,getCurrentTabDashboardCards,} from "metabase/dashboard/utils";+import { getMetadata } from "metabase/metadata-store";import { getSavedDashboardUiParameters } from "metabase/parameters/utils/dashboards";import { getParameterValuesByIdFromQueryParams } from "metabase/parameters/utils/parameter-parsing";import { makePivotAwareQueryRunner } from "metabase/querying/api/query-endpoints";@@ -45,7 +46,6 @@ import type {} from "metabase/redux/store";import { createAsyncThunk, createThunkAction } from "metabase/redux/utils";import { FieldSchema } from "metabase/schema";-import { getMetadata } from "metabase/selectors/metadata";import {getDashboardType,isQuestionDashCard,diff --git a/frontend/src/metabase/dashboard/actions/navigation.ts b/frontend/src/metabase/dashboard/actions/navigation.tsindex b898dbb2e61..52215169587 100644--- a/frontend/src/metabase/dashboard/actions/navigation.ts+++ b/frontend/src/metabase/dashboard/actions/navigation.ts@@ -1,8 +1,8 @@+import { getMetadata } from "metabase/metadata-store";import { createThunkAction } from "metabase/redux";import { openUrl } from "metabase/redux/app";import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";import type { Dispatch, GetState } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { isQuestionDashCard } from "metabase/utils/dashboard";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/dashboard/components/ActionViz/Action.tsx b/frontend/src/metabase/dashboard/components/ActionViz/Action.tsxindex 478ee8a0753..52e6979106a 100644--- a/frontend/src/metabase/dashboard/components/ActionViz/Action.tsx+++ b/frontend/src/metabase/dashboard/components/ActionViz/Action.tsx@@ -11,9 +11,9 @@ import {getParameterValues,} from "metabase/dashboard/selectors";import { getActionIsEnabledInDatabase } from "metabase/dashboard/utils";+import { getMetadata } from "metabase/metadata-store";import { connect, useSelector } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import { Tooltip } from "metabase/ui";import type { VisualizationProps } from "metabase/visualizations/types";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsxindex ffb7684e925..301360a42ea 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx@@ -17,8 +17,8 @@ import {clickTargetObjectType,} from "metabase/dashboard/components/ClickMappings";import { getDashboard } from "metabase/dashboard/selectors";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Button, Icon, Select } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts b/frontend/src/metabase/dashboard/components/ClickMappings/hooks.tsindex 7feb26558e4..9b3c0e53b4c 100644--- a/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts+++ b/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts@@ -6,9 +6,9 @@ import {getTargetsForDashboard,getTargetsForQuestion,} from "metabase/dashboard/utils/click-behavior";+import { getMetadata } from "metabase/metadata-store";import { loadMetadataForCard } from "metabase/questions/actions";import { useDispatch, useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { isQuestionDashCard } from "metabase/utils/dashboard";import MetabaseSettings from "metabase/utils/settings";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsxindex 3edbbf16a51..ef2c36e677a 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx@@ -17,12 +17,12 @@ import {} from "metabase/dashboard/utils";import EmbedFrameS from "metabase/embedding/theme.module.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { getMetadata } from "metabase/metadata-store";import type { NewParameterOpts } from "metabase/parameters/utils/dashboards";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { useDispatch, useSelector, useStore } from "metabase/redux";import type { StoreDashcard } from "metabase/redux/store";import type { VisualizerVizDefinitionWithColumns } from "metabase/redux/store/visualizer";-import { getMetadata } from "metabase/selectors/metadata";import { Box } from "metabase/ui";import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";import type { CardSlownessStatus } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsxindex 52b6550cb23..b35c673fd83 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx@@ -7,13 +7,13 @@ import {import { createMockEntitiesState } from "__support__/store";import { getIcon, renderWithProviders, screen } from "__support__/ui";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";+import { getMetadata } from "metabase/metadata-store";import {createMockDashboardState,createMockState,createMockStoreDashboard,} from "metabase/redux/store/mocks";import { Route } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Card, Dataset } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsxindex 73cfec44692..d468c76ee1a 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsx@@ -8,9 +8,9 @@ import {renderWithProviders,screen,} from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import type { ParameterMappingOption } from "metabase/parameters/utils/mapping-options";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type { Card, VirtualCard } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsxindex 30f11e452f7..050c7c3e6df 100644--- a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx@@ -7,8 +7,8 @@ import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownlimport { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";import { useDashboardContext } from "metabase/dashboard/context";import { getParameterValuesBySlugMap } from "metabase/dashboard/selectors";+import { getMetadata } from "metabase/metadata-store";import { useSelector, useStore } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { ActionIcon, Icon, Menu } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";diff --git a/frontend/src/metabase/dashboard/selectors.ts b/frontend/src/metabase/dashboard/selectors.tsindex 66771cc880d..f81ad6dfaea 100644--- a/frontend/src/metabase/dashboard/selectors.ts+++ b/frontend/src/metabase/dashboard/selectors.ts@@ -11,6 +11,7 @@ import { getEmbedOptions } from "metabase/embedding/interactive-embedding";import { getIsWebApp } from "metabase/embedding/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import type { SdkSharedStoreState } from "metabase/embedding-sdk/types/store";+import { getMetadata } from "metabase/metadata-store";import {getDashboardQuestions,getSavedDashboardUiParameters,@@ -24,7 +25,6 @@ import type {State,StoreDashboard,} from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsxindex ddb644955f5..3016d7876b0 100644--- a/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx@@ -1,5 +1,5 @@+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Flex } from "metabase/ui";import * as Lib from "metabase-lib";import type { DatasetQuery, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxindex 4e5e5673846..cea1e6895c0 100644--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -7,8 +7,8 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { 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 { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsxindex bbef8ff5158..df2c2eafb1c 100644--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx@@ -8,9 +8,9 @@ import { trackMeasureCreated } from "metabase/common/data-studio/analytics";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { useMetadataToasts } from "metabase/common/hooks";import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";+import { getMetadataWithHiddenTables } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import { useNavigate } from "metabase/router";-import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import * as Lib from "metabase-lib";import type { DatasetQuery, Measure, Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsxindex 76c59899c8c..ef4a76664ad 100644--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx@@ -8,9 +8,9 @@ import { trackSegmentCreated } from "metabase/common/data-studio/analytics";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { useMetadataToasts } from "metabase/common/hooks";import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";+import { getMetadataWithHiddenTables } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import { useNavigate } from "metabase/router";-import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import * as Lib from "metabase-lib";import type { DatasetQuery, Segment, Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsxindex e447f12f994..929bf473874 100644--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx@@ -8,8 +8,8 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContaiimport { 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 { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";import * as Lib from "metabase-lib";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsxindex f44051ae609..232755549f9 100644--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx@@ -6,8 +6,8 @@ import { t } from "ttag";import { skipToken, useGetAdhocQueryQuery } from "metabase/api";import { Link } from "metabase/common/components/Link";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Loader, Stack, Text, rem } from "metabase/ui";import * as Lib from "metabase-lib";import type { ForeignKey } from "metabase-types/api";diff --git a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsxindex 0923b0317f2..596b68dc076 100644--- a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx+++ b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx@@ -12,11 +12,11 @@ import {getRowName,getTableQuery,} from "metabase/detail-view/utils";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useSelector } from "metabase/redux";import { closeNavbar, setDetailView } from "metabase/redux/app";import { useParams } from "metabase/router";import { getIsNavbarOpen } from "metabase/selectors/app";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { extractRemappedColumns } from "metabase/viz-core";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsxindex 35a85ba190f..6ed49e23f2c 100644--- a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx+++ b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx@@ -15,11 +15,11 @@ import {getRowName,getTableQuery,} from "metabase/detail-view/utils";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useSelector } from "metabase/redux";import { closeNavbar, setDetailView } from "metabase/redux/app";import { useParams } from "metabase/router";import { getIsNavbarOpen } from "metabase/selectors/app";-import { getMetadata } from "metabase/selectors/metadata";import { extractRemappedColumns } from "metabase/viz-core";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsxindex 06876392eb3..0ad79dab941 100644--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/CardEmbedNode.tsx@@ -18,6 +18,7 @@ import { ExplicitSizeRefreshModeContext } from "metabase/common/components/Expliimport { QuestionPickerModal } from "metabase/common/components/Pickers";import type { QuestionPickerValueItem } from "metabase/common/components/Pickers/QuestionPicker/types";import { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useSelector } from "metabase/redux";import { CommentsButton } from "metabase/rich_text_editing/tiptap/components/CommentsButton";import { CardEmbedLoadingState } from "metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedLoadingState";@@ -37,7 +38,6 @@ import {import { DropZone } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/DropZone";import { useDndHelpers } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/use-dnd-helpers";import { useNavigate } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import {Box,Ellipsified,diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsxindex 8338ffe0193..f9c1a62db8f 100644--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsx+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";import { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { ActionIcon, Icon, Menu } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsxindex 1092fae77b3..86771805c4b 100644--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsx+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/CreateStructuredQuestionModal.tsx@@ -2,10 +2,10 @@ import { useMemo, useState } from "react";import { t } from "ttag";import _ from "underscore";+import { getMetadata } from "metabase/metadata-store";import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useDispatch, useSelector, useStore } from "metabase/redux";import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import { Box, Button, Flex, Modal } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsxindex 52ec3624c7e..e3776e264ad 100644--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsx+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/ModifyQuestionModal.tsx@@ -2,10 +2,10 @@ import { useEffect, useMemo, useState } from "react";import { t } from "ttag";import _ from "underscore";+import { getMetadata } from "metabase/metadata-store";import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useDispatch, useSelector, useStore } from "metabase/redux";import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import { Box, Button, Flex, Modal, Text } from "metabase/ui";import * as Lib from "metabase-lib";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.tsxindex 96c71dc8f3e..b095b2671f5 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@@ -5,12 +5,12 @@ import { c, t } from "ttag";import EmptyCodeResult from "assets/img/empty-states/code.svg";import { datasetApi } from "metabase/api/dataset";import { ErrorMessage } from "metabase/common/components/ErrorMessage";+import { getMetadata } from "metabase/metadata-store";import { DataReference } from "metabase/querying/components/DataReference/DataReference";import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";import { useDispatch, useSelector } from "metabase/redux";import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";-import { getMetadata } from "metabase/selectors/metadata";import { Box, Button, Flex, Loader, Modal, Stack, Text } from "metabase/ui";import { isMac } from "metabase/utils/browser";import Visualization from "metabase/visualizations/components/Visualization";diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/use-update-card-operations.ts b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/use-update-card-operations.tsindex c25d26ec85d..60112f04f85 100644--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/use-update-card-operations.ts+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/use-update-card-operations.ts@@ -1,12 +1,12 @@import type { NodeViewProps } from "@tiptap/core";import { useCallback } from "react";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useSelector } from "metabase/redux";import {type UseCardDataResult,useEditorHost,} from "metabase/rich_text_editing/tiptap/EditorHost";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import Question from "metabase-lib/v1/Question";import type { Card, Document, VisualizationSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/documents/hooks/use-card-data.ts b/frontend/src/metabase/documents/hooks/use-card-data.tsindex 9d9dcab6abe..d9055ef91f6 100644--- a/frontend/src/metabase/documents/hooks/use-card-data.ts+++ b/frontend/src/metabase/documents/hooks/use-card-data.ts@@ -5,9 +5,9 @@ import {useGetAdhocPivotQueryQuery,useGetAdhocQueryQuery,} from "metabase/api/dataset";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import type { UseCardDataResult } from "metabase/rich_text_editing/tiptap/EditorHost";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot-options";import type {diff --git a/frontend/src/metabase/documents/hooks/use-external-card-data.ts b/frontend/src/metabase/documents/hooks/use-external-card-data.tsindex 720937f1ce9..822e03d506a 100644--- a/frontend/src/metabase/documents/hooks/use-external-card-data.ts+++ b/frontend/src/metabase/documents/hooks/use-external-card-data.ts@@ -1,9 +1,9 @@import { useMemo } from "react";import { skipToken, useGetPublicDocumentCardQueryQuery } from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import type { UseCardDataResult } from "metabase/rich_text_editing/tiptap/EditorHost";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type { Card, CardId, Dataset, RawSeries } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx b/frontend/src/metabase/embedding/components/QuestionEmbedWidget/QuestionEmbedWidget.tsxindex 792078db330..5fba3412e28 100644--- a/frontend/src/metabase/embedding/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx+++ b/frontend/src/metabase/embedding/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx@@ -4,8 +4,8 @@ import {} from "metabase/api";import { EmbedModal } from "metabase/embedding/components/EmbedModal";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.tsindex 3fdd62c1d20..181fbc9f3e9 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts@@ -2,11 +2,11 @@ import { useEffect, useMemo, useRef } from "react";import { useLatest, usePrevious } from "react-use";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";+import { getMetadata } from "metabase/metadata-store";import { getSavedDashboardUiParameters } from "metabase/parameters/utils/dashboards";import { useDispatch, useSelector } from "metabase/redux";import { updateMetadata } from "metabase/redux/metadata";import { FieldSchema } from "metabase/schema";-import { getMetadata } from "metabase/selectors/metadata";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";import type { Card, Dashboard, Parameter } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.tsindex 1d7b3d4f595..9912999c42f 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts@@ -34,7 +34,7 @@ jest.mock("metabase/schema", () => ({FieldSchema: {},}));-jest.mock("metabase/selectors/metadata", () => ({+jest.mock("metabase/metadata-store", () => ({getMetadata: jest.fn(),}));diff --git a/frontend/src/metabase/hoc/Remapped.tsx b/frontend/src/metabase/hoc/Remapped.tsxindex ea667e943bb..861bea8dc79 100644--- a/frontend/src/metabase/hoc/Remapped.tsx+++ b/frontend/src/metabase/hoc/Remapped.tsx@@ -1,9 +1,9 @@import { Component, type ComponentType } from "react";+import { getMetadata } from "metabase/metadata-store";import { connect } from "metabase/redux";import { fetchRemapping } from "metabase/redux/remappings";import type { State } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import type Field from "metabase-lib/v1/metadata/Field";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex 0d15f4e0c42..e4127fba834 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -14,9 +14,9 @@ import {activateSuggestedTransform,getIsSuggestedTransformActive,} from "metabase/metabot/state";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useSelector } from "metabase/redux";import { useNavigate } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import {Button,Collapse,diff --git a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsxindex e7499485837..fa75882162c 100644--- a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx@@ -12,9 +12,9 @@ import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { MetabotProvider } from "metabase/metabot/context";+import { getMetadata } from "metabase/metadata-store";import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor/NativeQueryEditor";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type Question from "metabase-lib/v1/Question";import {diff --git a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsxindex f33070ce514..4f6096803bc 100644--- a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx@@ -11,9 +11,9 @@ import {findMatchingInflightAiStreamingRequests,} from "metabase/api/ai-streaming";import { useInlineSQLPrompt } from "metabase/metabot/components/MetabotInlineSQLPrompt";+import { getMetadata } from "metabase/metadata-store";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/metadata-store/index.ts b/frontend/src/metabase/metadata-store/index.tsnew file mode 100644index 00000000000..a6802ff8674--- /dev/null+++ b/frontend/src/metabase/metadata-store/index.ts@@ -0,0 +1,21 @@+/**+ * The public face of the metadata mirror.+ *+ * `state.entities` holds one normalized record per database, table, field and+ * so on, merged from many endpoints. Everything outside this folder reads it+ * through the selectors below, and `metabase/enforce-module-public-api` rejects+ * a deeper import.+ *+ * `getMetadata` builds the metabase-lib v1 `Metadata` object. It is the input+ * format the CLJS provider parses, so it stays until that provider does.+ */+export type { MetadataSelectorOpts } from "./selectors";+export {+ getMetadata,+ getMetadataUnfiltered,+ getMetadataWithHiddenTables,+ getShallowDatabases,+ getShallowFields,+ getShallowSegments,+ getShallowTables,+} from "./selectors";diff --git a/frontend/src/metabase/selectors/metadata.ts b/frontend/src/metabase/metadata-store/selectors.tssimilarity index 100%rename from frontend/src/metabase/selectors/metadata.tsrename to frontend/src/metabase/metadata-store/selectors.tsdiff --git a/frontend/src/metabase/selectors/metadata.unit.spec.ts b/frontend/src/metabase/metadata-store/selectors.unit.spec.tssimilarity index 97%rename from frontend/src/metabase/selectors/metadata.unit.spec.tsrename to frontend/src/metabase/metadata-store/selectors.unit.spec.tsindex 01c590bf9fe..253ee81a8ae 100644--- a/frontend/src/metabase/selectors/metadata.unit.spec.ts+++ b/frontend/src/metabase/metadata-store/selectors.unit.spec.ts@@ -3,7 +3,6 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import Metadata from "metabase-lib/v1/metadata/Metadata";import {@@ -18,6 +17,8 @@ import {createSampleDatabase,} from "metabase-types/api/mocks/presets";+import { getMetadata } from "./selectors";+function setup() {const sampleDatabase = createSampleDatabase();diff --git a/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx b/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsxindex c34707ca07b..27f36a61b32 100644--- a/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx+++ b/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx@@ -10,8 +10,8 @@ import { getErrorMessage } from "metabase/api/utils";import { EmptyState } from "metabase/common/components/EmptyState";import { DetailsGroup, Header } from "metabase/detail-view/components";import { getEntityIcon, getHeaderColumns } from "metabase/detail-view/utils";+import { getMetadataUnfiltered } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadataUnfiltered } from "metabase/selectors/metadata";import { Box, Repeat, Skeleton, Stack, rem } from "metabase/ui";import { extractRemappedColumns } from "metabase/viz-core";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx b/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsxindex 4c954f6e287..494a770a9ce 100644--- a/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx+++ b/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx@@ -9,8 +9,8 @@ import {} from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { EmptyState } from "metabase/common/components/EmptyState";+import { getMetadataUnfiltered } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadataUnfiltered } from "metabase/selectors/metadata";import { Repeat, Skeleton, Stack } from "metabase/ui";import Visualization from "metabase/visualizations/components/Visualization";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.tsindex 2a779afc2f1..3483842fd55 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts@@ -2,9 +2,9 @@ import { useDisclosure } from "@mantine/hooks";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { measureApi, metricApi, segmentApi } from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useStore } from "metabase/redux";import { useLocation } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { getObjectEntries } from "metabase/utils/objects";import type { MetricDefinition, ProjectionClause } from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";diff --git a/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.tsindex bbe6d32f5d0..0d368ae593e 100644--- a/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts+++ b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts@@ -1,8 +1,8 @@import { useMemo } from "react";import { useGetMetricQuery } from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import type { MetricDefinition } from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";import type { MetricId } from "metabase-types/api/metric";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsxindex 5fce7943f2e..0e6fbdc9893 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx@@ -8,10 +8,10 @@ import {} from "metabase/common/components/PillTabNavigation";import type { MetricUrls } from "metabase/common/metrics/types";import { getUserIsAdmin, getUserIsAnalyst } from "metabase/current-user";+import { getMetadata } from "metabase/metadata-store";import { isNumericMetric } from "metabase/metrics/utils/validation";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex dedefd01795..50be17b104f 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -11,6 +11,7 @@ import { AddToDashSelectDashModal } from "metabase/common/components/Pickers/Addimport { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/common/data-studio/selectors";import type { MetricUrls } from "metabase/common/metrics/types";import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/current-user";+import { getMetadata } from "metabase/metadata-store";import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";import {PLUGIN_AUDIT,@@ -24,7 +25,6 @@ import { MoveCardModal } from "metabase/questions/components/MoveCardModal";import { useDispatch, useSelector } from "metabase/redux";import { openUrl } from "metabase/redux/app";import { useNavigate } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { ActionIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsxindex 5b75af94784..f7cb62b1501 100644--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx@@ -13,10 +13,10 @@ import type {MetricPageProps,MetricUrls,} from "metabase/common/metrics/types";+import { getMetadata } from "metabase/metadata-store";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useSelector } from "metabase/redux";import { useParams } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { Card } from "metabase/ui";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsxindex fdb6e0bafcd..360f8b75546 100644--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -12,12 +12,12 @@ import {} from "metabase/common/data-studio/components/PaneHeader";import { getResultMetadata } from "metabase/common/data-studio/utils/get-result-metadata";import type { MetricUrls } from "metabase/common/metrics/types";+import { getMetadata } from "metabase/metadata-store";import { MetricQueryEditor } from "metabase/metrics/components/MetricQueryEditor";import { NAME_MAX_LENGTH } from "metabase/metrics/constants";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useSelector } from "metabase/redux";import { useLocation, useNavigate } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { Breadcrumbs, Card, Icon } from "metabase/ui";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/models/containers/ActionCreatorModal/ActionCreatorModal.tsx b/frontend/src/metabase/models/containers/ActionCreatorModal/ActionCreatorModal.tsxindex db785060284..f1c565c11ea 100644--- a/frontend/src/metabase/models/containers/ActionCreatorModal/ActionCreatorModal.tsx+++ b/frontend/src/metabase/models/containers/ActionCreatorModal/ActionCreatorModal.tsx@@ -3,11 +3,11 @@ import { useEffect } from "react";import { skipToken, useGetActionQuery, useGetCardQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";+import { getMetadata } from "metabase/metadata-store";import { ActionCreator } from "metabase/querying/action-creator";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { useNavigate } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";import type { WritebackAction } from "metabase-types/api";diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsxindex 3e19a9ad19f..6daa2baca3f 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx@@ -10,13 +10,13 @@ import {import { NotFound } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { usePageTitle } from "metabase/hooks/use-page-title";+import { getMetadata } from "metabase/metadata-store";import ModelActionsView from "metabase/models/components/ModelActions";import { loadMetadataForCard } from "metabase/questions/actions";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { fetchTableForeignKeys } from "metabase/redux/tables";import { Outlet, useNavigate, useParams } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationDetailSidebar.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationDetailSidebar.tsxindex 5909ead473e..94ce8ff0d65 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationDetailSidebar.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationDetailSidebar.tsx@@ -6,10 +6,10 @@ import {useGetCardQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getMetadata } from "metabase/metadata-store";import { CreateOrEditQuestionAlertModal } from "metabase/notifications/modals/CreateOrEditQuestionAlertModal";import { loadMetadataForCard } from "metabase/questions/actions";import { useDispatch, useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Flex, Stack } from "metabase/ui";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsxindex 89ad8cf89ba..8a4955062e8 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx@@ -11,9 +11,9 @@ import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { CreateOrEditQuestionAlertModal } from "metabase/notifications/modals";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type {Notification,diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsxindex 0d5d941c8f9..dfed657551a 100644--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx@@ -11,8 +11,8 @@ import {import { ExternalLink } from "metabase/common/components/ExternalLink";import { ModalContent } from "metabase/common/components/ModalContent";import { SelectButton } from "metabase/common/components/SelectButton";+import { getMetadata } from "metabase/metadata-store";import { connect, useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Button, Flex, Icon, Radio, Select, Stack } from "metabase/ui";diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsxindex 0e8ebe41764..1429e464d6d 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx@@ -23,6 +23,7 @@ import { useTranslateContent } from "metabase/content-translation/hooks";import type { ContentTranslationFunction } from "metabase/content-translation/types";import CS from "metabase/css/core/index.css";import { useEmbeddingEntityContext } from "metabase/embedding/context";+import { getMetadata } from "metabase/metadata-store";import {fetchCardParameterValues,fetchDashboardParameterValues,@@ -31,7 +32,6 @@ import {import { connect, useDispatch } from "metabase/redux";import { addRemappings } from "metabase/redux/remappings";import type { State } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import {Autocomplete,Loader,diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.tsindex 8318819e22f..e8c25ec79b7 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.ts+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.ts@@ -1,6 +1,6 @@import { createMockEntitiesState } from "__support__/store";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { createMockField } from "metabase-types/api/mocks";import {REVIEWS_ID,diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsxindex 77efd472176..4048f654960 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsx+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsx@@ -6,8 +6,8 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import type Field from "metabase-lib/v1/metadata/Field";import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";import type { UiParameter } from "metabase-lib/v1/parameters/types";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsxindex b62ee799efe..677c727fca4 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx@@ -7,6 +7,7 @@ import { applyParameters } from "metabase/common/utils/card";import { fetchDataOrError } from "metabase/dashboard/utils";import { LocaleProvider } from "metabase/embedding/LocaleProvider";import { EmbeddingEntityContextProvider } from "metabase/embedding/context";+import { getMetadata } from "metabase/metadata-store";import { getParameterValuesByIdFromQueryParams } from "metabase/parameters/utils/parameter-parsing";import { useEmbedFrameOptions } from "metabase/public/hooks";import { usePublicEndpoints } from "metabase/public/hooks/use-public-endpoints";@@ -17,7 +18,6 @@ import { setErrorPage } from "metabase/redux/app";import { updateMetadata } from "metabase/redux/metadata";import { useLocation, useParams } from "metabase/router";import { FieldSchema } from "metabase/schema";-import { getMetadata } from "metabase/selectors/metadata";import { getCanWhitelabel } from "metabase/selectors/whitelabel";import { parseSearchQuery } from "metabase/utils/browser";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";diff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.tsindex 39de4ed48fe..bc0642a5a54 100644--- a/frontend/src/metabase/query_builder/actions/core/core.ts+++ b/frontend/src/metabase/query_builder/actions/core/core.ts@@ -12,6 +12,7 @@ import {cardIsEquivalent,cardQueryIsEquivalent,} from "metabase/common/utils/card";+import { getMetadata } from "metabase/metadata-store";import { loadMetadataForCard } from "metabase/questions/actions";import { createThunkAction } from "metabase/redux";import { openUrl } from "metabase/redux/app";@@ -21,7 +22,6 @@ import {questionUpdated,} from "metabase/redux/query-builder";import type { Dispatch, GetState } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { clone } from "metabase/utils/clone";import { isNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.tsindex 15316714f0f..7dc78cd09da 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts@@ -6,6 +6,7 @@ import {parseHash,} from "metabase/common/utils/card";import { canUserCreateQueries, getUser } from "metabase/current-user";+import { getMetadata } from "metabase/metadata-store";import { loadMetadataForCard } from "metabase/questions/actions";import { setErrorPage } from "metabase/redux/app";import type { DispatchFn } from "metabase/redux/hooks";@@ -20,7 +21,6 @@ import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";import type { Location } from "metabase/router";import { navigate } from "metabase/router";import { FieldSchema } from "metabase/schema";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { parseSearchQuery } from "metabase/utils/browser";import { isNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.tsindex a5426c91817..775ba35a16e 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts@@ -4,6 +4,7 @@ import { createMockEntitiesState } from "__support__/store";import { databaseApi, snippetApi } from "metabase/api";import * as rtkEndpointUtils from "metabase/api/utils/run-rtk-endpoint";import * as CardLib from "metabase/common/utils/card";+import { getMetadata } from "metabase/metadata-store";import * as questionActions from "metabase/questions/actions";import { setErrorPage } from "metabase/redux/app";import * as sharedQB from "metabase/redux/query-builder";@@ -12,7 +13,6 @@ import {createMockState,} from "metabase/redux/store/mocks";import type { Location } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { defer } from "metabase/utils/promise";import { checkNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.tsindex 95743294297..48916eb6817 100644--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts@@ -1,4 +1,5 @@import { createMockEntitiesState } from "__support__/store";+import { getMetadata } from "metabase/metadata-store";import * as questionActions from "metabase/questions/actions";import type { QueryBuilderMode } from "metabase/redux/store";import {@@ -6,7 +7,6 @@ import {createMockQueryBuilderUIControlsState,createMockState,} from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import { registerVisualizations } from "metabase/visualizations/register";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/actions/object-detail.ts b/frontend/src/metabase/query_builder/actions/object-detail.tsindex 63d5fcc4e35..b9697a6ea65 100644--- a/frontend/src/metabase/query_builder/actions/object-detail.ts+++ b/frontend/src/metabase/query_builder/actions/object-detail.ts@@ -2,9 +2,9 @@ import _ from "underscore";import { datasetApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";+import { getMetadata } from "metabase/metadata-store";import { createThunkAction } from "metabase/redux";import type { Dispatch, GetState } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/actions/url.unit.spec.ts b/frontend/src/metabase/query_builder/actions/url.unit.spec.tsindex ac495de190c..1f18e00159c 100644--- a/frontend/src/metabase/query_builder/actions/url.unit.spec.ts+++ b/frontend/src/metabase/query_builder/actions/url.unit.spec.ts@@ -6,6 +6,7 @@// other side: how `navigate` drives the router.import { createMockEntitiesState } from "__support__/store";+import { getMetadata } from "metabase/metadata-store";import {createMockQueryBuilderState,createMockQueryBuilderUIControlsState,@@ -17,7 +18,6 @@ import {getIsNavigationPending,navigate,} from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { registerVisualizations } from "metabase/visualizations/register";diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsxindex 1eb106be9bb..179f52f9b45 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx@@ -21,6 +21,7 @@ import { EditBar } from "metabase/common/components/EditBar";import { LeaveConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { getSemanticTypeIcon } from "metabase/common/utils/fields";import CS from "metabase/css/core/index.css";+import { getMetadata } from "metabase/metadata-store";import { DataReference } from "metabase/querying/components/DataReference/DataReference";import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";import { getInitialEditorHeight } from "metabase/querying/components/NativeQueryEditor/utils";@@ -31,7 +32,6 @@ import { MODAL_TYPES } from "metabase/querying/constants";import { connect, useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";-import { getMetadata } from "metabase/selectors/metadata";import { Box, Button, Flex, Icon, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsxindex 6fa997b6402..c0554e08265 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx@@ -13,8 +13,8 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Card } from "metabase-types/api";import {diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsxindex 82c5bc580f1..38288859ff7 100644--- a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx@@ -6,8 +6,8 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { getIcon, renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Card, Dataset } from "metabase-types/api";import {diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsxindex 698649a310b..51d4ba410ce 100644--- a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx@@ -9,8 +9,8 @@ import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import { registerVisualizations } from "metabase/visualizations/register";import type { Card, Dataset } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsxindex 20d9b3b255d..a70c3463fd7 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx@@ -10,9 +10,9 @@ import {import { setupGetUserKeyValueEndpoint } from "__support__/server-mocks/user-key-value";import { createMockEntitiesState } from "__support__/store";import { fireEvent, renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import MetabaseSettings from "metabase/utils/settings";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsxindex 783b6312572..a5f1ba7ba4e 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx@@ -13,12 +13,12 @@ import {waitFor,within,} from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { MODAL_TYPES } from "metabase/querying/constants";import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import type Question from "metabase-lib/v1/Question";import type { Card } from "metabase-types/api";import {diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsxindex 776accd15fe..2ebae286e64 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx@@ -1,8 +1,8 @@import { type ReactElement, useMemo } from "react";import { skipToken, useGetCardQuery } from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsxindex 8b730c1ab97..c56efe00935 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsx@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.tsindex 4de0f84531a..a38db67d371 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts@@ -1,5 +1,5 @@+import { getMetadataUnfiltered } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadataUnfiltered } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsxindex 063c598c82d..c895ffef1e5 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx@@ -6,8 +6,8 @@ import { setupCardPublicLinkEndpoints } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type Question from "metabase-lib/v1/Question";import { createMockCard, createMockUser } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsxindex 54ea437280a..4f46c832a21 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx@@ -8,9 +8,9 @@ import { setupModelPersistenceEndpoints } from "__support__/server-mocks/persistimport { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Card, Settings } from "metabase-types/api";import {diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex b8777a5fdde..5cc425645b0 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -23,6 +23,7 @@ import {getUserIsAdmin,} from "metabase/current-user";import { usePageTitleWithLoadingTime } from "metabase/hooks/use-page-title";+import { getMetadata } from "metabase/metadata-store";import { VISUALIZATION_SLOW_TIMEOUT } from "metabase/querying/constants";import { connect, useSelector } from "metabase/redux";import { closeNavbar } from "metabase/redux/app";@@ -40,7 +41,6 @@ import {useParams,} from "metabase/router";import { getIsNavbarOpen } from "metabase/selectors/app";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import { useForceUpdate } from "metabase/utils/use-force-update";import type { Series } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/store/mode-selectors.ts b/frontend/src/metabase/query_builder/store/mode-selectors.tsindex 07f93cc009e..585014595e7 100644--- a/frontend/src/metabase/query_builder/store/mode-selectors.ts+++ b/frontend/src/metabase/query_builder/store/mode-selectors.ts@@ -1,6 +1,6 @@import { createSelector } from "@reduxjs/toolkit";-import { getMetadata } from "metabase/selectors/metadata";+import { getMetadata } from "metabase/metadata-store";import { getMode as getQuestionMode } from "metabase/visualizations/click-actions/lib/modes";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/store/question-selectors.ts b/frontend/src/metabase/query_builder/store/question-selectors.tsindex c610eda324a..841267443ac 100644--- a/frontend/src/metabase/query_builder/store/question-selectors.ts+++ b/frontend/src/metabase/query_builder/store/question-selectors.ts@@ -1,7 +1,7 @@import { createSelector } from "@reduxjs/toolkit";+import { getMetadata } from "metabase/metadata-store";import { isSavedQuestionChanged } from "metabase/querying/common/utils/question";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/store/selectors.ts b/frontend/src/metabase/query_builder/store/selectors.tsindex 9fe481960a8..6c7a6dbb67c 100644--- a/frontend/src/metabase/query_builder/store/selectors.ts+++ b/frontend/src/metabase/query_builder/store/selectors.ts@@ -10,11 +10,11 @@ import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";import { getSortedTimelines } from "metabase/common/utils/timelines";import { dayjs } from "metabase/dayjs";import { getEmbedOptions } from "metabase/embedding/interactive-embedding";+import { getMetadata } from "metabase/metadata-store";import {isQuestionDirty,isQuestionRunnable,} from "metabase/querying/common/utils/question";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import { selectIsWithinIframe } from "metabase/utils/iframe";import { parseTimestamp } from "metabase/utils/time-dayjs";diff --git a/frontend/src/metabase/query_builder/store/state.ts b/frontend/src/metabase/query_builder/store/state.tsindex 6e0ae9f6262..6fae3915dd7 100644--- a/frontend/src/metabase/query_builder/store/state.ts+++ b/frontend/src/metabase/query_builder/store/state.ts@@ -1,7 +1,7 @@import type { timelineApi } from "metabase/api";import type { getEmbedOptions } from "metabase/embedding/interactive-embedding";+import type { getMetadata } from "metabase/metadata-store";import type { QueryBuilderState } from "metabase/redux/store/qb";-import type { getMetadata } from "metabase/selectors/metadata";import type { getSetting } from "metabase/settings";/**diff --git a/frontend/src/metabase/querying/action-creator/ActionCreator.tsx b/frontend/src/metabase/querying/action-creator/ActionCreator.tsxindex fb39e553698..2256a72ae04 100644--- a/frontend/src/metabase/querying/action-creator/ActionCreator.tsx+++ b/frontend/src/metabase/querying/action-creator/ActionCreator.tsx@@ -6,8 +6,8 @@ import {useGetCardQuery,useListDatabasesQuery,} from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import type {Card,CardId,diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsxindex b53db124f77..1278d093d64 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx@@ -17,10 +17,10 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";import { canUserCreateQueries } from "metabase/current-user";+import { getMetadata } from "metabase/metadata-store";import { connect } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";import { fetchTableMetadata } from "metabase/redux/tables";-import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/settings";import { Box, Popover } from "metabase/ui";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsxindex 24e7fa68a06..419e87a22bc 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import { createMockDatabase } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsxindex 3b0dedb66fd..3c6da2f6e59 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { render, renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type Database from "metabase-lib/v1/metadata/Database";import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsxindex 36fa68341d3..e291fc765bf 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx@@ -7,9 +7,9 @@ import {QueryColumnInfoIcon,} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";import CS from "metabase/css/core/index.css";+import { getMetadata } from "metabase/metadata-store";import { getQueryAndColumns } from "metabase/querying/common/utils";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Box, DelayGroup, Icon } from "metabase/ui";import type Field from "metabase-lib/v1/metadata/Field";import type Table from "metabase-lib/v1/metadata/Table";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsxindex f5d950bb919..248b8a31dc5 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { fireEvent, renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type Field from "metabase-lib/v1/metadata/Field";import type Table from "metabase-lib/v1/metadata/Table";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsxindex 3d596c9f69d..00d2b9af88d 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx@@ -1,7 +1,7 @@import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import type { Database, InitialSyncStatus } from "metabase-types/api";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/querying/components/DataReference/FieldList.tsx b/frontend/src/metabase/querying/components/DataReference/FieldList.tsxindex 420dd77f23e..61a3ef03aa2 100644--- a/frontend/src/metabase/querying/components/DataReference/FieldList.tsx+++ b/frontend/src/metabase/querying/components/DataReference/FieldList.tsx@@ -5,9 +5,9 @@ import {HoverParent,QueryColumnInfoIcon,} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";+import { getMetadata } from "metabase/metadata-store";import { getQueryAndColumns } from "metabase/querying/common/utils";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { DelayGroup } from "metabase/ui";import {getIconForField,diff --git a/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx b/frontend/src/metabase/querying/components/DataReference/FieldPane.tsxindex fe0bcd50222..ce1a99ddcf0 100644--- a/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx@@ -10,9 +10,9 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { QueryColumnInfo } from "metabase/common/components/MetadataInfo/QueryColumnInfo";import { SidebarContent } from "metabase/common/components/SidebarContent";+import { getMetadata } from "metabase/metadata-store";import { getQueryAndColumns } from "metabase/querying/common/utils";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import type { FieldId } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsxindex 636c08f0524..ad59237d186 100644--- a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx+++ b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx@@ -11,6 +11,7 @@ import {CodeMirror,type CodeMirrorRef,} from "metabase/common/components/CodeMirror";+import { getMetadata } from "metabase/metadata-store";import {type ExpressionError,diagnoseAndCompile,@@ -20,7 +21,6 @@ import {import { tokenAtPos } from "metabase/querying/expressions";import { COMMA, GROUP } from "metabase/querying/expressions/pratt";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Button, Tooltip as ButtonTooltip, Flex, Icon } from "metabase/ui";import type * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsxindex bfe78dda231..78cfb2aadfb 100644--- a/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx@@ -8,11 +8,11 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import Question from "metabase-lib/v1/Question";import { getTemplateTagParameter } from "metabase-lib/v1/parameters/utils/template-tags";diff --git a/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.unit.spec.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.unit.spec.tsxindex c4b7f63dbad..7622ca4905b 100644--- a/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.unit.spec.tsx@@ -5,8 +5,8 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import Question from "metabase-lib/v1/Question";import type { TemplateTag } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.unit.spec.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.unit.spec.tsxindex 0f45fe40209..13f69e43ba9 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.unit.spec.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.unit.spec.tsx@@ -7,8 +7,8 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import {createMockCard,diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.tsindex f386cc13794..6f409b1931a 100644--- a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts+++ b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts@@ -1,7 +1,7 @@import { useMemo, useState } from "react";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type { VisualizationSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.tsindex d277b58c052..e71459df95f 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts@@ -2,8 +2,8 @@import { createMockEntitiesState } from "__support__/store";import { dayjs } from "metabase/dayjs";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";import {diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsxindex 41c536c40ad..d78fcf3d2a6 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx@@ -17,9 +17,9 @@ import type {} from "metabase/common/components/Pickers/MiniPicker/types";import { getIsTenantUser } from "metabase/current-user";import { isEmbedding } from "metabase/embedding/config";+import { getMetadata } from "metabase/metadata-store";import { loadMetadataForTable } from "metabase/questions/actions";import { useDispatch, useSelector, useStore } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Icon, TextInput } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/querying/run-query.unit.spec.ts b/frontend/src/metabase/querying/run-query.unit.spec.tsindex 34d83b4a873..1cef9a62eab 100644--- a/frontend/src/metabase/querying/run-query.unit.spec.ts+++ b/frontend/src/metabase/querying/run-query.unit.spec.ts@@ -3,8 +3,8 @@ import fetchMock from "fetch-mock";import { getMainStore } from "__support__/entities-store";import { createMockEntitiesState } from "__support__/store";import { waitFor } from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import { createMockState } from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type {Card,diff --git a/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx b/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsxindex bbefcfd7a64..6f2207c2f5d 100644--- a/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx+++ b/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx@@ -1,7 +1,7 @@+import { getMetadata } from "metabase/metadata-store";import { FilterPill } from "metabase/querying/filters/components/FilterPanel/FilterPill";import { getSegmentQuery } from "metabase/querying/segments/utils";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { Flex } from "metabase/ui";import * as Lib from "metabase-lib";import type { DatasetQuery, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsxindex e7b3c474145..78b6070740e 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx@@ -7,9 +7,9 @@ import {getDataPickerValue,} from "metabase/common/components/Pickers/DataPicker";import { TableBreadcrumbs } from "metabase/metadata/components";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useStore } from "metabase/redux";import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";-import { getMetadata } from "metabase/selectors/metadata";import { Box, Button, Flex, Icon, Text } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/questions/components/AdHocQuestionLoader.tsx b/frontend/src/metabase/questions/components/AdHocQuestionLoader.tsxindex 8242e18044d..5efd23e6046 100644--- a/frontend/src/metabase/questions/components/AdHocQuestionLoader.tsx+++ b/frontend/src/metabase/questions/components/AdHocQuestionLoader.tsx@@ -2,9 +2,9 @@ import type { ReactNode } from "react";import { useCallback, useEffect, useRef, useState } from "react";import { deserializeCardFromUrl } from "metabase/common/utils/card";+import { getMetadata } from "metabase/metadata-store";import { loadMetadataForCard } from "metabase/questions/actions";import { useDispatch, useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { UnsavedCard } from "metabase-types/api";diff --git a/frontend/src/metabase/questions/components/SavedQuestionLoader.tsx b/frontend/src/metabase/questions/components/SavedQuestionLoader.tsxindex 656014306c2..e95b0baca53 100644--- a/frontend/src/metabase/questions/components/SavedQuestionLoader.tsx+++ b/frontend/src/metabase/questions/components/SavedQuestionLoader.tsx@@ -2,9 +2,9 @@ import type { ReactNode } from "react";import { useEffect, useMemo } from "react";import { skipToken, useGetCardQuery } from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { loadMetadataForCard } from "metabase/questions/actions";import { useDispatch, useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type { CardId } from "metabase-types/api";diff --git a/frontend/src/metabase/redux/entities/hydration.ts b/frontend/src/metabase/redux/entities/hydration.tsindex 648418ddd36..d74527cbf48 100644--- a/frontend/src/metabase/redux/entities/hydration.ts+++ b/frontend/src/metabase/redux/entities/hydration.ts@@ -79,7 +79,7 @@ const toNormalizedSchemas = (/*** Every endpoint whose payload flows into `getMetadata`.*- * `getMetadata` in `metabase/selectors/metadata.ts` stitches one logical object+ * `getMetadata` in `metabase/metadata-store.ts` stitches one logical object* together from several endpoints' payloads, so each of these has to reach* `state.entities` on success. This table is the only place that happens.*diff --git a/frontend/src/metabase/redux/entities/index.ts b/frontend/src/metabase/redux/entities/index.tsindex 2131438b1e5..c492fc9f8fc 100644--- a/frontend/src/metabase/redux/entities/index.ts+++ b/frontend/src/metabase/redux/entities/index.ts@@ -12,7 +12,7 @@ type SliceReducer = Reducer<SliceState>;/*** Slices held under `state.entities.<name>`. These used to be wired up by the* (now-removed) entity framework via `createEntity`; the slices themselves- * still exist because `getMetadata` in `metabase/selectors/metadata.ts` reads+ * still exist because `getMetadata` in `metabase/metadata-store.ts` reads* directly from them. `metadataHydrationMiddleware` in `./hydration` is the* only writer, and populates them by dispatching `metabase/entities/UPDATE`.*/diff --git a/frontend/src/metabase/redux/entities/tables-reducer.ts b/frontend/src/metabase/redux/entities/tables-reducer.tsindex ac382c0d59c..64cfeda73c3 100644--- a/frontend/src/metabase/redux/entities/tables-reducer.ts+++ b/frontend/src/metabase/redux/entities/tables-reducer.ts@@ -16,7 +16,7 @@ type ReducerAction = { type: string; payload?: any; error?: unknown };** Tables no longer go through the entity framework — CRUD lives in* `metabase/api/table`. The slice itself is still consumed by `getMetadata` in- * `metabase/selectors/metadata.ts`, so we keep it in sync when:+ * `metabase/metadata-store.ts`, so we keep it in sync when:** - questions are created/updated/archived (the saved-question virtual table* `card__<id>` representation needs to track them), anddiff --git a/frontend/src/metabase/redux/tables.ts b/frontend/src/metabase/redux/tables.tsindex 0eae87d385a..ed7f1c9f2e9 100644--- a/frontend/src/metabase/redux/tables.ts+++ b/frontend/src/metabase/redux/tables.ts@@ -1,9 +1,9 @@import { fieldApi, tableApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";+import { getMetadataUnfiltered } from "metabase/metadata-store";import { updateMetadata } from "metabase/redux/metadata";import type { Dispatch, GetState } from "metabase/redux/store";import { TableSchema } from "metabase/schema";-import { getMetadataUnfiltered } from "metabase/selectors/metadata";import type { FieldId, TableId } from "metabase-types/api";type FetchOptions = {diff --git a/frontend/src/metabase/redux/tables.unit.spec.ts b/frontend/src/metabase/redux/tables.unit.spec.tsindex e5b117b6fc8..55a7ad01232 100644--- a/frontend/src/metabase/redux/tables.unit.spec.ts+++ b/frontend/src/metabase/redux/tables.unit.spec.ts@@ -5,7 +5,7 @@ import {setupTableQueryMetadataEndpoint,setupUnauthorizedFieldEndpoint,} from "__support__/server-mocks";-import { getMetadata } from "metabase/selectors/metadata";+import { getMetadata } from "metabase/metadata-store";import { createMockField, createMockTable } from "metabase-types/api/mocks";import { fetchTableMetadataAndForeignKeys } from "./tables";diff --git a/frontend/src/metabase/reference/databases/DatabaseDetail.tsx b/frontend/src/metabase/reference/databases/DatabaseDetail.tsxindex d92172eb4b7..1f61f177234 100644--- a/frontend/src/metabase/reference/databases/DatabaseDetail.tsx+++ b/frontend/src/metabase/reference/databases/DatabaseDetail.tsx@@ -5,13 +5,13 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { getShallowFields as getFields } from "metabase/metadata-store";import { connect } from "metabase/redux";import { updateDatabase } from "metabase/redux/metadata";import Detail from "metabase/reference/components/Detail";import { EditHeader } from "metabase/reference/components/EditHeader";import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";import * as actions from "metabase/reference/reference";-import { getShallowFields as getFields } from "metabase/selectors/metadata";import type { User } from "metabase-types/api";import type { ReferenceRouteProps, StateWithReference } from "../selectors";diff --git a/frontend/src/metabase/reference/databases/DatabaseList.tsx b/frontend/src/metabase/reference/databases/DatabaseList.tsxindex 9541844ed34..aaebd12c5e0 100644--- a/frontend/src/metabase/reference/databases/DatabaseList.tsx+++ b/frontend/src/metabase/reference/databases/DatabaseList.tsx@@ -5,11 +5,11 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { NoDatabasesEmptyState } from "metabase/common/components/NoDatabasesEmptyState";import CS from "metabase/css/core/index.css";+import { getShallowDatabases as getDatabases } from "metabase/metadata-store";import { connect } from "metabase/redux";import { List } from "metabase/reference/components/List";import S from "metabase/reference/components/List/List.module.css";import { ListItem } from "metabase/reference/components/ListItem";-import { getShallowDatabases as getDatabases } from "metabase/selectors/metadata";import type { NormalizedDatabase } from "metabase-types/api";import ReferenceHeader from "../components/ReferenceHeader";diff --git a/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx b/frontend/src/metabase/reference/databases/FieldDetailContainer.tsxindex 6b5082c406a..7ffe9bfe829 100644--- a/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx+++ b/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx@@ -3,6 +3,7 @@ import { useEffect } from "react";import { usePrevious } from "react-use";import CS from "metabase/css/core/index.css";+import { getMetadata } from "metabase/metadata-store";import { connect, useDispatch, useSelector } from "metabase/redux";import { SidebarLayout } from "metabase/reference/components/SidebarLayout";import FieldDetail from "metabase/reference/databases/FieldDetail";@@ -10,7 +11,6 @@ import { fetchTableData } from "metabase/reference/fetch-data";import * as actions from "metabase/reference/reference";import { useReferenceFetch } from "metabase/reference/use-reference-fetch-state";import { useLocation, useParams } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import type { ClearStateProps } from "../reference";import {diff --git a/frontend/src/metabase/reference/databases/TableDetail.tsx b/frontend/src/metabase/reference/databases/TableDetail.tsxindex 36f009825fe..58b93fa82b9 100644--- a/frontend/src/metabase/reference/databases/TableDetail.tsx+++ b/frontend/src/metabase/reference/databases/TableDetail.tsx@@ -5,6 +5,10 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import {+ getShallowFields as getFields,+ getMetadata,+} from "metabase/metadata-store";import { connect } from "metabase/redux";import { updateTable } from "metabase/redux/metadata";import S from "metabase/reference/Reference.module.css";@@ -13,10 +17,6 @@ import { EditHeader } from "metabase/reference/components/EditHeader";import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";import UsefulQuestions from "metabase/reference/components/UsefulQuestions";import * as actions from "metabase/reference/reference";-import {- getShallowFields as getFields,- getMetadata,-} from "metabase/selectors/metadata";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/databases/TableQuestions.tsx b/frontend/src/metabase/reference/databases/TableQuestions.tsxindex 4beab36a36d..6a495c50c5d 100644--- a/frontend/src/metabase/reference/databases/TableQuestions.tsx+++ b/frontend/src/metabase/reference/databases/TableQuestions.tsx@@ -6,11 +6,11 @@ import { AdminAwareEmptyState } from "metabase/common/components/AdminAwareEmptyimport { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";import { dayjs } from "metabase/dayjs";+import { getMetadata } from "metabase/metadata-store";import { connect } from "metabase/redux";import { List } from "metabase/reference/components/List";import S from "metabase/reference/components/List/List.module.css";import { ListItem } from "metabase/reference/components/ListItem";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { visualizations } from "metabase/viz-core";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/reference/segments/SegmentDetail.tsx b/frontend/src/metabase/reference/segments/SegmentDetail.tsxindex 7e5133381e0..9b08d29bcf1 100644--- a/frontend/src/metabase/reference/segments/SegmentDetail.tsx+++ b/frontend/src/metabase/reference/segments/SegmentDetail.tsx@@ -7,6 +7,10 @@ import { Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";+import {+ getShallowFields as getFields,+ getMetadata,+} from "metabase/metadata-store";import { connect } from "metabase/redux";import { updateSegment } from "metabase/redux/metadata";import Detail from "metabase/reference/components/Detail";@@ -16,10 +20,6 @@ import { Formula } from "metabase/reference/components/Formula";import { List } from "metabase/reference/components/List";import UsefulQuestions from "metabase/reference/components/UsefulQuestions";import * as actions from "metabase/reference/reference";-import {- getShallowFields as getFields,- getMetadata,-} from "metabase/selectors/metadata";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsx b/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsxindex 66a1a7aed3c..1f3480a1650 100644--- a/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsx+++ b/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsx@@ -5,6 +5,7 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { getMetadata } from "metabase/metadata-store";import { connect } from "metabase/redux";import { updateField } from "metabase/redux/metadata";import S from "metabase/reference/Reference.module.css";@@ -15,7 +16,6 @@ import FieldTypeDetail from "metabase/reference/components/FieldTypeDetail";import { List } from "metabase/reference/components/List";import UsefulQuestions from "metabase/reference/components/UsefulQuestions";import * as actions from "metabase/reference/reference";-import { getMetadata } from "metabase/selectors/metadata";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { FieldId, User } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsxindex 011ddfaddea..1f3bd33cd7e 100644--- a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx+++ b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx@@ -6,11 +6,11 @@ import { AdminAwareEmptyState } from "metabase/common/components/AdminAwareEmptyimport { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";+import { getShallowSegments } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import { List } from "metabase/reference/components/List";import S from "metabase/reference/components/List/List.module.css";import { ListItem } from "metabase/reference/components/ListItem";-import { getShallowSegments } from "metabase/selectors/metadata";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";diff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.tsx b/frontend/src/metabase/reference/segments/SegmentQuestions.tsxindex 3cce2e2476f..3a29533b6df 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestions.tsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.tsx@@ -6,11 +6,11 @@ import { AdminAwareEmptyState } from "metabase/common/components/AdminAwareEmptyimport { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";+import { getMetadata } from "metabase/metadata-store";import { connect } from "metabase/redux";import { List } from "metabase/reference/components/List";import S from "metabase/reference/components/List/List.module.css";import { ListItem } from "metabase/reference/components/ListItem";-import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import { visualizations } from "metabase/viz-core";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.tsx b/frontend/src/metabase/reference/segments/SegmentRevisions.tsxindex b27a9809d2c..ad9aee0832d 100644--- a/frontend/src/metabase/reference/segments/SegmentRevisions.tsx+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.tsx@@ -7,10 +7,10 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { modelIconMap } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";+import { getShallowTables as getTables } from "metabase/metadata-store";import { Revision } from "metabase/querying/segments/components/revisions/Revision";import { connect } from "metabase/redux";import S from "metabase/reference/components/List/List.module.css";-import { getShallowTables as getTables } from "metabase/selectors/metadata";import { assignUserColors } from "metabase/ui/colors/formatting-colors";import type {NormalizedTable,diff --git a/frontend/src/metabase/reference/selectors.ts b/frontend/src/metabase/reference/selectors.tsindex 5f576e304d2..27f9cc011f2 100644--- a/frontend/src/metabase/reference/selectors.ts+++ b/frontend/src/metabase/reference/selectors.ts@@ -1,13 +1,13 @@import { createSelector } from "@reduxjs/toolkit";import { getIn } from "icepick";-import type { State } from "metabase/redux/store";import {getShallowDatabases as getDatabases,getShallowFields as getFields,getShallowSegments as getSegments,getShallowTables as getTables,-} from "metabase/selectors/metadata";+} from "metabase/metadata-store";+import type { State } from "metabase/redux/store";import type { Card } from "metabase-types/api";import type {diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsxindex d649742d290..93bb6b36086 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { TitleSection } from "metabase/common/data-studio/components/TitleSection";import { useDocsUrl } from "metabase/common/hooks";import { FormSelect } from "metabase/forms";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { SOURCE_STRATEGY_OPTIONS } from "metabase/transforms/constants";import { getLibQuery } from "metabase/transforms/utils";import {diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsxindex f16cc8cce9e..184cb5a939f 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx@@ -2,8 +2,8 @@ import { skipToken } from "@reduxjs/toolkit/query";import { useMemo } from "react";import { useGetTableQueryMetadataQuery } from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import type { DataAttributes, InputDescriptionProps } from "metabase/ui";import * as Lib from "metabase-lib";import type { PythonTransformTableAliases } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.tsindex fe764044313..46e5b956d36 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts@@ -5,8 +5,8 @@ import {useGetAdhocQueryMetadataQuery,useGetTableQueryMetadataQuery,} from "metabase/api";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { getLibQuery, isMbqlQuery } from "metabase/transforms/utils";import * as Lib from "metabase-lib";import type { TransformSource } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.tsindex a78b35f8692..63defc28595 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts@@ -1,7 +1,7 @@import { useMemo } from "react";+import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import { isConcreteTableId } from "metabase-types/api/table";diff --git a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsxindex c50d1f42e1d..a94cd080b99 100644--- a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx+++ b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx@@ -1,12 +1,12 @@import { useMemo } from "react";+import { getMetadata } from "metabase/metadata-store";import {QueryEditor,type QueryEditorUiOptions,type QueryEditorUiState,} from "metabase/querying/editor/components/QueryEditor";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import type {Database,diff --git a/frontend/src/metabase/transforms/hooks/use-source-state.ts b/frontend/src/metabase/transforms/hooks/use-source-state.tsindex ef958f2efc7..ca53ee0df16 100644--- a/frontend/src/metabase/transforms/hooks/use-source-state.ts+++ b/frontend/src/metabase/transforms/hooks/use-source-state.ts@@ -4,8 +4,8 @@ import {deactivateSuggestedTransform,getMetabotSuggestedTransform,} from "metabase/metabot/state";+import { getMetadata } from "metabase/metadata-store";import { useDispatch, useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsxindex c5492fd8183..267cd2bb82c 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -14,6 +14,7 @@ import {PaneHeaderActions,PaneHeaderInput,} from "metabase/common/data-studio/components/PaneHeader";+import { getMetadata } from "metabase/metadata-store";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import {getInitialUiState,@@ -21,7 +22,6 @@ import {} from "metabase/querying/editor/components/QueryEditor";import { useSelector } from "metabase/redux";import { type Location, useNavigate, useParams } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center } from "metabase/ui";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/utils.ts b/frontend/src/metabase/transforms/pages/TransformListPage/utils.tsindex 8bfae9acfff..2a8bd697cd1 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/utils.ts+++ b/frontend/src/metabase/transforms/pages/TransformListPage/utils.ts@@ -2,9 +2,9 @@ import { useCallback, useMemo, useRef } from "react";import { t } from "ttag";import { getCollectionIcon } from "metabase/common/collections/utils";+import { getMetadata } from "metabase/metadata-store";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { getLibQuery } from "metabase/transforms/utils";import type { ColorName } from "metabase/ui/colors/types";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsxindex cee64a3dc7a..da009e42566 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeader";+import { getMetadata } from "metabase/metadata-store";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";import { getValidationResult } from "metabase/transforms/utils";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex f9aab8b04e1..610c519030b 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -15,6 +15,7 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { useMetadataToasts } from "metabase/common/hooks";+import { getMetadata } from "metabase/metadata-store";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import {getInitialUiState,@@ -22,7 +23,6 @@ import {} from "metabase/querying/editor/components/QueryEditor";import { useSelector } from "metabase/redux";import { useLocation, useNavigate, useParams } from "metabase/router";-import { getMetadata } from "metabase/selectors/metadata";import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center, Group, Icon } from "metabase/ui";diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsxindex b272467d60e..65b2552fbcc 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx@@ -6,11 +6,11 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";+import { getMetadata } from "metabase/metadata-store";import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";-import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";import { ObjectDetail } from "metabase/visualizations/components/ObjectDetail/ObjectDetail";import type { ObjectDetailProps } from "metabase/visualizations/components/ObjectDetail/types";diff --git a/frontend/test/__support__/metadata.ts b/frontend/test/__support__/metadata.tsindex 4ca151f8552..312a2b1504b 100644--- a/frontend/test/__support__/metadata.ts+++ b/frontend/test/__support__/metadata.ts@@ -1,9 +1,9 @@+import type { MetadataSelectorOpts } from "metabase/metadata-store";+import { getMetadata } from "metabase/metadata-store";import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import type { MetadataSelectorOpts } from "metabase/selectors/metadata";-import { getMetadata } from "metabase/selectors/metadata";import type { Settings } from "metabase-types/api";import type { EntitiesStateOpts } from "./store";