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
Migrate direct react-router usage onto the metabase/router facade + eslint ban (#77068)
Romeo Van Snick56879decb0aa
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsxindex bd800341203..9801b989a85 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx@@ -1,6 +1,5 @@import type { Location } from "history";import { useCallback } from "react";-import { withRouter } from "react-router";import { push } from "react-router-redux";import { useMount } from "react-use";@@ -10,6 +9,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { useDatabaseQuery } from "metabase/common/hooks";import { getParentPath } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { withRouter } from "metabase/router";import { updateImpersonation } from "metabase-enterprise/advanced_permissions/reducer";import { getImpersonation } from "metabase-enterprise/advanced_permissions/selectors";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.unit.spec.tsxindex 8f5e9085b64..d7cd5edf475 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.unit.spec.tsx@@ -1,7 +1,6 @@import { combineReducers } from "@reduxjs/toolkit";import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupDatabaseEndpoints,@@ -15,6 +14,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";+import { Route } from "metabase/router";import { ImpersonationModal } from "metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal";import { advancedPermissionsSlice } from "metabase-enterprise/advanced_permissions/reducer";import { getImpersonations } from "metabase-enterprise/advanced_permissions/selectors";diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsxindex b0d2f971fed..0bd615485d8 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import Database from "metabase-lib/v1/metadata/Database";import type { Database as IDatabase } from "metabase-types/api";import { createMockDatabase } from "metabase-types/api/mocks";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsxindex 07ebd233891..853b8141d7f 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsx@@ -1,7 +1,6 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";import { createMockSettingsState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { RequireMetabotConfigured } from "./RequireMetabotConfigured";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsxindex 389cf32d734..a2a538a6646 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsx@@ -1,4 +1,4 @@-import { Route } from "react-router";+import { Route } from "metabase/router";import { RequireMetabotConfigured } from "./components/RequireMetabotConfigured";import {diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsxindex d1d0f599772..73cd102d2ad 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx@@ -1,10 +1,10 @@import { useCallback, useEffect } from "react";-import type { Route } from "react-router";import { ApplicationPermissionsHelp } from "metabase/admin/permissions/components/ApplicationPermissionsHelp";import { PermissionsEditor } from "metabase/admin/permissions/components/PermissionsEditor";import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";import { connect } from "metabase/redux";+import type { Route } from "metabase/router";import {initializeApplicationPermissions,saveApplicationPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsxindex 69c1010d37d..19b53d3553a 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsx@@ -1,4 +1,4 @@-import { Route } from "react-router";+import { Route } from "metabase/router";import ApplicationPermissionsPage from "./pages/ApplicationPermissionsPage";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxindex d45e1d07a12..7015df4b428 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import type { WithRouterProps } from "react-router";import { t } from "ttag";import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";@@ -19,6 +18,7 @@ import type {import { normalizeFetchedChatMessages } from "metabase/metabot/utils/normalize-fetched-chat-messages";import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useSelector } from "metabase/redux";+import type { WithRouterProps } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import {diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsxindex d185043f0c6..eb43fa38488 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx@@ -1,6 +1,5 @@import dayjs from "dayjs";import { useCallback, useMemo } from "react";-import type { WithRouterProps } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -11,6 +10,7 @@ import { useToast } from "metabase/common/hooks";import { useUrlState } from "metabase/common/hooks/use-url-state";import { serializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";import { useDispatch } from "metabase/redux";+import type { WithRouterProps } from "metabase/router";import { Button, Flex, SimpleGrid, Tabs, Text, Title } from "metabase/ui";import { hasPremiumFeature } from "metabase-enterprise/settings";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsxindex d19027d69bc..5f6d9dc4422 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx@@ -1,11 +1,11 @@import { useMemo } from "react";-import type { WithRouterProps } from "react-router";import { t } from "ttag";import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";import { PaginationControls } from "metabase/common/components/PaginationControls";import { useUrlState } from "metabase/common/hooks/use-url-state";+import type { WithRouterProps } from "metabase/router";import { Card, Flex, Title } from "metabase/ui";import { useListMetabotConversationsQuery } from "../../api";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsxindex 6821a30e310..5d52f368a7a 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsx@@ -1,4 +1,4 @@-import { IndexRoute, Route } from "react-router";+import { IndexRoute, Route } from "metabase/router";import { ConversationDetailPage } from "./components/ConversationDetailPage";import { ConversationStatsPage } from "./components/ConversationStatsPage";diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsxindex a9883f8dae3..97414eeb811 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterprisePlugins } from "__support__/enterprise";import { setupPerformanceEndpoints } from "__support__/server-mocks/performance";@@ -11,6 +10,7 @@ import {selectCacheStrategy,} from "metabase/admin/performance/components/test-utils";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockSettings,createMockTokenFeatures,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsxindex af230e1ee15..ee5a74c7e09 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx@@ -1,8 +1,8 @@import { useDisclosure } from "@mantine/hooks";-import { Link } from "react-router";import { t } from "ttag";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";import { dataStudioArchivedSnippets } from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsxindex de6e821f2ed..3d742d84278 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -10,6 +9,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, within } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks/state";+import { Route } from "metabase/router";import { dataStudioArchivedSnippets } from "metabase/urls";import type { EnterpriseSettings } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsxindex 3e0cd472a12..00bc4dd1101 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx@@ -1,7 +1,6 @@-import type { Route } from "react-router";-import type { MetricPageParams } from "metabase/common/metrics/types";import { MetricQueryPage } from "metabase/metrics/pages/MetricQueryPage";+import type { Route } from "metabase/router";import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";import { dataStudioMetricUrls } from "../../urls";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsxindex 09eba56af55..a42971fd253 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -1,9 +1,9 @@import type { Location } from "history";-import { Link, type Route } from "react-router";import { t } from "ttag";import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { NewMetricPage } from "metabase/metrics/pages/NewMetricPage";+import { Link, type Route } from "metabase/router";import * as Urls from "metabase/urls";import { dataStudioMetricUrls } from "../../urls";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsxindex e3bd3a4d6ef..4f220d066c9 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx@@ -1,6 +1,5 @@-import { IndexRoute, Route } from "react-router";-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { DataStudioMetricAboutPage } from "./pages/DataStudioMetricAboutPage";import { DataStudioMetricDependenciesPage } from "./pages/DataStudioMetricDependenciesPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsxindex 18b79d47199..ae51a688d72 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx@@ -1,7 +1,7 @@import type { ComponentType } from "react";-import { IndexRoute, Route } from "react-router";import { getDataStudioSegmentRoutes } from "metabase/data-studio/segments/routes";+import { IndexRoute, Route } from "metabase/router";import { LibraryPage } from "./LibraryPage";import { LibrarySectionLayout } from "./LibrarySectionLayout";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsxindex f90943acdf1..371cc03af76 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx@@ -1,5 +1,4 @@import type { ReactNode } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useUpdateSnippetMutation } from "metabase/api";@@ -17,6 +16,7 @@ import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collectimport { useToast } from "metabase/common/hooks";import { PLUGIN_DEPENDENCIES, PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import * as Urls from "metabase/urls";import type { NativeQuerySnippet } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsxindex cff67dbf36d..cf41e780695 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import { setupCollectionByIdEndpoint } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type {EnterpriseSettings,NativeQuerySnippet,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsxindex 3fd17338160..8687edeffb5 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx@@ -1,4 +1,3 @@-import { Link } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -6,6 +5,7 @@ import { useUpdateSnippetMutation } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";+import { Link } from "metabase/router";import { Button, Group, Modal, Stack, Text } from "metabase/ui";import * as Urls from "metabase/urls";import type { NativeQuerySnippet } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsxindex e98e6ca0489..b2c6a3a68a4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx@@ -1,5 +1,4 @@import { useCallback, useState } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useUpdateSnippetMutation } from "metabase/api";@@ -10,6 +9,7 @@ import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";import { useBuildSnippetTree } from "metabase/data-studio/common/hooks/use-build-snippet-tree";import { useMetadataToasts } from "metabase/metadata/hooks";+import { Link } from "metabase/router";import {Card,Center,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsxindex 5943ce79882..207f88a08f2 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx@@ -1,6 +1,5 @@import { sql } from "@codemirror/lang-sql";import { useLayoutEffect, useMemo, useState } from "react";-import type { Route } from "react-router";import { usePreviousDistinct } from "react-use";import { t } from "ttag";@@ -20,6 +19,7 @@ import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeimport { useToast } from "metabase/common/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { Alert, Card, Center, Flex, Stack } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsxindex 446d876d8e6..de82bfb5485 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import {@@ -9,6 +7,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type {EnterpriseSettings,NativeQuerySnippet,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsxindex 1c5e9acc3df..c2cb62ef2e2 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx@@ -1,6 +1,5 @@import { sql } from "@codemirror/lang-sql";import { useEffect, useMemo, useState } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -21,6 +20,7 @@ import {import { useToast } from "metabase/common/hooks";import { PLUGIN_REMOTE_SYNC, PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { Card, Flex, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsxindex 3dd47949857..3b32a12f887 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/routes.tsx@@ -1,6 +1,5 @@-import { IndexRoute, Route } from "react-router";-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { ArchivedSnippetsPage } from "./pages/ArchivedSnippetsPage";import { EditSnippetPage } from "./pages/EditSnippetPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsxindex ad3bd4328f4..a22c7c3639b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";@@ -16,6 +15,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor } from "__support__/ui";import type { CollectionPickerModalProps } from "metabase/common/components/Pickers/CollectionPicker/CollectionPickerModal";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { EnterpriseSettings, TokenFeatures } from "metabase-types/api";import {createMockCollection,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsxindex 762eb4a988b..0f6315013ab 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx@@ -1,10 +1,9 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type {EnterpriseSettings,Table,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsxindex e839207c4e4..8db365a7c84 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx@@ -1,10 +1,9 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type {EnterpriseSettings,Table,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsxindex 8c800c18d28..1fced952630 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx@@ -1,5 +1,4 @@import type { ComponentType } from "react";-import { IndexRoute, Route } from "react-router";import { PublishedTableMeasureDependenciesPage } from "metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage";import { PublishedTableMeasureDetailPage } from "metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage";@@ -10,6 +9,7 @@ import { PublishedTableSegmentDependenciesPage } from "metabase/data-studio/segmimport { PublishedTableSegmentDetailPage } from "metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage";import { PublishedTableSegmentRevisionHistoryPage } from "metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { TableDependenciesPage } from "./pages/TableDependenciesPage";import { TableFieldsPage } from "./pages/TableFieldsPage";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsxindex 1d2f1df38ab..a360a96c994 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx@@ -1,5 +1,4 @@import { useEffect, useState } from "react";-import { Link } from "react-router";import { t } from "ttag";import {@@ -20,6 +19,7 @@ import { useSetting } from "metabase/common/hooks";import { useToast } from "metabase/common/hooks/use-toast";import { hasDbRoutingEnabled } from "metabase/common/utils/database";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import {Alert,diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsxindex bfeb2ed37a8..72ffbc92a40 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx@@ -1,4 +1,3 @@-import { Link } from "react-router";import { match } from "ts-pattern";import { t } from "ttag";@@ -8,6 +7,7 @@ import {hasTableEditingEnabled,hasWritableConnectionDetails,} from "metabase/common/utils/database";+import { Link } from "metabase/router";import { Text } from "metabase/ui";import type { Database } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsxindex 5cd2c14f719..a41caac218a 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import type { Route } from "react-router";import { push, replace } from "react-router-redux";import { t } from "ttag";@@ -11,6 +10,7 @@ import { useDocsUrl } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import type { Route } from "metabase/router";import { Flex, Icon, Modal, Text } from "metabase/ui";import * as Urls from "metabase/urls";import { useCreateDestinationDatabaseMutation } from "metabase-enterprise/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsxindex 16bf8f1e4c6..9575553923a 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import { Link } from "react-router";import { c, t } from "ttag";import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/components/DatabaseConnectionHealthInfo";@@ -7,6 +6,7 @@ import { useListDatabasesQuery } from "metabase/api";import { ForwardRefLink } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Icon, Menu, Text, UnstyledButton } from "metabase/ui";import * as Urls from "metabase-enterprise/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/index.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/index.tsxindex 488c29c4d65..b86493937b0 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/index.tsx@@ -1,7 +1,7 @@-import { IndexRoute, Route } from "react-router";import { t } from "ttag";import { PLUGIN_DB_ROUTING } from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { hasPremiumFeature } from "metabase-enterprise/settings";import { DatabaseRoutingSection } from "./DatabaseRoutingSection";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsxindex d65438431d2..6adcb93ce0f 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx@@ -1,8 +1,8 @@import cx from "classnames";import { Fragment } from "react";-import { Link } from "react-router";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Box, Group, type GroupProps } from "metabase/ui";import type { NodeLink } from "../../../types";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsxindex 0cf3cda368d..970a7baebc1 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { DependencyEntry, DependencyNode } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsxindex ab8a5363f73..62ddc6167c2 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx@@ -1,7 +1,7 @@import cx from "classnames";-import { Link } from "react-router";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Box, FixedSizeIcon, Group } from "metabase/ui";import type { IconName } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.unit.spec.tsxindex 79ee0c65375..7b45504c57e 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.unit.spec.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import {setupDependencyGraphEndpoint,setupRecentViewsAndSelectionsEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { Route } from "metabase/router";import { createMockDependencyGraph } from "metabase-types/api/mocks";import { DependencyGraphPage } from "./DependencyGraphPage";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsxindex b4d5c4daed9..a760d38963d 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx@@ -1,5 +1,4 @@-import { IndexRedirect, IndexRoute, Route } from "react-router";-+import { IndexRedirect, IndexRoute, Route } from "metabase/router";import {BrokenDependencyDiagnosticsPage,UnreferencedDependencyDiagnosticsPage,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsxindex fd7f7773047..01421ac7b02 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx@@ -1,8 +1,8 @@import type { ReactNode } from "react";-import { Link } from "react-router";import { jt, t } from "ttag";import type { AdminPathKey, State } from "metabase/redux/store";+import { Link } from "metabase/router";import { getUser } from "metabase/selectors/user";import type {PermissionSubject,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.unit.spec.tsxindex e26c04c6a44..e51dedc111f 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.unit.spec.tsx@@ -1,7 +1,6 @@-import { Route } from "react-router";-import { setupListBrokenGraphNodesEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { DependencyNode } from "metabase-types/api";import {createMockAnalysisFindingError,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.tsxindex 57347cf4e2c..ae52d96b689 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.tsx@@ -1,9 +1,9 @@import type { ReactNode } from "react";-import { Link } from "react-router";import { t } from "ttag";import { DateTime } from "metabase/common/components/DateTime";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Anchor, Box, Card, FixedSizeIcon, Group, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import { getUserName } from "metabase/utils/user";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.unit.spec.tsxindex 3cbec68b7aa..d5c76680b1d 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/InfoSection/InfoSection.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { DependencyNode } from "metabase-types/api";import {createMockCardDependencyNode,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.tsxindex 465d834735b..ba57f223296 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.tsx@@ -1,7 +1,7 @@-import { Link } from "react-router";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Anchor, Breadcrumbs, FixedSizeIcon, Group } from "metabase/ui";import { getNodeLocationInfo } from "metabase-enterprise/dependencies/utils";import type { DependencyNode } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.unit.spec.tsxindex e6af040be03..dbf4a788709 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/LocationSection/LocationSection.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { DependencyNode } from "metabase-types/api";import {createMockCardDependencyNode,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.unit.spec.tsxindex 97fd6570d9e..192861968e8 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { DependencyNode } from "metabase-types/api";import {createMockCardDependencyNode,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsxindex 549c7146409..66d1da4ddf3 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupListBreakingGraphNodesEndpoint,@@ -12,6 +11,7 @@ import {screen,within,} from "__support__/ui";+import { Route } from "metabase/router";import type * as Urls from "metabase/urls";import type { DependencyDiagnosticsMode } from "metabase-enterprise/monitor/dependency-diagnostics/components/types";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsxindex 91bda78a5b0..473905a8e6f 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsx@@ -1,9 +1,9 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Collection } from "metabase-types/api";import { createMockCollection } from "metabase-types/api/mocks";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsxindex 5e4f2675ea7..cb9b115af31 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { t } from "ttag";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import { Button, Icon, Menu, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsxindex e9296ba6fb2..2b48a222c74 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx@@ -1,6 +1,6 @@-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { Anchor, FixedSizeIcon, Group, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import type { Card, IconName } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsxindex 214d5a89448..81ce3473088 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { t } from "ttag";import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";+import { Link } from "metabase/router";import { Box, Text, Title } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsxindex d7e5bdbb176..725446b7d82 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsx@@ -1,4 +1,4 @@-import { Route } from "react-router";+import { Route } from "metabase/router";import { MigrateModelsPage } from "./pages/MigrateModelsPage";diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.unit.spec.tsxindex c34b327d801..b1d0962f7ee 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCollectionByIdEndpoint,@@ -11,6 +10,7 @@ import {screen,waitFor,} from "__support__/ui";+import { Route } from "metabase/router";import type { DatabaseId, SchemaName } from "metabase-types/api";import {createMockCollection,diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsxindex 74ce81baf62..dde1933cc9f 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsx@@ -1,10 +1,10 @@import cx from "classnames";import { Fragment } from "react";-import { Link } from "react-router";import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import {ActionIcon,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsxindex 12415a1bb0b..89b736cb975 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsx@@ -1,4 +1,4 @@-import { IndexRoute } from "react-router";+import { IndexRoute } from "metabase/router";import { SchemaViewerPage } from "./pages/SchemaViewerPage";diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsxindex 44216dd2a7d..8360c8a75c1 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx@@ -1,4 +1,3 @@-import { Link } from "react-router";import { jt, t } from "ttag";import {@@ -8,6 +7,7 @@ import {import { Banner } from "metabase/common/components/Banner";import { useSetting } from "metabase/common/hooks";import { getPlan } from "metabase/common/utils/plan";+import { Link } from "metabase/router";import { Anchor, Text } from "metabase/ui";import { isAffected } from "../../utils";diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsxindex 79e64cd66af..c272de3b956 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsx@@ -1,10 +1,10 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupNotificationChannelsEndpoints } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Advisory } from "metabase-types/api";import {createMockTokenFeatures,diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsxindex 4a0056406fc..7ece3ef43da 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsx@@ -1,12 +1,12 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupNotificationChannelsEndpoints } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { securityCenterApi, subscriptionApi } from "metabase/api";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Advisory } from "metabase-types/api";import {createMockTokenFeatures,diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.unit.spec.tsxindex 3de353cab6f..ab997f96b18 100644--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.unit.spec.tsx@@ -1,6 +1,5 @@import dayjs from "dayjs";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupCurrentAccessGrantEndpoint,@@ -8,6 +7,7 @@ import {setupListAccessGrantsEndpointWithError,} from "__support__/server-mocks";import { fireEvent, renderWithProviders, screen, within } from "__support__/ui";+import { Route } from "metabase/router";import { createMockAccessGrant } from "metabase-types/api/mocks";import { GrantAccessModal } from "./GrantAccessModal";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsxindex 91c1d8b0aff..b3b99bd89ba 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsx@@ -1,4 +1,4 @@-import { Route } from "react-router";+import { Route } from "metabase/router";import { EditTableDataContainer } from "./table-edit/EditTableDataContainer";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsxindex bf70aabfadb..596410e7b9b 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx@@ -1,8 +1,8 @@import { useState } from "react";-import { Link } from "react-router";import { jt, t } from "ttag";import { useGetTableQuery } from "metabase/api";+import { Link } from "metabase/router";import { Anchor, Box, Button, Group, Icon, Stack, Text } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsxindex c7b09e2b68d..d9ecd8804e9 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsx@@ -1,6 +1,6 @@-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { ActionIcon, Icon, Tooltip } from "metabase/ui";import * as Urls from "metabase-enterprise/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsxindex c9cdb479d38..b11bd3d5361 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -30,6 +29,7 @@ import { assertNumericId } from "metabase/admin/permissions/types";import { useListCollectionsTreeQuery } from "metabase/api";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";+import type { Route } from "metabase/router";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsxindex e66572b385b..6607b618352 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect, useMemo } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -22,6 +21,7 @@ import type { PermissionEditorEntity } from "metabase/admin/permissions/types";import { assertNumericId } from "metabase/admin/permissions/types";import { useListCollectionsTreeQuery } from "metabase/api";import { useDispatch, useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsxindex 0244d4af611..18a606de65a 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx@@ -1,5 +1,4 @@import { Fragment } from "react";-import { IndexRedirect, IndexRoute, Route } from "react-router";import { t } from "ttag";import { EditUserModal } from "metabase/admin/people/containers/EditUserModal";@@ -25,6 +24,7 @@ import {PLUGIN_TENANTS,} from "metabase/plugins";import { useSelector } from "metabase/redux";+import { IndexRedirect, IndexRoute, Route } from "metabase/router";import { getIsTenantUser, getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Text } from "metabase/ui";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsxindex f94ba8f31e6..179479a5c9e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx@@ -1,5 +1,4 @@-import { Route } from "react-router";-+import { Route } from "metabase/router";import { TransformInspectorUpsellPage } from "metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage";import { TransformInspectPage } from "./pages/TransformInspectPage";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsxindex 82b09455569..230d2d6e2fa 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import {setupDatabasesEndpoints,setupSearchEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Transform } from "metabase-types/api";import {createMockDatabase,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsxindex b60e464fbbd..0fd37e29869 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx@@ -1,5 +1,4 @@import { useLayoutEffect, useState } from "react";-import type { Route } from "react-router";import { t } from "ttag";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";@@ -7,6 +6,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { useMetadataToasts } from "metabase/metadata/hooks";import { useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { Alert, Box, Card, Stack } from "metabase/ui";import type * as Urls from "metabase/urls";import { isResourceNotFoundError } from "metabase/utils/errors";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsxindex c019d120d1d..5de7eeb0f0d 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { ModalRoute } from "metabase/hoc/ModalRoute";+import { Route } from "metabase/router";import { NewPythonTransformPage } from "metabase/transforms/pages/NewTransformPage";import { TransformListPage } from "metabase/transforms/pages/TransformListPage";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsxindex 3c9fe7d4e3b..13413f64838 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import {@@ -10,6 +8,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockSettings,createMockTokenFeatures,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsxindex 48b81eb2fcd..3b0543929a8 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {setupBillingEndpoints,setupBugReportingDetailsEndpoint,@@ -11,6 +9,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { createMockSettings, createMockUser } from "metabase-types/api/mocks";import { TransformsUpsellPage } from "./TransformsUpsellPage";diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.tsxindex 659ac1c1493..06b53210c82 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/components/WorkspaceDatabaseSection/WorkspaceDatabaseSection.tsx@@ -1,4 +1,3 @@-import { Link } from "react-router";import { t } from "ttag";import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/components/DatabaseConnectionHealthInfo";@@ -18,6 +17,7 @@ import {isDbModifiable,} from "metabase/common/utils/database";import type { WorkspaceDatabaseSectionProps } from "metabase/plugins/oss/workspaces";+import { Link } from "metabase/router";import {Alert,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsxindex 09e1db20dcb..b6389b6aa43 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsx@@ -1,5 +1,4 @@import { useMemo, useState } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -14,6 +13,7 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadinimport { DatabaseForm } from "metabase/databases/components/DatabaseForm";import type { DatabaseFormConfig } from "metabase/databases/types";import { useDispatch } from "metabase/redux";+import type { Route } from "metabase/router";import { Box, Flex, ScrollArea, Title } from "metabase/ui";import * as Urls from "metabase/urls";import type { Database, DatabaseData } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.unit.spec.tsxindex f1dfabb3f1b..d4fd969a2f2 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.unit.spec.tsx@@ -1,8 +1,7 @@-import { Route } from "react-router";-import { setupDatabaseEndpoints } from "__support__/server-mocks/database";import { renderWithProviders, screen } from "__support__/ui";import { createMockSettingsState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Database } from "metabase-types/api";import {createMockDatabase,diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.unit.spec.tsxindex 76fa825fd85..9be0718d358 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.unit.spec.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import {setupDatabasesEndpoints,setupGetCurrentWorkspaceEndpoint,setupListTableRemappingsEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { TableRemapping } from "metabase-types/api";import {createMockCurrentWorkspace,diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.unit.spec.tsxindex 9f2808f466f..abab843be42 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.unit.spec.tsx@@ -1,9 +1,9 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupDeleteCurrentWorkspaceEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import { Route } from "metabase/router";import { DeleteSection } from "./DeleteSection";diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsxindex 6ca864e72d2..5069c833077 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceIndexPage/WorkspaceIndexPage.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {setupDatabasesEndpoints,setupGetCurrentWorkspaceEndpoint,@@ -9,6 +7,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { CurrentWorkspace } from "metabase-types/api";import {createMockCurrentWorkspace,diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsxindex f8bea083445..69df2534384 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.tsx@@ -1,9 +1,9 @@import { useDisclosure } from "@mantine/hooks";-import { Link } from "react-router";import { t } from "ttag";import { useDocsUrl } from "metabase/common/hooks";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getApplicationName } from "metabase/selectors/whitelabel";import {Box,diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsxindex 2c962d474c8..b5d7d05db03 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceEmptyState/WorkspaceEmptyState.unit.spec.tsx@@ -1,8 +1,7 @@-import { Route } from "react-router";-import { setupApplyAdvancedConfigEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { createMockSettingsState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { WorkspaceEmptyState } from "./WorkspaceEmptyState";diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsxindex 788528d2c41..1ba92077e2b 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCreateWorkspaceEndpoint,@@ -7,6 +6,7 @@ import {setupListWorkspacesEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { Workspace } from "metabase-types/api";import {createMockDatabase,diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsxindex 6d896b2c0fb..c2ea34739e4 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx@@ -1,4 +1,4 @@-import { IndexRoute, Route, type RouteComponent } from "react-router";+import { IndexRoute, Route, type RouteComponent } from "metabase/router";import { AdminConnectionInfoPage } from "./pages/AdminConnectionInfoPage";import { WorkspaceIndexPage } from "./pages/WorkspaceIndexPage";diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsxindex b1966a179bb..cfa78931770 100644--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx@@ -1,4 +1,3 @@-import { Link } from "react-router";import { t } from "ttag";import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/components/DatabaseConnectionHealthInfo";@@ -13,6 +12,7 @@ import {isDbModifiable,} from "metabase/common/utils/database";import type { WritableConnectionInfoSectionProps } from "metabase/plugins/oss/writable-connection";+import { Link } from "metabase/router";import { Alert, Button, Group, Icon } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsxindex 37f65c13dc1..61b11ffa9f9 100644--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx@@ -1,5 +1,4 @@import { useMemo, useState } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -14,6 +13,7 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadinimport { DatabaseForm } from "metabase/databases/components/DatabaseForm";import type { DatabaseFormConfig } from "metabase/databases/types";import { useDispatch } from "metabase/redux";+import type { Route } from "metabase/router";import { Box, Flex, ScrollArea, Title } from "metabase/ui";import * as Urls from "metabase/urls";import type { Database, DatabaseData } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsxindex c4e789db0bd..832d1516ed5 100644--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsx@@ -1,4 +1,4 @@-import { Route } from "react-router";+import { Route } from "metabase/router";import { WritableConnectionInfoPage } from "./pages/WritableConnectionInfoPage";diff --git a/eslint.config.mjs b/eslint.config.mjsindex b2708c1a3bc..09d5a6faaab 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -49,6 +49,10 @@ const baseMetabaseRestrictedConfig = {importNames: ["useSelector", "useDispatch", "connect"],message: "Please import from `metabase/redux` instead.",},+ {+ name: "react-router",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",@@ -612,6 +616,14 @@ const configs = ["no-restricted-imports": ["error", baseMetabaseRestrictedConfig],},},+ {+ // The router facade is the single seam allowed to import `react-router`+ // directly; every other file goes through `metabase/router`.+ files: ["frontend/src/metabase/router/**/*"],+ rules: {+ "no-restricted-imports": "off",+ },+ },{files: ["frontend/src/metabase/ui/**/*.{js,jsx,ts,tsx}"],rules: {@@ -624,6 +636,10 @@ const configs = ["cljs/metabase.lib*",],paths: [+ {+ name: "react-router",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@emotion/styled",message: "Please style components using css modules.",@@ -660,6 +676,10 @@ const configs = [importNames: ["useSelector", "useDispatch", "connect"],message: "Please import from `metabase/redux` instead.",},+ {+ name: "react-router",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",@@ -834,6 +854,10 @@ const configs = [},],paths: [+ {+ name: "react-router",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",@@ -907,6 +931,10 @@ const configs = [{patterns: [{ group: ["cljs/metabase.lib*"] }],paths: [+ {+ name: "react-router",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",diff --git a/frontend/src/metabase/account/notifications/routes.tsx b/frontend/src/metabase/account/notifications/routes.tsxindex 7e4abd6d39c..e0fd022b71c 100644--- a/frontend/src/metabase/account/notifications/routes.tsx+++ b/frontend/src/metabase/account/notifications/routes.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { ModalRoute } from "metabase/hoc/ModalRoute";+import { Route } from "metabase/router";import { HelpModal } from "./components/HelpModal";import { DeleteAlertModal } from "./containers/ArchiveAlertModal";diff --git a/frontend/src/metabase/account/routes.tsx b/frontend/src/metabase/account/routes.tsxindex 40c10794db1..519501a5a99 100644--- a/frontend/src/metabase/account/routes.tsx+++ b/frontend/src/metabase/account/routes.tsx@@ -1,7 +1,7 @@import type { Store } from "@reduxjs/toolkit";-import { IndexRedirect, Route, type RouteComponent } from "react-router";import type { State } from "metabase/redux/store";+import { IndexRedirect, Route, type RouteComponent } from "metabase/router";import AccountApp from "./app/containers/AccountApp";import LoginHistoryApp from "./login-history/containers/LoginHistoryApp";diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsxindex 6bd9547bb80..8cf2b17bf9d 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import type { Route } from "react-router";import { t } from "ttag";import {@@ -16,6 +15,7 @@ import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";import { useToast } from "metabase/common/hooks/use-toast";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";+import type { Route } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Modal } from "metabase/ui";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsxindex 12e23f5e6a5..a598db76658 100644--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx@@ -1,6 +1,5 @@import type { LocationDescriptor } from "history";import { useEffect } from "react";-import type { Route } from "react-router";import { replace } from "react-router-redux";import { skipToken, useGetActionQuery, useGetCardQuery } from "metabase/api";@@ -9,6 +8,7 @@ import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { connect, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import type { AppErrorDescriptor } from "metabase/redux/store";+import type { Route } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsxindex a982c4fcb41..0aeb5434574 100644--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupCardsEndpoints,@@ -14,6 +13,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Card, WritebackAction } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsxindex f111d772440..a67292d4429 100644--- a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -16,6 +15,7 @@ import {type MetabotApiKeyProvider,} from "metabase/metabot";import { reinitialize } from "metabase/plugins";+import { Route } from "metabase/router";import { defer } from "metabase/utils/promise";import type {BedrockCredentials,diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsxindex 91be5dca219..fdee4f861a9 100644--- a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupEnterprisePlugins } from "__support__/enterprise";import {@@ -22,6 +21,7 @@ import { FIXED_METABOT_IDS } from "metabase/metabot/constants";import { buildDefaultMetabots } from "metabase/metabot/tests/utils";import { reinitialize } from "metabase/plugins";import { createMockSettingsState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockCollection,createMockSettingDefinition,diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsxindex 12fd5944bb7..a5a5f351e8a 100644--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx@@ -1,6 +1,5 @@import _userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupMetabotPromptSuggestionsEndpoint,@@ -11,6 +10,7 @@ import {import { renderWithProviders, screen, waitFor } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";import { FIXED_METABOT_IDS } from "metabase/metabot/constants";+import { Route } from "metabase/router";import type {RegenerateSuggestedMetabotPromptsResponse,SuggestedMetabotPrompt,diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsxindex 99a5d2828bb..146ecc2e055 100644--- a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx@@ -1,11 +1,11 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupEnterprisePlugins } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { reinitialize } from "metabase/plugins";import { createMockSettingsState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { createMockTokenFeatures } from "metabase-types/api/mocks";import { MetabotNavPane } from "./MetabotNavPane";diff --git a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsx b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsxindex 0ad1243e2a1..463e34da170 100644--- a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsx+++ b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import type { WithRouterProps } from "react-router";import { t } from "ttag";import NoResults from "assets/img/no_results.svg";@@ -16,6 +15,7 @@ import {useUrlState,} from "metabase/common/hooks/use-url-state";import CS from "metabase/css/core/index.css";+import type { WithRouterProps } from "metabase/router";import {Badge,Box,diff --git a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsxindex 0ef61cb6b24..e96470ce4fc 100644--- a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsx@@ -1,10 +1,10 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import type { ReactNode } from "react";-import { Route } from "react-router";import { setupOAuthAuthorizationsEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import { Route } from "metabase/router";import type { ListOAuthAuthorizationsResponse } from "metabase-types/api";import {createMockListOAuthAuthorizationsResponse,diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsxindex de7722e5f1b..33f697372be 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx@@ -1,7 +1,6 @@import type { LocationDescriptorObject } from "history";import { updateIn } from "icepick";import { type ComponentType, useState } from "react";-import { type Route, withRouter } from "react-router";import _ from "underscore";import ErrorBoundary from "metabase/ErrorBoundary";@@ -20,6 +19,7 @@ import type {} from "metabase/databases/types";import { useDispatch } from "metabase/redux";import type { Dispatch } from "metabase/redux/store";+import { type Route, withRouter } from "metabase/router";import { Text } from "metabase/ui";import type {DatabaseData,diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsxindex 098ce548760..4fd0c6ed5e6 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx@@ -1,8 +1,7 @@-import { Route } from "react-router";-import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { DatabaseData } from "metabase-types/api";import { createMockEngines } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsxindex cff9601804d..7022fcc6381 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx@@ -1,5 +1,4 @@import { useDisclosure } from "@mantine/hooks";-import { Link } from "react-router";import { c, t } from "ttag";import { NewUserModal } from "metabase/admin/people/containers/NewUserModal";@@ -8,6 +7,7 @@ import { getHelpUrl } from "metabase/common/utils/help-url";import CS from "metabase/css/core/index.css";import { getEngines } from "metabase/databases/selectors";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getIsPaidPlan } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import {diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsxindex 3cbea25616b..64540f82036 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsx@@ -1,12 +1,12 @@import { act } from "@testing-library/react";import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterprisePlugins } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, within } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { EngineKey } from "metabase-types/api";import {createMockEngines,diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsxindex fb218b45eec..a5ab7e945c4 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx@@ -1,9 +1,9 @@import type { ComponentProps } from "react";-import { Link } from "react-router";import CS from "metabase/css/core/index.css";import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";+import { Link } from "metabase/router";import { getDocsUrl } from "metabase/selectors/settings";export const MarkdownLink = ({ href, children }: ComponentProps<"a">) => {diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsxindex 6347e792438..35a2f38b1f8 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsx@@ -1,11 +1,11 @@import type { ReactNode } from "react";-import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { createMockVersion } from "metabase-types/api/mocks";import { MarkdownLink } from "./MarkdownLink";diff --git a/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsx b/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsxindex 127b0227732..aacfa6fc061 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsx@@ -1,12 +1,12 @@import cx from "classnames";import { useMemo } from "react";-import { Link } from "react-router";import { t } from "ttag";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { FormMessage } from "metabase/forms";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";+import { Link } from "metabase/router";import { Button, Flex, Loader, UnstyledButton } from "metabase/ui";import { isSyncCompleted } from "metabase/utils/syncing";import type { Database, Engine } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsxindex 908280e0e3a..780f7da5838 100644--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx@@ -1,6 +1,6 @@-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { Button, Flex, Icon } from "metabase/ui";import { browseDatabase } from "metabase/urls";import { isSyncInProgress } from "metabase/utils/syncing";diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsxindex b115077f93c..30878ac8fc3 100644--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { browseDatabase } from "metabase/urls";import type { Database } from "metabase-types/api";import { createMockDatabase } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsxindex ebcf56b3514..27121077cf3 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx@@ -1,5 +1,4 @@import { type ComponentType, useEffect, useState } from "react";-import { withRouter } from "react-router";import { t } from "ttag";import _ from "underscore";@@ -24,6 +23,7 @@ import {PLUGIN_WRITABLE_CONNECTION,} from "metabase/plugins";import { connect, useSelector } from "metabase/redux";+import { withRouter } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Divider, Flex } from "metabase/ui";import type { DatabaseId, Database as DatabaseType } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsxindex 3259ae24950..eef7222da4d 100644--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx@@ -1,11 +1,11 @@import { useDisclosure } from "@mantine/hooks";import { useEffect, useState } from "react";-import type { Route } from "react-router";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { getEngines } from "metabase/databases/selectors";import { useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import {Box,Button,diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsxindex 4e427b08301..1cf4869aecb 100644--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx@@ -1,10 +1,10 @@import { waitFor } from "@testing-library/react";import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { createMockEngines } from "metabase-types/api/mocks";import { DatabasePage } from "./DatabasePage";diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsxindex 7707707bbaa..9114aaaa869 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx@@ -1,7 +1,7 @@import { useDisclosure } from "@mantine/hooks";-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { ActionIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsxindex d3ba1925e32..ae69b84a891 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx@@ -1,7 +1,6 @@import type { FieldInputProps } from "formik";import { useFormik } from "formik";import { useEffect } from "react";-import { Link } from "react-router";import { t } from "ttag";import { FieldSet } from "metabase/common/components/FieldSet";@@ -12,6 +11,7 @@ import {getSegmentQueryDefinition,} from "metabase/querying/segments/utils";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Alert, Button } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsxindex 0b0dc917377..709584cf0c4 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx@@ -1,7 +1,6 @@-import { Link } from "react-router";-import { modelIconMap } from "metabase/common/utils/icon";import { TableBreadcrumbs } from "metabase/metadata/components";+import { Link } from "metabase/router";import { Box, Flex, Group, Icon } from "metabase/ui";import * as Urls from "metabase/urls";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsxindex 7b02cf6785b..5cd69ae3a57 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx@@ -1,5 +1,4 @@import { useCallback, useState } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -15,6 +14,7 @@ import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";+import type { Route } from "metabase/router";import type {CreateSegmentRequest,Segment,diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsxindex 1673afaea78..2668de8cb8d 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { callMockEvent } from "__support__/events";import {@@ -20,6 +19,7 @@ import {waitForLoaderToBeRemoved,} from "__support__/ui";import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import { createMockCollection } from "metabase-types/api/mocks";import { createSampleDatabase } from "metabase-types/api/mocks/presets";diff --git a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsxindex 44c7652fe5f..73f6bce1304 100644--- a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx+++ b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import { renderWithProviders, screen, within } from "__support__/ui";import {createMockLocation,createMockRoutingState,createMockSettingsState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockSettings,createMockTokenFeatures,diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsxindex 94f60797a0d..f7989fd943e 100644--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsx+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsx@@ -1,5 +1,4 @@import { useRef } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { useDeleteThemeFlow } from "metabase/admin/embedding/hooks";@@ -8,6 +7,7 @@ import { NotFound } from "metabase/common/components/ErrorPages";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal";import { useBeforeUnload } from "metabase/common/hooks/use-before-unload";import { useDispatch } from "metabase/redux";+import type { Route } from "metabase/router";import { Flex, Loader, Stack } from "metabase/ui";import { EditorPanel } from "./EditorPanel";diff --git a/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.unit.spec.tsx b/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.unit.spec.tsxindex b340a3e6c42..85c43d8ce38 100644--- a/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.unit.spec.tsx+++ b/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.unit.spec.tsx@@ -1,7 +1,7 @@import type { ComponentProps } from "react";-import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { AdminEmbeddingApp } from "./AdminEmbeddingApp";diff --git a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsxindex 7ea4b4bfe64..c369337085b 100644--- a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx+++ b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx@@ -1,5 +1,3 @@-import { IndexRoute, Route } from "react-router";-import { renderWithProviders, screen, within } from "__support__/ui";import { UpsellTenants } from "metabase/admin/upsells/UpsellTenants";import { createTenantsRouteGuard } from "metabase/admin/utils";@@ -11,6 +9,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { IndexRoute, Route } from "metabase/router";import type { EmbeddingHomepageStatus } from "metabase-types/api";import {createMockTokenFeatures,diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsxindex a67cd4626b3..90427c558ea 100644--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx@@ -1,5 +1,4 @@import { useEffect, useMemo } from "react";-import { Link } from "react-router";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";@@ -8,6 +7,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { useSetting } from "metabase/common/hooks";import { PLUGIN_TENANTS } from "metabase/plugins";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Flex, Group, Tabs, Title } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/admin/performance/components/test-utils.tsx b/frontend/src/metabase/admin/performance/components/test-utils.tsxindex ca29d3d3039..5962452d1cf 100644--- a/frontend/src/metabase/admin/performance/components/test-utils.tsx+++ b/frontend/src/metabase/admin/performance/components/test-utils.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupEnterpriseOnlyPlugin,@@ -14,6 +13,7 @@ import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { act, fireEvent, renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import { CacheDurationUnit } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsxindex 38c55d0b1bb..595b5b9c63d 100644--- a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx+++ b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx@@ -1,7 +1,7 @@import type { History } from "history";-import { Route } from "react-router";import { act, renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import { useConfirmOnRouteLeave } from "./useConfirmOnRouteLeave";diff --git a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsxindex 2fee39b6689..363e3c0de6d 100644--- a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx+++ b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { jt, t } from "ttag";import { useModalOpen } from "metabase/common/hooks/use-modal-open";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getDocsUrl } from "metabase/selectors/settings";import { Button, Flex, Modal, Text } from "metabase/ui";diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsxindex 3788ec97842..deb7da0dd18 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -20,6 +19,7 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { useToggle } from "metabase/common/hooks/use-toggle";import { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";+import type { Route } from "metabase/router";import {Group,Button as NewButton,diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsxindex 2ed08e0001b..99f4900bca2 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -8,6 +7,7 @@ import { CollectionPermissionsHelp } from "metabase/admin/permissions/componentsimport { useListCollectionsTreeQuery } from "metabase/api";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";+import type { Route } from "metabase/router";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsxindex 8cf66a26f0e..859991c7561 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupCollectionPermissionsGraphEndpoint,@@ -10,6 +8,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type {Collection,CollectionPermissionsGraph,diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsxindex 31e12af070e..22b8f11a58c 100644--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx@@ -1,5 +1,4 @@import type { ReactNode } from "react";-import type { Route } from "react-router";import { useAsync } from "react-use";import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";@@ -10,6 +9,7 @@ import {useListPermissionsGroupsQuery,} from "metabase/api";import { useDispatch, useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { getMetadataUnfiltered } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";diff --git a/frontend/src/metabase/admin/permissions/routes.tsx b/frontend/src/metabase/admin/permissions/routes.tsxindex e63946e58f8..e95cd2abb6b 100644--- a/frontend/src/metabase/admin/permissions/routes.tsx+++ b/frontend/src/metabase/admin/permissions/routes.tsx@@ -1,5 +1,3 @@-import { IndexRedirect, Route } from "react-router";-import {PLUGIN_ADMIN_PERMISSIONS_DATABASE_GROUP_ROUTES,PLUGIN_ADMIN_PERMISSIONS_DATABASE_ROUTES,@@ -8,6 +6,7 @@ import {PLUGIN_ADMIN_PERMISSIONS_TABS,PLUGIN_APPLICATION_PERMISSIONS,} from "metabase/plugins";+import { IndexRedirect, Route } from "metabase/router";import { CollectionPermissionsPage } from "./pages/CollectionPermissionsPage/CollectionPermissionsPage";import DataPermissionsPage from "./pages/DataPermissionsPage";diff --git a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsxindex e2ea83e507f..ba6c6a7a45c 100644--- a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx@@ -1,6 +1,5 @@import { userEvent } from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { callMockEvent } from "__support__/events";import {@@ -19,6 +18,7 @@ import DataPermissionsPage from "metabase/admin/permissions/pages/DataPermissionimport { DatabasesPermissionsPage } from "metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage";import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";import { PLUGIN_ADMIN_PERMISSIONS_TABLE_GROUP_ROUTES } from "metabase/plugins";+import { Route } from "metabase/router";import { createMockGroup } from "metabase-types/api/mocks/group";import { createSampleDatabase } from "metabase-types/api/mocks/presets";diff --git a/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsx b/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsxindex c82660407c4..270943a5c8f 100644--- a/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { callMockEvent } from "__support__/events";import {@@ -18,6 +17,7 @@ import DataPermissionsPage from "metabase/admin/permissions/pages/DataPermissionimport { GroupsPermissionsPage } from "metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage";import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";import { PLUGIN_ADMIN_PERMISSIONS_TABLE_ROUTES } from "metabase/plugins";+import { Route } from "metabase/router";import { createMockGroup } from "metabase-types/api/mocks/group";import { createSampleDatabase } from "metabase-types/api/mocks/presets";diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsxindex fcc2203d073..ff427b94bda 100644--- a/frontend/src/metabase/admin/routes.tsx+++ b/frontend/src/metabase/admin/routes.tsx@@ -1,12 +1,5 @@import type { Store } from "@reduxjs/toolkit";import { Fragment } from "react";-import {- IndexRedirect,- IndexRoute,- Redirect,- Route,- type RouteComponent,-} from "react-router";import AdminApp from "metabase/admin/app/components/AdminApp";import { DatabaseEditApp } from "metabase/admin/databases/containers/DatabaseEditApp";@@ -72,6 +65,13 @@ import {PerformanceTabId,} from "metabase/plugins";import type { State } from "metabase/redux/store";+import {+ IndexRedirect,+ IndexRoute,+ Redirect,+ Route,+ type RouteComponent,+} from "metabase/router";import { getTokenFeature } from "metabase/selectors/settings";import { AISettingsPage, McpSettingsPage } from "./ai/AISettingsPage";diff --git a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsxindex 6a19c88f475..62313efc271 100644--- a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx+++ b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx@@ -1,11 +1,11 @@import type { ReactNode } from "react";import { useCallback, useState } from "react";-import { Link } from "react-router";import { c, t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { useGetEnvVarDocsUrl } from "metabase/admin/settings/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";+import { Link } from "metabase/router";import { ActionIcon, Anchor, Button, Icon, Menu, Text } from "metabase/ui";import type { SettingDefinition } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsxindex 0fd51e0aca4..616b9e27059 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupSettingEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";@@ -8,6 +7,7 @@ import {createMockRoutingState,createMockSettingsState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import {createMockSettings,diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.unit.spec.tsxindex 25a12a9745e..cd07191bcb8 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {findRequests,@@ -12,6 +11,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";+import { Route } from "metabase/router";import type { SettingKey } from "metabase-types/api";import {createMockDashboard,diff --git a/frontend/src/metabase/admin/settings/tests/setup.tsx b/frontend/src/metabase/admin/settings/tests/setup.tsxindex 18f172ce035..48e1a51e9f5 100644--- a/frontend/src/metabase/admin/settings/tests/setup.tsx+++ b/frontend/src/metabase/admin/settings/tests/setup.tsx@@ -1,7 +1,6 @@import { render as testingLibraryRender } from "@testing-library/react";import fetchMock from "fetch-mock";import type { ReactNode } from "react";-import { Route } from "react-router";import {setupEnterpriseOnlyPlugin,@@ -27,6 +26,7 @@ import { mockSettings } from "__support__/settings";import { getTestStoreAndWrapper, screen } from "__support__/ui";import { getSettingsRoutes } from "metabase/admin/settingsRoutes";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeature, TokenFeatures } from "metabase-types/api";import {createMockSettings,diff --git a/frontend/src/metabase/admin/settingsRoutes.tsx b/frontend/src/metabase/admin/settingsRoutes.tsxindex 46cdaf3a30c..7ef9f01d8c8 100644--- a/frontend/src/metabase/admin/settingsRoutes.tsx+++ b/frontend/src/metabase/admin/settingsRoutes.tsx@@ -1,10 +1,4 @@import type { Store } from "@reduxjs/toolkit";-import {- IndexRedirect,- IndexRoute,- Route,- type RouteComponent,-} from "react-router";import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";import { NotFound } from "metabase/common/components/ErrorPages";@@ -13,6 +7,12 @@ import {PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";import type { State } from "metabase/redux/store";+import {+ IndexRedirect,+ IndexRoute,+ Route,+ type RouteComponent,+} from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { GoogleAuthForm } from "./settings/auth/components/GoogleAuthForm";diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex e3a1003a2f3..d82c755618d 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -27,7 +27,6 @@ import { createHistory } from "history";import { DragDropContextProvider } from "react-dnd";import { createPortal } from "react-dom";import { createRoot } from "react-dom/client";-import { useRouterHistory } from "react-router";import { syncHistoryWithStore } from "react-router-redux";import { initializePlugins } from "ee-plugins";@@ -40,6 +39,7 @@ import { MetabotProvider } from "metabase/metabot/context";import { PLUGIN_APP_INIT_FUNCTIONS } from "metabase/plugins";import { MetabaseReduxProvider } from "metabase/redux";import { refreshSiteSettings } from "metabase/redux/settings";+import { useRouterHistory } from "metabase/router";import { getUserId } from "metabase/selectors/user";import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";import { PortalContainer } from "metabase/ui";diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsxindex 7e6071e43bf..0b5f2bb57e0 100644--- a/frontend/src/metabase/app/nav/AppBar.tsx+++ b/frontend/src/metabase/app/nav/AppBar.tsx@@ -1,4 +1,3 @@-import { withRouter } from "react-router";import { push } from "react-router-redux";import { skipToken, useGetDashboardQuery } from "metabase/api";@@ -32,6 +31,7 @@ import {import { connect, useDispatch, useSelector } from "metabase/redux";import { closeNavbar, toggleNavbar } from "metabase/redux/app";import type { State } from "metabase/redux/store";+import { withRouter } from "metabase/router";import type { RouterProps } from "metabase/selectors/app";import { getDetailViewState, getIsNavbarOpen } from "metabase/selectors/app";import { getIsEmbeddingIframe } from "metabase/selectors/embed";diff --git a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsxindex 9726d2dc82c..d96aeabdc2c 100644--- a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx+++ b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx@@ -1,6 +1,5 @@import { screen } from "@testing-library/react";import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCardEndpoints,@@ -23,6 +22,7 @@ import {createMockQueryBuilderState,createMockStoreDashboard,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { modelToUrl } from "metabase/urls";import type { Card } from "metabase-types/api";import {diff --git a/frontend/src/metabase/app/nav/Navbar.tsx b/frontend/src/metabase/app/nav/Navbar.tsxindex 8686e370f57..095a24cc259 100644--- a/frontend/src/metabase/app/nav/Navbar.tsx+++ b/frontend/src/metabase/app/nav/Navbar.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import { type WithRouterProps, withRouter } from "react-router";import { useListDatabasesQuery } from "metabase/api";import { getDashboard } from "metabase/dashboard/selectors";@@ -7,6 +6,7 @@ import { AdminNavbar } from "metabase/nav/components/AdminNavbar";import { MainNavbar } from "metabase/nav/containers/MainNavbar";import { connect } from "metabase/redux";import type { AdminPath, State, StoreDashboard } from "metabase/redux/store";+import { type WithRouterProps, withRouter } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";import { getIsNavbarOpen } from "metabase/selectors/app";import { getUser } from "metabase/selectors/user";diff --git a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsxindex 53a9eb77829..444292f9466 100644--- a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx+++ b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx@@ -1,6 +1,5 @@import type { Store } from "@reduxjs/toolkit";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupCollectionItemsEndpoint,@@ -29,6 +28,7 @@ import {createMockEmbedState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import * as iframeUtils from "metabase/utils/iframe";import type { User } from "metabase-types/api";import {diff --git a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsxindex e13cdc8739f..10cb56a7f75 100644--- a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx+++ b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupForgotPasswordEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";@@ -7,6 +6,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { ForgotPassword } from "./ForgotPassword";diff --git a/frontend/src/metabase/auth/components/Login/tests/setup.tsx b/frontend/src/metabase/auth/components/Login/tests/setup.tsxindex 102e9180d21..a7270add3df 100644--- a/frontend/src/metabase/auth/components/Login/tests/setup.tsx+++ b/frontend/src/metabase/auth/components/Login/tests/setup.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import { createMockTokenFeatures } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsx b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsxindex 8a7c0f53848..fab79c2914f 100644--- a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsx+++ b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCurrentUserEndpoint,@@ -9,6 +8,7 @@ import {setupResetPasswordEndpoint,} from "__support__/server-mocks";import { act, renderWithProviders, screen, waitFor } from "__support__/ui";+import { Route } from "metabase/router";import { createMockSettings, createMockUser } from "metabase-types/api/mocks";import { ResetPassword } from "./ResetPassword";diff --git a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx b/frontend/src/metabase/browse/components/BrowseDataHeader.tsxindex 67a072b008f..58c6aab985d 100644--- a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx+++ b/frontend/src/metabase/browse/components/BrowseDataHeader.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { t } from "ttag";import { trackDataReferenceClicked } from "metabase/common/collections/analytics";import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";+import { Link } from "metabase/router";import { Flex, Group, Icon, Text, Title } from "metabase/ui";import S from "./BrowseContainer.module.css";diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.tsxindex d359eeaf5e9..a5d7020e257 100644--- a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import { Link } from "react-router";import { t } from "ttag";import NoResults from "assets/img/no_results.svg";@@ -9,6 +8,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport CS from "metabase/css/core/index.css";import { getEngineLogo } from "metabase/databases/utils/engine";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Group, Stack, Text, Title } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/browse/metrics/tests/setup.tsx b/frontend/src/metabase/browse/metrics/tests/setup.tsxindex c9c8d5dee21..cc90862a6b9 100644--- a/frontend/src/metabase/browse/metrics/tests/setup.tsx+++ b/frontend/src/metabase/browse/metrics/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupCardEndpoints,@@ -14,6 +12,7 @@ import {createMockSetupState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import {createMockCard,diff --git a/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx b/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsxindex d211a70b107..0b936a26365 100644--- a/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx+++ b/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupRecentViewsEndpoints,@@ -8,6 +7,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, within } from "__support__/ui";import { createMockSetupState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockCollection,createMockSearchResult,diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsxindex 6e97dafaeb8..f4d7ab3b2c2 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupBookmarksEndpoints,@@ -24,6 +23,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { FileUploadStatus } from "metabase/status/components/FileUploadStatus/FileUploadStatus";import {createMockCollection,diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsxindex a22bee2082c..066ac411508 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx@@ -1,10 +1,9 @@-import { withRouter } from "react-router";-import {isInstanceAnalyticsCollection,isLibraryCollection,isTrashedCollection,} from "metabase/common/collections/utils";+import { withRouter } from "metabase/router";import type { Collection } from "metabase-types/api";import { CollectionMenu } from "../CollectionMenu";diff --git a/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx b/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsxindex 37913b3c9a7..eb0686db539 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {setupEnterpriseOnlyPlugin,setupEnterprisePlugins,@@ -11,6 +9,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Collection, TokenFeatures } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx b/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsxindex 94d0c5e99d5..147c66b35c2 100644--- a/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx+++ b/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx@@ -1,6 +1,5 @@/* istanbul ignore file */import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -11,6 +10,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type {Collection,DashboardQuestionCandidate,diff --git a/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsxindex a925e5c439e..a87f90537e1 100644--- a/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx@@ -1,6 +1,4 @@import { useCallback, useMemo, useState } from "react";-import type { WithRouterProps } from "react-router";-import { withRouter } from "react-router";import { t } from "ttag";import * as Yup from "yup";@@ -18,6 +16,8 @@ import type {} from "metabase/common/components/Pickers";import { Form, FormProvider, FormSubmitButton } from "metabase/forms";import { PLUGIN_TENANTS } from "metabase/plugins";+import type { WithRouterProps } from "metabase/router";+import { withRouter } from "metabase/router";import { Button, Flex } from "metabase/ui";import * as Errors from "metabase/utils/errors";import type { Collection, CollectionNamespace } from "metabase-types/api";diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsxindex e47d5d00c25..62413d877e0 100644--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Collection, CollectionItem } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxindex 83237af88d0..b71057f404f 100644--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {renderWithProviders,@@ -7,6 +6,7 @@ import {getIcon as testGetIcon,} from "__support__/ui";import { modelIconMap } from "metabase/common/utils/icon";+import { Route } from "metabase/router";import type { CollectionItem, CollectionItemModel } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsxindex ae8ff34e521..3f16fe9f0ba 100644--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupDatabasesEndpoints } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenStatus } from "metabase-types/api";import {createMockDatabase,diff --git a/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.tsx b/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.tsxindex 2abf63c4af2..eb0e10474c1 100644--- a/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.tsx+++ b/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.tsx@@ -1,7 +1,7 @@import cx from "classnames";import type { MouseEventHandler, ReactNode } from "react";-import { Link } from "react-router";+import { Link } from "metabase/router";import { Ellipsified, Icon } from "metabase/ui";import S from "./Breadcrumbs.module.css";diff --git a/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsx b/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsxindex c24c2d89218..ee16f208c12 100644--- a/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsx+++ b/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsx@@ -1,5 +1,4 @@import { useCallback, useMemo } from "react";-import { withRouter } from "react-router";import { c, t } from "ttag";import * as Yup from "yup";@@ -21,6 +20,7 @@ import {FormTextInput,FormTextarea,} from "metabase/forms";+import { withRouter } from "metabase/router";import { Button, Group, Icon, Tooltip } from "metabase/ui";import { isVirtualDashCard } from "metabase/utils/dashboard";import * as Errors from "metabase/utils/errors";diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsxindex df0ce773791..d7235a074d8 100644--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx@@ -1,7 +1,6 @@import cx from "classnames";import type { ReactElement, ReactNode } from "react";import { useMemo } from "react";-import { Link } from "react-router";import { c, t } from "ttag";import { archiveAndTrack } from "metabase/archive/analytics";@@ -26,6 +25,7 @@ import { EntityIcon } from "metabase/common/components/EntityIcon";import { Swapper } from "metabase/common/components/Swapper";import type { IconData } from "metabase/common/utils/icon";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import type { IconProps } from "metabase/ui";import {ActionIcon,diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsxindex 1d630ec3a68..e52910a4c70 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import dayjs from "dayjs";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";@@ -8,6 +7,7 @@ import { getIcon, renderWithProviders, screen } from "__support__/ui";import { DEFAULT_VISIBLE_COLUMNS_LIST } from "metabase/common/collections/columns";import { getVisibleColumnsMap } from "metabase/common/components/ItemsTable/utils";import type { ItemWithLastEditInfo } from "metabase/common/components/LastEditInfoLabel/LastEditInfoLabel";+import { Route } from "metabase/router";import {DEFAULT_DATE_STYLE,DEFAULT_TIME_STYLE,diff --git a/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsx b/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsxindex 739acc8754c..e4a95dda95b 100644--- a/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsx+++ b/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsx@@ -1,10 +1,10 @@import type { Location } from "history";import { useEffect } from "react";-import type { InjectedRouter, Route } from "react-router";-import { withRouter } from "react-router";import { usePrevious } from "react-use";import { useConfirmRouteLeaveModal } from "metabase/common/hooks/use-confirm-route-leave-modal";+import type { InjectedRouter, Route } from "metabase/router";+import { withRouter } from "metabase/router";import { LeaveConfirmModal } from "./LeaveConfirmModal";diff --git a/frontend/src/metabase/common/components/Link/ForwardRefLink.tsx b/frontend/src/metabase/common/components/Link/ForwardRefLink.tsxindex 4943848154f..deb96becdf2 100644--- a/frontend/src/metabase/common/components/Link/ForwardRefLink.tsx+++ b/frontend/src/metabase/common/components/Link/ForwardRefLink.tsx@@ -2,7 +2,11 @@// Hover states get weird when using Link directly. Since Link does not take the standardimport { forwardRef } from "react";-import { Link, type LinkProps } from "react-router";++import {+ RouterLink as Link,+ type RouterLinkProps as LinkProps,+} from "metabase/router/react-router";// `ref` prop, we have to manually forward it to the correct prop name to make hover work as expected.export const ForwardRefLink = forwardRef(function _ForwardRefLink(diff --git a/frontend/src/metabase/common/components/Link/Link.styled.tsx b/frontend/src/metabase/common/components/Link/Link.styled.tsxindex 93761d1e7f3..0cba2641515 100644--- a/frontend/src/metabase/common/components/Link/Link.styled.tsx+++ b/frontend/src/metabase/common/components/Link/Link.styled.tsx@@ -2,10 +2,13 @@import { css } from "@emotion/react";// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { Link, type LinkProps } from "react-router";import { focusOutlineStyle } from "metabase/common/style/input";import { doNotForwardProps } from "metabase/common/utils/doNotForwardProps";+import {+ RouterLink as Link,+ type RouterLinkProps as LinkProps,+} from "metabase/router/react-router";type LinkVariantProp = { variant?: "default" | "brand" | "brandBold" };diff --git a/frontend/src/metabase/common/components/Link/types.ts b/frontend/src/metabase/common/components/Link/types.tsindex 28df5c5b903..8d7d1992200 100644--- a/frontend/src/metabase/common/components/Link/types.ts+++ b/frontend/src/metabase/common/components/Link/types.ts@@ -1,5 +1,4 @@-import type { LinkProps as RouterLinkProps } from "react-router";-+import type { RouterLinkProps } from "metabase/router/react-router";import type { TooltipProps } from "metabase/ui";export interface LinkProps extends RouterLinkProps {diff --git a/frontend/src/metabase/common/components/ListItem/ListItem.styled.tsx b/frontend/src/metabase/common/components/ListItem/ListItem.styled.tsxindex 9f1ec00cb42..bc2a31496e0 100644--- a/frontend/src/metabase/common/components/ListItem/ListItem.styled.tsx+++ b/frontend/src/metabase/common/components/ListItem/ListItem.styled.tsx@@ -2,7 +2,8 @@import { css } from "@emotion/react";// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { Link } from "react-router";++import { Link } from "metabase/router";interface Props {disabled?: boolean;}diff --git a/frontend/src/metabase/common/components/ListItem/ListItem.unit.spec.tsx b/frontend/src/metabase/common/components/ListItem/ListItem.unit.spec.tsxindex af705d80544..e19243631fd 100644--- a/frontend/src/metabase/common/components/ListItem/ListItem.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ListItem/ListItem.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { getIcon, renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { ListItem, type ListItemProps } from "./ListItem";diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsxindex 85c04c46f73..1395acd1f42 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx@@ -1,7 +1,6 @@import { QueryStatus } from "@reduxjs/toolkit/query";import type { Location } from "history";import { useEffect } from "react";-import { withRouter } from "react-router";import { replace } from "react-router-redux";import { t } from "ttag";@@ -13,6 +12,7 @@ import {import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { withRouter } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsxindex a35aa2bb8d5..4c91ef9b795 100644--- a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx+++ b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupCollectionByIdEndpoint,@@ -20,6 +19,7 @@ import {} from "__support__/ui";import { getNextId } from "__support__/utils";import { ROOT_COLLECTION as ROOT } from "metabase/common/collections/constants";+import { Route } from "metabase/router";import { checkNotNull, isNotNull } from "metabase/utils/types";import type {BaseEntityId,diff --git a/frontend/src/metabase/common/components/QueryButton/QueryButton.tsx b/frontend/src/metabase/common/components/QueryButton/QueryButton.tsxindex 47dd1c3a9a5..da28549307f 100644--- a/frontend/src/metabase/common/components/QueryButton/QueryButton.tsx+++ b/frontend/src/metabase/common/components/QueryButton/QueryButton.tsx@@ -1,8 +1,8 @@import cx from "classnames";import { memo } from "react";-import { Link } from "react-router";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Icon } from "metabase/ui";import type { IconName } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/SearchResult/tests/SearchResult.unit.spec.tsx b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult.unit.spec.tsxindex 21895f6b609..1ed28dc2aaf 100644--- a/frontend/src/metabase/common/components/SearchResult/tests/SearchResult.unit.spec.tsx+++ b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCollectionByIdEndpoint,@@ -15,6 +14,7 @@ import {import { SearchResult } from "metabase/common/components/SearchResult/SearchResult";import { createWrappedSearchResult } from "metabase/common/components/SearchResult/tests/util";import { trackSearchClick } from "metabase/common/search/analytics";+import { Route } from "metabase/router";import { modelToUrl } from "metabase/urls";import type { SearchResult as ApiSearchResult } from "metabase-types/api";import { createMockCollection, createMockUser } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsx b/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsxindex 63ed2f28914..8b0330a1092 100644--- a/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsx+++ b/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsx@@ -1,6 +1,6 @@import { memo } from "react";-import { Link } from "react-router";+import { Link } from "metabase/router";import type { IconName } from "metabase-types/api";import { LabelIcon } from "../LabelIcon";diff --git a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/setup.tsx b/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/setup.tsxindex 279bca381a6..b3fdf6b4d01 100644--- a/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/setup.tsx+++ b/frontend/src/metabase/common/components/Sidesheet/components/InsightsTabOrLink/tests/setup.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import { setupEnterprisePlugins } from "__support__/enterprise";import { setupAuditInfoEndpoint } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { Tabs } from "metabase/ui";import {createMockCollection,diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellBanner.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellBanner.unit.spec.tsxindex b2e344a036a..aaa51894789 100644--- a/frontend/src/metabase/common/components/upsells/components/UpsellBanner.unit.spec.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpsellBanner.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {findRequests,@@ -7,6 +6,7 @@ import {setupUserKeyValueEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { Route } from "metabase/router";import { createMockUser } from "metabase-types/api/mocks";import { UpsellBanner, type UpsellBannerProps } from "./UpsellBanner";diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellCta.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellCta.unit.spec.tsxindex 37f373b3906..73b38ae98e0 100644--- a/frontend/src/metabase/common/components/upsells/components/UpsellCta.unit.spec.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpsellCta.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { UpsellCta } from "./UpsellCta";diff --git a/frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.tsx b/frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.tsxindex e2bf8573be7..7036f6a67fe 100644--- a/frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.tsx+++ b/frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.tsx@@ -1,5 +1,4 @@import type { FC, ReactNode } from "react";-import { Link } from "react-router";import { t } from "ttag";import { EditableText } from "metabase/common/components/EditableText";@@ -7,6 +6,7 @@ import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGimport { MetabotDataStudioButton } from "metabase/metabot/components/MetabotDataStudioButton";import { AppSwitcher } from "metabase/nav/components/AppSwitcher";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getLocation } from "metabase/selectors/routing";import {Box,diff --git a/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts b/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.tsindex 0b8323b69ab..e5e3da9c728 100644--- a/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts+++ b/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts@@ -1,10 +1,10 @@import type { Location } from "history";import { useCallback, useEffect, useState } from "react";-import type { InjectedRouter, Route } from "react-router";import { goBack, push, replace } from "react-router-redux";import { match } from "ts-pattern";import { useDispatch } from "metabase/redux";+import type { InjectedRouter, Route } from "metabase/router";import { useBeforeUnload } from "./use-before-unload";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 71c4440cb4a..3534a10d7d0 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@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCardQueryDownloadEndpoint,@@ -13,6 +12,7 @@ import {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";diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsxindex b8587604c8e..a8f1fc82389 100644--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx@@ -1,7 +1,6 @@import type { Location } from "history";import { dissoc } from "icepick";import { useState } from "react";-import { withRouter } from "react-router";import { replace } from "react-router-redux";import { t } from "ttag";@@ -10,6 +9,7 @@ import { useInitialCollectionId } from "metabase/common/collections/hooks";import type { CopyDashboardFormProperties } from "metabase/common/components/CopyDashboardForm";import { CopyModal } from "metabase/common/components/CopyModal";import { useDispatch, useSelector } from "metabase/redux";+import { withRouter } from "metabase/router";import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsxindex 6ba1c9ee92a..505ba0b76dd 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupBookmarksEndpoints } from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";@@ -11,6 +10,7 @@ import {createMockDashboardState,createMockStoreDashboard,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { IconName } from "metabase-types/api";import {createMockDashboard,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CopyAnalyticsDashboardButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CopyAnalyticsDashboardButton.tsxindex 220647e718b..b6e73c3b84c 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CopyAnalyticsDashboardButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/CopyAnalyticsDashboardButton.tsx@@ -1,7 +1,7 @@-import { type WithRouterProps, withRouter } from "react-router";import { t } from "ttag";import { Link } from "metabase/common/components/Link";+import { type WithRouterProps, withRouter } from "metabase/router";import { Button, Icon } from "metabase/ui";export const CopyAnalyticsDashboardButton = withRouter(diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsxindex 5808ceb1418..a371b78c9bd 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx@@ -1,5 +1,4 @@import { type MouseEvent, forwardRef, useState } from "react";-import { Link, type LinkProps, withRouter } from "react-router";import type { WithRouterProps } from "react-router/lib/withRouter";import { c, t } from "ttag";@@ -12,6 +11,7 @@ import { DashboardSubscriptionMenuItem } from "metabase/notifications/Notificatiimport { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { PLUGIN_CACHING, PLUGIN_MODERATION } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";+import { Link, type LinkProps, withRouter } from "metabase/router";import { Icon, Menu } from "metabase/ui";type DashboardActionMenuProps = {diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsxindex ee23bd67774..0f2c90d6962 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";@@ -8,6 +7,7 @@ import { renderWithProviders, screen } from "__support__/ui";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { getIsSharing } from "metabase/dashboard/selectors";import { createMockDashboardState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockCard,createMockDashboard,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsxindex 3b80ce6bec5..7638895b6e2 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupBookmarksEndpoints,@@ -13,6 +11,7 @@ import { getDefaultTab } from "metabase/dashboard/actions";import { DASHBOARD_APP_ACTIONS } from "metabase/dashboard/containers/DashboardApp/DashboardApp";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockDashboardState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Collection, TokenFeatures } from "metabase-types/api";import {createMockDashboard,diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsxindex 83c612fccd8..0a8a203622b 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupAuditInfoEndpoint,@@ -13,6 +11,7 @@ import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Dashboard, Settings, TokenFeatures } from "metabase-types/api";import {createMockDashboard,diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsxindex f2439200768..e187a6e647d 100644--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx@@ -1,4 +1,3 @@-import { type Route, type WithRouterProps, withRouter } from "react-router";import { t } from "ttag";import { useConfirmRouteLeaveModal } from "metabase/common/hooks/use-confirm-route-leave-modal";@@ -6,6 +5,7 @@ import { updateDashboardAndCards } from "metabase/dashboard/actions/save";import { getIsDirty, getIsEditing } from "metabase/dashboard/selectors";import { useDispatch, useSelector } from "metabase/redux";import { dismissAllUndo } from "metabase/redux/undo";+import { type Route, type WithRouterProps, withRouter } from "metabase/router";import { Box, Button, Flex, Modal, Text } from "metabase/ui";import { isNavigatingToCreateADashboardQuestion } from "./utils";diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsxindex 1f85809a7d2..981cafc0c7d 100644--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupDashboardEndpoints,@@ -12,6 +10,7 @@ import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Dashboard, Settings } from "metabase-types/api";import {createMockDashboard,diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsxindex 5ae7e210f71..decf998298e 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx@@ -1,12 +1,5 @@import userEvent from "@testing-library/user-event";import type { Location } from "history";-import {- type InjectedRouter,- Link,- Route,- type WithRouterProps,- withRouter,-} from "react-router";import { renderWithProviders, screen, within } from "__support__/ui";import { INPUT_WRAPPER_TEST_ID } from "metabase/common/components/TabButton";@@ -17,6 +10,13 @@ import { getSelectedTabId } from "metabase/dashboard/selectors";import { createTabSlug } from "metabase/dashboard/utils";import { useSelector } from "metabase/redux";import type { DashboardState } from "metabase/redux/store";+import {+ type InjectedRouter,+ Link,+ Route,+ type WithRouterProps,+ withRouter,+} from "metabase/router";import type { DashboardTab } from "metabase-types/api";import { createMockCard } from "metabase-types/api/mocks";import { createMockDashboardCard } from "metabase-types/api/mocks/dashboard";diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsxindex be351601c1d..82fed8fd351 100644--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import { withRouter } from "react-router";import { t } from "ttag";import _ from "underscore";@@ -8,6 +7,7 @@ import { ArchiveModal } from "metabase/common/components/ArchiveModal";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { setArchivedDashboard } from "metabase/dashboard/actions";import { useDispatch } from "metabase/redux";+import { withRouter } from "metabase/router";import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.unit.spec.tsxindex d0d765b0be0..1a0e467c553 100644--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.unit.spec.tsx@@ -1,10 +1,9 @@-import type { WithRouterProps } from "react-router";-import {setupDashboardEndpoints,setupDashboardNotFoundEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import type { WithRouterProps } from "metabase/router";import { createMockDashboard } from "metabase-types/api/mocks";import { ArchiveDashboardModalConnectedInner } from "./ArchiveDashboardModal";diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsxindex 35803916b3d..c475cdb0d46 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx@@ -1,7 +1,6 @@import cx from "classnames";import { dissoc } from "icepick";import { useEffect, useState } from "react";-import type { WithRouterProps } from "react-router";import { t } from "ttag";import { dashboardApi } from "metabase/api";@@ -19,6 +18,7 @@ import { useDashboardUrlQuery } from "metabase/dashboard/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import type { WithRouterProps } from "metabase/router";import { Box, Button, Flex, Group, Icon } from "metabase/ui";import * as Urls from "metabase/urls";import { DASHBOARD_HEADER_PARAMETERS_PDF_EXPORT_NODE_ID } from "metabase/visualizations/lib/save-dashboard-pdf";diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsxindex 3928ecf5b5f..2284c41af04 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupAutoDashboardEndpoints,@@ -13,6 +12,7 @@ import {within,} from "__support__/ui";import { createMockDashboardState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockDashboard,createMockDashboardQueryMetadata,diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsxindex 3ef3764c49a..ea4a3186d10 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx@@ -1,7 +1,6 @@import cx from "classnames";import type { PropsWithChildren } from "react";import { useState } from "react";-import type { Route, WithRouterProps } from "react-router";import { replace } from "react-router-redux";import ErrorBoundary from "metabase/ErrorBoundary";@@ -34,6 +33,7 @@ import {} from "metabase/hooks/use-page-title";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";+import type { Route, WithRouterProps } from "metabase/router";import * as Urls from "metabase/urls";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";import type { DashboardId, Dashboard as IDashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsxindex e1bdb7bac21..bf4063284ad 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { callMockEvent } from "__support__/events";import {@@ -27,6 +26,7 @@ import {import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";import { DashboardApp } from "metabase/dashboard/containers/DashboardApp/DashboardApp";import { createMockDashboardState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Dashboard } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/use-dashboard-location-sync.ts b/frontend/src/metabase/dashboard/containers/DashboardApp/use-dashboard-location-sync.tsindex 5a0576379d0..21befdf9c55 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/use-dashboard-location-sync.ts+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/use-dashboard-location-sync.ts@@ -1,8 +1,7 @@-import type { WithRouterProps } from "react-router";-import { useDashboardContext } from "metabase/dashboard/context";import { useLocationSync } from "metabase/dashboard/hooks";import type { RefreshPeriod } from "metabase/dashboard/types";+import type { WithRouterProps } from "metabase/router";export const useDashboardLocationSync = ({location,diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.tsindex 5f12bb2d4b4..f652b54eccd 100644--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts@@ -1,6 +1,5 @@import type { Location } from "history";import { useEffect, useMemo } from "react";-import type { InjectedRouter } from "react-router";import { push, replace } from "react-router-redux";import { usePrevious } from "react-use";import _ from "underscore";@@ -9,6 +8,7 @@ import { useSetting } from "metabase/common/hooks";import { isEmbedPreview } from "metabase/embedding/config";import { useDispatch, useSelector } from "metabase/redux";import { selectTab } from "metabase/redux/dashboard";+import type { InjectedRouter } from "metabase/router";import * as Urls from "metabase/urls";import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsxindex 50ce0625063..5e4c120bab7 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupCollectionsEndpoints,@@ -13,6 +11,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type {Collection,CurrentWorkspace,diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsxindex b2e2f24aafa..7d30aa1a4a4 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx@@ -1,5 +1,4 @@import type { ReactNode } from "react";-import type { WithRouterProps } from "react-router";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -7,6 +6,7 @@ import { useSetting } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { PLUGIN_TRANSFORMS } from "metabase/plugins";import { useSelector } from "metabase/redux";+import type { WithRouterProps } from "metabase/router";import { useTransformSupportedDbs } from "metabase/transforms/hooks/use-transform-supported-dbs";import { EnableTransformsPage } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage";import { NoWritableDatabasesEmptyState } from "metabase/transforms/pages/NoWritableDatabasesEmptyState";diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsxindex c7cde117db2..7c8ee9cb8f0 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx@@ -1,5 +1,4 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -12,6 +11,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Database } from "metabase-types/api";import {COMMON_DATABASE_FEATURES,diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsxindex ffcf9be11bd..cca9ff1516b 100644--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx@@ -1,6 +1,6 @@import { Fragment } from "react";-import { Link } from "react-router";+import { Link } from "metabase/router";import { Ellipsified, Flex, Group, Text } from "metabase/ui";import S from "./Breadcrumbs.module.css";diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsxindex 7fc2e23e41a..3b7b07c665b 100644--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx@@ -1,8 +1,8 @@import { skipToken } from "@reduxjs/toolkit/query";-import { Link } from "react-router";import { useListDatabaseSchemasQuery } from "metabase/api";import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";+import { Link } from "metabase/router";import { Ellipsified } from "metabase/ui";import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsxindex da9af8fa28c..1a5dafb7f30 100644--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx@@ -1,7 +1,6 @@-import { Link } from "react-router";-import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";+import { Link } from "metabase/router";import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsxindex 39e25a70716..a017eed79e8 100644--- a/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx+++ b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx@@ -1,5 +1,4 @@-import { Link } from "react-router";-+import { Link } from "metabase/router";import { Card, Ellipsified, Flex, Icon, Stack, Text } from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";import type { IconName } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx b/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsxindex 3a40cc105fe..50ab7568675 100644--- a/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx+++ b/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx@@ -1,8 +1,8 @@import { useDisclosure } from "@mantine/hooks";-import { Link } from "react-router";import { t } from "ttag";import { ConfirmModal } from "metabase/common/components/ConfirmModal";+import { Link } from "metabase/router";import { ActionIcon, Icon, Menu } from "metabase/ui";type MoreMenuProps = {diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsxindex 0e1edc396e7..19cf05cf40e 100644--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -18,6 +17,7 @@ import {} from "__support__/ui";import { SelectionProvider } from "metabase/data-studio/data-model/pages/DataModel/contexts/SelectionContext";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Database, TokenFeatures, User } from "metabase-types/api";import {createMockDatabase,diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsxindex 18a121a8fb4..ae188682887 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx@@ -1,5 +1,4 @@-import { Link } from "react-router";-+import { Link } from "metabase/router";import { Card, Ellipsified, Flex, Icon, Stack, Text } from "metabase/ui";import type { Measure } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsxindex a6871fe54d6..bb1f9af78e3 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { createMockMeasure } from "metabase-types/api/mocks";import { MeasureItem } from "./MeasureItem";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsxindex 3181289350b..640d42ae032 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { EnterpriseSettings, Measure, Table } from "metabase-types/api";import {createMockTable,diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsxindex de17d15fa24..f7000acf15b 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.tsx@@ -1,5 +1,4 @@-import { Link } from "react-router";-+import { Link } from "metabase/router";import { Card, Ellipsified, Flex, Icon, Stack, Text } from "metabase/ui";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsxindex feabe0439bb..ddfa2362b2a 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import { createMockSegment } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsxindex b1e94547894..e6b565c15d2 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { EnterpriseSettings, Segment, Table } from "metabase-types/api";import {createMockTable,diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsxindex dd8d820af62..a4dfcab6c53 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx@@ -1,11 +1,11 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupEnterprisePlugins } from "__support__/enterprise";import { setupListSourceReplacementRunsEndpoint } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Table } from "metabase-types/api";import {createMockDatabase,diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsxindex 548e5858484..2dc40c925d0 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import { Link } from "react-router";import { t } from "ttag";import { useUpdateTableMutation } from "metabase/api";@@ -10,6 +9,7 @@ import {UserInput,} from "metabase/metadata/components";import { useMetadataToasts } from "metabase/metadata/hooks";+import { Link } from "metabase/router";import { Box, Icon, Text } from "metabase/ui";import * as Urls from "metabase/urls";import type {diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsxindex f6c9cf3d2a6..d8854db2515 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { P, match } from "ts-pattern";import { t } from "ttag";import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";+import { Link } from "metabase/router";import { Box } from "metabase/ui";import * as Urls from "metabase/urls";import type { Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsxindex f7f71224441..79429161111 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx@@ -1,7 +1,6 @@-import { Route } from "react-router";-import { setupCollectionByIdEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { Collection, Table } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsxindex f2ccd718d6f..0f175c2a823 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx@@ -1,5 +1,4 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -10,6 +9,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import type { RouteParams } from "metabase/data-studio/data-model/pages/DataModel/types";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { DataStudioTableMetadataTab } from "metabase/urls";import type {Database,diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsxindex 916a7367951..7303943c7d1 100644--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { IndexRedirect, Link, Redirect, Route } from "react-router";import {setupCardDataset,@@ -25,6 +24,7 @@ import {within,} from "__support__/ui";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import { IndexRedirect, Link, Redirect, Route } from "metabase/router";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import registerVisualizations from "metabase/visualizations/register";diff --git a/frontend/src/metabase/data-studio/data-model/routes.tsx b/frontend/src/metabase/data-studio/data-model/routes.tsxindex 32d26be1052..2349e2478f3 100644--- a/frontend/src/metabase/data-studio/data-model/routes.tsx+++ b/frontend/src/metabase/data-studio/data-model/routes.tsx@@ -1,5 +1,4 @@import type { ComponentType } from "react";-import { IndexRoute, Redirect, Route } from "react-router";import { DataModelMeasureDependenciesPage } from "metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage";import { DataModelMeasureDetailPage } from "metabase/data-studio/measures/pages/DataModelMeasureDetailPage";@@ -10,6 +9,7 @@ import { DataModelSegmentDependenciesPage } from "metabase/data-studio/segments/import { DataModelSegmentDetailPage } from "metabase/data-studio/segments/pages/DataModelSegmentDetailPage";import { DataModelSegmentRevisionHistoryPage } from "metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { IndexRoute, Redirect, Route } from "metabase/router";import { DataModel } from "./pages/DataModel";diff --git a/frontend/src/metabase/data-studio/glossary/routes.tsx b/frontend/src/metabase/data-studio/glossary/routes.tsxindex 31df623391b..4fd625cd3a2 100644--- a/frontend/src/metabase/data-studio/glossary/routes.tsx+++ b/frontend/src/metabase/data-studio/glossary/routes.tsx@@ -1,4 +1,4 @@-import { Route } from "react-router";+import { Route } from "metabase/router";import { GlossaryPage } from "./pages/GlossaryPage";diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsxindex 33531a16354..ffb304762be 100644--- a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import {setupCollectionByIdEndpoint,setupSchemaEndpoints,setupTablesEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Collection, Measure, Table } from "metabase-types/api";import {diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsxindex 6d6d63bf51b..61fdc2b8656 100644--- a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { createMockMeasure } from "metabase-types/api/mocks";import { MeasureHeader } from "./MeasureHeader";diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsxindex f85db818d0f..4eace763012 100644--- a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx@@ -1,6 +1,5 @@-import type { Route } from "react-router";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsxindex f4d10895571..3827d580ef0 100644--- a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx@@ -1,8 +1,8 @@import type { ReactNode } from "react";-import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxindex b960efef34b..40a8943d32e 100644--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback, useMemo, useState } from "react";-import type { Route } from "react-router";import { t } from "ttag";import { useUpdateMeasureMutation } from "metabase/api";@@ -9,6 +8,7 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContaiimport { getUserCanWriteMeasures } from "metabase/common/data-studio/selectors";import { useMetadataToasts } from "metabase/metadata/hooks";import { useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsxindex 8ae4ba9d27f..8a611628d9c 100644--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback, useEffect, useRef, useState } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -11,6 +10,7 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContaiimport { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch, useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsxindex 152099872f7..b1d034b1b48 100644--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupSchemaEndpoints } from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen } from "__support__/ui";import { createMockSettingsState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Table } from "metabase-types/api";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsxindex 2b96a4330ce..19e9341e41f 100644--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx@@ -1,6 +1,5 @@-import type { Route } from "react-router";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsxindex 0779ec8487e..1dcc93d702f 100644--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx@@ -1,8 +1,8 @@import type { ReactNode } from "react";-import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/data-studio/measures/routes.tsx b/frontend/src/metabase/data-studio/measures/routes.tsxindex f63b9c147e3..e52b57157e0 100644--- a/frontend/src/metabase/data-studio/measures/routes.tsx+++ b/frontend/src/metabase/data-studio/measures/routes.tsx@@ -1,6 +1,5 @@-import { IndexRoute, Route } from "react-router";-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { MeasureDependenciesPage } from "./pages/MeasureDependenciesPage";import { MeasureDetailPage } from "./pages/MeasureDetailPage";diff --git a/frontend/src/metabase/data-studio/measures/types.ts b/frontend/src/metabase/data-studio/measures/types.tsindex 570ea86acb9..c5124704e07 100644--- a/frontend/src/metabase/data-studio/measures/types.ts+++ b/frontend/src/metabase/data-studio/measures/types.ts@@ -1,6 +1,6 @@import type { ReactNode } from "react";-import type { Route } from "react-router";+import type { Route } from "metabase/router";import type { Measure, Table } from "metabase-types/api";export type MeasureTabUrls = {diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsxindex 5f7b623c273..8bf3f3ea7f2 100644--- a/frontend/src/metabase/data-studio/routes.tsx+++ b/frontend/src/metabase/data-studio/routes.tsx@@ -1,5 +1,4 @@import type { Store } from "@reduxjs/toolkit";-import { IndexRoute, Route, type RouteComponent } from "react-router";import { DependencyDiagnosticsSectionLayout } from "metabase/monitor/dependency-diagnostics/DependencyDiagnosticsSectionLayout";import { DependencyDiagnosticsUpsellPage } from "metabase/monitor/dependency-diagnostics/DependencyDiagnosticsUpsellPage";@@ -11,6 +10,7 @@ import {PLUGIN_WORKSPACES,} from "metabase/plugins";import type { State } from "metabase/redux/store";+import { IndexRoute, Route, type RouteComponent } from "metabase/router";import { getDataStudioTransformRoutes } from "metabase/transforms/routes";import { canAccessTransforms } from "metabase/transforms/selectors";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsxindex 70c459cb6d2..0d868910b5f 100644--- a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {setupCollectionByIdEndpoint,setupSchemaEndpoints,@@ -7,6 +5,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Segment, Table } from "metabase-types/api";import {diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsxindex 2f7b80ef781..b96289f5d3f 100644--- a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx@@ -1,8 +1,8 @@import type { ReactNode } from "react";-import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsxindex 87343b460f2..da26d79f51f 100644--- a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx@@ -1,6 +1,5 @@-import type { Route } from "react-router";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsxindex bcf087ef8d1..71a739a21aa 100644--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback, useEffect, useRef, useState } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -11,6 +10,7 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContaiimport { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch, useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsxindex 6656879d777..37a8a7035c3 100644--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.unit.spec.tsx@@ -1,10 +1,10 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupSchemaEndpoints } from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { Route } from "metabase/router";import type { Table } from "metabase-types/api";import {createMockDatabase,diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsxindex f6963d18b57..357eae33f58 100644--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx@@ -1,8 +1,8 @@import type { ReactNode } from "react";-import type { Route } from "react-router";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsxindex 8fd9351243c..0738b14e0b1 100644--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx@@ -1,6 +1,5 @@-import type { Route } from "react-router";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type { Route } from "metabase/router";import { Center } from "metabase/ui";import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsxindex 5c3cfd1a118..f0f53f35407 100644--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback, useMemo, useState } from "react";-import type { Route } from "react-router";import { t } from "ttag";import { useUpdateSegmentMutation } from "metabase/api";@@ -10,6 +9,7 @@ import { getUserCanWriteSegments } from "metabase/common/data-studio/selectors";import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";import { useMetadataToasts } from "metabase/metadata/hooks";import { useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsxindex 7326ad51866..ec1f77c1fa2 100644--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupSchemaEndpoints,@@ -11,6 +9,7 @@ import { renderWithProviders } from "__support__/ui";import { DataModelSegmentBreadcrumbs } from "metabase/data-studio/segments/components/SegmentBreadcrumbs";import { SegmentDetailPage } from "metabase/data-studio/segments/pages/SegmentDetailPage";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type {EnterpriseSettings,diff --git a/frontend/src/metabase/data-studio/segments/routes.tsx b/frontend/src/metabase/data-studio/segments/routes.tsxindex 80fa1f0ccec..05d51011be9 100644--- a/frontend/src/metabase/data-studio/segments/routes.tsx+++ b/frontend/src/metabase/data-studio/segments/routes.tsx@@ -1,6 +1,5 @@-import { IndexRoute, Route } from "react-router";-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { NewSegmentPage } from "./pages/NewSegmentPage";import { SegmentDependenciesPage } from "./pages/SegmentDependenciesPage";diff --git a/frontend/src/metabase/data-studio/segments/types.ts b/frontend/src/metabase/data-studio/segments/types.tsindex 44e438612de..da35b7b737f 100644--- a/frontend/src/metabase/data-studio/segments/types.ts+++ b/frontend/src/metabase/data-studio/segments/types.ts@@ -1,6 +1,6 @@import type { ReactNode } from "react";-import type { Route } from "react-router";+import type { Route } from "metabase/router";import type { Segment, Table } from "metabase-types/api";export type SegmentTabUrls = {diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsxindex af4ee0d3140..5be41641c87 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { t } from "ttag";import CS from "metabase/css/core/index.css";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getDocsUrl } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsxindex 857a4c075e8..5cf147caf1e 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupEnterprisePlugins } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockTokenFeatures,createMockUser,diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsxindex 7c993531000..bbd0601f4c9 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { t } from "ttag";import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getIsPaidPlan } from "metabase/selectors/settings";import { Button, Flex } from "metabase/ui";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsxindex 655daa61fd9..805caebe274 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx@@ -1,8 +1,7 @@-import { Route } from "react-router";-import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, within } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { createMockTokenStatus } from "metabase-types/api/mocks";import { ContactSupportButtonSection } from "./ContactSupportButtonSection";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsxindex b5f9284ee5e..9788b707575 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx@@ -1,5 +1,4 @@import { Fragment } from "react";-import { Route } from "react-router";import { setupEnterprisePlugins } from "__support__/enterprise";import { mockSettings } from "__support__/settings";@@ -9,6 +8,7 @@ import {screen,} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import { createMockTokenFeatures } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsxindex 1bd78945a1a..2758eac4c34 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsx@@ -1,11 +1,11 @@import { useFormikContext } from "formik";import type { ReactNode } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { useFormErrorMessage } from "metabase/forms";+import { Link } from "metabase/router";import { Box } from "metabase/ui";import type { DatabaseData } from "metabase-types/api";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsxindex 0c4a3453769..09a93427b60 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx@@ -1,6 +1,5 @@import { renderHook } from "@testing-library/react";import type { PropsWithChildren } from "react";-import { Route } from "react-router";import { mockSettings } from "__support__/settings";import {@@ -9,6 +8,7 @@ import {screen,} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {type FormProvidersOptions,diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsxindex c85c5496ad6..42aead30cc5 100644--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx@@ -1,6 +1,5 @@import { useDisclosure, useHotkeys } from "@mantine/hooks";import { useCallback, useEffect, useMemo, useState } from "react";-import { Link } from "react-router";import { t } from "ttag";import { ActionExecuteModal } from "metabase/actions/containers/ActionExecuteModal";@@ -25,6 +24,7 @@ import {getRowName,} from "metabase/detail-view/utils";import { useDispatch } from "metabase/redux";+import { Link } from "metabase/router";import {Box,Button,diff --git a/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsx b/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsxindex 51a0e417f26..6457ae98968 100644--- a/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsx+++ b/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsx@@ -1,9 +1,9 @@import cx from "classnames";import { type ReactNode, useMemo } from "react";-import { Link } from "react-router";import { t } from "ttag";import { CodeEditor } from "metabase/common/components/CodeEditor";+import { Link } from "metabase/router";import { Box, Image, Stack, Text, rem } from "metabase/ui";import { TYPE } from "metabase-lib/v1/types/constants";import { isFK, isa } from "metabase-lib/v1/types/utils/isa";diff --git a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.tsx b/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.tsxindex 6b1d8db583d..222b6c501ef 100644--- a/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.tsx+++ b/frontend/src/metabase/detail-view/components/Nav/Breadcrumb/Breadcrumb.tsx@@ -1,7 +1,7 @@import cx from "classnames";import type { ReactNode } from "react";-import { Link } from "react-router";+import { Link } from "metabase/router";import { Ellipsified } from "metabase/ui";import { Box, type BoxProps, Group, Icon, rem } from "metabase/ui";import type { IconName } 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 75d2ca2443f..5194146c2ec 100644--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx@@ -1,12 +1,12 @@import cx from "classnames";import { inflect } from "inflection";import { useMemo } from "react";-import { Link } from "react-router";import { useLatest } from "react-use";import { t } from "ttag";import { skipToken, useGetAdhocQueryQuery } from "metabase/api";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Loader, Stack, Text, rem } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsx b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsxindex 5239bdf1cad..d5eaceb96b8 100644--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsx+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsx@@ -1,12 +1,12 @@import { screen } from "@testing-library/react";import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupCardDataset } from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Table } from "metabase-types/api";import { createMockForeignKey } from "metabase-types/api/mocks";import {diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsxindex f477d0c6ead..f6aff082ac1 100644--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx@@ -1,5 +1,4 @@import { useCallback, useState } from "react";-import { Link } from "react-router";import { c, t } from "ttag";import { useListCommentsQuery } from "metabase/api";@@ -12,6 +11,7 @@ import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-nextimport CS from "metabase/css/core/index.css";import { usePrintContext } from "metabase/documents/contexts/PrintContext";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import {ActionIcon,diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsxindex f2fe0b794f5..0cd9d44a39f 100644--- a/frontend/src/metabase/documents/components/DocumentPage.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx@@ -11,7 +11,6 @@ import {useRef,useState,} from "react";-import type { Route } from "react-router";import { push, replace } from "react-router-redux";import { usePrevious, useUnmount } from "react-use";import useBeforeUnload from "react-use/lib/useBeforeUnload";@@ -41,6 +40,7 @@ import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";+import type { Route } from "metabase/router";import { Box } from "metabase/ui";import { extractEntityId } from "metabase/urls";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsx b/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsxindex 45b7fbe5e91..3a687971047 100644--- a/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupBookmarksEndpoints,@@ -7,6 +6,7 @@ import {setupDocumentEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { Route } from "metabase/router";import { createMockDocument } from "metabase-types/api/mocks";import { DocumentPage } from "./DocumentPage";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsxindex 4b822565798..b7b2f7263bc 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx@@ -1,5 +1,4 @@import { type ReactNode, useEffect, useState } from "react";-import { Link } from "react-router";import { jt, t } from "ttag";import { UserForm } from "metabase/admin/people/forms/UserForm";@@ -13,6 +12,7 @@ import { CopyTextInput } from "metabase/common/components/CopyTextInput";import { PasswordReveal } from "metabase/common/components/PasswordReveal";import { useSetting, useToast } from "metabase/common/hooks";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getSetting, isSsoEnabled } from "metabase/selectors/settings";import { Button, Group, Icon, Modal, Stack, Text } from "metabase/ui";import { generatePassword } from "metabase/utils/password";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsxindex f095c255e40..86567d11110 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsx@@ -1,13 +1,13 @@/* eslint-disable metabase/no-literal-metabase-strings -- This string only shows for admins */import { useCallback, useMemo, useState } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useListDatabasesQuery } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { DatabaseMultiSelect } from "metabase/common/components/DatabaseMultiSelect";import { useToast } from "metabase/common/hooks";+import { Link } from "metabase/router";import { Button, Flex, Stack, Text } from "metabase/ui";import type { Database, DatabaseId } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsxindex f83b907cba3..61932f363c7 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/SetupPermissionsAndTenantsPage.tsx@@ -1,5 +1,4 @@import { useMemo, useRef, useState } from "react";-import { Link } from "react-router";import { match } from "ts-pattern";import { t } from "ttag";@@ -10,6 +9,7 @@ import {type CreatedTenantData,PLUGIN_TENANTS,} from "metabase/plugins/oss/tenants";+import { Link } from "metabase/router";import { Group, Icon, Stack, Text, Title } from "metabase/ui";import type { DataSegregationStrategy } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsxindex 2ab4b3993e5..06ef7531df1 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.tsx@@ -1,10 +1,10 @@import { useMemo, useRef, useState } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useGetEmbeddingHubChecklistQuery } from "metabase/api/embedding-hub";import { OnboardingStepper } from "metabase/common/components/OnboardingStepper";import type { OnboardingStepperHandle } from "metabase/common/components/OnboardingStepper/types";+import { Link } from "metabase/router";import { Group, Icon, Stack, Text, Title } from "metabase/ui";import { AddEndpointStep } from "./AddEndpointStep";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsxindex 2c7c011283b..a1daa64989f 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {findRequests,@@ -13,6 +12,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { createMockSettings } from "metabase-types/api/mocks";import { SetupSsoPage } from "./SetupSsoPage";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsxindex e3df2fa37a1..97096e2caf1 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsx@@ -1,12 +1,12 @@/* eslint-disable metabase/no-literal-metabase-strings */import { useState } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useUpdateSettingsMutation } from "metabase/api";import { useToast } from "metabase/common/hooks";import { useHelpUrl } from "metabase/embedding/embedding-hub/hooks";+import { Link } from "metabase/router";import { Button, Group, Stack, Text, Title } from "metabase/ui";const SETUP_GUIDE_PATH = "/admin/embedding/setup-guide";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsx b/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsxindex b90a3421e1e..b878139533e 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsx@@ -1,9 +1,9 @@import cx from "classnames";import type { ReactNode } from "react";-import { Link } from "react-router";import { match } from "ts-pattern";import { t } from "ttag";+import { Link } from "metabase/router";import type { UtmProps } from "metabase/selectors/settings";import {Alert,diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/AppearanceStep/BehaviorCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/AppearanceStep/BehaviorCard.tsxindex ae8d83ec7dd..771141f4578 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/AppearanceStep/BehaviorCard.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/AppearanceStep/BehaviorCard.tsx@@ -1,10 +1,10 @@import { useMemo } from "react";-import { Link } from "react-router";import { P, match } from "ts-pattern";import { c, t } from "ttag";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useDocsUrl, useHasEmailSetup } from "metabase/common/hooks";+import { Link } from "metabase/router";import {Anchor,Card,diff --git a/frontend/src/metabase/hoc/ModalRoute.tsx b/frontend/src/metabase/hoc/ModalRoute.tsxindex d93bc8e767e..1c1b27dccfa 100644--- a/frontend/src/metabase/hoc/ModalRoute.tsx+++ b/frontend/src/metabase/hoc/ModalRoute.tsx@@ -1,9 +1,9 @@import type { Location, LocationDescriptor } from "history";import { Component, cloneElement } from "react";-import { Route } from "react-router";import { push } from "react-router-redux";import { connect } from "metabase/redux";+import { Route } from "metabase/router";import { Modal, type ModalProps } from "metabase/ui";import MetabaseSettings from "metabase/utils/settings";diff --git a/frontend/src/metabase/hoc/ScrollToTop.tsx b/frontend/src/metabase/hoc/ScrollToTop.tsxindex b9c997a7c78..adee2c8e899 100644--- a/frontend/src/metabase/hoc/ScrollToTop.tsx+++ b/frontend/src/metabase/hoc/ScrollToTop.tsx@@ -1,6 +1,7 @@import type { ReactNode } from "react";import { Component } from "react";-import { type WithRouterProps, withRouter } from "react-router";++import { type WithRouterProps, withRouter } from "metabase/router";interface ScrollToTopProps {children?: ReactNode;diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsxindex eed7c3fb2c9..cc88ff57a9b 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx@@ -1,10 +1,10 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { Link } from "react-router";import { match } from "ts-pattern";import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { Link } from "metabase/router";import { Box, Button, Group, Text } from "metabase/ui";type EmbedJsContentProps = {diff --git a/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsxindex 5bdeb0db936..16b3447c20c 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx@@ -1,9 +1,9 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { Link } from "react-router";import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { Link } from "metabase/router";import { Box, Button, Group, Text } from "metabase/ui";import { trackEmbeddingHomepageExampleDashboardClick } from "./analytics";diff --git a/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx b/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsxindex 42d422d3c40..3356aa19ce0 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx@@ -1,5 +1,4 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -11,6 +10,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Settings, TokenFeatures } from "metabase-types/api";import {createMockSettings,diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsxindex 096204ad12c..bc783b7c0a9 100644--- a/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx+++ b/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {setupDashboardEndpoints,setupDatabasesEndpoints,@@ -9,6 +7,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { DashboardId } from "metabase-types/api";import { createMockDashboard, createMockUser } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx b/frontend/src/metabase/home/components/Onboarding/tests/setup.tsxindex 2f4ccc3c76f..9494bc159d7 100644--- a/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx+++ b/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupBugReportingDetailsEndpoint,@@ -12,6 +10,7 @@ import {createMockAppState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import {createMockSettings,diff --git a/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsxindex 68cb4d4c08c..37a61116b5c 100644--- a/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterprisePlugins } from "__support__/enterprise";import { mockSettings } from "__support__/settings";@@ -10,6 +9,7 @@ import {createMockRoutingState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { UserMetabotPermissions } from "metabase-types/api";import { createMockUserMetabotPermissions } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsxindex c7cb77ded5f..a597cc545f7 100644--- a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx@@ -1,5 +1,4 @@import { useEffect, useState } from "react";-import { Route } from "react-router";import { replace } from "react-router-redux";import {@@ -7,6 +6,7 @@ import {useUserMetabotPermissions,} from "metabase/metabot/hooks";import { useDispatch } from "metabase/redux";+import { Route } from "metabase/router";import { Loader } from "metabase/ui";export const getMetabotQuickLinks = () => {diff --git a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsxindex 31177deb792..04ee0b7ebec 100644--- a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx@@ -1,11 +1,11 @@import userEvent from "@testing-library/user-event";import { assocIn } from "icepick";-import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";import { getMessages, metabotReducer } from "metabase/metabot/state";import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { Menu } from "metabase/ui";import { NewMenuItemAIExploration } from "./NewMenuItemAIExploration";diff --git a/frontend/src/metabase/metabot/routes.tsx b/frontend/src/metabase/metabot/routes.tsxindex 6b4e84ea82a..58a0cac698f 100644--- a/frontend/src/metabase/metabot/routes.tsx+++ b/frontend/src/metabase/metabot/routes.tsx@@ -1,4 +1,4 @@-import { Route } from "react-router";+import { Route } from "metabase/router";import { getMetabotQuickLinks } from "./components/MetabotQuickLinks";import { SlackConnectSuccess } from "./components/SlackConnectSuccess";diff --git a/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsxindex 065beedfcb4..ba634970e4d 100644--- a/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx+++ b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx@@ -1,11 +1,11 @@import cx from "classnames";import type { MouseEvent } from "react";import { memo, useMemo } from "react";-import { Link } from "react-router";import { t } from "ttag";import { EditableText } from "metabase/common/components/EditableText";import { getColumnIcon } from "metabase/common/utils/columns";+import { Link } from "metabase/router";import { Box, Card, Ellipsified, Flex, Group, Icon, rem } from "metabase/ui";import * as Lib from "metabase-lib";import type { Field } from "metabase-types/api";diff --git a/frontend/src/metabase/metadata/components/FieldSection/utils.tsx b/frontend/src/metabase/metadata/components/FieldSection/utils.tsxindex 6394de78a62..06af7bff3dc 100644--- a/frontend/src/metabase/metadata/components/FieldSection/utils.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/utils.tsx@@ -1,9 +1,9 @@import { Fragment, type ReactNode } from "react";-import { Link } from "react-router";import { t } from "ttag";import _ from "underscore";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import { Link } from "metabase/router";import { isEntityName } from "metabase-lib/v1/types/utils/isa";import type { Field, FieldId, Table } from "metabase-types/api";diff --git a/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsx b/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsxindex 5731ac1adfd..fe22d3f4e63 100644--- a/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsx+++ b/frontend/src/metabase/metadata/components/NoDatabasesEmptyState/NoDatabasesEmptyState.tsx@@ -1,8 +1,8 @@-import { Link } from "react-router";import { t } from "ttag";import EmptyDashboardBot from "assets/img/dashboard-empty.svg";import { EmptyState } from "metabase/common/components/EmptyState";+import { Link } from "metabase/router";import { Box, Button, Stack, rem } from "metabase/ui";export const NoDatabasesEmptyState = () => {diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsxindex e42de8ae395..52953faa877 100644--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx@@ -1,5 +1,4 @@import { memo, useState } from "react";-import { Link } from "react-router";import { t } from "ttag";import {@@ -9,6 +8,7 @@ import {import { EmptyState } from "metabase/common/components/EmptyState";import { useMetadataToasts } from "metabase/metadata/hooks";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import { Link } from "metabase/router";import {ActionIcon,Group,diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsxindex 8d430423117..29d68028d66 100644--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsx+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { FieldId, Table } from "metabase-types/api";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsxindex ece6088f459..8dfcc13b9f6 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { IndexRedirect, Link, Route } from "react-router";import {setupCardDataset,@@ -22,6 +21,7 @@ import {} from "__support__/ui";import { getNextId } from "__support__/utils";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import { IndexRedirect, Link, Route } from "metabase/router";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import registerVisualizations from "metabase/visualizations/register";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsxindex 14e1fa47115..97432f9022b 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupEnterpriseOnlyPlugin,@@ -12,6 +11,7 @@ import { setupPerformanceEndpoints } from "__support__/server-mocks/performance"import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, within } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { CollectionType } from "metabase-types/api";import {createMockCard,diff --git a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsxindex cf04d6f8c5d..406fc9e8e66 100644--- a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsx+++ b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsx@@ -1,12 +1,12 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupBookmarksEndpoints } from "__support__/server-mocks/bookmark";import { setupCollectionsEndpoints } from "__support__/server-mocks/collection";import { setupMetricEndpoint } from "__support__/server-mocks/metric";import { setupListNotificationEndpoints } from "__support__/server-mocks/notification";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { Route } from "metabase/router";import { createMockCard, createMockCollection } from "metabase-types/api/mocks";import { createMockMetric } from "metabase-types/api/mocks/metric";diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsxindex ba4db288944..e7640e0daef 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterprisePlugins } from "__support__/enterprise";import { setupDatabaseEndpoints } from "__support__/server-mocks/database";import { setupDependencyGraphEndpoint } from "__support__/server-mocks/dependencies";@@ -8,6 +6,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor } from "__support__/ui";import type { MetricUrls } from "metabase/common/metrics/types";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Card } from "metabase-types/api";import {createMockCard,diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsxindex 60909202adb..2ab8814a7c7 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {setupCardEndpoints,setupCardQueryEndpoints,@@ -9,6 +7,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import registerVisualizations from "metabase/visualizations/register";import type { Card, Dataset, Field } from "metabase-types/api";import {diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsxindex 135ebd38396..62544fce5bf 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx@@ -1,5 +1,4 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupCardEndpoints,@@ -10,6 +9,7 @@ import {} from "__support__/server-mocks";import { PERMISSION_ERROR } from "__support__/server-mocks/constants";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { Card } from "metabase-types/api";import {createMockCard,diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsxindex 6563a326ec7..5bf79b4cee1 100644--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx@@ -1,5 +1,4 @@import { useLayoutEffect, useMemo, useState } from "react";-import type { Route } from "react-router";import { useLatest } from "react-use";import { t } from "ttag";@@ -15,6 +14,7 @@ import type {import { useMetadataToasts } from "metabase/metadata/hooks";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Card } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsxindex d8e69b6bc55..f08d0535e3e 100644--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -2,7 +2,6 @@ import { useDisclosure } from "@mantine/hooks";import type { Location } from "history";import type { ReactNode } from "react";import { useMemo, useState } from "react";-import type { Route } from "react-router";import { goBack, push } from "react-router-redux";import { t } from "ttag";@@ -20,6 +19,7 @@ import { MetricQueryEditor } from "metabase/metrics/components/MetricQueryEditorimport { NAME_MAX_LENGTH } from "metabase/metrics/constants";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";+import type { Route } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Breadcrumbs, Card, Icon } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/metrics/routes.tsx b/frontend/src/metabase/metrics/routes.tsxindex 99470b4c3d1..823553e3971 100644--- a/frontend/src/metabase/metrics/routes.tsx+++ b/frontend/src/metabase/metrics/routes.tsx@@ -1,6 +1,5 @@-import { IndexRoute, Route } from "react-router";-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { MetricAboutPage } from "./pages/MetricAboutPage";import { MetricDependenciesPage } from "./pages/MetricDependenciesPage";diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsxindex 290596303be..d273312ffd9 100644--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsx+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsx@@ -1,10 +1,10 @@import { useDisclosure } from "@mantine/hooks";import { useCallback } from "react";-import { Link as RouterLink } from "react-router";import { t } from "ttag";import { ActionExecuteModal } from "metabase/actions/containers/ActionExecuteModal";import { useConfirmation } from "metabase/common/hooks/use-confirmation";+import { RouterLink } from "metabase/router";import { ActionIcon, Icon, Menu, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/models/components/NewModelOption.tsx b/frontend/src/metabase/models/components/NewModelOption.tsxindex a824877574e..c04b44d3d50 100644--- a/frontend/src/metabase/models/components/NewModelOption.tsx+++ b/frontend/src/metabase/models/components/NewModelOption.tsx@@ -1,5 +1,4 @@-import { Link, type LinkProps } from "react-router";-+import { Link, type LinkProps } from "metabase/router";import { Box, Flex, Text, Title } from "metabase/ui";import S from "./NewModelOption.module.css";diff --git a/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx b/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsxindex f48b54fac9a..462aeda9b8a 100644--- a/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx+++ b/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { NewModelOption } from "./NewModelOption";diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsxindex 81598d454d0..ef0c7d44703 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { IndexRedirect, Route } from "react-router";import { createMockMetadata } from "__support__/metadata";import {@@ -24,6 +23,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { IndexRedirect, Route } from "metabase/router";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { TYPE } from "metabase-lib/v1/types/constants";diff --git a/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx b/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsxindex f9a8cc79f42..12d1a42f6b9 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import {createMockTokenFeatures,diff --git a/frontend/src/metabase/models/routes.tsx b/frontend/src/metabase/models/routes.tsxindex b4a5a47fb6e..cae202e629e 100644--- a/frontend/src/metabase/models/routes.tsx+++ b/frontend/src/metabase/models/routes.tsx@@ -1,9 +1,8 @@-import { IndexRedirect, Redirect, Route } from "react-router";-import ActionCreatorModal from "metabase/actions/containers/ActionCreatorModal/ActionCreatorModal";import { ModelDetailPage } from "metabase/detail-view/pages/ModelDetailPage/ModelDetailPage";import { ModalRoute } from "metabase/hoc/ModalRoute";import ModelActions from "metabase/models/containers/ModelActions/ModelActions";+import { IndexRedirect, Redirect, Route } from "metabase/router";import {type ModalProps,PREVENT_AUTOCOMPLETE_CLIPPING_MODAL_PROPS,diff --git a/frontend/src/metabase/monitor/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsxindex 4a39d84795e..b3fd5d727c9 100644--- a/frontend/src/metabase/monitor/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { dedent } from "ts-dedent";import {@@ -16,6 +15,7 @@ import {} from "__support__/ui";import { getNextId } from "__support__/utils";import { ModalRoute } from "metabase/hoc/ModalRoute";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { LoggerPreset } from "metabase-types/api";import { createMockLoggerPreset } from "metabase-types/api/mocks/logger";diff --git a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsxindex a26ef29f037..dff5be11205 100644--- a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx+++ b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx@@ -2,7 +2,6 @@ import type { Location } from "history";import * as React from "react";import { type ReactNode, useMemo } from "react";import reactAnsiStyle from "react-ansi-style";-import { Link, withRouter } from "react-router";import { t } from "ttag";import {@@ -11,6 +10,7 @@ import {} from "metabase/admin/components/SettingsSection";import { AnsiLogs } from "metabase/common/components/AnsiLogs";import { useUrlState } from "metabase/common/hooks/use-url-state";+import { Link, withRouter } from "metabase/router";import {Button,DefaultSelectItem,diff --git a/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsxindex aee7e5b5e78..156814ccbd5 100644--- a/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsx@@ -1,12 +1,12 @@import fetchMock from "fetch-mock";import type { Location } from "history";-import { Route } from "react-router";import { act, renderWithProviders, screen, waitFor } from "__support__/ui";import {createMockLocation,createMockRoutingState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { DEFAULT_POLLING_DURATION_MS, Logs } from "./Logs";import { maybeMergeLogs } from "./utils";diff --git a/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.tsxindex b54315d5940..76a44788352 100644--- a/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import { Link } from "react-router";import { t } from "ttag";import _ from "underscore";@@ -9,6 +8,7 @@ import { CodeEditor } from "metabase/common/components/CodeEditor";import { CopyButton } from "metabase/common/components/CopyButton";import { DateTime } from "metabase/common/components/DateTime";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Link } from "metabase/router";import {Anchor,Box,diff --git a/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsxindex ed01e9bad56..9d94f75aef2 100644--- a/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx@@ -1,6 +1,5 @@import { useClipboard } from "@mantine/hooks";import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupDatabasesEndpoints,@@ -12,6 +11,7 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { Task } from "metabase-types/api";import { createMockTask } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsxindex ff8438418b6..4ca9ebe99cc 100644--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx@@ -1,8 +1,7 @@-import type { WithRouterProps } from "react-router";-import { useListDatabasesQuery, useListTasksQuery } from "metabase/api";import { PaginationControls } from "metabase/common/components/PaginationControls";import { useUrlState } from "metabase/common/hooks/use-url-state";+import type { WithRouterProps } from "metabase/router";import { Flex } from "metabase/ui";import { TaskPicker } from "../TaskPicker";diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsxindex dac15638a32..db314264ad1 100644--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx@@ -1,7 +1,6 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import type { Location } from "history";-import { Route } from "react-router";import {setupDatabasesEndpoints,@@ -18,6 +17,7 @@ import {} from "__support__/ui";import { URL_UPDATE_DEBOUNCE_DELAY } from "metabase/common/hooks/use-url-state";import { createMockLocation } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { ListTasksResponse } from "metabase-types/api";import { createMockTask } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsxindex 5df509d75e4..8037d15d430 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import { Link } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -11,6 +10,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";+import { Link } from "metabase/router";import {Anchor,Box,diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsxindex 3e62648c0de..0382c771516 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx@@ -1,6 +1,5 @@import { useClipboard } from "@mantine/hooks";import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { setupTaskRunEndpoint } from "__support__/server-mocks";import {@@ -9,6 +8,7 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { TaskRunExtended } from "metabase-types/api";import { createMockTaskRunExtended } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsxindex 8d71fd06290..2d78ae7d4ca 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx@@ -1,9 +1,9 @@-import { type WithRouterProps, withRouter } from "react-router";import { t } from "ttag";import { useListTaskRunsQuery } from "metabase/api";import { PaginationControls } from "metabase/common/components/PaginationControls";import { useUrlState } from "metabase/common/hooks/use-url-state";+import { type WithRouterProps, withRouter } from "metabase/router";import { Flex } from "metabase/ui";import { toBackendStartedAt } from "../../utils";diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsxindex 8a8d3db1f79..77e179b4f69 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupTaskRunsEndpoints } from "__support__/server-mocks";import {@@ -9,6 +8,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { ListTaskRunsResponse } from "metabase-types/api";import { createMockTaskRun } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx b/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsxindex 4d8047f00cf..94faaf24fdf 100644--- a/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx+++ b/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx@@ -1,4 +1,3 @@-import { type WithRouterProps, withRouter } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -7,6 +6,7 @@ import {SettingsSection,} from "metabase/admin/components/SettingsSection";import { useDispatch } from "metabase/redux";+import { type WithRouterProps, withRouter } from "metabase/router";import { Flex, Icon, Tabs, Title, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationRunSummaryLog.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationRunSummaryLog.tsxindex 185b15d7dad..02a25144dcf 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationRunSummaryLog.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/NotificationRunSummaryLog.tsx@@ -1,7 +1,7 @@import dayjs from "dayjs";-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { Anchor, Badge, Flex, Loader, Text, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsxindex 74f735c71ba..e0ed61b0df5 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx@@ -1,6 +1,5 @@import type { Row, SortingState } from "@tanstack/react-table";import { useCallback, useEffect, useMemo, useState } from "react";-import type { WithRouterProps } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -20,6 +19,7 @@ import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { useUrlState } from "metabase/common/hooks/use-url-state";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import type { WithRouterProps } from "metabase/router";import { Flex, type SelectionState, Title } from "metabase/ui";import * as Urls from "metabase/urls";import type {diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsxindex a6bf3200319..fd1af5a7033 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {findRequests,@@ -22,6 +21,7 @@ import {within,} from "__support__/ui";import { URL_UPDATE_DEBOUNCE_DELAY } from "metabase/common/hooks/use-url-state";+import { Route } from "metabase/router";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import type { AdminNotification, UserListResult } from "metabase-types/api";import {diff --git a/frontend/src/metabase/monitor/tools/notifications/routes.tsx b/frontend/src/metabase/monitor/tools/notifications/routes.tsxindex 9f06ffd0a65..5442b7a867c 100644--- a/frontend/src/metabase/monitor/tools/notifications/routes.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/routes.tsx@@ -1,4 +1,4 @@-import { IndexRoute, Route } from "react-router";+import { IndexRoute, Route } from "metabase/router";import { NotificationsAdminPage } from "./NotificationsAdminPage";diff --git a/frontend/src/metabase/monitor/tools/routes.tsx b/frontend/src/metabase/monitor/tools/routes.tsxindex e91f94d8d58..ec5d97d14ab 100644--- a/frontend/src/metabase/monitor/tools/routes.tsx+++ b/frontend/src/metabase/monitor/tools/routes.tsx@@ -1,4 +1,4 @@-import { IndexRedirect, Route } from "react-router";+import { IndexRedirect, Route } from "metabase/router";import { TaskDetailsPage } from "./components/TaskDetailsPage";import { TaskListPage } from "./components/TaskListPage";diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsxindex 359568a2071..7a36d63e019 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupBugReportingDetailsEndpoint } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {createMockSettings,createMockTokenStatus,diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsxindex 0f6ffae7ae5..3d55d8d35d3 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import dayjs from "dayjs";-import { Route } from "react-router";import { setupBugReportingDetailsEndpoint } from "__support__/server-mocks";import { mockSettings } from "__support__/settings";@@ -9,6 +8,7 @@ import {createMockAdminAppState,createMockAdminState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { HelpLinkSetting } from "metabase-types/api";import {createMockMetabaseInfo,diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsxindex 8b89939c854..03ce51496fd 100644--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsx@@ -1,7 +1,6 @@-import { Route } from "react-router";-import { setupCollectionByIdEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import {createMockCollection,createMockDashboard,diff --git a/frontend/src/metabase/nav/components/NavbarPromoCard/NavbarPromoCard.tsx b/frontend/src/metabase/nav/components/NavbarPromoCard/NavbarPromoCard.tsxindex 08ed95b431e..320a4751e53 100644--- a/frontend/src/metabase/nav/components/NavbarPromoCard/NavbarPromoCard.tsx+++ b/frontend/src/metabase/nav/components/NavbarPromoCard/NavbarPromoCard.tsx@@ -1,7 +1,7 @@import type { ReactNode } from "react";-import { Link } from "react-router";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";+import { Link } from "metabase/router";import { Anchor, Flex, Icon, Paper, Stack, Text } from "metabase/ui";import S from "./NavbarPromoCard.module.css";diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsxindex 5e0a24bd572..d32705b6ef4 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx@@ -6,7 +6,6 @@ import type {KeyboardEvent as ReactKeyboardEvent,} from "react";import { useCallback, useEffect, useMemo, useRef, useState } from "react";-import { withRouter } from "react-router";import { push } from "react-router-redux";import { usePrevious } from "react-use";import { t } from "ttag";@@ -23,6 +22,7 @@ import type { SearchAwareLocation } from "metabase/common/search/types";import { RecentsList } from "metabase/nav/components/search/RecentsList";import { SearchResultsDropdown } from "metabase/nav/components/search/SearchResultsDropdown";import { useDispatch, useSelector } from "metabase/redux";+import { withRouter } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { Icon } from "metabase/ui";import { modelToUrl } from "metabase/urls";diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsxindex cf29be4d769..4a9a183c271 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCollectionsEndpoints,@@ -19,6 +18,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { CollectionItem, RecentItem } from "metabase-types/api";import {diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsxindex b6ea3ca793c..fe6d9e0cd4e 100644--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx@@ -1,11 +1,11 @@import { VisualState, useKBar } from "kbar";import { useCallback } from "react";-import { withRouter } from "react-router";import { t } from "ttag";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";import { getSearchTextFromLocation } from "metabase/common/search";import type { SearchAwareLocation } from "metabase/common/search/types";+import { withRouter } from "metabase/router";import { Button, type ButtonProps, Flex, Icon } from "metabase/ui";import { METAKEY } from "metabase/utils/browser";diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.unit.spec.tsxindex 478c1b3a251..f9c3244ddd8 100644--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import { SearchButton } from "./SearchButton";diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsxindex 28e01726d2c..ebd0b666fd3 100644--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupCollectionByIdEndpoint,@@ -14,6 +13,7 @@ import {} from "__support__/ui";import type { SearchResultsFooter } from "metabase/nav/components/search/SearchResults";import { SearchResults } from "metabase/nav/components/search/SearchResults";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { SearchResult } from "metabase-types/api";import {diff --git a/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsxindex d908af8364e..1d4eb8cbe12 100644--- a/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCollectionByIdEndpoint,@@ -11,6 +10,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { SearchResult } from "metabase-types/api";import {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsxindex 174cb90e940..432bb6fdee2 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx@@ -1,9 +1,9 @@import type { ReactNode } from "react";-import { Link } from "react-router";import { match } from "ts-pattern";import { c, t } from "ttag";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import {Alert,diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsxindex 5eb04507226..9aa883a76d6 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx@@ -1,6 +1,6 @@-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { Box, Group, Modal } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsxindex 5e181607067..1c86c8f14cd 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import {@@ -10,6 +8,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { Collection } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsxindex 2e9228522db..0bd8b0209ca 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx@@ -1,6 +1,5 @@import dayjs from "dayjs";import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {@@ -26,6 +25,7 @@ import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import * as iframeUtils from "metabase/utils/iframe";import type {Card,diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex 83788b07c77..091bae8fd67 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -1,6 +1,4 @@import { useCallback, useEffect } from "react";-import type { WithRouterProps } from "react-router";-import { withRouter } from "react-router";import { push } from "react-router-redux";import { useLocation } from "react-use";@@ -22,6 +20,8 @@ import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut"import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { closeModal, setOpenModal } from "metabase/redux/ui";+import type { WithRouterProps } from "metabase/router";+import { withRouter } from "metabase/router";import { getCurrentOpenModalState } from "metabase/selectors/ui";import { Modal, PREVENT_AUTOCOMPLETE_CLIPPING_MODAL_PROPS } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/notifications/modals/ChannelSetupModal.tsx b/frontend/src/metabase/notifications/modals/ChannelSetupModal.tsxindex 973a8195ee8..b8b1a0f6b92 100644--- a/frontend/src/metabase/notifications/modals/ChannelSetupModal.tsx+++ b/frontend/src/metabase/notifications/modals/ChannelSetupModal.tsx@@ -1,6 +1,6 @@-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { Button, Icon, Modal, Stack, Text } from "metabase/ui";import type { IconName } from "metabase-types/api";const CHANNELS_CONFIG: {diff --git a/frontend/src/metabase/palette/components/Palette.tsx b/frontend/src/metabase/palette/components/Palette.tsxindex 28efbd4ee7b..744005df35a 100644--- a/frontend/src/metabase/palette/components/Palette.tsx+++ b/frontend/src/metabase/palette/components/Palette.tsx@@ -1,10 +1,10 @@import type { Query } from "history";import { KBarPortal, VisualState, useKBar } from "kbar";import { useEffect, useRef } from "react";-import { type PlainRoute, withRouter } from "react-router";import { useOnClickOutside } from "metabase/common/hooks/use-on-click-outside";import { useSelector } from "metabase/redux";+import { type PlainRoute, withRouter } from "metabase/router";import { getUser } from "metabase/selectors/user";import { Box, Card, Center, Icon, Overlay, Stack, rem } from "metabase/ui";import { isWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx b/frontend/src/metabase/palette/components/Palette.unit.spec.tsxindex a5a7a5a40f1..14809f48853 100644--- a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx+++ b/frontend/src/metabase/palette/components/Palette.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupCollectionByIdEndpoint,@@ -10,6 +9,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { SearchResult } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx b/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsxindex aab5edee37d..9978243d6f1 100644--- a/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx+++ b/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {fireEvent,render,@@ -7,6 +5,7 @@ import {screen,waitFor,} from "__support__/ui";+import { Route } from "metabase/router";import type { PaletteActionImpl } from "../types";diff --git a/frontend/src/metabase/palette/components/PaletteResults.tsx b/frontend/src/metabase/palette/components/PaletteResults.tsxindex 0944e56b676..e6d6147ee47 100644--- a/frontend/src/metabase/palette/components/PaletteResults.tsx+++ b/frontend/src/metabase/palette/components/PaletteResults.tsx@@ -1,13 +1,13 @@import type { Query } from "history";import { VisualState, useKBar, useMatches } from "kbar";import { useEffect, useMemo } from "react";-import { Link } from "react-router";import { useKeyPressEvent } from "react-use";import { t } from "ttag";import NoResults from "assets/img/no_results.svg";import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";import { trackSearchClick } from "metabase/common/search/analytics";+import { Link } from "metabase/router";import {Flex,Group,diff --git a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsxindex 22245667ee0..e3b4ee6d5c5 100644--- a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx+++ b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx@@ -1,6 +1,5 @@import { VisualState, useKBar } from "kbar";import { useEffect } from "react";-import { Route, type WithRouterProps, withRouter } from "react-router";import _ from "underscore";import { setupEnterprisePlugins } from "__support__/enterprise";@@ -19,6 +18,7 @@ import {createMockAdminState,createMockState,} from "metabase/redux/store/mocks";+import { Route, type WithRouterProps, withRouter } from "metabase/router";import type { RecentItem, Settings } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex c53ca3d527a..69338938045 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -1,6 +1,5 @@import { useRegisterActions } from "kbar";import { useCallback, useMemo } from "react";-import type { WithRouterProps } from "react-router";import { push } from "react-router-redux";import { useLatest } from "react-use";import { t } from "ttag";@@ -18,6 +17,7 @@ import {setOpenModal,setOpenModalWithProps,} from "metabase/redux/ui";+import type { WithRouterProps } from "metabase/router";import { getHasDatabaseWithActionsEnabled } from "metabase/selectors/data";import {canUserCreateNativeQueries,diff --git a/frontend/src/metabase/plugins/oss/workspaces.ts b/frontend/src/metabase/plugins/oss/workspaces.tsindex 6beec4a4058..d52fbaecc8b 100644--- a/frontend/src/metabase/plugins/oss/workspaces.ts+++ b/frontend/src/metabase/plugins/oss/workspaces.ts@@ -1,7 +1,7 @@import type { ReactNode } from "react";-import type { RouteComponent } from "react-router";import type { State } from "metabase/redux/store";+import type { RouteComponent } from "metabase/router";import type { Database } from "metabase-types/api";import { PluginPlaceholder } from "../components/PluginPlaceholder";diff --git a/frontend/src/metabase/public/components/EmbedFrame/SyncedEmbedFrame.tsx b/frontend/src/metabase/public/components/EmbedFrame/SyncedEmbedFrame.tsxindex 9661ef7c178..018ed070787 100644--- a/frontend/src/metabase/public/components/EmbedFrame/SyncedEmbedFrame.tsx+++ b/frontend/src/metabase/public/components/EmbedFrame/SyncedEmbedFrame.tsx@@ -1,7 +1,6 @@-import type { WithRouterProps } from "react-router";-import { withRouter } from "react-router";-import { useEmbedFrameOptions } from "metabase/public/hooks";+import type { WithRouterProps } from "metabase/router";+import { withRouter } from "metabase/router";import type { EmbedFrameProps } from "./EmbedFrame";import { EmbedFrame } from "./EmbedFrame";diff --git a/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsxindex afffed4faca..31934289b9a 100644--- a/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsx+++ b/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {renderWithProviders,@@ -8,6 +7,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";+import { Route } from "metabase/router";import type {ParametersForActionExecution,PublicWritebackAction,diff --git a/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsxindex 020e36990bc..64c8cc0dfce 100644--- a/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsx+++ b/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsx@@ -1,12 +1,12 @@import userEvent from "@testing-library/user-event";import type { JSX } from "react";-import { Route } from "react-router";import { mockSettings } from "__support__/settings";import { getIcon, renderWithProviders, screen } from "__support__/ui";import { SyncedEmbedFrame } from "metabase/public/components/EmbedFrame";import type { AppErrorDescriptor } from "metabase/redux/store";import { createMockAppState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import PublicApp from "./PublicApp";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsxindex 19a88917435..6f70adb5b44 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx@@ -1,5 +1,3 @@-import type { WithRouterProps } from "react-router";-import { PublicOrEmbeddedDashCardMenu } from "metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu";import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants";import { useDashboardLocationSync } from "metabase/dashboard/containers/DashboardApp/use-dashboard-location-sync";@@ -10,6 +8,7 @@ import { EmbeddingEntityContextProvider } from "metabase/embedding/context";import { useEmbedFrameOptions, useSetEmbedFont } from "metabase/public/hooks";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";+import type { WithRouterProps } from "metabase/router";import { getCanWhitelabel } from "metabase/selectors/whitelabel";import { isActionDashCard, isQuestionCard } from "metabase/utils/dashboard";import { Mode } from "metabase/visualizations/click-actions/Mode";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsxindex 255d51f977b..459375035ae 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx@@ -1,5 +1,4 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import _ from "underscore";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";@@ -8,6 +7,7 @@ import { setupEmbedDashboardEndpoints } from "__support__/server-mocks/embed";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { registerStaticVisualizations } from "metabase/static-viz/register";import type {DashboardCard,diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsxindex 82f40f5fe34..e94fe0cec2d 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx@@ -1,5 +1,4 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import _ from "underscore";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";@@ -14,6 +13,7 @@ import {waitForLoaderToBeRemoved,} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { registerStaticVisualizations } from "metabase/static-viz/register";import type { VisualizationProps } from "metabase/visualizations/types";import type { TokenFeatures } 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 4e54e2aa1e5..58664423e5a 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@@ -1,7 +1,6 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import type { ComponentProps } from "react";-import { Route } from "react-router";import _ from "underscore";import { setupTableEndpoints } from "__support__/server-mocks";@@ -9,6 +8,7 @@ import { setupGetUserKeyValueEndpoint } from "__support__/server-mocks/user-key-import { createMockEntitiesState } from "__support__/store";import { fireEvent, renderWithProviders, screen } from "__support__/ui";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";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsxindex 817ea850bb7..d6939f56700 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx@@ -1,11 +1,11 @@import type { HTMLAttributes } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useTranslateContent } from "metabase/content-translation/hooks";import { getParentEntity } from "metabase/query_builder/selectors";import { useDispatch, useSelector } from "metabase/redux";import { navigateBackToDashboard } from "metabase/redux/query-builder";+import { Link } from "metabase/router";import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";import type { CollectionItemModel, DashboardId } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsxindex 6055e798515..927c5fdd6d3 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { createMockMetadata } from "__support__/metadata";import {@@ -18,6 +17,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { TYPE } from "metabase-lib/v1/types/constants";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsxindex fe46e4b9a24..e0075a3c644 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx@@ -1,4 +1,3 @@-import { Route } from "react-router";import _ from "underscore";import { mockSettings } from "__support__/settings";@@ -9,6 +8,7 @@ import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { convertSavedQuestionToVirtualTable } from "metabase-lib/v1/metadata/utils/saved-questions";import type { Card, NormalizedTable } from "metabase-types/api";import { createMockCard, createMockSettings } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsxindex f93f4ee5e3b..bf3a3b4113b 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupAuditInfoEndpoint,@@ -18,6 +16,7 @@ import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Card, Settings, User } from "metabase-types/api";import {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 e8313db06ea..edeb70700fc 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@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupCardEndpoints,@@ -11,6 +9,7 @@ import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";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";diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex f06140856a0..05329a7097e 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -2,7 +2,6 @@ import { useHotkeys } from "@mantine/hooks";import type { Location } from "history";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import type { ConnectedProps } from "react-redux";-import type { Route, WithRouterProps } from "react-router";import { push } from "react-router-redux";import { useMount, usePrevious, useUnmount } from "react-use";import { t } from "ttag";@@ -53,6 +52,7 @@ import {setUIControls,} from "metabase/redux/query-builder";import type { QueryBuilderUIControls, State } from "metabase/redux/store";+import type { Route, WithRouterProps } from "metabase/router";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";diff --git a/frontend/src/metabase/query_builder/containers/test-utils.tsx b/frontend/src/metabase/query_builder/containers/test-utils.tsxindex 560bb550520..4b44f485999 100644--- a/frontend/src/metabase/query_builder/containers/test-utils.tsx+++ b/frontend/src/metabase/query_builder/containers/test-utils.tsx@@ -2,7 +2,6 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import type { ComponentPropsWithoutRef } from "react";-import { IndexRoute, Route } from "react-router";import {setupAdhocQueryMetadataEndpoint,@@ -37,6 +36,7 @@ import { NewItemMenu } from "metabase/common/components/NewItemMenu";import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";import { serializeCardForUrl } from "metabase/common/utils/card";import { createMockState } from "metabase/redux/store/mocks";+import { IndexRoute, Route } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Card, Dataset, Timeline, UnsavedCard } from "metabase-types/api";import {diff --git a/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsxindex 0ad02c0ac54..1261007843b 100644--- a/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsx+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";-import { Link } from "react-router";import { t } from "ttag";import { useDocsUrl } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Select } from "metabase/ui";import type { TemplateTag } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsxindex a2a41c5d1cb..5c9fc6d4487 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";-import { Link } from "react-router";import { P, match } from "ts-pattern";import { t } from "ttag";import { useGetAdhocQueryQuery } from "metabase/api";+import { Link } from "metabase/router";import { Button, Flex, Loader, Text } from "metabase/ui";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/reference/components/Detail.tsx b/frontend/src/metabase/reference/components/Detail.tsxindex 26ad80baa4b..53a1869d622 100644--- a/frontend/src/metabase/reference/components/Detail.tsx+++ b/frontend/src/metabase/reference/components/Detail.tsx@@ -1,9 +1,9 @@import cx from "classnames";import { memo } from "react";-import { Link } from "react-router";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import S from "./Detail.module.css";diff --git a/frontend/src/metabase/reference/components/EditableReferenceHeader.tsx b/frontend/src/metabase/reference/components/EditableReferenceHeader.tsxindex f94f8d483a8..3135bdadb29 100644--- a/frontend/src/metabase/reference/components/EditableReferenceHeader.tsx+++ b/frontend/src/metabase/reference/components/EditableReferenceHeader.tsx@@ -1,10 +1,10 @@import cx from "classnames";import { memo } from "react";-import { Link } from "react-router";import { t } from "ttag";import L from "metabase/common/components/List/List.module.css";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Button, Ellipsified, Icon, TextInputBlurChange } from "metabase/ui";import type { IconName } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/components/Field.tsx b/frontend/src/metabase/reference/components/Field.tsxindex 2660180ea09..66a0b5608af 100644--- a/frontend/src/metabase/reference/components/Field.tsx+++ b/frontend/src/metabase/reference/components/Field.tsx@@ -1,7 +1,6 @@import cx from "classnames";import { getIn } from "icepick";import { memo } from "react";-import { Link } from "react-router";import { P, match } from "ts-pattern";import { t } from "ttag";@@ -13,6 +12,7 @@ import {SemanticTypePicker,} from "metabase/metadata/components";import { getFieldCurrency } from "metabase/metadata/utils/field";+import { Link } from "metabase/router";import { Box, Icon } from "metabase/ui";import { isTypeCurrency, isTypeFK } from "metabase-lib/v1/types/utils/isa";import type {diff --git a/frontend/src/metabase/reference/components/ReferenceHeader.tsx b/frontend/src/metabase/reference/components/ReferenceHeader.tsxindex 4212e60769b..dd3fc51162d 100644--- a/frontend/src/metabase/reference/components/ReferenceHeader.tsx+++ b/frontend/src/metabase/reference/components/ReferenceHeader.tsx@@ -1,11 +1,11 @@import cx from "classnames";import { memo } from "react";-import { Link } from "react-router";import { t } from "ttag";import L from "metabase/common/components/List/List.module.css";import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Ellipsified, Icon } from "metabase/ui";import type { IconName } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx b/frontend/src/metabase/reference/databases/TableList.unit.spec.tsxindex 7817c53e4fc..7773798e4d1 100644--- a/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx+++ b/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, within } from "__support__/ui";import { getNextId } from "__support__/utils";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";import TableList from "./TableList";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.unit.spec.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.unit.spec.tsxindex 4354c485bcc..537e3945000 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.unit.spec.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.unit.spec.tsx@@ -1,6 +1,5 @@import type { NodeViewProps } from "@tiptap/react";import { createMemoryHistory } from "history";-import { Route, Router, useRouterHistory } from "react-router";import {setupCardEndpoints,@@ -11,6 +10,7 @@ import {setupTableEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { Route, Router, useRouterHistory } from "metabase/router";import {createMockCard,createMockCollection,diff --git a/frontend/src/metabase/route-guards.unit.spec.tsx b/frontend/src/metabase/route-guards.unit.spec.tsxindex 209ff803248..8a069575d09 100644--- a/frontend/src/metabase/route-guards.unit.spec.tsx+++ b/frontend/src/metabase/route-guards.unit.spec.tsx@@ -1,11 +1,11 @@import { type Context, createContext } from "react";-import { Route } from "react-router";import { routerActions } from "react-router-redux";import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { metabaseReduxContext } from "metabase/redux/context";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import {IsAuthenticated,diff --git a/frontend/src/metabase/router/Link.unit.spec.tsx b/frontend/src/metabase/router/Link.unit.spec.tsxindex acbf5bd2c15..603e6ed2ceb 100644--- a/frontend/src/metabase/router/Link.unit.spec.tsx+++ b/frontend/src/metabase/router/Link.unit.spec.tsx@@ -1,8 +1,7 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";import { Link } from "./Link";+import { Route } from "./react-router";describe("router/Link", () => {it("re-exports the to-based Link", () => {diff --git a/frontend/src/metabase/router/Navigate.unit.spec.tsx b/frontend/src/metabase/router/Navigate.unit.spec.tsxindex 9083c7dd6f5..e81b9b9b94a 100644--- a/frontend/src/metabase/router/Navigate.unit.spec.tsx+++ b/frontend/src/metabase/router/Navigate.unit.spec.tsx@@ -1,10 +1,10 @@import userEvent from "@testing-library/user-event";import { useState } from "react";-import { Route } from "react-router";import { act, renderWithProviders, screen, waitFor } from "__support__/ui";import { Navigate } from "./Navigate";+import { Route } from "./react-router";// Stable references: `<Navigate>` keeps `state` raw in its effect deps (like v7),// so a fresh object literal each render would re-navigate and loop.diff --git a/frontend/src/metabase/router/RouterProvider.tsx b/frontend/src/metabase/router/RouterProvider.tsxindex c7af0721345..88d9dc37e99 100644--- a/frontend/src/metabase/router/RouterProvider.tsx+++ b/frontend/src/metabase/router/RouterProvider.tsx@@ -1,9 +1,15 @@import type { History } from "history";import { type PropsWithChildren, createContext } from "react";-import { Route, Router, type WithRouterProps, withRouter } from "react-router";import { useHistory } from "metabase/history";+import {+ Route,+ Router,+ type WithRouterProps,+ withRouter,+} from "./react-router";+type RouterContextType = WithRouterProps;export const RouterContext = createContext<RouterContextType | null>(null);diff --git a/frontend/src/metabase/router/index.ts b/frontend/src/metabase/router/index.tsindex acb62de5de0..7d61bac1230 100644--- a/frontend/src/metabase/router/index.ts+++ b/frontend/src/metabase/router/index.ts@@ -1,5 +1,6 @@export * from "./Link";export * from "./Navigate";+export * from "./react-router";export * from "./Outlet";export * from "./RouterProvider";export * from "./types";diff --git a/frontend/src/metabase/router/react-router.ts b/frontend/src/metabase/router/react-router.tsnew file mode 100644index 00000000000..bb6d09ae4ad--- /dev/null+++ b/frontend/src/metabase/router/react-router.ts@@ -0,0 +1,29 @@+// The single module that imports the `react-router` package directly. The rest+// of the app reaches these symbols through `metabase/router`, so later phases can+// swap the engine behind this seam without touching call sites.+//+// The v7-shaped API (useNavigate, useLocation, Link, Navigate, Outlet, ...) lives+// in the sibling facade modules. This file only re-exports the raw v3 symbols that+// have not been given a v7 shape yet (route-tree components, withRouter, history+// helpers) plus the raw Link/LinkProps under `Router`-prefixed names for the few+// call sites that need the unstyled primitive.+export {+ IndexRedirect,+ IndexRoute,+ Link as RouterLink,+ Redirect,+ Route,+ Router,+ createMemoryHistory,+ useRouterHistory,+ withRouter,+} from "react-router";++export type {+ InjectedRouter,+ LinkProps as RouterLinkProps,+ PlainRoute,+ RouteComponent,+ RouteProps,+ WithRouterProps,+} from "react-router";diff --git a/frontend/src/metabase/router/use-location.unit.spec.tsx b/frontend/src/metabase/router/use-location.unit.spec.tsxindex 67bd17d91c0..6aa3041f26d 100644--- a/frontend/src/metabase/router/use-location.unit.spec.tsx+++ b/frontend/src/metabase/router/use-location.unit.spec.tsx@@ -1,7 +1,6 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "./react-router";import { useLocation } from "./use-location";function LocationProbe() {diff --git a/frontend/src/metabase/router/use-navigate.unit.spec.tsx b/frontend/src/metabase/router/use-navigate.unit.spec.tsxindex d84f1b43746..f55441eed36 100644--- a/frontend/src/metabase/router/use-navigate.unit.spec.tsx+++ b/frontend/src/metabase/router/use-navigate.unit.spec.tsx@@ -1,8 +1,8 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "./react-router";import { useNavigate } from "./use-navigate";function NavigateProbe() {diff --git a/frontend/src/metabase/router/use-params.unit.spec.tsx b/frontend/src/metabase/router/use-params.unit.spec.tsxindex f30284cdb16..5f2b9187cc5 100644--- a/frontend/src/metabase/router/use-params.unit.spec.tsx+++ b/frontend/src/metabase/router/use-params.unit.spec.tsx@@ -1,7 +1,6 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "./react-router";import { useParams } from "./use-params";function ParamsProbe() {diff --git a/frontend/src/metabase/router/use-search-params.unit.spec.tsx b/frontend/src/metabase/router/use-search-params.unit.spec.tsxindex 6c88b76dc74..b5eadc8f63a 100644--- a/frontend/src/metabase/router/use-search-params.unit.spec.tsx+++ b/frontend/src/metabase/router/use-search-params.unit.spec.tsx@@ -1,8 +1,8 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import { act, renderWithProviders, screen } from "__support__/ui";+import { Route } from "./react-router";import { useSearchParams } from "./use-search-params";function SearchParamsProbe() {diff --git a/frontend/src/metabase/routes-embed.tsx b/frontend/src/metabase/routes-embed.tsxindex e0285f0b529..50ccd5b2746 100644--- a/frontend/src/metabase/routes-embed.tsx+++ b/frontend/src/metabase/routes-embed.tsx@@ -1,8 +1,7 @@-import { Route } from "react-router";-import { PublicNotFound } from "metabase/public/components/PublicNotFound";import PublicApp from "metabase/public/containers/PublicApp";import { PublicOrEmbeddedQuestion } from "metabase/public/containers/PublicOrEmbeddedQuestion";+import { Route } from "metabase/router";import { PublicOrEmbeddedDashboardPage } from "./public/containers/PublicOrEmbeddedDashboard";diff --git a/frontend/src/metabase/routes-public.tsx b/frontend/src/metabase/routes-public.tsxindex 4819c04b810..7fbcf50e990 100644--- a/frontend/src/metabase/routes-public.tsx+++ b/frontend/src/metabase/routes-public.tsx@@ -1,11 +1,10 @@-import { Route } from "react-router";-import { PublicNotFound } from "metabase/public/components/PublicNotFound";import PublicAction from "metabase/public/containers/PublicAction";import PublicApp from "metabase/public/containers/PublicApp";import { PublicDocument } from "metabase/public/containers/PublicDocument";import { PublicOrEmbeddedDashboardPage } from "metabase/public/containers/PublicOrEmbeddedDashboard";import { PublicOrEmbeddedQuestion } from "metabase/public/containers/PublicOrEmbeddedQuestion";+import { Route } from "metabase/router";export const getRoutes = () => {return (diff --git a/frontend/src/metabase/routes-stable-id-aware.tsx b/frontend/src/metabase/routes-stable-id-aware.tsxindex ad98d2402db..67897cb8b4e 100644--- a/frontend/src/metabase/routes-stable-id-aware.tsx+++ b/frontend/src/metabase/routes-stable-id-aware.tsx@@ -1,9 +1,9 @@import { useEffect, useMemo, useState } from "react";-import type { WithRouterProps } from "react-router";import { match } from "ts-pattern";import { NotFound } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type { WithRouterProps } from "metabase/router";import { isBaseEntityID } from "metabase-types/api/entity-id";import {diff --git a/frontend/src/metabase/routes.tsx b/frontend/src/metabase/routes.tsxindex 993450a00d4..c6aa485bd98 100644--- a/frontend/src/metabase/routes.tsx+++ b/frontend/src/metabase/routes.tsx@@ -1,5 +1,4 @@import type { Store, ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";-import { IndexRedirect, IndexRoute, Redirect, Route } from "react-router";import App from "metabase/AppComponent";import { getAccountRoutes } from "metabase/account/routes";@@ -66,6 +65,7 @@ import SegmentFieldListContainer from "metabase/reference/segments/SegmentFieldLimport SegmentListContainer from "metabase/reference/segments/SegmentListContainer";import SegmentQuestionsContainer from "metabase/reference/segments/SegmentQuestionsContainer";import SegmentRevisionsContainer from "metabase/reference/segments/SegmentRevisionsContainer";+import { IndexRedirect, IndexRoute, Redirect, Route } from "metabase/router";import { SearchApp } from "metabase/search/containers/SearchApp";import { Setup } from "metabase/setup/components/Setup";import getCollectionTimelineRoutes from "metabase/timelines/collections/routes";diff --git a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsxindex 4a70b408351..af1863891d7 100644--- a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx+++ b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupCollectionByIdEndpoint,@@ -15,6 +14,7 @@ import {within,} from "__support__/ui";import type { SearchFilters } from "metabase/common/search/types";+import { Route } from "metabase/router";import { SearchApp } from "metabase/search/containers/SearchApp";import { checkNotNull } from "metabase/utils/types";import type { EnabledSearchModel, SearchResult } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsxindex e70f55da490..c20b5a0c2fc 100644--- a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx@@ -1,5 +1,4 @@import type { ReactNode } from "react";-import { Link } from "react-router";import { t } from "ttag";import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";@@ -9,6 +8,7 @@ import {PaneHeaderInput,} from "metabase/common/data-studio/components/PaneHeader";import { useSetting } from "metabase/common/hooks";+import { Link } from "metabase/router";import { Group, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsx b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsxindex e1450a6ec60..ebaf506d0c2 100644--- a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsx@@ -1,10 +1,9 @@-import { Route } from "react-router";-import {setupListTransformJobTransformsEndpoint,setupListTransformTagsEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { TransformJob } from "metabase-types/api";import { createMockTransformJob } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx b/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsxindex 39d1b31d51a..6ed9698ffba 100644--- a/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx+++ b/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx@@ -1,6 +1,6 @@-import { Link } from "react-router";import { t } from "ttag";+import { Link } from "metabase/router";import { Button, type ButtonProps } from "metabase/ui";import { transformEdit } from "metabase/urls";import type { TransformId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsxindex 78bab699087..7c826532f3d 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterprisePlugins } from "__support__/enterprise";import {setupCollectionByIdEndpoint,@@ -7,6 +5,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, within } from "__support__/ui";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";+import { Route } from "metabase/router";import {createMockCollection,createMockTransform,diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsxindex aef92520722..bbc71ae1a1e 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import {setupDatabaseListEndpoint,setupPropertiesEndpoints,@@ -8,6 +6,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import {createMockSettings,diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsxindex ba38c13a2ee..3cb7855f80a 100644--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx@@ -1,7 +1,6 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import type { ReactNode } from "react";-import { Route } from "react-router";import {setupDeleteTransformJobEndpoint,@@ -11,6 +10,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks/state";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { TransformJob } from "metabase-types/api";import {diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsxindex 80f20e8deb3..1f29ed5084c 100644--- a/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx@@ -1,5 +1,4 @@import fetchMock from "fetch-mock";-import { Route } from "react-router";import { setupDatabaseListEndpoint } from "__support__/server-mocks";import {@@ -7,6 +6,7 @@ import {setupListTransformTagsEndpoint,} from "__support__/server-mocks/transform";import { act, renderWithProviders, screen, within } from "__support__/ui";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { TransformJob } from "metabase-types/api";import {diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsxindex 266d80300e3..206e8d2396f 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx@@ -2,7 +2,6 @@ import { useDisclosure, useElementSize } from "@mantine/hooks";import cx from "classnames";import type { Location } from "history";import { useCallback, useLayoutEffect, useMemo, useState } from "react";-import { Link } from "react-router";import { replace } from "react-router-redux";import { t } from "ttag";@@ -20,6 +19,7 @@ import {} from "metabase/common/data-studio/components/PaneHeader";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";+import { Link } from "metabase/router";import { POLLING_INTERVAL } from "metabase/transforms/constants";import { formatRunMethod, formatStatus } from "metabase/transforms/utils";import { Center, Flex, Group, Select, Stack } from "metabase/ui";diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsxindex dde29d296e3..abd0685ad3a 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx@@ -1,6 +1,5 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {setupGetTransformJobEndpoint,@@ -16,6 +15,7 @@ import {waitFor,within,} from "__support__/ui";+import { Route } from "metabase/router";import { POLLING_INTERVAL } from "metabase/transforms/constants";import type {TransformJobRun,diff --git a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsxindex 517fd14d032..5fb4e960f12 100644--- a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx@@ -1,5 +1,4 @@import { useMemo, useState } from "react";-import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -12,6 +11,7 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeader";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";+import type { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsxindex 8b44ab95899..8da71017a73 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -1,7 +1,6 @@import { useDisclosure } from "@mantine/hooks";import type { Location } from "history";import { useCallback, useMemo, useRef, useState } from "react";-import { Link, type Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";@@ -19,6 +18,7 @@ import {import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";+import { Link, type Route } 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";diff --git a/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx b/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsxindex dfd80d9695b..b794cf2ad42 100644--- a/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx+++ b/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx@@ -1,10 +1,10 @@-import { Link } from "react-router";import { t } from "ttag";import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { Button, Center, Icon, Stack, Text, Title } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsxindex c1f32dfe854..3f2dcaf0250 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { Route } from "react-router";import {setupListTransformRunsEndpoint,@@ -13,6 +12,7 @@ import {screen,within,} from "__support__/ui";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type { TransformRun } from "metabase-types/api";import {diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsxindex f52f8695436..c70de18e44b 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx@@ -1,7 +1,7 @@-import { Link } from "react-router";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { Link } from "metabase/router";import { Anchor, Breadcrumbs, FixedSizeIcon, Group } from "metabase/ui";import * as Urls from "metabase/urls";import type { TransformRun } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsxindex dc4a1109bdc..76ee52b21a2 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx@@ -7,7 +7,6 @@ import {useRef,useState,} from "react";-import type { WithRouterProps } from "react-router";import { t } from "ttag";import {@@ -27,6 +26,7 @@ import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { PLUGIN_REPLACEMENT, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { useSelector } from "metabase/redux";+import type { WithRouterProps } from "metabase/router";import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsxindex c6eb918e425..97ef8e1bc4e 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx@@ -1,5 +1,4 @@import type { ReactNode } from "react";-import { Route } from "react-router";import {setupCollectionTreeEndpoint,@@ -14,6 +13,7 @@ import {waitForLoaderToBeRemoved,} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import { createMockTokenFeatures } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsxindex 6f390390157..dfd08ecf51f 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx@@ -1,6 +1,5 @@-import { Route } from "react-router";-import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import * as transformsUtils from "metabase/transforms/utils";import type { DraftTransformSource } from "metabase-types/api";import { createMockTransform } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex 93e19f7ecee..da3f197777b 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -1,6 +1,5 @@import { useDisclosure } from "@mantine/hooks";import { useEffect, useLayoutEffect, useMemo, useState } from "react";-import type { Route, RouteProps } from "react-router";import { push } from "react-router-redux";import { useLatest } from "react-use";import { t } from "ttag";@@ -20,6 +19,7 @@ import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";+import type { Route, RouteProps } 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";diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsxindex 4acc5f93de7..cda55ac8cd6 100644--- a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx@@ -1,5 +1,4 @@import { useDisclosure } from "@mantine/hooks";-import { Link } from "react-router";import { usePrevious } from "react-use";import { t } from "ttag";@@ -13,6 +12,7 @@ import { TitleSection } from "metabase/common/data-studio/components/TitleSectioimport { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";+import { Link } from "metabase/router";import { Anchor, Box, Card, Divider, Group, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import { isResourceNotFoundError } from "metabase/utils/errors";diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsxindex e27b0a9a28d..a03d6981bb7 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import {@@ -10,6 +8,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type {EnterpriseSettings,diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsxindex 0e56943ec00..397797e2348 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx@@ -1,5 +1,3 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";import {@@ -10,6 +8,7 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import * as Urls from "metabase/urls";import type {EnterpriseSettings,diff --git a/frontend/src/metabase/transforms/routes.tsx b/frontend/src/metabase/transforms/routes.tsxindex 111fd630fac..db041cc0698 100644--- a/frontend/src/metabase/transforms/routes.tsx+++ b/frontend/src/metabase/transforms/routes.tsx@@ -1,10 +1,9 @@-import { IndexRoute, Route } from "react-router";-import {PLUGIN_DEPENDENCIES,PLUGIN_REPLACEMENT,PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";+import { IndexRoute, Route } from "metabase/router";import { JobListPage } from "./pages/JobListPage";import { JobPage } from "./pages/JobPage";diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsxindex 571b19ee82f..933bc07e69e 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx@@ -3,8 +3,9 @@ import { flexRender } from "@tanstack/react-table";import cx from "classnames";import type { MouseEvent } from "react";import { memo, useMemo } from "react";-import { Link } from "react-router";+// eslint-disable-next-line boundaries/element-types -- this UI-library row renders a routing Link; it predates the metabase/router facade and should move out of metabase/ui+import { Link } from "metabase/router";import { Flex } from "metabase/ui";import { ExpandButton } from "../ExpandButton";diff --git a/frontend/src/metabase/visualizations/components/legend/LegendLabel.tsx b/frontend/src/metabase/visualizations/components/legend/LegendLabel.tsxindex 1d83db8ba90..f73ff302f5a 100644--- a/frontend/src/metabase/visualizations/components/legend/LegendLabel.tsx+++ b/frontend/src/metabase/visualizations/components/legend/LegendLabel.tsx@@ -8,10 +8,10 @@ import {forwardRef,useCallback,} from "react";-import type { LinkProps } from "react-router";-import { Link } from "react-router";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import type { LinkProps } from "metabase/router";+import { Link } from "metabase/router";import { Box } from "metabase/ui";import S from "./LegendLabel.module.css";diff --git a/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsx b/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsxindex 42ba22694b3..5b52afdc240 100644--- a/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsx@@ -1,8 +1,8 @@import { fireEvent, render } from "@testing-library/react";import type { ComponentProps } from "react";-import { Route, Router, createMemoryHistory } from "react-router";import { screen } from "__support__/ui";+import { Route, Router, createMemoryHistory } from "metabase/router";import { LegendLabel } from "./LegendLabel";diff --git a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsxindex 5a45f337c89..68d690fc089 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx@@ -1,9 +1,8 @@-import { Route } from "react-router";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import {createMockTokenFeatures,diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsxindex e5c1b944a9b..0af3401aac2 100644--- a/frontend/test/__support__/ui.tsx+++ b/frontend/test/__support__/ui.tsx@@ -14,7 +14,6 @@ import { useCallback, useMemo, useState } from "react";import { DragDropContextProvider } from "react-dnd";import HTML5Backend from "react-dnd-html5-backend";import { createPortal } from "react-dom";-import { Route, useRouterHistory } from "react-router";import { routerMiddleware, routerReducer } from "react-router-redux";import _ from "underscore";@@ -30,7 +29,7 @@ import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";-import { RouterProvider } from "metabase/router";+import { Route, RouterProvider, useRouterHistory } from "metabase/router";import { getMetabaseCssVariables } from "metabase/styled-components/theme/css-variables";import type { MantineThemeOverride } from "metabase/ui";import { PortalContainer, ThemeProvider, useMantineTheme } from "metabase/ui";