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
Convert the route tree to element/Outlet (#77805)
Romeo Van Snick638f7e7f86bd
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 dc27469a329..3eb3546e2a5 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@@ -14,8 +14,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";-import type { ModalComponentProps } from "metabase/common/components/ModalRoute";-import { Route } from "metabase/router";+import { Route, withRouteProps } 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";@@ -26,6 +25,8 @@ import {createMockTable,} from "metabase-types/api/mocks";+const RoutedImpersonationModal = withRouteProps(ImpersonationModal);+const groupId = 2;const databaseId = 1;const selectedAttribute = "foo";@@ -67,9 +68,7 @@ const setup = async ({<Route path="/" /><Routepath="database/:databaseId/impersonated/group/:groupId"- component={(props: ModalComponentProps) => (- <ImpersonationModal {...props} onClose={onClose} />- )}+ element={<RoutedImpersonationModal onClose={onClose} />}/></>,{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 0bd615485d8..eb7bd08c50b 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@@ -10,11 +10,11 @@ const setup = (database: IDatabase) => {renderWithProviders(<Routepath="*"- component={() => (+ element={<ImpersonationWarningdatabase={new Database({ ...database, tables: [] })}/>- )}+ }/>,{withRouter: true,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsxindex 6cb7e686208..a8e9ec58b87 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx@@ -2,13 +2,13 @@ import { useLayoutEffect } from "react";import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";-import { replace } from "metabase/router";+import { Outlet, replace } from "metabase/router";const FALLBACK_PATH = "/admin/metabot/";/** Redirects Metabot admin sub-pages to the index until AI is configured. */export const RequireMetabotConfigured = ({- children,+ children = <Outlet />,}: {children?: React.ReactNode;}) => {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 853b8141d7f..7efe4a2397c 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@@ -10,13 +10,10 @@ const INDEX_PATH = "/admin/metabot/";function setup({ configured }: { configured: boolean }) {return renderWithProviders(<>- <Route component={RequireMetabotConfigured}>- <Route- path={SUB_PAGE_PATH}- component={() => <div>SUB PAGE CONTENT</div>}- />+ <Route element={<RequireMetabotConfigured />}>+ <Route path={SUB_PAGE_PATH} element={<div>SUB PAGE CONTENT</div>} /></Route>- <Route path={INDEX_PATH} component={() => <div>METABOT INDEX</div>} />+ <Route path={INDEX_PATH} element={<div>METABOT INDEX</div>} /></>,{withRouter: true,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsxindex a2a538a6646..cc46d048768 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/routes.tsx@@ -19,36 +19,36 @@ import { MetabotUsageLimitsPage } from "./pages/MetabotUsageLimitsPage";export function getAiControlsRoutes() {return (- <Route component={RequireMetabotConfigured}>+ <Route element={<RequireMetabotConfigured />}><Routekey="ai-feature-access"path="usage-controls/ai-feature-access"- component={MetabotFeatureAccessPage}+ element={<MetabotFeatureAccessPage />}/><Routekey="ai-usage-limits"path="usage-controls/ai-usage-limits"- component={MetabotUsageLimitsPage}+ element={<MetabotUsageLimitsPage />}/><Routekey="customization"path="customization"- component={MetabotCustomizationPage}+ element={<MetabotCustomizationPage />}/><Routekey="system-prompts-metabot-chat"path="system-prompts/metabot-chat"- component={MetabotChatPromptPage}+ element={<MetabotChatPromptPage />}/><Routekey="system-prompts-natural-language-queries"path="system-prompts/natural-language-queries"- component={NaturalLanguagePromptPage}+ element={<NaturalLanguagePromptPage />}/><Routekey="system-prompts-sql-generation"path="system-prompts/sql-generation"- component={SqlGenerationPromptPage}+ element={<SqlGenerationPromptPage />}/></Route>);@@ -60,17 +60,17 @@ export function getAiControlsUpsellRoutes() {<Routekey="ai-feature-access"path="usage-controls/ai-feature-access"- component={MetabotFeatureAccessUpsellPage}+ element={<MetabotFeatureAccessUpsellPage />}/><Routekey="customization"path="customization"- component={MetabotCustomizationUpsellPage}+ element={<MetabotCustomizationUpsellPage />}/><Routekey="system-prompts"path="system-prompts/metabot-chat"- component={MetabotSystemPromptsUpsellPage}+ element={<MetabotSystemPromptsUpsellPage />}/></>);diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsxindex 19b53d3553a..12867bdfabb 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/routes.tsx@@ -1,9 +1,13 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import ApplicationPermissionsPage from "./pages/ApplicationPermissionsPage";+const RoutedApplicationPermissionsPage = withRouteProps(+ ApplicationPermissionsPage,+);+const getRoutes = () => (- <Route path="application" component={ApplicationPermissionsPage} />+ <Route path="application" element={<RoutedApplicationPermissionsPage />} />);// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsxindex e037384412b..c190b4807a6 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx@@ -9,7 +9,7 @@ import {import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { registerVisualizations } from "metabase/visualizations/register";import type { Database, Dataset, Field } from "metabase-types/api";import {@@ -28,6 +28,8 @@ import { AUDIT_DB_ID } from "../constants";import { McpAnalyticsPage } from "./McpAnalyticsPage";+const RoutedMcpAnalyticsPage = withRouteProps(McpAnalyticsPage);+registerVisualizations();const MCP_TOOL_CALLS_TABLE_ID = 2001;@@ -183,7 +185,7 @@ function setup({ dataset }: { dataset?: Dataset } = {}) {return renderWithProviders(<Routepath="/admin/metabot/usage-auditing/mcp"- component={McpAnalyticsPage}+ element={<RoutedMcpAnalyticsPage />}/>,{initialRoute: "/admin/metabot/usage-auditing/mcp",diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/routes.tsxindex b7bac555987..72f4ca92623 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/routes.tsx@@ -1,7 +1,9 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { McpAnalyticsPage } from "./components/McpAnalyticsPage";+const RoutedMcpAnalyticsPage = withRouteProps(McpAnalyticsPage);+/*** The `/admin/metabot/usage-auditing/mcp` route — nested under the `usage-auditing` namespace so* the admin nav opens the "Usage auditing" folder (where the link lives) rather than the MCP@@ -13,7 +15,7 @@ export function getMcpAnalyticsRoutes() {<Routekey="mcp-analytics"path="usage-auditing/mcp"- component={McpAnalyticsPage}+ element={<RoutedMcpAnalyticsPage />}/>);}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsxindex b6e0fde58e4..97b85ddf78c 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx@@ -2,13 +2,15 @@ import userEvent from "@testing-library/user-event";import { setupMetabotConversationEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen, within } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { createMockUser } from "metabase-types/api/mocks";import type { ConversationDetail, ConversationFeedback } from "../../types";import { ConversationDetailPage } from "./ConversationDetailPage";+const RoutedConversationDetailPage = withRouteProps(ConversationDetailPage);+jest.mock("metabase/admin/ai/MetabotAdminLayout", () => ({MetabotAdminLayout: ({ children }: { children: React.ReactNode }) => children,}));@@ -88,7 +90,10 @@ function createConversation(function setup(conversation: ConversationDetail) {setupMetabotConversationEndpoint(conversation);return renderWithProviders(- <Route path="/conversations/:convoId" component={ConversationDetailPage} />,+ <Route+ path="/conversations/:convoId"+ element={<RoutedConversationDetailPage />}+ />,{withRouter: true,initialRoute: "/conversations/convo-1",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 ca7217cc5ad..31b86ddf355 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,16 +1,23 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { ConversationDetailPage } from "./components/ConversationDetailPage";import { ConversationStatsPage } from "./components/ConversationStatsPage";import { ConversationsPage } from "./components/ConversationsPage";import { MetabotAnalyticsUpsellPage } from "./components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage";+const RoutedConversationStatsPage = withRouteProps(ConversationStatsPage);+const RoutedConversationsPage = withRouteProps(ConversationsPage);+const RoutedConversationDetailPage = withRouteProps(ConversationDetailPage);+export function getAiAnalyticsRoutes() {return (<Route key="usage-auditing" path="usage-auditing">- <Route index component={ConversationStatsPage} />- <Route path="conversations" component={ConversationsPage} />- <Route path="conversations/:convoId" component={ConversationDetailPage} />+ <Route index element={<RoutedConversationStatsPage />} />+ <Route path="conversations" element={<RoutedConversationsPage />} />+ <Route+ path="conversations/:convoId"+ element={<RoutedConversationDetailPage />}+ /></Route>);}@@ -20,7 +27,7 @@ export function getAiAnalyticsUpsellRoutes() {<Routekey="usage-auditing"path="usage-auditing"- component={MetabotAnalyticsUpsellPage}+ element={<MetabotAnalyticsUpsellPage />}/>);}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 97414eeb811..16466e70b67 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@@ -43,13 +43,13 @@ function setup({ cardId = 19, cardName = "Number of Orders" }: SetupOpts = {}) {renderWithProviders(<Routepath="/"- component={() => (+ element={<MetricCachingModalcardId={cardId}cardName={cardName}onClose={onClose}/>- )}+ }/>,{ storeInitialState, withRouter: true, initialRoute: "/" },);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 3d742d84278..7f313d48ae8 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@@ -45,13 +45,11 @@ const setup = ({ isSuperuser = true, remoteSyncType }: SetupOptions = {}) => {<><Routepath="/"- component={() => (- <RootSnippetsCollectionMenu collectionId={collection.id} />- )}+ element={<RootSnippetsCollectionMenu collectionId={collection.id} />}/><Routepath={dataStudioArchivedSnippets()}- component={() => <div data-testid="archived-snippets" />}+ element={<div data-testid="archived-snippets" />}/></>,{diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsxindex 94dad07f5f6..c9dc11c62d4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibrarySectionLayout/LibrarySectionLayout.tsx@@ -1,14 +1,10 @@-import type { ReactNode } from "react";import { t } from "ttag";import { usePageTitle } from "metabase/hooks/use-page-title";+import { Outlet } from "metabase/router";-type LibrarySectionLayoutProps = {- children?: ReactNode;-};--export function LibrarySectionLayout({ children }: LibrarySectionLayoutProps) {+export function LibrarySectionLayout() {usePageTitle(t`Library`);- return <>{children}</>;+ return <Outlet />;}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsxindex ba7854609bf..75acfb959fc 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx@@ -1,5 +1,3 @@-import type { ReactNode } from "react";-import type { MetricPageParams } from "metabase/common/metrics/types";import { MetricDependenciesPage } from "metabase/metrics/pages/MetricDependenciesPage";@@ -8,12 +6,10 @@ import { dataStudioMetricUrls } from "../../urls";interface DataStudioMetricDependenciesPageProps {params: MetricPageParams;- children?: ReactNode;}export function DataStudioMetricDependenciesPage({params,- children,}: DataStudioMetricDependenciesPageProps) {return (<MetricDependenciesPage@@ -22,8 +18,6 @@ export function DataStudioMetricDependenciesPage({showAppSwitchershowDataStudioLink={false}renderBreadcrumbs={(card) => <DataStudioMetricBreadcrumbs card={card} />}- >- {children}- </MetricDependenciesPage>+ />);}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 7c13fec2ca4..8f5aaad15e8 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,5 +1,5 @@import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { DataStudioMetricAboutPage } from "./pages/DataStudioMetricAboutPage";import { DataStudioMetricDependenciesPage } from "./pages/DataStudioMetricDependenciesPage";@@ -8,22 +8,48 @@ import { DataStudioMetricOverviewPage } from "./pages/DataStudioMetricOverviewPaimport { DataStudioMetricQueryPage } from "./pages/DataStudioMetricQueryPage";import { DataStudioNewMetricPage } from "./pages/NewMetricPage";+const RoutedDataStudioNewMetricPage = withRouteProps(DataStudioNewMetricPage);+const RoutedDataStudioMetricAboutPage = withRouteProps(+ DataStudioMetricAboutPage,+);+const RoutedDataStudioMetricOverviewPage = withRouteProps(+ DataStudioMetricOverviewPage,+);+const RoutedDataStudioMetricQueryPage = withRouteProps(+ DataStudioMetricQueryPage,+);+const RoutedDataStudioMetricDependenciesPage = withRouteProps(+ DataStudioMetricDependenciesPage,+);+const RoutedDataStudioMetricHistoryPage = withRouteProps(+ DataStudioMetricHistoryPage,+);+export function getDataStudioMetricRoutes() {return (<Route path="metrics">- <Route path="new" component={DataStudioNewMetricPage} />- <Route path=":cardId" component={DataStudioMetricAboutPage} />- <Route path=":cardId/overview" component={DataStudioMetricOverviewPage} />- <Route path=":cardId/query" component={DataStudioMetricQueryPage} />+ <Route path="new" element={<RoutedDataStudioNewMetricPage />} />+ <Route path=":cardId" element={<RoutedDataStudioMetricAboutPage />} />+ <Route+ path=":cardId/overview"+ element={<RoutedDataStudioMetricOverviewPage />}+ />+ <Route+ path=":cardId/query"+ element={<RoutedDataStudioMetricQueryPage />}+ />{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath=":cardId/dependencies"- component={DataStudioMetricDependenciesPage}+ element={<RoutedDataStudioMetricDependenciesPage />}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}- <Route path=":cardId/history" component={DataStudioMetricHistoryPage} />+ <Route+ path=":cardId/history"+ element={<RoutedDataStudioMetricHistoryPage />}+ /></Route>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsxindex 2cfc425b74b..ac80c8dcaba 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx@@ -1,6 +1,5 @@import type { ComponentType } from "react";-import { getDataStudioSegmentRoutes } from "metabase/data-studio/segments/routes";import { Route } from "metabase/router";import { LibraryPage } from "./LibraryPage";@@ -11,11 +10,10 @@ import { getDataStudioTableRoutes } from "./tables/routes";export const getDataStudioLibraryRoutes = (IsAdmin: ComponentType) => {return (- <Route path="library" component={LibrarySectionLayout}>- <Route index component={LibraryPage} />+ <Route path="library" element={<LibrarySectionLayout />}>+ <Route index element={<LibraryPage />} />{getDataStudioTableRoutes(IsAdmin)}{getDataStudioMetricRoutes()}- {getDataStudioSegmentRoutes()}{getDataStudioSnippetRoutes()}</Route>);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 cf41e780695..06a55cd5cc2 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@@ -55,12 +55,12 @@ const setup = ({ snippet = {}, remoteSyncType }: SetupOps) => {renderWithProviders(<Routepath="/"- component={() => (+ element={<SnippetHeadersnippet={mockSnippet}actions={<div data-testid="custom-actions" />}/>- )}+ }/>,{storeInitialState: state,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 de82bfb5485..6d6d2e044ea 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@@ -7,7 +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 { Route, withRouteProps } from "metabase/router";import type {EnterpriseSettings,NativeQuerySnippet,@@ -21,6 +21,8 @@ import {import { EditSnippetPage } from "../EditSnippetPage";+const RoutedEditSnippetPage = withRouteProps(EditSnippetPage);+type SetupOps = {snippet?: Partial<NativeQuerySnippet>;remoteSyncType?: EnterpriseSettings["remote-sync-type"];@@ -54,7 +56,7 @@ export const setup = async ({}renderWithProviders(- <Route component={EditSnippetPage} path="/snippets/:snippetId" />,+ <Route element={<RoutedEditSnippetPage />} path="/snippets/:snippetId" />,{initialRoute: `/snippets/${mockSnippet.id}`,storeInitialState: state,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsxindex 69e4ad6f2f1..8f62aff1529 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx@@ -1,9 +1,8 @@-import type { ReactNode } from "react";-import { skipToken, useGetSnippetQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { Outlet } from "metabase/router";import { Card, Center } from "metabase/ui";import * as Urls from "metabase/urls";@@ -15,12 +14,10 @@ export type SnippetDependenciesPageParams = {type SnippetDependenciesPageProps = {params?: SnippetDependenciesPageParams;- children?: ReactNode;};export function SnippetDependenciesPage({params,- children,}: SnippetDependenciesPageProps) {const snippetId = Urls.extractEntityId(params?.snippetId);@@ -48,7 +45,7 @@ export function SnippetDependenciesPage({}}><Card p={0} withBorder flex={1}>- {children}+ <Outlet /></Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider></PageContainer>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 a5053779392..7885ff89c95 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,23 +1,27 @@import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { ArchivedSnippetsPage } from "./pages/ArchivedSnippetsPage";import { EditSnippetPage } from "./pages/EditSnippetPage";import { NewSnippetPage } from "./pages/NewSnippetPage";import { SnippetDependenciesPage } from "./pages/SnippetDependenciesPage";+const RoutedNewSnippetPage = withRouteProps(NewSnippetPage);+const RoutedEditSnippetPage = withRouteProps(EditSnippetPage);+const RoutedSnippetDependenciesPage = withRouteProps(SnippetDependenciesPage);+export function getDataStudioSnippetRoutes() {return (<>- <Route path="snippets/new" component={NewSnippetPage} />- <Route path="snippets/archived" component={ArchivedSnippetsPage} />- <Route path="snippets/:snippetId" component={EditSnippetPage} />+ <Route path="snippets/new" element={<RoutedNewSnippetPage />} />+ <Route path="snippets/archived" element={<ArchivedSnippetsPage />} />+ <Route path="snippets/:snippetId" element={<RoutedEditSnippetPage />} />{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath="snippets/:snippetId/dependencies"- component={SnippetDependenciesPage}+ element={<RoutedSnippetDependenciesPage />}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}</>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 8c15b1030d4..2d8df99333f 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@@ -155,7 +155,7 @@ const setup = ({ table, remoteSyncType, onMoved }: SetupOpts = {}) => {renderWithProviders(<Routepath="/"- component={() => <TableMoreMenu table={tableData} onMoved={onMoved} />}+ element={<TableMoreMenu table={tableData} onMoved={onMoved} />}/>,{withRouter: true,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsxindex 9191b0b605f..142bed60e82 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx@@ -1,9 +1,8 @@-import type { ReactNode } from "react";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { Outlet } from "metabase/router";import { Card, Center } from "metabase/ui";import * as Urls from "metabase/urls";@@ -15,13 +14,9 @@ type TableDependenciesPageParams = {type TableDependenciesPageProps = {params: TableDependenciesPageParams;- children?: ReactNode;};-export function TableDependenciesPage({- params,- children,-}: TableDependenciesPageProps) {+export function TableDependenciesPage({ params }: TableDependenciesPageProps) {const tableId = Urls.extractEntityId(params.tableId);const { table, isLoading, error } = useLoadTableWithMetadata(tableId);@@ -43,7 +38,7 @@ export function TableDependenciesPage({}}><Card p={0} withBorder flex={1}>- {children}+ <Outlet /></Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider></PageContainer>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 0f6315013ab..c858db2e723 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@@ -49,7 +49,7 @@ const setup = ({ isAdmin = true, remoteSyncType, table }: SetupOpts = {}) => {enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);renderWithProviders(- <Route path="/" component={() => <TableMeasures table={mockTable} />} />,+ <Route path="/" element={<TableMeasures table={mockTable} />} />,{withRouter: true,storeInitialState: state,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 8db365a7c84..7d5573f4964 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@@ -53,7 +53,7 @@ const setup = ({enterprisePlugins.forEach(setupEnterpriseOnlyPlugin);renderWithProviders(- <Route path="/" component={() => <TableSegments table={mockTable} />} />,+ <Route path="/" element={<TableSegments table={mockTable} />} />,{storeInitialState: state,withRouter: true,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 e1b9623ab4d..e92705d8aff 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@@ -9,7 +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 { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { TableDependenciesPage } from "./pages/TableDependenciesPage";import { TableFieldsPage } from "./pages/TableFieldsPage";@@ -17,55 +17,91 @@ import { TableMeasuresPage } from "./pages/TableMeasuresPage";import { TableOverviewPage } from "./pages/TableOverviewPage";import { TableSegmentsPage } from "./pages/TableSegmentsPage";+const RoutedTableOverviewPage = withRouteProps(TableOverviewPage);+const RoutedTableFieldsPage = withRouteProps(TableFieldsPage);+const RoutedTableSegmentsPage = withRouteProps(TableSegmentsPage);+const RoutedTableMeasuresPage = withRouteProps(TableMeasuresPage);+const RoutedTableDependenciesPage = withRouteProps(TableDependenciesPage);+const RoutedPublishedTableNewSegmentPage = withRouteProps(+ PublishedTableNewSegmentPage,+);+const RoutedPublishedTableSegmentDetailPage = withRouteProps(+ PublishedTableSegmentDetailPage,+);+const RoutedPublishedTableSegmentRevisionHistoryPage = withRouteProps(+ PublishedTableSegmentRevisionHistoryPage,+);+const RoutedPublishedTableSegmentDependenciesPage = withRouteProps(+ PublishedTableSegmentDependenciesPage,+);+const RoutedPublishedTableNewMeasurePage = withRouteProps(+ PublishedTableNewMeasurePage,+);+const RoutedPublishedTableMeasureDetailPage = withRouteProps(+ PublishedTableMeasureDetailPage,+);+const RoutedPublishedTableMeasureRevisionHistoryPage = withRouteProps(+ PublishedTableMeasureRevisionHistoryPage,+);+const RoutedPublishedTableMeasureDependenciesPage = withRouteProps(+ PublishedTableMeasureDependenciesPage,+);+export function getDataStudioTableRoutes(IsAdmin: ComponentType) {return (<Route path="tables">- <Route path=":tableId" component={TableOverviewPage} />- <Route path=":tableId/fields" component={TableFieldsPage} />- <Route path=":tableId/fields/:fieldId" component={TableFieldsPage} />- <Route path=":tableId/segments" component={TableSegmentsPage} />+ <Route path=":tableId" element={<RoutedTableOverviewPage />} />+ <Route path=":tableId/fields" element={<RoutedTableFieldsPage />} />+ <Route+ path=":tableId/fields/:fieldId"+ element={<RoutedTableFieldsPage />}+ />+ <Route path=":tableId/segments" element={<RoutedTableSegmentsPage />} /><Route path=":tableId/segments/new" element={<IsAdmin />}>- <Route index component={PublishedTableNewSegmentPage} />+ <Route index element={<RoutedPublishedTableNewSegmentPage />} /></Route><Routepath=":tableId/segments/:segmentId"- component={PublishedTableSegmentDetailPage}+ element={<RoutedPublishedTableSegmentDetailPage />}/><Routepath=":tableId/segments/:segmentId/revisions"- component={PublishedTableSegmentRevisionHistoryPage}+ element={<RoutedPublishedTableSegmentRevisionHistoryPage />}/>{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath=":tableId/segments/:segmentId/dependencies"- component={PublishedTableSegmentDependenciesPage}+ element={<RoutedPublishedTableSegmentDependenciesPage />}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}- <Route path=":tableId/measures" component={TableMeasuresPage} />+ <Route path=":tableId/measures" element={<RoutedTableMeasuresPage />} /><Route path=":tableId/measures/new" element={<IsAdmin />}>- <Route index component={PublishedTableNewMeasurePage} />+ <Route index element={<RoutedPublishedTableNewMeasurePage />} /></Route><Routepath=":tableId/measures/:measureId"- component={PublishedTableMeasureDetailPage}+ element={<RoutedPublishedTableMeasureDetailPage />}/><Routepath=":tableId/measures/:measureId/revisions"- component={PublishedTableMeasureRevisionHistoryPage}+ element={<RoutedPublishedTableMeasureRevisionHistoryPage />}/>{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath=":tableId/measures/:measureId/dependencies"- component={PublishedTableMeasureDependenciesPage}+ element={<RoutedPublishedTableMeasureDependenciesPage />}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}{PLUGIN_DEPENDENCIES.isEnabled && (- <Route path=":tableId/dependencies" component={TableDependenciesPage}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route+ path=":tableId/dependencies"+ element={<RoutedTableDependenciesPage />}+ >+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}</Route>diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppsPage.unit.spec.tsxindex 38a1aec5fec..03b1627221b 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppsPage.unit.spec.tsx@@ -36,7 +36,7 @@ const setup = ({</>);- renderWithProviders(<Route path="/" component={Page} />, {+ renderWithProviders(<Route path="/" element={<Page />} />, {withRouter: true,});};diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/navbar/DataAppsNavbarSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/navbar/DataAppsNavbarSection.unit.spec.tsxindex 22762d25976..c5ea7b8d8ba 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/navbar/DataAppsNavbarSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/navbar/DataAppsNavbarSection.unit.spec.tsx@@ -27,7 +27,7 @@ describe("DataAppsNavbarSection", () => {renderWithProviders(<Routepath="/"- component={() => <DataAppsNavbarSection onItemSelect={jest.fn()} />}+ element={<DataAppsNavbarSection onItemSelect={jest.fn()} />}/>,{ withRouter: true },);diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/routes.tsxindex 1b31d14640f..571bee61b53 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/routes.tsx@@ -1,9 +1,12 @@-import { Route } from "metabase/router";+import { Outlet, Route, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import { DataAppLayout } from "./components/DataAppLayout/DataAppLayout";import { DataAppView } from "./components/DataAppView/DataAppView";+const RoutedDataAppLayout = withRouteProps(DataAppLayout);+const RoutedDataAppView = withRouteProps(DataAppView);+/*** Data-app host routes. Open to any signed-in user.*@@ -14,14 +17,18 @@ export function getRoutes() {return (<Routepath={`${Urls.DATA_APP_URL_SEGMENT}/:name`}- component={DataAppLayout}+ element={+ <RoutedDataAppLayout>+ <Outlet />+ </RoutedDataAppLayout>+ }>- <Route index component={DataAppView} />+ <Route index element={<RoutedDataAppView />} />{/* Sub-paths under /apps/:name are owned by the iframe's router.Same component — `DataAppView` just keeps the iframe mounted; the URLchange is mirrored back from inside the iframe via`history.replaceState`. */}- <Route path="*" component={DataAppView} />+ <Route path="*" element={<RoutedDataAppView />} /></Route>);}diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/index.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/index.tsxindex a202e04d072..dd38a33bb4b 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 { t } from "ttag";import { PLUGIN_DB_ROUTING } from "metabase/plugins";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { hasPremiumFeature } from "metabase-enterprise/settings";import { DatabaseRoutingSection } from "./DatabaseRoutingSection";@@ -10,6 +10,16 @@ import { DestinationDatabasesModal } from "./DestinationDatabasesModal";import { RemoveDestinationDatabaseModal } from "./RemoveDestinationDatabaseModal";import { useRedirectDestinationDatabase } from "./hooks";+const RoutedDestinationDatabasesModal = withRouteProps(+ DestinationDatabasesModal,+);+const RoutedDestinationDatabaseConnectionModal = withRouteProps(+ DestinationDatabaseConnectionModal,+);+const RoutedRemoveDestinationDatabaseModal = withRouteProps(+ RemoveDestinationDatabaseModal,+);+/*** Initialize database_routing plugin features that depend on hasPremiumFeature.*/@@ -38,14 +48,20 @@ export function initializePlugin() {PLUGIN_DB_ROUTING.getDestinationDatabaseRoutes = (IsAdmin: any) => (<Route path="destination-databases">- <Route index component={DestinationDatabasesModal} />+ <Route index element={<RoutedDestinationDatabasesModal />} /><Route element={<IsAdmin />}>- <Route path="create" component={DestinationDatabaseConnectionModal} />+ <Route+ path="create"+ element={<RoutedDestinationDatabaseConnectionModal />}+ /></Route><Route path=":destinationDatabaseId">- <Route index component={DestinationDatabaseConnectionModal} />+ <Route index element={<RoutedDestinationDatabaseConnectionModal />} /><Route element={<IsAdmin />}>- <Route path="remove" component={RemoveDestinationDatabaseModal} />+ <Route+ path="remove"+ element={<RoutedRemoveDestinationDatabaseModal />}+ /></Route></Route></Route>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 970a7baebc1..5128c7be947 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@@ -24,7 +24,7 @@ function setup({ node = createMockCardDependencyNode() }: SetupOpts = {}) {renderWithProviders(<Routepath="/"- component={() => <PanelBody node={node} getGraphUrl={getGraphUrl} />}+ element={<PanelBody node={node} getGraphUrl={getGraphUrl} />}/>,{ withRouter: true, initialRoute: "/" },);diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/index.tsindex e9bf016f346..023b8b3f6f2 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/index.ts@@ -1,4 +1,5 @@import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { withRouteProps } from "metabase/router";import { hasPremiumFeature } from "metabase-enterprise/settings";import { useGetDependenciesCount } from "./hooks/use-get-dependencies-count";@@ -18,7 +19,8 @@ export function initializePlugin() {getDataStudioDependencyRoutes;PLUGIN_DEPENDENCIES.getDataStudioDependencyDiagnosticsRoutes =getDataStudioDependencyDiagnosticsRoutes;- PLUGIN_DEPENDENCIES.DependencyGraphPage = DependencyGraphPage;+ PLUGIN_DEPENDENCIES.DependencyGraphPage =+ withRouteProps(DependencyGraphPage);PLUGIN_DEPENDENCIES.useGetDependenciesCount = useGetDependenciesCount;}}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 7b45504c57e..b4281f6126f 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@@ -4,20 +4,25 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { createMockDependencyGraph } from "metabase-types/api/mocks";import { DependencyGraphPage } from "./DependencyGraphPage";+const RoutedDependencyGraphPage = withRouteProps(DependencyGraphPage);+describe("DependencyGraphPage", () => {beforeEach(() => {setupDependencyGraphEndpoint(createMockDependencyGraph());setupRecentViewsAndSelectionsEndpoints([], ["selections"]);});it("should show an app switcher if there is no context", async () => {- renderWithProviders(<Route path="/" component={DependencyGraphPage} />, {- withRouter: true,- });+ renderWithProviders(+ <Route path="/" element={<RoutedDependencyGraphPage />} />,+ {+ withRouter: true,+ },+ );expect(await screen.findByTestId("dependency-graph")).toBeInTheDocument();expect(screen.getByTestId("app-switcher-target")).toBeInTheDocument();@@ -27,7 +32,7 @@ describe("DependencyGraphPage", () => {renderWithProviders(<Routepath="/"- component={() => (+ element={<PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Providervalue={{baseUrl: "any-url",@@ -36,7 +41,7 @@ describe("DependencyGraphPage", () => {><DependencyGraphPage /></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>- )}+ }/>,{withRouter: true,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsxindex 6cb49215477..46d6a86089f 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/routes.tsx@@ -1,4 +1,4 @@-import { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import {BrokenDependencyDiagnosticsPage,UnreferencedDependencyDiagnosticsPage,@@ -6,18 +6,29 @@ import {import { DependencyGraphPage } from "./pages/DependencyGraphPage";+const RoutedDependencyGraphPage = withRouteProps(DependencyGraphPage);+const RoutedBrokenDependencyDiagnosticsPage = withRouteProps(+ BrokenDependencyDiagnosticsPage,+);+const RoutedUnreferencedDependencyDiagnosticsPage = withRouteProps(+ UnreferencedDependencyDiagnosticsPage,+);+export function getDataStudioDependencyRoutes() {- return <Route index component={DependencyGraphPage} />;+ return <Route index element={<RoutedDependencyGraphPage />} />;}export function getDataStudioDependencyDiagnosticsRoutes() {return (<>- <Route index component={redirect("broken")} />- <Route path="broken" component={BrokenDependencyDiagnosticsPage} />+ <Route index element={redirect("broken")} />+ <Route+ path="broken"+ element={<RoutedBrokenDependencyDiagnosticsPage />}+ /><Routepath="unreferenced"- component={UnreferencedDependencyDiagnosticsPage}+ element={<RoutedUnreferencedDependencyDiagnosticsPage />}/></>);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 e51dedc111f..bbe16e40091 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@@ -31,7 +31,7 @@ function setup({renderWithProviders(<Routepath="/"- component={() => (+ element={<DiagnosticsSidebarnode={node}mode={mode}@@ -40,7 +40,7 @@ function setup({onResizeStop={onResizeStop}onClose={onClose}/>- )}+ }/>,{ withRouter: true, initialRoute: "/" },);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 d5c76680b1d..8384c6e8302 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@@ -22,7 +22,7 @@ type SetupOpts = {function setup({ node = createMockCardDependencyNode() }: SetupOpts = {}) {renderWithProviders(- <Route path="/" component={() => <InfoSection node={node} />} />,+ <Route path="/" element={<InfoSection node={node} />} />,{ withRouter: true, initialRoute: "/" },);}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 dbf4a788709..edda107c2e6 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@@ -18,7 +18,7 @@ type SetupOpts = {function setup({ node = createMockCardDependencyNode() }: SetupOpts = {}) {renderWithProviders(- <Route path="/" component={() => <LocationSection node={node} />} />,+ <Route path="/" element={<LocationSection node={node} />} />,{ withRouter: true, initialRoute: "/" },);}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 192861968e8..d9fe6ddf971 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@@ -19,9 +19,9 @@ function setup({ node = createMockCardDependencyNode() }: SetupOpts = {}) {renderWithProviders(<Routepath="/"- component={() => (+ element={<SidebarHeader node={node} onClose={onClose} mode="unreferenced" />- )}+ }/>,{ withRouter: true, initialRoute: "/" },);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 66d1da4ddf3..9c238732f95 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@@ -11,7 +11,7 @@ import {screen,within,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type * as Urls from "metabase/urls";import type { DependencyDiagnosticsMode } from "metabase-enterprise/monitor/dependency-diagnostics/components/types";import type {@@ -82,13 +82,14 @@ function setup({mockGetBoundingClientRect({ width: 100, height: 100 });- const PageComponent =+ const PageComponent = withRouteProps(mode === "broken"? BrokenDependencyDiagnosticsPage- : UnreferencedDependencyDiagnosticsPage;+ : UnreferencedDependencyDiagnosticsPage,+ );const { history } = renderWithProviders(- <Route path={getPageUrl(mode, {})} component={PageComponent} />,+ <Route path={getPageUrl(mode, {})} element={<PageComponent />} />,{withRouter: true,initialRoute: getPageUrl(mode, urlParams),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 b1c306ec55b..dd3af97ba2b 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@@ -59,14 +59,14 @@ const setup = ({return renderWithProviders(<Routepath="/"- component={() => (+ element={<CollectionsNavTree// Unjustified type cast. FIXMEcollections={collections as any}selectedId={undefined}onSelect={jest.fn()}/>- )}+ }/>,{storeInitialState: createMockState({diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsxindex 725446b7d82..6cb1ae1734a 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/routes.tsx@@ -5,7 +5,7 @@ import { MigrateModelsPage } from "./pages/MigrateModelsPage";export function getTransformToolsRoutes() {return (<Route path="tools">- <Route path="migrate-models" component={MigrateModelsPage} />+ <Route path="migrate-models" element={<MigrateModelsPage />} /></Route>);}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 b1d0962f7ee..36f1912a3d5 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@@ -76,13 +76,13 @@ function setup({ databaseId, schema }: SetupOpts) {const { history } = renderWithProviders(<Routepath="/"- component={() => (+ element={<SchemaPickerInputdatabaseId={databaseId}schema={schema}onSchemaChange={onSchemaChange}/>- )}+ }/>,{ withRouter: true },);diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsxindex 56d5e92ae51..0650d258570 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/routes.tsx@@ -1,7 +1,9 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { SchemaViewerPage } from "./pages/SchemaViewerPage";+const RoutedSchemaViewerPage = withRouteProps(SchemaViewerPage);+export function getDataStudioSchemaViewerRoutes() {- return <Route index component={SchemaViewerPage} />;+ return <Route index element={<RoutedSchemaViewerPage />} />;}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 c272de3b956..479c2979d1f 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@@ -50,7 +50,7 @@ function setup({}),});- renderWithProviders(<Route path="*" component={SecurityCenterBanner} />, {+ renderWithProviders(<Route path="*" element={<SecurityCenterBanner />} />, {initialRoute: "/",storeInitialState: state,withRouter: true,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 7ece3ef43da..e24b72db832 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@@ -57,7 +57,7 @@ function setup({});return renderWithProviders(- <Route path="*" component={SecurityCenterPromoCard} />,+ <Route path="*" element={<SecurityCenterPromoCard />} />,{initialRoute: "/",storeInitialState: state,diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/index.ts b/enterprise/frontend/src/metabase-enterprise/security_center/index.tsindex de03cb4e2fb..bc0aabb57a4 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/security_center/index.ts@@ -1,4 +1,5 @@import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";+import { withRouteProps } from "metabase/router";import { hasPremiumFeature } from "metabase-enterprise/settings";import { SecurityCenterBanner } from "./components/SecurityCenterBanner/SecurityCenterBanner";@@ -10,7 +11,8 @@ import { SecurityCenterPromoCard } from "./components/SecurityCenterPromoCard/Seexport function initializePlugin() {if (hasPremiumFeature("admin_security_center")) {PLUGIN_SECURITY_CENTER.isEnabled = true;- PLUGIN_SECURITY_CENTER.SecurityCenterPage = SecurityCenterPage;+ PLUGIN_SECURITY_CENTER.SecurityCenterPage =+ withRouteProps(SecurityCenterPage);PLUGIN_SECURITY_CENTER.SecurityCenterBanner = SecurityCenterBanner;PLUGIN_SECURITY_CENTER.SecurityCenterPromoCard = SecurityCenterPromoCard;PLUGIN_SECURITY_CENTER.SecurityCenterNavItem = SecurityCenterNavItem;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 ab997f96b18..780318ffbcd 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@@ -16,13 +16,10 @@ import { SupportSettingsSection } from "./SupportSettingsSection";const setup = () => {return renderWithProviders(<>- <Route- path="/admin/tools/help"- component={() => <SupportSettingsSection />}- />+ <Route path="/admin/tools/help" element={<SupportSettingsSection />} /><Routepath="/admin/tools/help/grant-access"- component={() => <GrantAccessModal onClose={jest.fn()} />}+ element={<GrantAccessModal onClose={jest.fn()} />}/></>,{ withRouter: true, initialRoute: "/admin/tools/help" },diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsxindex b3b99bd89ba..e5d6ff0654d 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/routes.tsx@@ -1,12 +1,14 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { EditTableDataContainer } from "./table-edit/EditTableDataContainer";+const RoutedEditTableDataContainer = withRouteProps(EditTableDataContainer);+export function getRoutes() {return (<Routepath="databases/:dbId/tables/:tableId/edit(/:objectId)"- component={EditTableDataContainer}+ element={<RoutedEditTableDataContainer />}/>);}diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsxindex 552e0c461e9..9e003cd08df 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx@@ -4,13 +4,16 @@ import { useGetCollectionQuery } from "metabase/api";import { Unauthorized } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSelector } from "metabase/redux";+import { Outlet } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";type Props = {- children: ReactNode;+ children?: ReactNode;};-export const CanAccessTenantSpecificRoute = ({ children }: Props) => {+export const CanAccessTenantSpecificRoute = ({+ children = <Outlet />,+}: Props) => {const isAdmin = useSelector(getUserIsAdmin);// Admins always have access, skip the API calldiff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsxindex a7e8f0d9f36..a2b5e1d58ee 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx@@ -3,18 +3,15 @@ import { t } from "ttag";import { useListUsersQuery } from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { CollectionListView } from "metabase/common/components/CollectionListView";+import { useParams } from "metabase/router";import * as Urls from "metabase/urls";+import { checkNotNull } from "metabase/utils/types";import { useGetTenantQuery } from "metabase-enterprise/api";import type { IconName } from "metabase-types/api";-interface TenantUsersPersonalCollectionListProps {- params: { tenantId: string };-}--export const TenantUsersPersonalCollectionList = ({- params,-}: TenantUsersPersonalCollectionListProps) => {- const tenantId = parseInt(params.tenantId, 10);+export const TenantUsersPersonalCollectionList = () => {+ const { tenantId: tenantIdParam } = useParams();+ const tenantId = parseInt(checkNotNull(tenantIdParam), 10);const { data: tenant } = useGetTenantQuery(tenantId);const { data, isLoading } = useListUsersQuery({ tenant_id: tenantId });diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsxindex 156b7e00149..778b29a9265 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx@@ -8,6 +8,7 @@ import {} from "metabase/admin/people/constants";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSelector } from "metabase/redux";+import { Outlet } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Group, Tabs, Title } from "metabase/ui";import { useListTenantsQuery } from "metabase-enterprise/api";@@ -16,11 +17,7 @@ import { EditUserStrategySettingsButton } from "../EditUserStrategySettingsButtoimport { TenantsDocsButton } from "../TenantsDocsButton";import { TenantsListing } from "../components/TenantsListing";-export const TenantsListingApp = ({- children,-}: {- children: React.ReactNode;-}) => {+export const TenantsListingApp = () => {const isAdmin = useSelector(getUserIsAdmin);const [searchInputValue, setSearchInputValue] = useState("");@@ -97,7 +94,7 @@ export const TenantsListingApp = ({/></LoadingAndErrorWrapper>- {children}+ <Outlet /></SettingsSection></Box>);diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsxindex 7b9eafb773e..1abf8ca28b2 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsx@@ -28,7 +28,7 @@ const setup = ({const currentUser = createMockUser({ is_superuser: isAdmin });- renderWithProviders(<TenantsListingApp>{null}</TenantsListingApp>, {+ renderWithProviders(<TenantsListingApp />, {storeInitialState: createMockState({settings,currentUser,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsxindex 9df68350efb..4baabe57d3e 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx@@ -24,7 +24,7 @@ import {PLUGIN_TENANTS,} from "metabase/plugins";import { useSelector } from "metabase/redux";-import { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import { getIsTenantUser, getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Text } from "metabase/ui";@@ -69,6 +69,15 @@ import {isTenantGroup,} from "./utils/utils";+const RoutedTenantCollectionPermissionsPage = withRouteProps(+ TenantCollectionPermissionsPage,+);+const RoutedTenantSpecificCollectionPermissionsPage = withRouteProps(+ TenantSpecificCollectionPermissionsPage,+);+const RoutedExternalGroupDetailApp = withRouteProps(ExternalGroupDetailApp);+const RoutedExternalPeopleListingApp = withRouteProps(ExternalPeopleListingApp);+export function initializePlugin() {if (hasPremiumFeature("tenants")) {PLUGIN_TENANTS.isEnabled = true;@@ -95,13 +104,13 @@ export function initializePlugin() {<><Routepath="tenant-collections"- component={TenantCollectionPermissionsPage}+ element={<RoutedTenantCollectionPermissionsPage />}><Route path=":collectionId" /></Route><Routepath="tenant-specific-collections"- component={TenantSpecificCollectionPermissionsPage}+ element={<RoutedTenantSpecificCollectionPermissionsPage />}><Route path=":collectionId" /></Route>@@ -120,16 +129,16 @@ export function initializePlugin() {PLUGIN_TENANTS.tenantsRoutes = (<>- <Route index component={TenantsListingApp} />- <Route path="" component={TenantsListingApp}>+ <Route index element={<TenantsListingApp />} />+ <Route path="" element={<TenantsListingApp />}>{modalRoute("new", NewTenantModal, { noWrap: true })}{modalRoute("user-strategy", EditUserStrategyModal, { noWrap: true })}</Route><Route path="groups">- <Route index component={ExternalGroupsListingApp} />- <Route path=":groupId" component={ExternalGroupDetailApp} />+ <Route index element={<ExternalGroupsListingApp />} />+ <Route path=":groupId" element={<RoutedExternalGroupDetailApp />} /></Route>- <Route path="people" component={ExternalPeopleListingApp}>+ <Route path="people" element={<RoutedExternalPeopleListingApp />}>{modalRoute("new",(props) => (@@ -140,7 +149,7 @@ export function initializePlugin() {},)}<Route path=":userId">- <Route index component={redirect("/admin/people/tenants/people")} />+ <Route index element={redirect("/admin/people/tenants/people")} />{modalRoute("edit",(props) => (@@ -157,7 +166,7 @@ export function initializePlugin() {))}</Route></Route>- <Route path=":tenantId" component={TenantsListingApp}>+ <Route path=":tenantId" element={<TenantsListingApp />}>{modalRoute("edit",// @ts-expect-error - params prop can't be inferreddiff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsxindex 179479a5c9e..b4bd4db8027 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx@@ -1,18 +1,23 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { TransformInspectorUpsellPage } from "metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage";import { TransformInspectPage } from "./pages/TransformInspectPage";+const RoutedTransformInspectorUpsellPage = withRouteProps(+ TransformInspectorUpsellPage,+);+const RoutedTransformInspectPage = withRouteProps(TransformInspectPage);+export function getInspectorUpsellRoutes() {return (<><Routepath=":transformId/inspect"- component={TransformInspectorUpsellPage}+ element={<RoutedTransformInspectorUpsellPage />}/><Routepath=":transformId/inspect/:lensId"- component={TransformInspectorUpsellPage}+ element={<RoutedTransformInspectorUpsellPage />}/></>);@@ -21,10 +26,13 @@ export function getInspectorUpsellRoutes() {export function getInspectorRoutes() {return (<>- <Route path=":transformId/inspect" component={TransformInspectPage} />+ <Route+ path=":transformId/inspect"+ element={<RoutedTransformInspectPage />}+ /><Routepath=":transformId/inspect/:lensId"- component={TransformInspectPage}+ element={<RoutedTransformInspectPage />}/></>);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 230d2d6e2fa..6ab22f77600 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@@ -49,14 +49,14 @@ function setup({renderWithProviders(<Route- component={() => (+ element={<PythonTransformTopBardatabaseId={databaseId}isEditMode={isEditMode}transform={transform}onDatabaseChange={onDatabaseChange}/>- )}+ }path="/"/>,{diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsxindex 35cf994951a..c7de89f05b5 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx@@ -1,16 +1,20 @@import { modalRoute } from "metabase/common/components/ModalRoute";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { NewPythonTransformPage } from "metabase/transforms/pages/NewTransformPage";import { TransformListPage } from "metabase/transforms/pages/TransformListPage";import { PythonLibraryEditorPage } from "./pages/PythonLibraryEditorPage";import { PythonTransformsUpsellModal } from "./upsells/PythonTransformsUpsellModal";+const RoutedPythonLibraryEditorPage = withRouteProps(PythonLibraryEditorPage);+const RoutedNewPythonTransformPage = withRouteProps(NewPythonTransformPage);+const RoutedTransformListPage = withRouteProps(TransformListPage);+export function getPythonTransformsRoutes() {return (<>- <Route path="library/:path" component={PythonLibraryEditorPage} />- <Route path="new/python" component={NewPythonTransformPage} />+ <Route path="library/:path" element={<RoutedPythonLibraryEditorPage />} />+ <Route path="new/python" element={<RoutedNewPythonTransformPage />} /></>);}@@ -18,7 +22,7 @@ export function getPythonTransformsRoutes() {export function getPythonUpsellRoutes() {return (// Render upsell modal on python transforms routes if feature is not enabled- <Route path="" component={TransformListPage}>+ <Route path="" element={<RoutedTransformListPage />}>{modalRoute("library/:path", PythonTransformsUpsellModal, {noWrap: true,})}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 13413f64838..813b34ec4dc 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@@ -72,7 +72,7 @@ export const setup = ({renderWithProviders(<Route- component={() => <PythonTransformsUpsellModal onClose={onClose} />}+ element={<PythonTransformsUpsellModal onClose={onClose} />}path="/"/>,{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 3b0543929a8..95f581a0efa 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@@ -54,10 +54,7 @@ export const setup = ({setupBugReportingDetailsEndpoint();renderWithProviders(- <Route- component={() => <TransformsUpsellPage />}- path="/data-studio/transforms"- />,+ <Route element={<TransformsUpsellPage />} path="/data-studio/transforms" />,{storeInitialState: state,withRouter: true,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 47d47d66986..56a71bfdb23 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@@ -16,13 +16,13 @@ function setup({ database }: { database: Database }) {renderWithProviders(<Routepath="*"- component={() => (+ element={<AdminConnectionInfoPageparams={{ databaseId: String(database.id) }}// Unjustified type cast. FIXMEroute={{ path: "/" } as unknown as Route}/>- )}+ }/>,{withRouter: true,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 91e988c7b66..4b766202680 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@@ -35,7 +35,7 @@ function setup({setupGetCurrentWorkspaceEndpoint(workspace);setupListTableRemappingsEndpoint(remappings);- renderWithProviders(<Route path="*" component={CurrentWorkspacePage} />, {+ renderWithProviders(<Route path="*" element={<CurrentWorkspacePage />} />, {withRouter: true,});}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 abab843be42..30b061b1e87 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@@ -12,7 +12,7 @@ const { trackSimpleEvent } = jest.requireMock("metabase/analytics");function setup() {setupDeleteCurrentWorkspaceEndpoint();- renderWithProviders(<Route path="*" component={DeleteSection} />, {+ renderWithProviders(<Route path="*" element={<DeleteSection />} />, {withRouter: true,});}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 5069c833077..a8753b699b0 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@@ -57,7 +57,7 @@ function setup({ isAdmin = true, workspace = null }: SetupOpts = {}) {}),});- renderWithProviders(<Route path="*" component={WorkspaceIndexPage} />, {+ renderWithProviders(<Route path="*" element={<WorkspaceIndexPage />} />, {withRouter: true,storeInitialState: state,});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 b5d7d05db03..faf8465ab41 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@@ -8,7 +8,7 @@ import { WorkspaceEmptyState } from "./WorkspaceEmptyState";function setup() {setupApplyAdvancedConfigEndpoint();renderWithProviders(- <Route path="*" component={() => <WorkspaceEmptyState databases={[]} />} />,+ <Route path="*" element={<WorkspaceEmptyState databases={[]} />} />,{withRouter: true,storeInitialState: {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 4795bf16c8d..038f5e1e17c 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@@ -26,7 +26,7 @@ function setup({ workspaces = [] as Workspace[] } = {}) {setupDatabasesEndpoints([ELIGIBLE_DATABASE]);setupCreateWorkspaceEndpoint(createMockWorkspace({ name: "Brand new" }));- renderWithProviders(<Route path="*" component={WorkspaceListPage} />, {+ renderWithProviders(<Route path="*" element={<WorkspaceListPage />} />, {withRouter: true,});}diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsxindex acb5a1b2a92..0a81036eeaa 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/routes.tsx@@ -1,12 +1,14 @@-import { Route, type RouteComponent } from "metabase/router";+import { Route, type RouteComponent, withRouteProps } from "metabase/router";import { AdminConnectionInfoPage } from "./pages/AdminConnectionInfoPage";import { WorkspaceIndexPage } from "./pages/WorkspaceIndexPage";+const RoutedAdminConnectionInfoPage = withRouteProps(AdminConnectionInfoPage);+export function getDataStudioRoutes() {return (<Route path="workspaces">- <Route index component={WorkspaceIndexPage} />+ <Route index element={<WorkspaceIndexPage />} /></Route>);}@@ -14,7 +16,10 @@ export function getDataStudioRoutes() {export function getWorkspaceDatabaseRoutes(IsAdmin: RouteComponent) {return (<Route element={<IsAdmin />}>- <Route path=":databaseId/admin" component={AdminConnectionInfoPage} />+ <Route+ path=":databaseId/admin"+ element={<RoutedAdminConnectionInfoPage />}+ /></Route>);}diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsxindex 832d1516ed5..a091c980732 100644--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/routes.tsx@@ -1,12 +1,16 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { WritableConnectionInfoPage } from "./pages/WritableConnectionInfoPage";+const RoutedWritableConnectionInfoPage = withRouteProps(+ WritableConnectionInfoPage,+);+export function getWritableConnectionInfoRoutes() {return (<Routepath=":databaseId/write-data"- component={WritableConnectionInfoPage}+ element={<RoutedWritableConnectionInfoPage />}/>);}diff --git a/frontend/src/metabase/AppComponent.tsx b/frontend/src/metabase/AppComponent.tsxindex 538a681cd90..36245e48e07 100644--- a/frontend/src/metabase/AppComponent.tsx+++ b/frontend/src/metabase/AppComponent.tsx@@ -1,5 +1,4 @@import type { Location } from "history";-import type { ReactNode } from "react";import { useEffect, useState } from "react";import { AppBarContainer } from "metabase/app/nav/AppBar";@@ -27,7 +26,7 @@ import { usePageTitle } from "metabase/hooks/use-page-title";import { connect, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import type { AppErrorDescriptor, State } from "metabase/redux/store";-import { useLocation } from "metabase/router";+import { Outlet, useLocation } from "metabase/router";import { getErrorPage } from "metabase/selectors/app";import { getApplicationName } from "metabase/selectors/whitelabel";import { StatusListing } from "metabase/status/components/StatusListing";@@ -74,7 +73,6 @@ interface AppDispatchProps {interface AppRouterOwnProps {location: Location;- children: ReactNode;}type AppProps = AppStateProps & AppDispatchProps & AppRouterOwnProps;@@ -102,7 +100,6 @@ function App({isDataApp,isAppBarVisible,isNavBarEnabled,- children,onError,}: AppProps) {const [viewportElement, setViewportElement] = useState<HTMLElement | null>();@@ -134,7 +131,7 @@ function App({<ContentViewportContext.Providervalue={viewportElement ?? null}>- {errorPage ? getErrorComponent(errorPage) : children}+ {errorPage ? getErrorComponent(errorPage) : <Outlet />}</ContentViewportContext.Provider></AppContent><UndoListing />@@ -151,7 +148,12 @@ function App({}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default connect<AppStateProps, unknown, AppRouterOwnProps, State>(+export default connect<+ AppStateProps,+ AppDispatchProps,+ AppRouterOwnProps,+ State+>(mapStateToProps,mapDispatchToProps,)(App);diff --git a/frontend/src/metabase/LoadCurrentUser.tsx b/frontend/src/metabase/LoadCurrentUser.tsxindex dc9b3993e66..20fee6795dc 100644--- a/frontend/src/metabase/LoadCurrentUser.tsx+++ b/frontend/src/metabase/LoadCurrentUser.tsx@@ -3,13 +3,18 @@ import { useEffect, useState } from "react";import { useDispatch } from "metabase/redux";import { loadCurrentUser } from "metabase/redux/user";+import { Outlet } from "metabase/router";/*** Loads the current user before rendering the authenticated app, gating its* children until the request settles. The route guards below it read* `currentUser`, so they must not run before it has been fetched.*/-export function LoadCurrentUser({ children }: { children: ReactNode }) {+export function LoadCurrentUser({+ children = <Outlet />,+}: {+ children?: ReactNode;+}) {const dispatch = useDispatch();const [isLoaded, setIsLoaded] = useState(false);diff --git a/frontend/src/metabase/LoadCurrentUser.unit.spec.tsx b/frontend/src/metabase/LoadCurrentUser.unit.spec.tsxindex 10d03374d4c..fabfb12ff69 100644--- a/frontend/src/metabase/LoadCurrentUser.unit.spec.tsx+++ b/frontend/src/metabase/LoadCurrentUser.unit.spec.tsx@@ -11,8 +11,8 @@ import { LoadCurrentUser } from "./LoadCurrentUser";describe("LoadCurrentUser", () => {const setup = () =>renderWithProviders(- <Route component={LoadCurrentUser}>- <Route path="/" component={() => <div>app content</div>} />+ <Route element={<LoadCurrentUser />}>+ <Route path="/" element={<div>app content</div>} /></Route>,{storeInitialState: createMockState({ currentUser: undefined }),diff --git a/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.tsx b/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.tsxindex a8585b38876..47cb2ff1684 100644--- a/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.tsx+++ b/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.tsx@@ -1,6 +1,6 @@import type { Path } from "history";-import type { ReactNode } from "react";+import { Outlet } from "metabase/router";import { Box, rem } from "metabase/ui";import type { User } from "metabase-types/api";@@ -10,11 +10,9 @@ interface AccountLayoutProps {user: User | null;path?: string;onChangeLocation: (nextLocation: Path) => void;- children?: ReactNode;}const AccountLayout = ({- children,user,path,onChangeLocation,@@ -36,7 +34,7 @@ const AccountLayout = ({py={{ base: "sm", sm: "xl" }}w={{ base: "100%", sm: rem(540) }}>- {children}+ <Outlet /></Box></div>);diff --git a/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.unit.spec.tsx b/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.unit.spec.tsxindex fd8d0e07667..e7a3fe5b98a 100644--- a/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.unit.spec.tsx+++ b/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.unit.spec.tsx@@ -1,4 +1,5 @@import { renderWithProviders, screen } from "__support__/ui";+import { Route } from "metabase/router";import type { User } from "metabase-types/api";import { createMockUser } from "metabase-types/api/mocks";@@ -10,9 +11,13 @@ type SetupOpts = {function setup({ user = createMockUser() }: SetupOpts = {}) {renderWithProviders(- <AccountLayout user={user} onChangeLocation={() => {}}>- Content- </AccountLayout>,+ <Route+ path="/"+ element={<AccountLayout user={user} onChangeLocation={() => {}} />}+ >+ <Route index element={<>Content</>} />+ </Route>,+ { withRouter: true, initialRoute: "/" },);}diff --git a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsxindex c5705aec2db..eb1ac9ebb41 100644--- a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx+++ b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx@@ -1,4 +1,4 @@-import type { JSX, ReactNode } from "react";+import type { JSX } from "react";import { useMemo } from "react";import {@@ -8,6 +8,7 @@ import {} from "metabase/api";import type { NotificationListItem } from "metabase/notifications/types";import { useDispatch, useSelector } from "metabase/redux";+import { Outlet } from "metabase/router";import {canManageSubscriptions as canManageSubscriptionsSelector,getUser,@@ -21,13 +22,7 @@ import {} from "../../actions";import { NotificationList } from "../../components/NotificationList";-interface NotificationsAppProps {- children?: ReactNode;-}--export const NotificationsApp = ({- children,-}: NotificationsAppProps): JSX.Element | null => {+export const NotificationsApp = (): JSX.Element | null => {const user = useSelector(getUser);const canManageSubscriptions = useSelector(canManageSubscriptionsSelector);@@ -84,7 +79,7 @@ export const NotificationsApp = ({onUnsubscribe={onUnsubscribe}onArchive={onArchive}>- {children}+ <Outlet /></NotificationList>);};diff --git a/frontend/src/metabase/account/notifications/routes.tsx b/frontend/src/metabase/account/notifications/routes.tsxindex f08ca60ae05..06bba9be318 100644--- a/frontend/src/metabase/account/notifications/routes.tsx+++ b/frontend/src/metabase/account/notifications/routes.tsx@@ -10,7 +10,7 @@ import { UnsubscribePulseModal } from "./containers/UnsubscribePulseModal";export function getNotificationRoutes() {return (- <Route path="notifications" component={NotificationsApp}>+ <Route path="notifications" element={<NotificationsApp />}>{modalRoute("help", HelpModal)}{modalRoute("alert/:alertId/archive", DeleteAlertModal, { noWrap: true })}{modalRoute("pulse/:pulseId/archive", ArchivePulseModal)}diff --git a/frontend/src/metabase/account/routes.tsx b/frontend/src/metabase/account/routes.tsxindex eeacd61e8d2..964517d24be 100644--- a/frontend/src/metabase/account/routes.tsx+++ b/frontend/src/metabase/account/routes.tsx@@ -2,7 +2,12 @@ import type { Store } from "@reduxjs/toolkit";import { PLUGIN_MULTI_FACTOR_AUTH } from "metabase/plugins";import type { State } from "metabase/redux/store";-import { Route, type RouteComponent, redirect } from "metabase/router";+import {+ Route,+ type RouteComponent,+ redirect,+ withRouteProps,+} from "metabase/router";import AccountApp from "./app/containers/AccountApp";import LoginHistoryApp from "./login-history/containers/LoginHistoryApp";@@ -10,21 +15,23 @@ import { getNotificationRoutes } from "./notifications/routes";import UserPasswordApp from "./password/containers/UserPasswordApp";import UserProfileApp from "./profile/containers/UserProfileApp";+const RoutedAccountApp = withRouteProps(AccountApp);+export const getAccountRoutes = (_store: Store<State>,IsAuthenticated: RouteComponent,) => {return (<Route path="/account" element={<IsAuthenticated />}>- <Route component={AccountApp}>- <Route index component={redirect("profile")} />- <Route path="profile" component={UserProfileApp} />- <Route path="password" component={UserPasswordApp} />+ <Route element={<RoutedAccountApp />}>+ <Route index element={redirect("profile")} />+ <Route path="profile" element={<UserProfileApp />} />+ <Route path="password" element={<UserPasswordApp />} /><Routepath="security"- component={PLUGIN_MULTI_FACTOR_AUTH.AccountSecurityPanel}+ element={<PLUGIN_MULTI_FACTOR_AUTH.AccountSecurityPanel />}/>- <Route path="login-history" component={LoginHistoryApp} />+ <Route path="login-history" element={<LoginHistoryApp />} />{getNotificationRoutes()}</Route></Route>diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsxindex 0aeb5434574..0cdd9c1e16f 100644--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx@@ -13,7 +13,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Card, WritebackAction } from "metabase-types/api";import {@@ -24,6 +24,8 @@ import { createSampleDatabase } from "metabase-types/api/mocks/presets";import ActionCreatorModal from "./ActionCreatorModal";+const RoutedActionCreatorModal = withRouteProps(ActionCreatorModal);+const MODEL = createMockCard({ id: 1, type: "model" });const MODEL_SLUG = `${MODEL.id}-${MODEL.name.toLowerCase()}`;const ACTION = createMockQueryAction({ model_id: MODEL.id });@@ -56,16 +58,15 @@ async function setup({<><Routepath="/model/:slug/detail/actions/:actionId"- component={(routeProps) => (- <ActionCreatorModal- {...routeProps}+ element={+ <RoutedActionCreatorModalonClose={() => history?.push(`/model/${MODEL.id}/detail/actions`)}/>- )}+ }/><Routepath="/model/:slug/detail/actions"- component={() => <div data-testid="mock-model-detail" />}+ element={<div data-testid="mock-model-detail" />}/></>,{diff --git a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsxindex 5cc3cd516f9..d7cd7b3503b 100644--- a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx@@ -498,7 +498,10 @@ async function setup({},): renderWithProviders(- <Route path="/admin/metabot*" component={AIProviderSettingsSection} />,+ <Route+ path="/admin/metabot*"+ element={<AIProviderSettingsSection />}+ />,{withRouter: true,initialRoute: "/admin/metabot",@@ -2496,7 +2499,7 @@ function setupDivergentReadsBackend({});renderWithProviders(- <Route path="/admin/metabot*" component={AIProviderSettingsSection} />,+ <Route path="/admin/metabot*" element={<AIProviderSettingsSection />} />,{withRouter: true,initialRoute: "/admin/metabot",diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsxindex f831fe21410..3bd2642a38a 100644--- a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx@@ -40,9 +40,9 @@ type Page = "ai-features" | "mcp";function getPageRoute(page: Page) {switch (page) {case "mcp":- return <Route path="/admin/metabot/mcp" component={McpSettingsPage} />;+ return <Route path="/admin/metabot/mcp" element={<McpSettingsPage />} />;case "ai-features":- return <Route path="/admin/metabot*" component={AISettingsPage} />;+ return <Route path="/admin/metabot*" element={<AISettingsPage />} />;}}diff --git a/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx b/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsxindex 12230cf3d80..4692db5604f 100644--- a/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx+++ b/frontend/src/metabase/admin/ai/MetabotAdminLayout.tsx@@ -1,15 +1,16 @@import ErrorBoundary from "metabase/ErrorBoundary";import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";+import { Outlet } from "metabase/router";import { Box } from "metabase/ui";import { MetabotNavPane } from "./MetabotNavPane";export const MetabotAdminLayout = ({- children,+ children = <Outlet />,fullWidth,innerContentProps,}: {- children: React.ReactNode;+ children?: React.ReactNode;fullWidth?: boolean;innerContentProps?: {fullWidth?: boolean;diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsxindex a5a5f351e8a..e24691f72e0 100644--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx@@ -95,7 +95,7 @@ const setup = async (opts?: SetupOpts) => {</>);- renderWithProviders(<Route path="/" component={TestComponent} />, {+ renderWithProviders(<Route path="/" element={<TestComponent />} />, {withRouter: true,});diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsxindex 2855d096e3c..112b9bbd7a2 100644--- a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx@@ -34,7 +34,7 @@ const setup = ({setupEnterprisePlugins();return renderWithProviders(- <Route path="/admin/metabot*" component={MetabotNavPane} />,+ <Route path="/admin/metabot*" element={<MetabotNavPane />} />,{withRouter: true,initialRoute,diff --git a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsxindex e96470ce4fc..aaa84f6843e 100644--- a/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/OAuthAuthorizationsPage.unit.spec.tsx@@ -4,7 +4,7 @@ import type { ReactNode } from "react";import { setupOAuthAuthorizationsEndpoint } from "__support__/server-mocks";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type { ListOAuthAuthorizationsResponse } from "metabase-types/api";import {createMockListOAuthAuthorizationsResponse,@@ -47,6 +47,8 @@ jest.mock("metabase/ui/components/data-display/TreeTable/TreeTable", () => {};});+const RoutedOAuthAuthorizationsPage = withRouteProps(OAuthAuthorizationsPage);+const PATHNAME = "/admin/metabot/mcp/authorizations";const setup = ({@@ -65,7 +67,7 @@ const setup = ({}return renderWithProviders(- <Route path={PATHNAME} component={OAuthAuthorizationsPage} />,+ <Route path={PATHNAME} element={<RoutedOAuthAuthorizationsPage />} />,{ withRouter: true, initialRoute },);};diff --git a/frontend/src/metabase/admin/app/components/AdminApp/AdminApp.tsx b/frontend/src/metabase/admin/app/components/AdminApp/AdminApp.tsxindex 8fbbbed0572..25805932608 100644--- a/frontend/src/metabase/admin/app/components/AdminApp/AdminApp.tsx+++ b/frontend/src/metabase/admin/app/components/AdminApp/AdminApp.tsx@@ -1,16 +1,12 @@-import type { ReactNode } from "react";+import { Outlet } from "metabase/router";import DeprecationNotice from "../../containers/DeprecationNotice";-export interface AdminAppProps {- children?: ReactNode;-}--const AdminApp = ({ children }: AdminAppProps): JSX.Element => {+const AdminApp = (): JSX.Element => {return (<><DeprecationNotice />- {children}+ <Outlet /></>);};diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsxindex 4fd0c6ed5e6..05809c797f2 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx@@ -1,12 +1,16 @@import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type { DatabaseData } from "metabase-types/api";import { createMockEngines } from "metabase-types/api/mocks";import { DatabaseEditConnectionForm } from "./DatabaseEditConnectionForm";+const RoutedDatabaseEditConnectionForm = withRouteProps(+ DatabaseEditConnectionForm,+);+interface SetupOpts {database?: Partial<DatabaseData>;isAttachedDWH?: boolean;@@ -20,16 +24,15 @@ function setup({ database, isAttachedDWH = false }: SetupOpts = {}) {renderWithProviders(<Routepath="/"- component={(routerProps) => (- <DatabaseEditConnectionForm- {...routerProps}+ element={+ <RoutedDatabaseEditConnectionFormdatabase={database}isAttachedDWH={isAttachedDWH}onSubmitted={jest.fn()}onCancel={jest.fn()}formLocation="admin"/>- )}+ }/>,{ withRouter: true, storeInitialState },);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 64540f82036..f950759235f 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@@ -57,9 +57,9 @@ const setup = (opts: SetupOptions) => {renderWithProviders(<Route- component={() => (+ element={<DatabaseHelpSidePanel engineKey={engineKey} onClose={onClose} />- )}+ }path="/"/>,{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 35a2f38b1f8..43b222cf5d5 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@@ -24,7 +24,7 @@ const setup = ({ href, children }: SetupProps) => {});return renderWithProviders(<Route- component={() => <MarkdownLink href={href}>{children}</MarkdownLink>}+ element={<MarkdownLink href={href}>{children}</MarkdownLink>}path="/"/>,{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 30878ac8fc3..faebea2fa18 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@@ -8,10 +8,7 @@ import { HeaderLinkGroup } from "./HeaderLinkGroup";const setup = (mockDatabase: Database) => {renderWithProviders(- <Route- path="*"- component={() => <HeaderLinkGroup database={mockDatabase} />}- />,+ <Route path="*" element={<HeaderLinkGroup database={mockDatabase} />} />,{ withRouter: true },);};diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsxindex 7bc5c8facaf..571ea7d7909 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx@@ -23,7 +23,7 @@ import {PLUGIN_WRITABLE_CONNECTION,} from "metabase/plugins";import { connect, useSelector } from "metabase/redux";-import { withRouter } from "metabase/router";+import { Outlet, 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";@@ -35,7 +35,6 @@ import { ExistingDatabaseHeader } from "../components/ExistingDatabaseHeader";import { deleteDatabase, updateDatabase } from "../database";interface DatabaseEditAppProps {- children: React.ReactNode;params: { databaseId: string };updateDatabase: (database: { id: DatabaseId } & Partial<DatabaseType>,@@ -49,7 +48,6 @@ const mapDispatchToProps = {};function DatabaseEditAppInner({- children,params,updateDatabase,deleteDatabase,@@ -157,7 +155,7 @@ function DatabaseEditAppInner({</LoadingAndErrorWrapper></Box></ErrorBoundary>- {children}+ <Outlet />{fromEmbeddingSetupGuide && (<ReturnToSetupGuideModalopened={showReturnModal}diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsxindex d806bbe73fc..5cc9b647fdb 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx@@ -15,7 +15,7 @@ import { DatabaseList } from "../components/DatabaseList";import { getDeletes, getDeletionError } from "../selectors";interface DatabaseListAppProps {- children: React.ReactNode;+ children?: React.ReactNode;}export const DatabaseListApp = (props: DatabaseListAppProps) => {diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsxindex 1cf4869aecb..d1644d7ce8c 100644--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx@@ -4,7 +4,7 @@ import userEvent from "@testing-library/user-event";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { createMockEngines } from "metabase-types/api/mocks";import { DatabasePage } from "./DatabasePage";@@ -14,8 +14,10 @@ jest.mock(() => "Postgres MD Content",);+const RoutedDatabasePage = withRouteProps(DatabasePage);+const setup = () => {- renderWithProviders(<Route path="/" component={DatabasePage} />, {+ renderWithProviders(<Route path="/" element={<RoutedDatabasePage />} />, {withRouter: true,storeInitialState: createMockState({settings: mockSettings({diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsxindex 2668de8cb8d..eef148aeee8 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx@@ -19,7 +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 { Route, withRouteProps } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import { createMockCollection } from "metabase-types/api/mocks";import { createSampleDatabase } from "metabase-types/api/mocks/presets";@@ -28,6 +28,8 @@ import { SegmentApp } from "./SegmentApp";const TestHome = () => <div />;+const RoutedSegmentApp = withRouteProps(SegmentApp);+const SEGMENTS_URL = "/admin/datamodel/segments";const FORM_URL = "/admin/datamodel/segment/create";@@ -65,9 +67,9 @@ const setup = ({ initialRoute = FORM_URL }: SetupOpts = {}) => {const { history } = renderWithProviders(<>- <Route path="/" component={TestHome} />- <Route path={SEGMENTS_URL} component={TestHome} />- <Route path={FORM_URL} component={SegmentApp} />+ <Route path="/" element={<TestHome />} />+ <Route path={SEGMENTS_URL} element={<TestHome />} />+ <Route path={FORM_URL} element={<RoutedSegmentApp />} /></>,{initialRoute,diff --git a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsxindex 73f6bce1304..4fb086b6cc6 100644--- a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx+++ b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx@@ -25,7 +25,7 @@ const setup = ({}),});- renderWithProviders(<Route path="*" component={EmbeddingNav} />, {+ renderWithProviders(<Route path="*" element={<EmbeddingNav />} />, {withRouter: true,initialRoute,storeInitialState: {diff --git a/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsx b/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsxindex 0461f0040e5..662942dd9b9 100644--- a/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsx+++ b/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.tsx@@ -1,6 +1,7 @@import type { Location } from "history";import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";+import { Outlet } from "metabase/router";import { EmbeddingNav } from "../components/EmbeddingNav";import { useEnsureDefaultEmbeddingThemes } from "../hooks";@@ -16,13 +17,7 @@ const SIDEBAR_HIDDEN_PATH_PREFIXES = ["/admin/embedding/themes/"];// routes in this array will take the full width _of the main content area_const FULL_CONTENT_WIDTH_PATH_PREFIXES = ["/admin/embedding/themes/"];-export const AdminEmbeddingApp = ({- location,- children,-}: {- location: Location;- children: React.ReactNode;-}) => {+export const AdminEmbeddingApp = ({ location }: { location: Location }) => {useEnsureDefaultEmbeddingThemes();const shouldHideSidebar =@@ -40,7 +35,7 @@ export const AdminEmbeddingApp = ({sidebar={shouldHideSidebar ? undefined : <EmbeddingNav />}fullWidth={isFullWidth}>- {children}+ <Outlet /></AdminSettingsLayout>);};diff --git a/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.unit.spec.tsx b/frontend/src/metabase/admin/embedding/containers/AdminEmbeddingApp.unit.spec.tsxindex 85c43d8ce38..8a44a515d62 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 { renderWithProviders, screen } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { AdminEmbeddingApp } from "./AdminEmbeddingApp";@@ -13,12 +13,17 @@ const TestAdminEmbeddingApp = (</AdminEmbeddingApp>);+const RoutedTestAdminEmbeddingApp = withRouteProps(TestAdminEmbeddingApp);+describe("AdminEmbeddingApp", () => {it("shows the sidebar on the setup guide root", () => {- renderWithProviders(<Route path="*" component={TestAdminEmbeddingApp} />, {- initialRoute: "/admin/embedding/setup-guide",- withRouter: true,- });+ renderWithProviders(+ <Route path="*" element={<RoutedTestAdminEmbeddingApp />} />,+ {+ initialRoute: "/admin/embedding/setup-guide",+ withRouter: true,+ },+ );expect(screen.getByTestId("admin-layout-sidebar")).toBeInTheDocument();});@@ -27,10 +32,13 @@ describe("AdminEmbeddingApp", () => {"/admin/embedding/setup-guide/permissions","/admin/embedding/setup-guide/sso",])("hides the sidebar for %s", (pathname) => {- renderWithProviders(<Route path="*" component={TestAdminEmbeddingApp} />, {- initialRoute: pathname,- withRouter: true,- });+ renderWithProviders(+ <Route path="*" element={<RoutedTestAdminEmbeddingApp />} />,+ {+ initialRoute: pathname,+ withRouter: true,+ },+ );expect(screen.queryByTestId("admin-layout-sidebar"),@@ -39,10 +47,13 @@ describe("AdminEmbeddingApp", () => {});it("hides the sidebar for theme editor paths", () => {- renderWithProviders(<Route path="*" component={TestAdminEmbeddingApp} />, {- initialRoute: "/admin/embedding/themes/42",- withRouter: true,- });+ renderWithProviders(+ <Route path="*" element={<RoutedTestAdminEmbeddingApp />} />,+ {+ initialRoute: "/admin/embedding/themes/42",+ withRouter: true,+ },+ );expect(screen.queryByTestId("admin-layout-sidebar"),@@ -51,10 +62,13 @@ describe("AdminEmbeddingApp", () => {});it("shows the sidebar on the themes listing page", () => {- renderWithProviders(<Route path="*" component={TestAdminEmbeddingApp} />, {- initialRoute: "/admin/embedding/themes",- withRouter: true,- });+ renderWithProviders(+ <Route path="*" element={<RoutedTestAdminEmbeddingApp />} />,+ {+ initialRoute: "/admin/embedding/themes",+ withRouter: true,+ },+ );expect(screen.getByTestId("admin-layout-sidebar")).toBeInTheDocument();});diff --git a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsx b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsxindex d530258ca33..5e8b27a26ce 100644--- a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsx+++ b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.tsx@@ -1,11 +1,12 @@import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";import { shouldShowTenantsUpsell } from "metabase/admin/people/selectors";import { useSelector } from "metabase/redux";+import { Outlet } from "metabase/router";import { getLocation } from "metabase/selectors/routing";import { PeopleNav } from "../../components/PeopleNav";-export const AdminPeopleApp = ({ children }: { children: React.ReactNode }) => {+export const AdminPeopleApp = () => {const location = useSelector(getLocation);const showTenantsUpsell = useSelector(shouldShowTenantsUpsell);const isTenantsRoute = location?.pathname.startsWith("/admin/people/tenants");@@ -17,7 +18,7 @@ export const AdminPeopleApp = ({ children }: { children: React.ReactNode }) => {maw="80rem"fullWidth={isFullWidth}>- {children}+ <Outlet /></AdminSettingsLayout>);};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 eb313b06a39..33e1dfe0b71 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@@ -59,7 +59,9 @@ const setup = async (inputSetupOpts?: Partial<SetupOpts>) => {});renderWithProviders(- <Route path="/" component={() => <AdminPeopleApp>empty</AdminPeopleApp>} />,+ <Route path="/" element={<AdminPeopleApp />}>+ <Route index element={<>empty</>} />+ </Route>,{storeInitialState: state,withRouter: true,@@ -91,12 +93,14 @@ const setupTenantRoute = async (initialRoute: string) => {}),});+ const TenantsRouteGuard = createTenantsRouteGuard();+renderWithProviders(- <Route path="/admin/people" component={AdminPeopleApp}>- <Route path="tenants" component={createTenantsRouteGuard()}>- <Route path="groups" component={UpsellTenants} />- <Route path="people" component={UpsellTenants} />- <Route index component={UpsellTenants} />+ <Route path="/admin/people" element={<AdminPeopleApp />}>+ <Route path="tenants" element={<TenantsRouteGuard />}>+ <Route path="groups" element={<UpsellTenants />} />+ <Route path="people" element={<UpsellTenants />} />+ <Route index element={<UpsellTenants />} /></Route></Route>,{diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsxindex 39adcaca056..ceedb424ba9 100644--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx@@ -7,7 +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 { Link, Outlet } 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";@@ -22,7 +22,7 @@ const PAGE_SIZE = 25;const DEFAULT_NO_RESULTS_MESSAGE = () => t`No results found`;export function PeopleListingApp({- children,+ children = <Outlet />,external = false,showInviteButton = true,noResultsMessage = DEFAULT_NO_RESULTS_MESSAGE(),diff --git a/frontend/src/metabase/admin/performance/components/PerformanceApp.tsx b/frontend/src/metabase/admin/performance/components/PerformanceApp.tsxindex f40e4fc6a95..1e586878b59 100644--- a/frontend/src/metabase/admin/performance/components/PerformanceApp.tsx+++ b/frontend/src/metabase/admin/performance/components/PerformanceApp.tsx@@ -4,10 +4,11 @@ import {AdminNavWrapper,} from "metabase/admin/components/AdminNav";import { PLUGIN_CACHING, PerformanceTabId } from "metabase/plugins";+import { Outlet } from "metabase/router";import { getPerformanceTabName } from "../utils";-export const PerformanceApp = ({ children }: { children: React.ReactNode }) => (+export const PerformanceApp = () => (<AdminSettingsLayoutmaw="60rem"sidebar={@@ -34,6 +35,6 @@ export const PerformanceApp = ({ children }: { children: React.ReactNode }) => (</AdminNavWrapper>}>- {children}+ <Outlet /></AdminSettingsLayout>);diff --git a/frontend/src/metabase/admin/performance/components/test-utils.tsx b/frontend/src/metabase/admin/performance/components/test-utils.tsxindex 5962452d1cf..d6288f46962 100644--- a/frontend/src/metabase/admin/performance/components/test-utils.tsx+++ b/frontend/src/metabase/admin/performance/components/test-utils.tsx@@ -80,7 +80,7 @@ export const setupStrategyEditorForDatabases = ({const TestStrategyEditorForDatabases = () => <StrategyEditorForDatabases />;return renderWithProviders(- <Route path="*" component={TestStrategyEditorForDatabases} />,+ <Route path="*" element={<TestStrategyEditorForDatabases />} />,{storeInitialState,withRouter: true,diff --git a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsxindex 595b5b9c63d..657712f4fbb 100644--- a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx+++ b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx@@ -27,8 +27,8 @@ describe("useConfirmOnRouteLeave", () => {const { history, ...rest } = renderWithProviders(<div>- <Route path="/a" component={PageA} />- <Route path="/b" component={PageB} />+ <Route path="/a" element={<PageA />} />+ <Route path="/b" element={<PageB />} /></div>,{ withRouter: true, initialRoute: "/a" },);diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsxindex 859991c7561..b2af1c252cb 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx@@ -8,7 +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 { Route, withRouteProps } from "metabase/router";import type {Collection,CollectionPermissionsGraph,@@ -24,6 +24,10 @@ import {import { CollectionPermissionsPage } from "../CollectionPermissionsPage";+const RoutedCollectionPermissionsPage = withRouteProps(+ CollectionPermissionsPage,+);+const personalCollection = createMockCollection({id: "personal",name: "Personal",@@ -182,11 +186,11 @@ export function setup({<><Routepath="/admin/permissions/collections"- component={CollectionPermissionsPage}+ element={<RoutedCollectionPermissionsPage />}/><Routepath="/admin/permissions/collections/:collectionId"- component={CollectionPermissionsPage}+ element={<RoutedCollectionPermissionsPage />}/></>,{diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsxindex c12b678f3d3..31bade1c678 100644--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx@@ -1,4 +1,3 @@-import type { ReactNode } from "react";import { useAsync } from "react-use";import {@@ -9,7 +8,7 @@ import {} from "metabase/api";import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";import { useDispatch, useSelector } from "metabase/redux";-import type { Route } from "metabase/router";+import { Outlet, type Route } from "metabase/router";import { getMetadataUnfiltered } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";@@ -26,7 +25,6 @@ import {import { getDiff, getIsDirty } from "../../selectors/data-permissions/diff";type DataPermissionsPageProps = {- children: ReactNode;route: Route;params: {databaseId: DatabaseId;@@ -36,11 +34,7 @@ type DataPermissionsPageProps = {const EMPTY_GROUP_LIST: GroupInfo[] = [];const EMPTY_DATABASE_LIST: Database[] = [];-function DataPermissionsPage({- children,- route,- params,-}: DataPermissionsPageProps) {+function DataPermissionsPage({ route, params }: DataPermissionsPageProps) {const { isLoading: isLoadingDatabases } = useListDatabasesQuery();const databases = useSelector((state) =>@@ -112,7 +106,7 @@ function DataPermissionsPage({helpContent={<DataPermissionsHelp />}showSplitPermsModal={showSplitPermsModal}>- {children}+ <Outlet /></PermissionsPageLayout>);}diff --git a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsxindex f33c39a6d78..41d096212e8 100644--- a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx@@ -1,4 +1,4 @@-import { Fragment, type ReactNode, useCallback } from "react";+import { Fragment, useCallback } from "react";import { useAsync } from "react-use";import { t } from "ttag";import _ from "underscore";@@ -7,7 +7,7 @@ import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permimport { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import { connect, useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { push } from "metabase/router";+import { Outlet, push } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";@@ -67,7 +67,6 @@ const mapStateToProps = (interface DatabasesPermissionsPageInnerProps {sidebar: DataSidebarProps | null;params: RawDataRouteParams;- children: ReactNode;navigateToItem: (item: any) => void;navigateToDatabaseList: () => void;switchView: (entityType: string) => void;@@ -79,7 +78,6 @@ interface DatabasesPermissionsPageInnerProps {function DatabasesPermissionsPageInner({sidebar,params,- children,navigateToItem,navigateToDatabaseList,switchView,@@ -192,7 +190,7 @@ function DatabasesPermissionsPageInner({/>)}- {children}+ <Outlet /></Fragment>);}diff --git a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsxindex fea1f3c1e09..b22301ac0c7 100644--- a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx@@ -1,4 +1,4 @@-import { Fragment, type ReactNode, useCallback } from "react";+import { Fragment, useCallback } from "react";import { useAsync } from "react-use";import { t } from "ttag";import _ from "underscore";@@ -7,7 +7,7 @@ import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permimport { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import { connect, useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { push } from "metabase/router";+import { Outlet, push } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";import type { GroupId } from "metabase-types/api";@@ -73,7 +73,6 @@ const mapStateToProps = (interface GroupsPermissionsPageInnerProps {sidebar: GroupSidebarProps;params: RawGroupRouteParams;- children: ReactNode;navigateToItem: (item: any) => void;switchView: (entityType: string) => void;navigateToTableItem: (@@ -88,7 +87,6 @@ interface GroupsPermissionsPageInnerProps {function GroupsPermissionsPageInner({sidebar,params,- children,navigateToItem,switchView,navigateToTableItem,@@ -216,7 +214,7 @@ function GroupsPermissionsPageInner({/>)}- {children}+ <Outlet /></Fragment>);}diff --git a/frontend/src/metabase/admin/permissions/routes.tsx b/frontend/src/metabase/admin/permissions/routes.tsxindex 4b1810eb963..00e0ccf6ffa 100644--- a/frontend/src/metabase/admin/permissions/routes.tsx+++ b/frontend/src/metabase/admin/permissions/routes.tsx@@ -6,23 +6,30 @@ import {PLUGIN_ADMIN_PERMISSIONS_TABS,PLUGIN_APPLICATION_PERMISSIONS,} from "metabase/plugins";-import { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import { CollectionPermissionsPage } from "./pages/CollectionPermissionsPage/CollectionPermissionsPage";import DataPermissionsPage from "./pages/DataPermissionsPage";import { DatabasesPermissionsPage } from "./pages/DatabasePermissionsPage/DatabasesPermissionsPage";import { GroupsPermissionsPage } from "./pages/GroupDataPermissionsPage/GroupsPermissionsPage";+const RoutedDataPermissionsPage = withRouteProps(DataPermissionsPage);+const RoutedDatabasesPermissionsPage = withRouteProps(DatabasesPermissionsPage);+const RoutedGroupsPermissionsPage = withRouteProps(GroupsPermissionsPage);+const RoutedCollectionPermissionsPage = withRouteProps(+ CollectionPermissionsPage,+);+const getRoutes = () => (<Route>- <Route index component={redirect("data")} />+ <Route index element={redirect("data")} />- <Route path="data" component={DataPermissionsPage}>- <Route index component={redirect("group")} />+ <Route path="data" element={<RoutedDataPermissionsPage />}>+ <Route index element={redirect("group")} /><Routepath="database(/:databaseId)(/schema/:schemaName)(/table/:tableId)"- component={DatabasesPermissionsPage}+ element={<RoutedDatabasesPermissionsPage />}>{PLUGIN_ADMIN_PERMISSIONS_DATABASE_ROUTES}{PLUGIN_ADMIN_PERMISSIONS_TABLE_GROUP_ROUTES}@@ -30,14 +37,14 @@ const getRoutes = () => (<Routepath="group(/:groupId)(/database/:databaseId)(/schema/:schemaName)"- component={GroupsPermissionsPage}+ element={<RoutedGroupsPermissionsPage />}>{PLUGIN_ADMIN_PERMISSIONS_DATABASE_GROUP_ROUTES}{PLUGIN_ADMIN_PERMISSIONS_TABLE_ROUTES}</Route></Route>- <Route path="collections" component={CollectionPermissionsPage}>+ <Route path="collections" element={<RoutedCollectionPermissionsPage />}><Route path=":collectionId" /></Route>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 ba6c6a7a45c..e3ddeb9688a 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@@ -18,10 +18,13 @@ 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 { Route, withRouteProps } from "metabase/router";import { createMockGroup } from "metabase-types/api/mocks/group";import { createSampleDatabase } from "metabase-types/api/mocks/presets";+const RoutedDataPermissionsPage = withRouteProps(DataPermissionsPage);+const RoutedDatabasesPermissionsPage = withRouteProps(DatabasesPermissionsPage);+const TEST_DATABASE = createSampleDatabase();const TEST_GROUPS = [@@ -46,10 +49,13 @@ const setup = async () => {const mockEventListener = jest.spyOn(window, "addEventListener");renderWithProviders(- <Route path="/admin/permissions/data" component={DataPermissionsPage}>+ <Route+ path="/admin/permissions/data"+ element={<RoutedDataPermissionsPage />}+ ><Routepath="database(/:databaseId)(/schema/:schemaName)(/table/:tableId)"- component={DatabasesPermissionsPage}+ element={<RoutedDatabasesPermissionsPage />}>{PLUGIN_ADMIN_PERMISSIONS_TABLE_GROUP_ROUTES}</Route>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 270943a5c8f..0b7399489f3 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@@ -17,10 +17,13 @@ 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 { Route, withRouteProps } from "metabase/router";import { createMockGroup } from "metabase-types/api/mocks/group";import { createSampleDatabase } from "metabase-types/api/mocks/presets";+const RoutedDataPermissionsPage = withRouteProps(DataPermissionsPage);+const RoutedGroupsPermissionsPage = withRouteProps(GroupsPermissionsPage);+const NATIVE_QUERIES_PERMISSION_INDEX = 0;const TEST_DATABASE = createSampleDatabase();@@ -49,10 +52,13 @@ const setup = async ({const mockEventListener = jest.spyOn(window, "addEventListener");renderWithProviders(- <Route path="/admin/permissions/data" component={DataPermissionsPage}>+ <Route+ path="/admin/permissions/data"+ element={<RoutedDataPermissionsPage />}+ ><Routepath="group(/:groupId)(/database/:databaseId)(/schema/:schemaName)"- component={GroupsPermissionsPage}+ element={<RoutedGroupsPermissionsPage />}>{PLUGIN_ADMIN_PERMISSIONS_TABLE_ROUTES}</Route>diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsxindex 92623dbb6bb..3c5c0f7cb60 100644--- a/frontend/src/metabase/admin/routes.tsx+++ b/frontend/src/metabase/admin/routes.tsx@@ -1,5 +1,5 @@import type { Store } from "@reduxjs/toolkit";-import { Fragment } from "react";+import { Fragment, createElement } from "react";import AdminApp from "metabase/admin/app/components/AdminApp";import { DatabaseEditApp } from "metabase/admin/databases/containers/DatabaseEditApp";@@ -65,7 +65,12 @@ import {PerformanceTabId,} from "metabase/plugins";import type { State } from "metabase/redux/store";-import { Route, type RouteComponent, redirect } from "metabase/router";+import {+ Route,+ type RouteComponent,+ redirect,+ withRouteProps,+} from "metabase/router";import { getTokenFeature } from "metabase/selectors/settings";import { AISettingsPage, McpSettingsPage } from "./ai/AISettingsPage";@@ -81,6 +86,22 @@ import {createTenantsRouteGuard,} from "./utils";+// Legacy containers that still read v3 router props (`params`/`location`/+// `route`), fed from the router context so they run as `element` routes.+const RoutedRedirectToAllowedSettings = withRouteProps(+ RedirectToAllowedSettings,+);+const RoutedDataModelV1 = withRouteProps(DataModelV1);+const RoutedDatabasePage = withRouteProps(DatabasePage);+const RoutedSegmentListApp = withRouteProps(SegmentListApp);+const RoutedSegmentApp = withRouteProps(SegmentApp);+const RoutedRevisionHistoryApp = withRouteProps(RevisionHistoryApp);+const RoutedGroupDetailApp = withRouteProps(GroupDetailApp);+const RoutedAdminEmbeddingApp = withRouteProps(AdminEmbeddingApp);+const RoutedEmbeddingThemeEditorApp = withRouteProps(EmbeddingThemeEditorApp);+const RoutedToolsApp = withRouteProps(ToolsApp);+const RoutedOAuthAuthorizationsPage = withRouteProps(OAuthAuthorizationsPage);+export const getRoutes = (store: Store<State>,CanAccessSettings: RouteComponent,@@ -91,93 +112,108 @@ export const getRoutes = (return (<Route path="/admin" element={<CanAccessSettings />}>- <Route component={AdminApp}>- <Route index component={RedirectToAllowedSettings} />- <Route path="databases" component={createAdminRouteGuard("databases")}>- <Route index component={DatabaseListApp} />+ <Route element={<AdminApp />}>+ <Route index element={<RoutedRedirectToAllowedSettings />} />+ <Route+ path="databases"+ element={createElement(createAdminRouteGuard("databases"))}+ >+ <Route index element={<DatabaseListApp />} /><Route element={<IsAdmin />}>- <Route path="create" component={DatabasePage} />+ <Route path="create" element={<RoutedDatabasePage />} /></Route>- <Route path=":databaseId/edit" component={DatabasePage} />+ <Route path=":databaseId/edit" element={<RoutedDatabasePage />} />{PLUGIN_WRITABLE_CONNECTION.getWritableConnectionInfoRoutes(IsAdmin)}{PLUGIN_WORKSPACES.getWorkspaceDatabaseRoutes(IsAdmin)}- <Route path=":databaseId" component={DatabaseEditApp}>+ <Route path=":databaseId" element={<DatabaseEditApp />}>{PLUGIN_DB_ROUTING.getDestinationDatabaseRoutes(IsAdmin)}</Route></Route>- <Route path="datamodel" component={createAdminRouteGuard("data-model")}>+ <Route+ path="datamodel"+ element={createElement(createAdminRouteGuard("data-model"))}+ ><Route>- <Route index component={redirect("database")} />- <Route path="database" component={DataModelV1} />- <Route path="database/:databaseId" component={DataModelV1} />+ <Route index element={redirect("database")} />+ <Route path="database" element={<RoutedDataModelV1 />} />+ <Route+ path="database/:databaseId"+ element={<RoutedDataModelV1 />}+ /><Routepath="database/:databaseId/schema/:schemaId"- component={DataModelV1}+ element={<RoutedDataModelV1 />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId"- component={DataModelV1}+ element={<RoutedDataModelV1 />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId"- component={DataModelV1}+ element={<RoutedDataModelV1 />}/>- <Route component={DataModelV1}>- <Route path="segments" component={SegmentListApp} />+ <Route element={<RoutedDataModelV1 />}>+ <Route path="segments" element={<RoutedSegmentListApp />} /><Route path="segment/create" element={<IsAdmin />}>- <Route index component={SegmentApp} />+ <Route index element={<RoutedSegmentApp />} /></Route><Route path="segment/:id" element={<IsAdmin />}>- <Route index component={SegmentApp} />+ <Route index element={<RoutedSegmentApp />} /></Route><Routepath="segment/:id/revisions"- component={RevisionHistoryApp}+ element={<RoutedRevisionHistoryApp />}/></Route><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/settings"- component={redirect(+ element={redirect("database/:databaseId/schema/:schemaId/table/:tableId",)}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId/:section"- component={redirect(+ element={redirect("database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId",)}/></Route></Route>{/* PEOPLE */}- <Route path="people" component={createAdminRouteGuard("people")}>- <Route component={AdminPeopleApp}>- <Route index component={PeopleListingApp} />+ <Route+ path="people"+ element={createElement(createAdminRouteGuard("people"))}+ >+ <Route element={<AdminPeopleApp />}>+ <Route index element={<PeopleListingApp />} />{/*NOTE: this must come before the other routes otherwise it will be masked by them*/}<Route path="groups">- <Route index component={GroupsListingApp} />- <Route path=":groupId" component={GroupDetailApp} />+ <Route index element={<GroupsListingApp />} />+ <Route path=":groupId" element={<RoutedGroupDetailApp />} /></Route>{/* Tenants */}- <Route path="tenants" component={createTenantsRouteGuard()}>+ <Route+ path="tenants"+ element={createElement(createTenantsRouteGuard())}+ >{PLUGIN_TENANTS.tenantsRoutes ?? (<>- <Route index component={UpsellTenants} />- <Route path="groups" component={UpsellTenants} />- <Route path="people" component={UpsellTenants} />+ <Route index element={<UpsellTenants />} />+ <Route path="groups" element={<UpsellTenants />} />+ <Route path="people" element={<UpsellTenants />} /></>)}</Route>- <Route path="" component={PeopleListingApp}>+ <Route path="" element={<PeopleListingApp />}>{modalRoute("new", NewUserModal, { noWrap: true })}{PLUGIN_TENANTS.userStrategyRoute}</Route>- <Route path=":userId" component={PeopleListingApp}>- <Route index component={redirect("/admin/people")} />+ <Route path=":userId" element={<PeopleListingApp />}>+ <Route index element={redirect("/admin/people")} />{modalRoute("edit", EditUserModal, { noWrap: true })}{modalRoute("success", UserSuccessModal, { noWrap: true })}{modalRoute("reset", UserPasswordResetModal, { noWrap: true })}@@ -191,29 +227,35 @@ export const getRoutes = (</Route>{/* EMBEDDING */}- <Route path="embedding" component={createAdminRouteGuard("embedding")}>- <Route component={AdminEmbeddingApp}>- <Route index component={EmbeddingSettings} />+ <Route+ path="embedding"+ element={createElement(createAdminRouteGuard("embedding"))}+ >+ <Route element={<RoutedAdminEmbeddingApp />}>+ <Route index element={<EmbeddingSettings />} /><Route path="setup-guide">- <Route index component={EmbeddingHubAdminSettingsPage} />+ <Route index element={<EmbeddingHubAdminSettingsPage />} /><Routepath="permissions"- component={SetupPermissionsAndTenantsPage}+ element={<SetupPermissionsAndTenantsPage />}/>- <Route path="sso" component={SetupSsoPage} />+ <Route path="sso" element={<SetupSsoPage />} /></Route>{/* EE with non-starter plan has embedding settings on different pages */}{hasSimpleEmbedding && (- <Route path="guest" component={GuestEmbedsSettings} />+ <Route path="guest" element={<GuestEmbedsSettings />} />)}- <Route path="security" component={EmbeddingSecuritySettings} />- <Route path="themes" component={EmbeddingThemeListingApp} />- <Route path="themes/:themeId" component={EmbeddingThemeEditorApp} />+ <Route path="security" element={<EmbeddingSecuritySettings />} />+ <Route path="themes" element={<EmbeddingThemeListingApp />} />+ <Route+ path="themes/:themeId"+ element={<RoutedEmbeddingThemeEditorApp />}+ /></Route></Route>@@ -221,38 +263,41 @@ export const getRoutes = ({!hasSimpleEmbedding && (<Routepath="/admin/embedding/guest"- component={redirect("/admin/embedding")}+ element={redirect("/admin/embedding")}/>)}{/* Backwards compatibility for embedding settings */}<Routepath="/admin/embedding/modular"- component={redirect("/admin/embedding")}+ element={redirect("/admin/embedding")}/><Routepath="/admin/embedding/interactive"- component={redirect("/admin/embedding")}+ element={redirect("/admin/embedding")}/><Routepath="/admin/settings/embedding-in-other-applications"- component={redirect("/admin/embedding")}+ element={redirect("/admin/embedding")}/><Routepath="/admin/settings/embedding-in-other-applications/full-app"- component={redirect("/admin/embedding")}+ element={redirect("/admin/embedding")}/><Routepath="/admin/settings/embedding-in-other-applications/standalone"- component={redirect("/admin/embedding/guest")}+ element={redirect("/admin/embedding/guest")}/><Routepath="/admin/settings/embedding-in-other-applications/sdk"- component={redirect("/admin/embedding")}+ element={redirect("/admin/embedding")}/>{/* SETTINGS */}- <Route path="settings" component={createAdminRouteGuard("settings")}>+ <Route+ path="settings"+ element={createElement(createAdminRouteGuard("settings"))}+ >{getSettingsRoutes(store, IsAdmin)}</Route>{/* PERMISSIONS */}@@ -263,54 +308,57 @@ export const getRoutes = ({/* PERFORMANCE */}<Routepath="performance"- component={createAdminRouteGuard("performance")}+ element={createElement(createAdminRouteGuard("performance"))}>- <Route component={PerformanceApp}>- <Route index component={redirect(PerformanceTabId.Databases)} />- <Route path="databases" component={StrategyEditorForDatabases} />- <Route path="models" component={ModelPersistenceConfiguration} />+ <Route element={<PerformanceApp />}>+ <Route index element={redirect(PerformanceTabId.Databases)} />+ <Route path="databases" element={<StrategyEditorForDatabases />} />+ <Route path="models" element={<ModelPersistenceConfiguration />} /><Routepath="dashboards-and-questions"- component={PLUGIN_CACHING.StrategyEditorForQuestionsAndDashboards}+ element={+ <PLUGIN_CACHING.StrategyEditorForQuestionsAndDashboards />+ }/></Route></Route>{/* Metabot */}- <Route path="metabot" component={createAdminRouteGuard("metabot")}>+ <Route+ path="metabot"+ element={createElement(createAdminRouteGuard("metabot"))}+ >{PLUGIN_AUDIT.getAiAnalyticsRoutes()}{PLUGIN_AUDIT.getMcpAnalyticsRoutes()}- <Route key="index-layout" component={MetabotAdminLayout}>- <Route index key="index" component={AISettingsPage} />- <Route key="mcp" path="mcp" component={McpSettingsPage} />+ <Route key="index-layout" element={<MetabotAdminLayout />}>+ <Route index key="index" element={<AISettingsPage />} />+ <Route key="mcp" path="mcp" element={<McpSettingsPage />} /></Route><Routekey="mcp-authorizations-layout"- component={(props) => (+ element={<MetabotAdminLayout- {...props}fullWidthinnerContentProps={{ fullWidth: true, fullHeight: true }}/>- )}+ }><Routepath="mcp/authorizations"- component={OAuthAuthorizationsPage}+ element={<RoutedOAuthAuthorizationsPage />}/></Route><Routekey="layout"- component={(props) => (+ element={<MetabotAdminLayout- {...props}fullWidth={!PLUGIN_AI_CONTROLS.isEnabled}innerContentProps={{fullWidth: !PLUGIN_AI_CONTROLS.isEnabled,fullHeight: !PLUGIN_AI_CONTROLS.isEnabled,}}/>- )}+ }>{PLUGIN_AI_CONTROLS.getAiControlsRoutes()}</Route>@@ -319,41 +367,46 @@ export const getRoutes = ({PLUGIN_SECURITY_CENTER.isEnabled && (<Routepath="security-center"- component={PLUGIN_SECURITY_CENTER.SecurityCenterPage}+ element={<PLUGIN_SECURITY_CENTER.SecurityCenterPage />}/>)}- <Route path="tools" component={createAdminRouteGuard("tools")}>- <Route component={ToolsApp}>- <Route index component={redirect("help")} />+ <Route+ path="tools"+ element={createElement(createAdminRouteGuard("tools"))}+ >+ <Route element={<RoutedToolsApp />}>+ <Route index element={redirect("help")} /><Routekey="error-overview"path="errors"// If the audit_app feature flag is present, our enterprise plugin system kicks in and we render the// appropriate enterprise component. The upsell component is shown in all other cases.- component={PLUGIN_ADMIN_TOOLS.COMPONENT || ToolsUpsell}+ element={createElement(+ PLUGIN_ADMIN_TOOLS.COMPONENT || ToolsUpsell,+ )}/>- <Route path="model-caching" component={ModelCachePage}>+ <Route path="model-caching" element={<ModelCachePage />}>{modalRoute(":jobId", ModelCacheRefreshJobModal)}</Route>- <Route path="help" component={Help}>+ <Route path="help" element={<Help />}>{PLUGIN_SUPPORT.isEnabled &&modalRoute("grant-access", PLUGIN_SUPPORT.GrantAccessModal)}</Route><Route path="tasks">{getTasksRoutes()}</Route><Route path="notifications">{getNotificationsRoutes()}</Route>- <Route path="jobs" component={JobInfoApp}>+ <Route path="jobs" element={<JobInfoApp />}>{modalRoute(":jobKey", JobTriggersModal, {modalProps: { size: "85%" },})}</Route>- <Route path="logs" component={Logs}>+ <Route path="logs" element={<Logs />}>{modalRoute("levels", LogLevelsModal)}</Route>{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath="dependencies"- component={PLUGIN_DEPENDENCIES.DependencyGraphPage}+ element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />}/>)}</Route>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 616b9e27059..534004139d4 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@@ -46,7 +46,7 @@ const setup = async ({settingValue: versionInfo,});- renderWithProviders(<Route path="*" component={SettingsNav} />, {+ renderWithProviders(<Route path="*" element={<SettingsNav />} />, {withRouter: true,initialRoute,storeInitialState: {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 f9c0cde055e..4848bfe1f5e 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@@ -91,12 +91,12 @@ const setup = async ({renderWithProviders(<Routepath="*"- component={() => (+ element={<><GeneralSettingsPage /><UndoListing /></>- )}+ }/>,{ withRouter: true, initialRoute: "/admin/settings/general" },);diff --git a/frontend/src/metabase/admin/settingsRoutes.tsx b/frontend/src/metabase/admin/settingsRoutes.tsxindex 45a3f2d5d24..e0dc8b47ed5 100644--- a/frontend/src/metabase/admin/settingsRoutes.tsx+++ b/frontend/src/metabase/admin/settingsRoutes.tsx@@ -7,7 +7,13 @@ import {PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";import type { State } from "metabase/redux/store";-import { Route, type RouteComponent, redirect } from "metabase/router";+import {+ Outlet,+ Route,+ type RouteComponent,+ redirect,+ withRouteProps,+} from "metabase/router";import { getSetting } from "metabase/selectors/settings";import * as Urls from "metabase/urls";@@ -35,6 +41,10 @@ import { UpdatesSettingsPage } from "./settings/components/SettingsPages/Updatesimport { UploadSettingsPage } from "./settings/components/SettingsPages/UploadSettingsPage";import { WebhooksSettingsPage } from "./settings/components/SettingsPages/WebhooksSettingsPage";+const RoutedCustomVisualizationsFormPage = withRouteProps(+ CustomVisualizationsFormPage,+);+export const getSettingsRoutes = (store: Store<State>,IsAdmin: RouteComponent,@@ -46,59 +56,62 @@ export const getSettingsRoutes = (return (<Route- component={({ children }) => (+ element={<AdminSettingsLayout sidebar={<SettingsNav />}>- {children}+ <Outlet /></AdminSettingsLayout>- )}+ }>- <Route index component={redirect("general")} />- <Route path="general" component={GeneralSettingsPage} />- <Route path="updates" component={UpdatesSettingsPage} />- <Route path="email" component={EmailSettingsPage} />- <Route path="slack" component={SlackSettingsPage} />- <Route path="webhooks" component={WebhooksSettingsPage} />+ <Route index element={redirect("general")} />+ <Route path="general" element={<GeneralSettingsPage />} />+ <Route path="updates" element={<UpdatesSettingsPage />} />+ <Route path="email" element={<EmailSettingsPage />} />+ <Route path="slack" element={<SlackSettingsPage />} />+ <Route path="webhooks" element={<WebhooksSettingsPage />} /><Routepath="authentication"- component={() => <AuthenticationSettingsPage tab="authentication" />}+ element={<AuthenticationSettingsPage tab="authentication" />}/><Routepath="authentication/user-provisioning"- component={() => <AuthenticationSettingsPage tab="user-provisioning" />}+ element={<AuthenticationSettingsPage tab="user-provisioning" />}/><Routepath="authentication/api-keys"- component={() => <AuthenticationSettingsPage tab="api-keys" />}+ element={<AuthenticationSettingsPage tab="api-keys" />}/>- <Route path="authentication/google" component={GoogleAuthForm} />- <Route path="authentication/ldap" component={SettingsLdapForm} />+ <Route path="authentication/google" element={<GoogleAuthForm />} />+ <Route path="authentication/ldap" element={<SettingsLdapForm />} /><Routepath="authentication/saml"- component={() => <PLUGIN_AUTH_PROVIDERS.SettingsSAMLForm />}+ element={<PLUGIN_AUTH_PROVIDERS.SettingsSAMLForm />}/><Routepath="authentication/jwt"- component={() => <PLUGIN_AUTH_PROVIDERS.SettingsJWTForm />}+ element={<PLUGIN_AUTH_PROVIDERS.SettingsJWTForm />}/><Routepath="authentication/oidc"- component={() => <PLUGIN_AUTH_PROVIDERS.SettingsOIDCForm />}+ element={<PLUGIN_AUTH_PROVIDERS.SettingsOIDCForm />}/>- <Route path="remote-sync" component={RemoteSyncSettingsPage} />- <Route path="maps" component={MapsSettingsPage} />- <Route path="localization" component={LocalizationSettingsPage} />+ <Route path="remote-sync" element={<RemoteSyncSettingsPage />} />+ <Route path="maps" element={<MapsSettingsPage />} />+ <Route path="localization" element={<LocalizationSettingsPage />} /><Routepath="custom-visualizations"/* do not allow users with "Settings access" permissions to access custom viz pages */element={<IsAdmin />}>- <Route index component={CustomVisualizationsManagePage} />- <Route path="new" component={CustomVisualizationsFormPage} />- <Route path="edit/:id" component={CustomVisualizationsFormPage} />+ <Route index element={<CustomVisualizationsManagePage />} />+ <Route path="new" element={<RoutedCustomVisualizationsFormPage />} />+ <Route+ path="edit/:id"+ element={<RoutedCustomVisualizationsFormPage />}+ />{devModeEnabled && (<Routepath="development"- component={CustomVisualizationsDevelopmentPage}+ element={<CustomVisualizationsDevelopmentPage />}/>)}</Route>@@ -108,30 +121,30 @@ export const getSettingsRoutes = (} /* do not allow users with "Settings access" permissions to access data apps pages */element={<IsAdmin />}>- <Route index component={DataAppsManagePage} />+ <Route index element={<DataAppsManagePage />} /></Route>- <Route path="uploads" component={UploadSettingsPage} />+ <Route path="uploads" element={<UploadSettingsPage />} /><Routepath="python-runner"- component={PLUGIN_TRANSFORMS_PYTHON.PythonRunnerSettingsPage}+ element={<PLUGIN_TRANSFORMS_PYTHON.PythonRunnerSettingsPage />}/>- <Route path="public-sharing" component={PublicSharingSettingsPage} />- <Route path="license" component={LicenseSettingsPage} />- <Route path="appearance" component={() => <AppearanceSettingsPage />} />+ <Route path="public-sharing" element={<PublicSharingSettingsPage />} />+ <Route path="license" element={<LicenseSettingsPage />} />+ <Route path="appearance" element={<AppearanceSettingsPage />} /><Routepath="whitelabel"- component={() => <AppearanceSettingsPage tab="branding" />}+ element={<AppearanceSettingsPage tab="branding" />}/><Routepath="whitelabel/branding"- component={() => <AppearanceSettingsPage tab="branding" />}+ element={<AppearanceSettingsPage tab="branding" />}/><Routepath="whitelabel/conceal-metabase"- component={() => <AppearanceSettingsPage tab="conceal-metabase" />}+ element={<AppearanceSettingsPage tab="conceal-metabase" />}/>- <Route path="cloud" component={CloudSettingsPage} />- <Route path="*" component={NotFound} />+ <Route path="cloud" element={<CloudSettingsPage />} />+ <Route path="*" element={<NotFound />} /></Route>);};diff --git a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsxindex d96aeabdc2c..69b95605f9a 100644--- a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx+++ b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx@@ -380,7 +380,7 @@ function setup({setupCardEndpoints(card);setupDashboardEndpoints(BAR_DASHBOARD);- return renderWithProviders(<Route path="*" component={AppBarContainer} />, {+ return renderWithProviders(<Route path="*" element={<AppBarContainer />} />, {withRouter: true,initialRoute,storeInitialState: {diff --git a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsxindex 94fc0e257b6..653ffb0288d 100644--- a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx+++ b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx@@ -80,7 +80,7 @@ async function setup({});const { store } = renderWithProviders(- <Route path={route} component={Navbar} />,+ <Route path={route} element={<Navbar />} />,{storeInitialState,initialRoute: pathname,diff --git a/frontend/src/metabase/auth/components/AuthButton/AuthButton.unit.spec.tsx b/frontend/src/metabase/auth/components/AuthButton/AuthButton.unit.spec.tsxindex 4dc5d0a0ffb..878738e6c65 100644--- a/frontend/src/metabase/auth/components/AuthButton/AuthButton.unit.spec.tsx+++ b/frontend/src/metabase/auth/components/AuthButton/AuthButton.unit.spec.tsx@@ -29,7 +29,7 @@ describe("AuthTextLink", () => {renderWithProviders(<Routepath="/"- component={() => <AuthTextLink to="/auth/login">Sign in</AuthTextLink>}+ element={<AuthTextLink to="/auth/login">Sign in</AuthTextLink>}/>,{ withRouter: true },);@@ -43,7 +43,7 @@ describe("AuthCardLink", () => {renderWithProviders(<Routepath="/"- component={() => <AuthCardLink to="/auth/login">Sign in</AuthCardLink>}+ element={<AuthCardLink to="/auth/login">Sign in</AuthCardLink>}/>,{ withRouter: true },);diff --git a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsxindex 10cb56a7f75..adc2197275b 100644--- a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx+++ b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx@@ -6,10 +6,12 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { ForgotPassword } from "./ForgotPassword";+const RoutedForgotPassword = withRouteProps(ForgotPassword);+const TEST_EMAIL = "[email protected]";interface SetupOpts {@@ -28,7 +30,7 @@ const setup = ({ isEmailConfigured, isLdapEnabled }: SetupOpts) => {setupForgotPasswordEndpoint();renderWithProviders(- <Route path="/auth/forgot_password" component={ForgotPassword} />,+ <Route path="/auth/forgot_password" element={<RoutedForgotPassword />} />,{storeInitialState: state,withRouter: true,diff --git a/frontend/src/metabase/auth/components/Login/tests/setup.tsx b/frontend/src/metabase/auth/components/Login/tests/setup.tsxindex a7270add3df..0a464365628 100644--- a/frontend/src/metabase/auth/components/Login/tests/setup.tsx+++ b/frontend/src/metabase/auth/components/Login/tests/setup.tsx@@ -2,12 +2,14 @@ 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 { Route, withRouteProps } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import { createMockTokenFeatures } from "metabase-types/api/mocks";import { Login } from "../Login";+const RoutedLogin = withRouteProps(Login);+interface SetupOpts {initialRoute?: string;isPasswordLoginEnabled?: boolean;@@ -37,8 +39,8 @@ export const setup = ({renderWithProviders(<>- <Route path="/auth/login" component={Login} />- <Route path="/auth/login/:provider" component={Login} />+ <Route path="/auth/login" element={<RoutedLogin />} />+ <Route path="/auth/login/:provider" element={<RoutedLogin />} /></>,{ storeInitialState: state, withRouter: true, initialRoute },);diff --git a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsx b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsxindex fab79c2914f..515fea72b2e 100644--- a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsx+++ b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.unit.spec.tsx@@ -8,11 +8,13 @@ import {setupResetPasswordEndpoint,} from "__support__/server-mocks";import { act, renderWithProviders, screen, waitFor } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { createMockSettings, createMockUser } from "metabase-types/api/mocks";import { ResetPassword } from "./ResetPassword";+const RoutedResetPassword = withRouteProps(ResetPassword);+interface SetupOpts {isTokenValid?: boolean;}@@ -26,9 +28,12 @@ const setup = ({ isTokenValid = true }: SetupOpts = {}) => {return renderWithProviders(<>- <Route path="/" component={TestHome} />- <Route path="/another-page" component={AnotherPage} />- <Route path="/auth/reset_password/:token" component={ResetPassword} />+ <Route path="/" element={<TestHome />} />+ <Route path="/another-page" element={<AnotherPage />} />+ <Route+ path="/auth/reset_password/:token"+ element={<RoutedResetPassword />}+ /></>,{withRouter: true,diff --git a/frontend/src/metabase/auth/components/SsoReload/SsoReload.unit.spec.tsx b/frontend/src/metabase/auth/components/SsoReload/SsoReload.unit.spec.tsxindex 69f23fdfbbe..dd319a0184f 100644--- a/frontend/src/metabase/auth/components/SsoReload/SsoReload.unit.spec.tsx+++ b/frontend/src/metabase/auth/components/SsoReload/SsoReload.unit.spec.tsx@@ -14,7 +14,7 @@ describe("SsoReload", () => {.spyOn(domUtils, "reload").mockImplementation(() => undefined);- renderWithProviders(<Route path="sso" component={SsoReload} />, {+ renderWithProviders(<Route path="sso" element={<SsoReload />} />, {withRouter: true,initialRoute: "/sso",});diff --git a/frontend/src/metabase/browse/metrics/tests/setup.tsx b/frontend/src/metabase/browse/metrics/tests/setup.tsxindex 7df16d3a713..356d30ecae9 100644--- a/frontend/src/metabase/browse/metrics/tests/setup.tsx+++ b/frontend/src/metabase/browse/metrics/tests/setup.tsx@@ -264,10 +264,10 @@ export function setup({return renderWithProviders(<>- <Route path="/" component={() => <BrowseMetrics />} />+ <Route path="/" element={<BrowseMetrics />} /><Routepath="/metric/:cardId"- component={() => <div data-testid="metric-detail-page" />}+ element={<div data-testid="metric-detail-page" />}/></>,{diff --git a/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx b/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsxindex 0b936a26365..aa657efe38d 100644--- a/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx+++ b/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx@@ -46,10 +46,10 @@ const setup = ({setupRecentViewsEndpoints(mockRecentModels);return renderWithProviders(<>- <Route path="/" component={() => <BrowseModels />} />+ <Route path="/" element={<BrowseModels />} /><Routepath="/model/:slug"- component={() => <div data-testid="model-detail-page" />}+ element={<div data-testid="model-detail-page" />}/></>,{diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsxindex f4d7ab3b2c2..8dfb4cbbb55 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx@@ -85,17 +85,12 @@ async function setupCollectionContent(overrides = {}) {renderWithProviders(<Routepath="/"- component={() => {- return (- <>- <CollectionContent- collectionId={firstCollectionId}- {...overrides}- />- <FileUploadStatus />- </>- );- }}+ element={+ <>+ <CollectionContent collectionId={firstCollectionId} {...overrides} />+ <FileUploadStatus />+ </>+ }/>,{withRouter: true,diff --git a/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx b/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsxindex eb0686db539..66b22de6131 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx@@ -80,7 +80,7 @@ export const setup = ({}renderWithProviders(- <Route path="/" component={() => <CollectionHeader {...props} />} />,+ <Route path="/" element={<CollectionHeader {...props} />} />,{storeInitialState: state,initialRoute: "/",diff --git a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsxindex e3de3415aa3..cef32128b00 100644--- a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx+++ b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx@@ -1,9 +1,8 @@-import type { ReactNode } from "react";import { useEffect } from "react";import { useGetCollectionQuery } from "metabase/api";import { useDispatch } from "metabase/redux";-import { replace } from "metabase/router";+import { Outlet, replace } from "metabase/router";import { extractCollectionId } from "metabase/urls";import { isNotNull } from "metabase/utils/types";@@ -11,17 +10,13 @@ import { CollectionContent } from "../CollectionContent";export interface CollectionLandingProps {params: CollectionLandingParams;- children?: ReactNode;}export interface CollectionLandingParams {slug: string;}-const CollectionLanding = ({- params: { slug },- children,-}: CollectionLandingProps) => {+const CollectionLanding = ({ params: { slug } }: CollectionLandingProps) => {const dispatch = useDispatch();const { data: trashCollection } = useGetCollectionQuery({ id: "trash" });@@ -50,7 +45,7 @@ const CollectionLanding = ({return (<><CollectionContent collectionId={collectionId} />- {children}+ <Outlet /></>);};diff --git a/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx b/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsxindex 147c66b35c2..34ff9a72954 100644--- a/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx+++ b/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx@@ -86,13 +86,13 @@ export const setup = ({<><Routepath="/"- component={() => (+ element={<CollectionMenucollection={collection}isAdmin={isAdmin}onUpdateCollection={onUpdateCollection}/>- )}+ }/></>,{ storeInitialState: state, initialRoute: "/", withRouter: true },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 62413d877e0..4aad2016f73 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@@ -40,14 +40,14 @@ function setup({return renderWithProviders(<Routepath="/"- component={() => (+ element={<PinnedItemCarditem={item}collection={collection}createBookmark={jest.fn()}deleteBookmark={jest.fn()}/>- )}+ }/>,{ withRouter: true, storeInitialState },);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 77b75dc4121..3865f4dc6ba 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@@ -76,7 +76,7 @@ function setup({ item = defaultItem, collection = defaultCollection } = {}) {return renderWithProviders(<Routepath="/"- component={() => (+ element={<PinnedItemCarditem={item}collection={collection}@@ -85,7 +85,7 @@ function setup({ item = defaultItem, collection = defaultCollection } = {}) {createBookmark={jest.fn()}deleteBookmark={jest.fn()}/>- )}+ }/>,{ withRouter: true },);diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsxindex 3f16fe9f0ba..af33bdfcc6f 100644--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx@@ -43,7 +43,7 @@ function setup({}),});- renderWithProviders(<Route path="*" component={AppBanner} />, {+ renderWithProviders(<Route path="*" element={<AppBanner />} />, {initialRoute: "/",storeInitialState: state,withRouter: true,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 e52910a4c70..19cb95d57c2 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@@ -64,7 +64,7 @@ describe("BaseItemsTable", () => {return renderWithProviders(<Routepath="/"- component={() => (+ element={<BaseItemsTableitems={items}sortingOptions={{@@ -75,7 +75,7 @@ describe("BaseItemsTable", () => {visibleColumnsMap={VISIBLE_COLUMNS_MAP}{...props}/>- )}+ }/>,{ withDND: true, withRouter: true },);diff --git a/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsx b/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsxindex e4a95dda95b..cc3424d82b5 100644--- a/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsx+++ b/frontend/src/metabase/common/components/LeaveConfirmModal/LeaveRouteConfirmModal.tsx@@ -4,15 +4,21 @@ 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 { useRoute, withRouter } from "metabase/router";import { LeaveConfirmModal } from "./LeaveConfirmModal";interface LeaveRouteConfirmModalProps {isEnabled: boolean;isLocationAllowed?: (location?: Location) => boolean;- route: Route;+ /**+ * The route to guard. Omit it on an `element`-based page: the page's own+ * matched route comes from `useRoute()`, so the page does not need the+ * v3-injected `route`. Still accepted for callers that pass it explicitly.+ */+ route?: Route;router: InjectedRouter;+ routes: Route[];onConfirm?: () => void;onOpenChange?: (opened: boolean) => void;}@@ -22,13 +28,15 @@ const LeaveRouteConfirmModalInner = ({isLocationAllowed,route,router,+ routes,onConfirm,onOpenChange,}: LeaveRouteConfirmModalProps) => {+ const routeFromContext = useRoute();const { opened, close, confirm } = useConfirmRouteLeaveModal({isEnabled,isLocationAllowed,- route,+ route: route ?? routeFromContext ?? routes[routes.length - 1],router,});const previousIsOpened = usePrevious(opened);diff --git a/frontend/src/metabase/common/components/ModalRoute.tsx b/frontend/src/metabase/common/components/ModalRoute.tsxindex 6e8c3b1845d..fb9eb2fc711 100644--- a/frontend/src/metabase/common/components/ModalRoute.tsx+++ b/frontend/src/metabase/common/components/ModalRoute.tsx@@ -1,7 +1,13 @@import type { Location } from "history";import { useCallback } from "react";-import { Route, useNavigate } from "metabase/router";+import {+ Route,+ useNavigate,+ useParams,+ useRoute,+ useRouter,+} from "metabase/router";import { Modal, type ModalProps } from "metabase/ui";type RouteParams = Record<string, string | undefined>;@@ -44,11 +50,11 @@ export function modalRoute(ComposedModal: React.ComponentType<ModalComponentProps>,{ noWrap = false, modalProps }: ModalRouteOptions = {},) {- function ModalRouteComponent({- params,- location,- route,- }: RouteInjectedProps) {+ function ModalRouteComponent() {+ const params = useParams();+ // The raw v3 location (with `query`), which some modals still read.+ const { location } = useRouter();+ const route = useRoute() ?? undefined;const navigate = useNavigate();const onClose = useCallback(() => navigate("..", { relative: "route" }),@@ -87,15 +93,5 @@ export function modalRoute(}]`;// Keyed for the plugin route arrays, which React renders as a list.- return <Route key={path} path={path} component={ModalRouteComponent} />;+ return <Route key={path} path={path} element={<ModalRouteComponent />} />;}--/**- * What react-router v3 injects into a route `component`. Replaced by the facade- * hooks when the engine swaps.- */-type RouteInjectedProps = {- params: RouteParams;- location: Location;- route: Route;-};diff --git a/frontend/src/metabase/common/components/ModalRoute.unit.spec.tsx b/frontend/src/metabase/common/components/ModalRoute.unit.spec.tsxindex 2e8cb1ccb39..5698b3a8d53 100644--- a/frontend/src/metabase/common/components/ModalRoute.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ModalRoute.unit.spec.tsx@@ -1,15 +1,15 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import { Route } from "metabase/router";+import { Outlet, Route } from "metabase/router";import { type ModalComponentProps, modalRoute } from "./ModalRoute";-function CollectionPage({ children }: { children?: React.ReactNode }) {+function CollectionPage() {return (<div><span>Collection page</span>- {children}+ <Outlet /></div>);}@@ -41,7 +41,7 @@ const close = () =>describe("modalRoute", () => {it("renders the page and the modal when deep-linking to a modal URL", () => {setup(- <Route path="collection/:slug" component={CollectionPage}>+ <Route path="collection/:slug" element={<CollectionPage />}>{modalRoute("archive", TestModal, { modalProps })}</Route>,"/collection/5/archive",@@ -53,7 +53,7 @@ describe("modalRoute", () => {it("returns to the parent URL on close", async () => {const { pathname } = setup(- <Route path="collection/:slug" component={CollectionPage}>+ <Route path="collection/:slug" element={<CollectionPage />}>{modalRoute("archive", TestModal, { modalProps })}</Route>,"/collection/5/archive",@@ -68,7 +68,7 @@ describe("modalRoute", () => {it("closes a modal whose path spans several segments to the right parent", async () => {const { pathname } = setup(- <Route path="account/notifications" component={CollectionPage}>+ <Route path="account/notifications" element={<CollectionPage />}>{modalRoute("pulse/:pulseId/archive", TestModal, { modalProps })}</Route>,"/account/notifications/pulse/7/archive",@@ -87,7 +87,7 @@ describe("modalRoute", () => {const { pathname } = setup(<Routepath="database(/:databaseId)(/schema/:schemaName)(/table/:tableId)"- component={CollectionPage}+ element={<CollectionPage />}>{modalRoute("impersonated/group/:groupId", TestModal, { modalProps })}</Route>,@@ -104,7 +104,7 @@ describe("modalRoute", () => {it("wraps the modal component in a dialog by default", () => {setup(- <Route path="collection/:slug" component={CollectionPage}>+ <Route path="collection/:slug" element={<CollectionPage />}>{modalRoute("archive", TestModal, { modalProps })}</Route>,"/collection/5/archive",@@ -115,7 +115,7 @@ describe("modalRoute", () => {it("renders the modal component on its own with noWrap", () => {setup(- <Route path="collection/:slug" component={CollectionPage}>+ <Route path="collection/:slug" element={<CollectionPage />}>{modalRoute("archive", TestModal, { noWrap: true })}</Route>,"/collection/5/archive",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 2907d52362c..b77016fcc0e 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@@ -293,13 +293,13 @@ const setup = async ({renderWithProviders(<Routepath="/"- component={() => (+ element={<AddToDashSelectDashModalcard={card}onChangeLocation={onChangeLocation}onClose={() => undefined}/>- )}+ }/>,{withRouter: true,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 64a347efb1d..06f5a2d2d32 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@@ -58,10 +58,7 @@ const setup = ({ result }: { result: ApiSearchResult }) => {setupUserRecipientsEndpoint({ users: [USER] });const { history } = renderWithProviders(- <Route- path="*"- component={() => <SearchResult result={result} index={0} />}- />,+ <Route path="*" element={<SearchResult result={result} index={0} />} />,{withRouter: true,initialRoute: "/",diff --git a/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsxindex b3fdf6b4d01..36901d155f6 100644--- a/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx+++ b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx@@ -58,7 +58,7 @@ export const setup = async ({<><Routepath="/"- component={() => (+ element={<Tabs><Tabs.List>{isForADashboard ? (@@ -68,15 +68,15 @@ export const setup = async ({)}</Tabs.List></Tabs>- )}+ }/><Routepath="/dashboard/201"- component={() => <div data-testid="usage-analytics-dashboard" />}+ element={<div data-testid="usage-analytics-dashboard" />}/><Routepath="/dashboard/202"- component={() => <div data-testid="usage-analytics-dashboard" />}+ element={<div data-testid="usage-analytics-dashboard" />}/></>,{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 aaa51894789..99680b4d418 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@@ -30,15 +30,10 @@ function setup(return renderWithProviders(<>- <Route- path="/internal-link"- component={() => <div>Internal link content</div>}- />+ <Route path="/internal-link" element={<div>Internal link content</div>} /><Routepath="/"- component={() => (- <UpsellBanner {...props}>{props.children}</UpsellBanner>- )}+ element={<UpsellBanner {...props}>{props.children}</UpsellBanner>}/></>,{@@ -145,7 +140,7 @@ describe("UpsellsBanner > Upsell Wrapper Dismissible", () => {renderWithProviders(<Routepath="/"- component={() => (+ element={<UpsellBannerdismissiblecampaign="fresh-campaign"@@ -156,7 +151,7 @@ describe("UpsellsBanner > Upsell Wrapper Dismissible", () => {>Banner content</UpsellBanner>- )}+ }/>,{storeInitialState: {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 73b38ae98e0..a16f0db4da3 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@@ -22,10 +22,10 @@ function setup({renderWithProviders(<>- <Route path="/admin/settings" component={() => <div>Settings</div>} />+ <Route path="/admin/settings" element={<div>Settings</div>} /><Routepath="/"- component={() => (+ element={<UpsellCtaonClick={onClick}onClickCapture={mockOnClickCapture}@@ -33,7 +33,7 @@ function setup({url={url}internalLink={internalLink}/>- )}+ }/></>,{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 384f3fca76e..44c86f8bd48 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@@ -148,7 +148,7 @@ const setup = ({<><Routepath="dashboard/:slug"- component={() => (+ element={<MockDashboardContextdashboardId={mockDashboard.id}dashboard={mockDashboard}@@ -162,10 +162,10 @@ const setup = ({onEditVisualization={onEditVisualization}/></MockDashboardContext>- )}+ }/>- <Route path="question/:slug" component={() => <div />} />- <Route path="question/:slug/notebook" component={() => <div />} />+ <Route path="question/:slug" element={<div />} />+ <Route path="question/:slug/notebook" element={<div />} /></>,{storeInitialState,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 505ba0b76dd..997f0bf4e3f 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@@ -152,7 +152,7 @@ const setup = ({return renderWithProviders(<Routepath="*"- component={() => (+ element={<MockDashboardContextrefreshPeriod={null}onRefreshPeriodChange={jest.fn()}@@ -169,7 +169,7 @@ const setup = ({isAnalyticsDashboard={isAnalyticsDashboard}/></MockDashboardContext>- )}+ }></Route>,{storeInitialState: {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 0f2c90d6962..1833a7976c1 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@@ -59,7 +59,7 @@ const setup = ({const { store } = renderWithProviders(<Routepath="*"- component={() => (+ element={<MockDashboardContextdashboardId={dashboard.id}dashboard={dashboard}@@ -74,7 +74,7 @@ const setup = ({openSettingsSidebar={jest.fn()}/></MockDashboardContext>- )}+ }/>,{withRouter: true,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsxindex 7638895b6e2..3aac48393a9 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx@@ -116,7 +116,7 @@ export const setup = async ({renderWithProviders(<Routepath="*"- component={() => (+ element={<MockDashboardContextdashboardId={dashboard.id}dashboard={dashboard}@@ -131,7 +131,7 @@ export const setup = async ({><DashboardHeader /></MockDashboardContext>- )}+ }/>,{withRouter: true,diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsxindex be669dce28e..a22261cadcb 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx@@ -65,7 +65,7 @@ export async function setup({renderWithProviders(<Routepath="*"- component={() => (+ element={<MockDashboardContextdashboard={dashboard}// Unjustified type cast. FIXME@@ -74,7 +74,7 @@ export async function setup({><DashboardInfoSidebar /></MockDashboardContext>- )}+ }/>,{ storeInitialState: state, withRouter: true },);diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsxindex e187a6e647d..f2d21ae54cb 100644--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx@@ -5,25 +5,34 @@ 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 {+ type Route,+ type WithRouterProps,+ useRoute,+ withRouter,+} from "metabase/router";import { Box, Button, Flex, Modal, Text } from "metabase/ui";import { isNavigatingToCreateADashboardQuestion } from "./utils";interface DashboardLeaveConfirmationModalProps extends WithRouterProps {- route: Route;+ route?: Route;}export const DashboardLeaveConfirmationModal = withRouter(- ({ router, route }: DashboardLeaveConfirmationModalProps) => {+ ({ router, route, routes }: DashboardLeaveConfirmationModalProps) => {const isEditing = useSelector(getIsEditing);const isDirty = useSelector(getIsDirty);+ const routeFromContext = useRoute();const dispatch = useDispatch();const { opened, close, confirm, nextLocation } = useConfirmRouteLeaveModal({isEnabled: isEditing && isDirty,- route,+ // `routes` is the matched-route chain; its last entry is this page's own+ // route. Typed loosely as PlainRoute by react-router, cast to the `Route`+ // the hook expects.+ route: route ?? routeFromContext ?? (routes[routes.length - 1] as Route),router,});diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsxindex 981cafc0c7d..b1a111e869e 100644--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx@@ -67,7 +67,7 @@ export async function setup({);renderWithProviders(- <Route path="*" component={TestDashboardSettingsSidebar} />,+ <Route path="*" element={<TestDashboardSettingsSidebar />} />,{ storeInitialState: state, withRouter: true },);diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsxindex a6a9343ac67..4ca575d0e7f 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx@@ -15,6 +15,7 @@ import {Link,Route,type WithRouterProps,+ withRouteProps,withRouter,} from "metabase/router";import type { DashboardTab } from "metabase-types/api";@@ -81,32 +82,31 @@ function setup({);};+ const DashboardRoute = withRouteProps((props: WithRouterProps) => {+ return (+ <MockDashboardContext+ dashboardId={1}+ dashboard={{+ ...TEST_DASHBOARD_STATE.dashboards[1],+ dashcards: dashcards+ ? Object.values(dashcards)+ : TEST_DASHBOARD_STATE.dashboards[1].dashcards.map(+ (dcId) => TEST_DASHBOARD_STATE.dashcards[dcId],+ ),+ tabs: tabs ?? TEST_DASHBOARD_STATE.dashboards[1].tabs,+ }}+ navigateToNewCardFromDashboard={null}+ isEditing={isEditing}+ >+ <RoutedDashboardComponent {...props} />+ </MockDashboardContext>+ );+ });+const { store } = renderWithProviders(<>- <Route- path="dashboard/:slug(/:tabSlug)"- component={(props: WithRouterProps) => {- return (- <MockDashboardContext- dashboardId={1}- dashboard={{- ...TEST_DASHBOARD_STATE.dashboards[1],- dashcards: dashcards- ? Object.values(dashcards)- : TEST_DASHBOARD_STATE.dashboards[1].dashcards.map(- (dcId) => TEST_DASHBOARD_STATE.dashcards[dcId],- ),- tabs: tabs ?? TEST_DASHBOARD_STATE.dashboards[1].tabs,- }}- navigateToNewCardFromDashboard={null}- isEditing={isEditing}- >- <RoutedDashboardComponent {...props} />- </MockDashboardContext>- );- }}- />- <Route path="someotherpath" component={OtherComponent} />+ <Route path="dashboard/:slug(/:tabSlug)" element={<DashboardRoute />} />+ <Route path="someotherpath" element={<OtherComponent />} /></>,{storeInitialState: { dashboard },diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsxindex c475cdb0d46..2e6204aa964 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx@@ -18,7 +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 { useRouter } 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";@@ -33,8 +33,6 @@ import { trackXRaySaved } from "./analytics";const SIDEBAR_W = 346;-type AutomaticDashboardAppRouterProps = WithRouterProps<{ splat: string }>;-const AutomaticDashboardAppInner = () => {const { dashboard, parameters, isHeaderVisible, tabs } =useDashboardContext();@@ -219,11 +217,8 @@ const AutomaticDashboardAppInner = () => {);};-export const AutomaticDashboardApp = ({- router,- location,- params,-}: AutomaticDashboardAppRouterProps) => {+export const AutomaticDashboardApp = () => {+ const { router, location, params } = useRouter();useDashboardUrlQuery(router, location);const dispatch = useDispatch();diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsxindex 2284c41af04..c0540a8e509 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx@@ -38,7 +38,7 @@ const setup = async () => {setupDatabaseListEndpoint([TEST_DATABASE_WITH_ACTIONS]);renderWithProviders(- <Route path="/auto/dashboard/*" component={AutomaticDashboardApp} />,+ <Route path="/auto/dashboard/*" element={<AutomaticDashboardApp />} />,{withRouter: true,initialRoute: `/auto/dashboard/table/${dashboardId}`,diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsxindex 28186654ee9..71f7f6550db 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx@@ -1,5 +1,5 @@import cx from "classnames";-import type { PropsWithChildren } from "react";+import type { Location } from "history";import { useState } from "react";import ErrorBoundary from "metabase/ErrorBoundary";@@ -32,8 +32,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 { replace } from "metabase/router";+import { Outlet, replace, useRouter } 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";@@ -44,23 +43,7 @@ import { getDocumentTitle, getFavicon } from "../../selectors";import { useDashboardLocationSync } from "./use-dashboard-location-sync";import { useSlowCardNotification } from "./use-slow-card-notification";-interface DashboardAppProps extends PropsWithChildren<- WithRouterProps<{ slug: string }>-> {- dashboardId?: DashboardId;- route: Route;-}--type DashboardAppInnerProps = Pick<- DashboardAppProps,- "location" | "route" | "children"->;--function DashboardAppInner({- location,- route,- children,-}: DashboardAppInnerProps) {+function DashboardAppInner({ location }: { location: Location }) {useDashboardLocationSync({ location });const pageFavicon = useSelector(getFavicon);useFavicon({ favicon: pageFavicon });@@ -78,10 +61,10 @@ function DashboardAppInner({return (<><div className={cx(CS.shrinkBelowContentSize, CS.fullHeight)}>- <DashboardLeaveConfirmationModal route={route} />+ <DashboardLeaveConfirmationModal /><Dashboard />{/* For rendering modal urls */}- {children}+ <Outlet /></div></>);@@ -90,22 +73,15 @@ function DashboardAppInner({export const DASHBOARD_APP_ACTIONS = ({ isEditing }: { isEditing: boolean }) =>isEditing ? DASHBOARD_EDITING_ACTIONS : DASHBOARD_VIEW_ACTIONS;-export const DashboardApp = ({- location,- params,- router,- route,- dashboardId: _dashboardId,- children,-}: DashboardAppProps) => {+export const DashboardApp = () => {+ const { location, params, router } = useRouter();const dispatch = useDispatch();const [error, setError] = useState<string>();const parameterQueryParams = location.query;- const dashboardId =- // Unjustified type cast. FIXME- _dashboardId || (Urls.extractEntityId(params.slug) as DashboardId);+ // Unjustified type cast. FIXME+ const dashboardId = Urls.extractEntityId(params.slug) as DashboardId;useRegisterDashboardMetabotContext();useDashboardUrlQuery(router, location);@@ -190,9 +166,7 @@ export const DashboardApp = ({}}dashboardActions={DASHBOARD_APP_ACTIONS}>- <DashboardAppInner location={location} route={route}>- {children}- </DashboardAppInner>+ <DashboardAppInner location={location} /></DashboardContextProvider></ErrorBoundary>);diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsxindex bf4063284ad..d5a8d5d05c8 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx@@ -99,8 +99,8 @@ async function setup({ dashboard }: Options = {}) {const { history } = renderWithProviders(<>- <Route path="/" component={TestHome} />- <Route path="/dashboard/:slug" component={DashboardAppContainer} />+ <Route path="/" element={<TestHome />} />+ <Route path="/dashboard/:slug" element={<DashboardAppContainer />} /></>,{initialRoute: `/dashboard/${dashboardId}`,diff --git a/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsxindex 3ce590623a4..590f38f58d8 100644--- a/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataSectionLayout/DataSectionLayout.tsx@@ -1,16 +1,16 @@-import type { ReactNode } from "react";import { t } from "ttag";import { usePageTitle } from "metabase/hooks/use-page-title";+import { Outlet } from "metabase/router";import { SectionLayout } from "../../components/SectionLayout";-type DataSectionLayoutProps = {- children?: ReactNode;-};--export function DataSectionLayout({ children }: DataSectionLayoutProps) {+export function DataSectionLayout() {usePageTitle(t`Tables`);- return <SectionLayout>{children}</SectionLayout>;+ return (+ <SectionLayout>+ <Outlet />+ </SectionLayout>+ );}diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex f9af78f868f..e6af54d6d90 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -15,6 +15,7 @@ import {PLUGIN_WORKSPACES,} from "metabase/plugins";import { useSelector } from "metabase/redux";+import { Outlet } from "metabase/router";import { getLocation } from "metabase/selectors/routing";import { canAccessTransforms as canAccessTransformsSelector } from "metabase/transforms/selectors";import {@@ -36,11 +37,7 @@ import type { IconName } from "metabase-types/api";import S from "./DataStudioLayout.module.css";import { getCurrentTab } from "./utils";-type DataStudioLayoutProps = {- children?: ReactNode;-};--export function DataStudioLayout({ children }: DataStudioLayoutProps) {+export function DataStudioLayout() {const {value: _isNavbarOpened,setValue: setIsNavbarOpened,@@ -72,7 +69,7 @@ export function DataStudioLayout({ children }: DataStudioLayoutProps) {onNavbarToggle={setIsNavbarOpened}/><Box h="100%" flex={1} miw={0}>- {children}+ <Outlet /></Box></Flex>);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 0333d164bd5..5a35064e41c 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@@ -247,14 +247,9 @@ export const setup = ({}renderWithProviders(- <Route- path="/"- component={() => (- <DataStudioLayout>- <div data-testid="content">{"Content"}</div>- </DataStudioLayout>- )}- />,+ <Route path="/" element={<DataStudioLayout />}>+ <Route index element={<div data-testid="content">{"Content"}</div>} />+ </Route>,{storeInitialState: state,withRouter: true,diff --git a/frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsxindex 722812d8996..421cf004c65 100644--- a/frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DependenciesSectionLayout/DependenciesSectionLayout.tsx@@ -1,18 +1,16 @@-import type { ReactNode } from "react";import { t } from "ttag";import { usePageTitle } from "metabase/hooks/use-page-title";+import { Outlet } from "metabase/router";import { SectionLayout } from "../../components/SectionLayout";-type DependenciesSectionLayoutProps = {- children?: ReactNode;-};--export function DependenciesSectionLayout({- children,-}: DependenciesSectionLayoutProps) {+export function DependenciesSectionLayout() {usePageTitle(t`Dependency graph`);- return <SectionLayout>{children}</SectionLayout>;+ return (+ <SectionLayout>+ <Outlet />+ </SectionLayout>+ );}diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsxindex 9487deef92b..58a88505f7d 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx@@ -1,4 +1,3 @@-import type { ReactNode } from "react";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -6,7 +5,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 { Outlet, type WithRouterProps } from "metabase/router";import { useTransformSupportedDbs } from "metabase/transforms/hooks/use-transform-supported-dbs";import { EnableTransformsPage } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage";import { getShouldShowTransformsUpsell } from "metabase/transforms/selectors";@@ -15,12 +14,9 @@ import { SectionLayout } from "../../components/SectionLayout";import { NoWritableDatabasesEmptyState } from "./NoWritableDatabasesEmptyState";-type TransformsSectionLayoutProps = WithRouterProps & {- children?: ReactNode;-};+type TransformsSectionLayoutProps = WithRouterProps;export function TransformsSectionLayout({- children,params,}: TransformsSectionLayoutProps) {usePageTitle(t`Transforms`, { titleIndex: 1 });@@ -60,7 +56,7 @@ export function TransformsSectionLayout({error={databasesError}noWrapper>- {children}+ <Outlet /></LoadingAndErrorWrapper></SectionLayout>);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 88e8f5be18f..ddb8bf31f9d 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@@ -11,7 +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 { Route, withRouteProps } from "metabase/router";import type { Database } from "metabase-types/api";import {COMMON_DATABASE_FEATURES,@@ -23,6 +23,8 @@ import {import { TransformsSectionLayout } from "./TransformsSectionLayout";+const RoutedTransformsSectionLayout = withRouteProps(TransformsSectionLayout);+const createTransformSupportedDatabase = (opts?: Partial<Database>) =>createMockDatabase({features: [...COMMON_DATABASE_FEATURES, "transforms/table"],@@ -93,14 +95,9 @@ const setup = ({const path = "/transforms";renderWithProviders(- <Route- path={path}- component={(props) => (- <TransformsSectionLayout {...props}>- <div>List of transforms</div>- </TransformsSectionLayout>- )}- />,+ <Route path={path} element={<RoutedTransformsSectionLayout />}>+ <Route index element={<div>List of transforms</div>} />+ </Route>,{storeInitialState: createMockState({settings,diff --git a/frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsxindex a86a11b62a7..3524115acff 100644--- a/frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/WorkspacesSectionLayout/WorkspacesSectionLayout.tsx@@ -1,18 +1,16 @@-import type { ReactNode } from "react";import { t } from "ttag";import { usePageTitle } from "metabase/hooks/use-page-title";+import { Outlet } from "metabase/router";import { SectionLayout } from "../../components/SectionLayout";-type WorkspacesSectionLayoutProps = {- children?: ReactNode;-};--export function WorkspacesSectionLayout({- children,-}: WorkspacesSectionLayoutProps) {+export function WorkspacesSectionLayout() {usePageTitle(t`Workspaces`, { titleIndex: 1 });- return <SectionLayout>{children}</SectionLayout>;+ return (+ <SectionLayout>+ <Outlet />+ </SectionLayout>+ );}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 19cf05cf40e..7e84b59ee38 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@@ -188,7 +188,7 @@ function setup({renderWithProviders(<Routepath="*"- component={() => (+ element={<SelectionProvider><UncontrolledTablePickerinitialValue={path}@@ -197,7 +197,7 @@ function setup({setOnUpdateCallback={setOnUpdateCallback}/></SelectionProvider>- )}+ }/>,{ withRouter: true, storeInitialState: state },);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 bb1f9af78e3..8887b61139b 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@@ -17,7 +17,7 @@ describe("MeasureItem", () => {renderWithProviders(<Routepath="/"- component={() => <MeasureItem measure={measure} href={measureUrl} />}+ element={<MeasureItem measure={measure} href={measureUrl} />}/>,{ withRouter: true },);@@ -40,7 +40,7 @@ describe("MeasureItem", () => {renderWithProviders(<Routepath="/"- component={() => <MeasureItem measure={measure} href="/test" />}+ element={<MeasureItem measure={measure} href="/test" />}/>,{ withRouter: true },);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 640d42ae032..d3b64b190b0 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@@ -66,7 +66,7 @@ export function setup({}renderWithProviders(- <Route path="/" component={() => <MeasureList table={mockTable} />} />,+ <Route path="/" element={<MeasureList table={mockTable} />} />,{withRouter: true,storeInitialState: state,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 ddfa2362b2a..2e671a0afc7 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@@ -17,7 +17,7 @@ describe("SegmentItem", () => {renderWithProviders(<Routepath="/"- component={() => <SegmentItem segment={segment} href={segmentUrl} />}+ element={<SegmentItem segment={segment} href={segmentUrl} />}/>,{ withRouter: true },);@@ -40,7 +40,7 @@ describe("SegmentItem", () => {renderWithProviders(<Routepath="/"- component={() => <SegmentItem segment={segment} href="/test" />}+ element={<SegmentItem segment={segment} href="/test" />}/>,{ withRouter: true },);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 e6b565c15d2..b6ef00837e2 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@@ -66,7 +66,7 @@ export function setup({}renderWithProviders(- <Route path="/" component={() => <SegmentList table={mockTable} />} />,+ <Route path="/" element={<SegmentList table={mockTable} />} />,{withRouter: true,storeInitialState: state,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 a4dfcab6c53..61648876530 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@@ -36,7 +36,7 @@ function setup({ table, isAdmin = false }: SetupOpts) {setupEnterprisePlugins();renderWithProviders(- <Route path="/" component={() => <TableActionsMenu table={table} />} />,+ <Route path="/" element={<TableActionsMenu table={table} />} />,{ storeInitialState: state, withRouter: true },);}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 79429161111..b67db2c2f69 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@@ -38,7 +38,7 @@ function setup({});renderWithProviders(- <Route path="/" component={() => <TableCollection table={table} />} />,+ <Route path="/" element={<TableCollection table={table} />} />,{ withRouter: true },);}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 0f175c2a823..215c9852301 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@@ -83,7 +83,7 @@ export function setup({renderWithProviders(<Routepath="/"- component={() => (+ element={<TableSectiontable={tableWithSegments}activeTab={activeTab}@@ -91,7 +91,7 @@ export function setup({canPublishonUpdate={jest.fn()}/>- )}+ }/>,{withRouter: true,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 dc68cbf04fe..b7e1ef12c8f 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@@ -24,7 +24,7 @@ import {within,} from "__support__/ui";import { getRawTableFieldId } from "metabase/metadata/utils/field";-import { Link, Route, redirect } from "metabase/router";+import { Link, Route, redirect, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { registerVisualizations } from "metabase/visualizations/register";@@ -61,6 +61,8 @@ import {import { DataModel } from "./DataModel";import type { ParsedRouteParams } from "./types";+const RoutedDataModel = withRouteProps(DataModel);+registerVisualizations();const DEFAULT_ROUTE_PARAMS: ParsedRouteParams = {@@ -254,28 +256,28 @@ async function setup({const { history } = renderWithProviders(<>- <Route path="notData" component={OtherComponent} />+ <Route path="notData" element={<OtherComponent />} /><Route path="data-studio/data">- <Route index component={redirect("database")} />- <Route path="database" component={DataModel} />- <Route path="database/:databaseId" component={DataModel} />+ <Route index element={redirect("database")} />+ <Route path="database" element={<RoutedDataModel />} />+ <Route path="database/:databaseId" element={<RoutedDataModel />} /><Routepath="database/:databaseId/schema/:schemaId"- component={DataModel}+ element={<RoutedDataModel />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId"- component={redirect(+ element={redirect("database/:databaseId/schema/:schemaId/table/:tableId/details",)}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/:tab"- component={DataModel}+ element={<RoutedDataModel />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/:tab/:fieldId"- component={DataModel}+ element={<RoutedDataModel />}/></Route><Route path="data-studio/library/segments/new" />diff --git a/frontend/src/metabase/data-studio/data-model/routes.tsx b/frontend/src/metabase/data-studio/data-model/routes.tsxindex d3eb0e843ff..87695b03e41 100644--- a/frontend/src/metabase/data-studio/data-model/routes.tsx+++ b/frontend/src/metabase/data-studio/data-model/routes.tsx@@ -9,91 +9,113 @@ 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 { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import { DataModel } from "./pages/DataModel";+const RoutedDataModel = withRouteProps(DataModel);+const RoutedDataModelNewSegmentPage = withRouteProps(DataModelNewSegmentPage);+const RoutedDataModelSegmentDetailPage = withRouteProps(+ DataModelSegmentDetailPage,+);+const RoutedDataModelSegmentRevisionHistoryPage = withRouteProps(+ DataModelSegmentRevisionHistoryPage,+);+const RoutedDataModelSegmentDependenciesPage = withRouteProps(+ DataModelSegmentDependenciesPage,+);+const RoutedDataModelNewMeasurePage = withRouteProps(DataModelNewMeasurePage);+const RoutedDataModelMeasureDetailPage = withRouteProps(+ DataModelMeasureDetailPage,+);+const RoutedDataModelMeasureRevisionHistoryPage = withRouteProps(+ DataModelMeasureRevisionHistoryPage,+);+const RoutedDataModelMeasureDependenciesPage = withRouteProps(+ DataModelMeasureDependenciesPage,+);+export function getDataStudioMetadataRoutes(IsAdmin: ComponentType) {return (<>- <Route index component={DataModel} />- <Route path="database" component={DataModel} />- <Route path="database/:databaseId" component={DataModel} />+ <Route index element={<RoutedDataModel />} />+ <Route path="database" element={<RoutedDataModel />} />+ <Route path="database/:databaseId" element={<RoutedDataModel />} /><Routepath="database/:databaseId/schema/:schemaId"- component={DataModel}+ element={<RoutedDataModel />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId"- component={DataModel}+ element={<RoutedDataModel />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/segments/new"element={<IsAdmin />}>- <Route index component={DataModelNewSegmentPage} />+ <Route index element={<RoutedDataModelNewSegmentPage />} /></Route><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/segments/:segmentId"- component={DataModelSegmentDetailPage}+ element={<RoutedDataModelSegmentDetailPage />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/segments/:segmentId/revisions"- component={DataModelSegmentRevisionHistoryPage}+ element={<RoutedDataModelSegmentRevisionHistoryPage />}/>{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath="database/:databaseId/schema/:schemaId/table/:tableId/segments/:segmentId/dependencies"- component={DataModelSegmentDependenciesPage}+ element={<RoutedDataModelSegmentDependenciesPage />}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}<Routepath="database/:databaseId/schema/:schemaId/table/:tableId/measures/new"element={<IsAdmin />}>- <Route index component={DataModelNewMeasurePage} />+ <Route index element={<RoutedDataModelNewMeasurePage />} /></Route><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/measures/:measureId"- component={DataModelMeasureDetailPage}+ element={<RoutedDataModelMeasureDetailPage />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/measures/:measureId/revisions"- component={DataModelMeasureRevisionHistoryPage}+ element={<RoutedDataModelMeasureRevisionHistoryPage />}/>{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath="database/:databaseId/schema/:schemaId/table/:tableId/measures/:measureId/dependencies"- component={DataModelMeasureDependenciesPage}+ element={<RoutedDataModelMeasureDependenciesPage />}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}<Routepath="database/:databaseId/schema/:schemaId/table/:tableId"- component={redirect(+ element={redirect("database/:databaseId/schema/:schemaId/table/:tableId/details",)}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/:tab"- component={DataModel}+ element={<RoutedDataModel />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/:tab/:fieldId"- component={DataModel}+ element={<RoutedDataModel />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/settings"- component={redirect(+ element={redirect("database/:databaseId/schema/:schemaId/table/:tableId/details",)}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId/:section"- component={redirect(+ element={redirect("database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId",)}/>diff --git a/frontend/src/metabase/data-studio/glossary/routes.tsx b/frontend/src/metabase/data-studio/glossary/routes.tsxindex 4fd625cd3a2..ccd7a31387c 100644--- a/frontend/src/metabase/data-studio/glossary/routes.tsx+++ b/frontend/src/metabase/data-studio/glossary/routes.tsx@@ -3,5 +3,5 @@ import { Route } from "metabase/router";import { GlossaryPage } from "./pages/GlossaryPage";export function getDataStudioGlossaryRoutes() {- return <Route path="glossary" component={GlossaryPage} />;+ return <Route path="glossary" element={<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 ffb304762be..df86a245a78 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@@ -61,9 +61,9 @@ describe("PublishedTableMeasureBreadcrumbs", () => {renderWithProviders(<Routepath="/"- component={() => (+ element={<PublishedTableMeasureBreadcrumbs table={table} measure={measure} />- )}+ }/>,{ withRouter: true },);@@ -174,9 +174,9 @@ describe("DataModelMeasureBreadcrumbs", () => {renderWithProviders(<Routepath="/"- component={() => (+ element={<DataModelMeasureBreadcrumbs table={table} measure={measure} />- )}+ }/>,{ withRouter: true },);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 61fdc2b8656..d90fc649703 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@@ -21,7 +21,7 @@ const setup = ({ readOnly }: SetupOpts = {}) => {renderWithProviders(<Routepath="/"- component={() => (+ element={<MeasureHeadermeasure={measure}onRemove={jest.fn()}@@ -29,7 +29,7 @@ const setup = ({ readOnly }: SetupOpts = {}) => {tabUrls={tabUrls}previewUrl="/measures/1/preview"/>- )}+ }/>,{ withRouter: true },);diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsxindex 02fc86527a5..20830d485fb 100644--- a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx@@ -1,6 +1,5 @@-import type { ReactNode } from "react";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Outlet } from "metabase/router";import { Center } from "metabase/ui";import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";@@ -16,12 +15,10 @@ type DataModelMeasureDependenciesPageParams = {type DataModelMeasureDependenciesPageProps = {params: DataModelMeasureDependenciesPageParams;- children?: ReactNode;};export function DataModelMeasureDependenciesPage({params,- children,}: DataModelMeasureDependenciesPageProps) {const { isLoading, error, measure, table, tabUrls, onRemove } =useDataModelMeasurePage(params);@@ -43,7 +40,7 @@ export function DataModelMeasureDependenciesPage({}onRemove={onRemove}>- {children}+ <Outlet /></MeasureDependenciesPage>);}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 145c0403598..167c6e692fa 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@@ -23,7 +23,7 @@ function setup({ table }: SetupOpts) {renderWithProviders(<Routepath="/"- component={() => (+ element={<NewMeasurePage// Unjustified type cast. FIXMEroute={{ path: "/" } as never}@@ -31,7 +31,7 @@ function setup({ table }: SetupOpts) {breadcrumbs={<div />}getSuccessUrl={() => "/success"}/>- )}+ }/>,{withRouter: true,diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsxindex e8feae0416c..e13bf73e5b8 100644--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx@@ -1,6 +1,5 @@-import type { ReactNode } from "react";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Outlet } from "metabase/router";import { Center } from "metabase/ui";import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";@@ -14,12 +13,10 @@ type PublishedTableMeasureDependenciesPageParams = {type PublishedTableMeasureDependenciesPageProps = {params: PublishedTableMeasureDependenciesPageParams;- children?: ReactNode;};export function PublishedTableMeasureDependenciesPage({params,- children,}: PublishedTableMeasureDependenciesPageProps) {const { isLoading, error, measure, table, tabUrls, onRemove } =usePublishedTableMeasurePage(params);@@ -41,7 +38,7 @@ export function PublishedTableMeasureDependenciesPage({}onRemove={onRemove}>- {children}+ <Outlet /></MeasureDependenciesPage>);}diff --git a/frontend/src/metabase/data-studio/measures/routes.tsx b/frontend/src/metabase/data-studio/measures/routes.tsxdeleted file mode 100644index 0022ad4081b..00000000000--- a/frontend/src/metabase/data-studio/measures/routes.tsx+++ /dev/null@@ -1,25 +0,0 @@-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Route } from "metabase/router";--import { MeasureDependenciesPage } from "./pages/MeasureDependenciesPage";-import { MeasureDetailPage } from "./pages/MeasureDetailPage";-import { MeasureRevisionHistoryPage } from "./pages/MeasureRevisionHistoryPage";-import { NewMeasurePage } from "./pages/NewMeasurePage";--export function getDataStudioMeasureRoutes() {- return (- <Route path="measures">- <Route path="new" component={NewMeasurePage} />- <Route path=":measureId" component={MeasureDetailPage} />- <Route path=":measureId/history" component={MeasureRevisionHistoryPage} />- {PLUGIN_DEPENDENCIES.isEnabled && (- <Route- path=":measureId/dependencies"- component={MeasureDependenciesPage}- >- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />- </Route>- )}- </Route>- );-}diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsxindex 480c49bf9e4..9d937516d89 100644--- a/frontend/src/metabase/data-studio/routes.tsx+++ b/frontend/src/metabase/data-studio/routes.tsx@@ -9,7 +9,12 @@ import {} from "metabase/plugins";import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { Navigate, Route, type RouteComponent } from "metabase/router";+import {+ Navigate,+ Route,+ type RouteComponent,+ withRouteProps,+} from "metabase/router";import { getDataStudioTransformRoutes } from "metabase/transforms/routes";import { canAccessTransforms } from "metabase/transforms/selectors";import * as Urls from "metabase/urls";@@ -29,6 +34,8 @@ import {SchemaViewerUpsellPage,} from "./upsells/pages";+const RoutedTransformsSectionLayout = withRouteProps(TransformsSectionLayout);+export function getDataStudioRoutes(CanAccessDataStudio: RouteComponent,CanAccessDataModel: RouteComponent,@@ -36,17 +43,17 @@ export function getDataStudioRoutes() {return (<Route element={<CanAccessDataStudio />}>- <Route path="data-studio" component={DataStudioLayout}>- <Route index component={DataStudioIndexRedirect} />+ <Route path="data-studio" element={<DataStudioLayout />}>+ <Route index element={<DataStudioIndexRedirect />} /><Route path="data" element={<CanAccessDataModel />}>- <Route component={DataSectionLayout}>+ <Route element={<DataSectionLayout />}>{getDataStudioMetadataRoutes(IsAdmin)}</Route></Route>- <Route path="transforms" component={TransformsSectionLayout}>+ <Route path="transforms" element={<RoutedTransformsSectionLayout />}>{getDataStudioTransformRoutes()}</Route>- <Route component={WorkspacesSectionLayout}>+ <Route element={<WorkspacesSectionLayout />}>{PLUGIN_WORKSPACES.getDataStudioRoutes()}</Route>{getDataStudioGlossaryRoutes()}@@ -54,26 +61,26 @@ export function getDataStudioRoutes({PLUGIN_LIBRARY.isEnabled ? (PLUGIN_LIBRARY.getDataStudioLibraryRoutes(IsAdmin)) : (- <Route path="library" component={LibraryUpsellPage} />+ <Route path="library" element={<LibraryUpsellPage />} />)}{PLUGIN_DEPENDENCIES.isEnabled ? (- <Route path="dependencies" component={DependenciesSectionLayout}>+ <Route path="dependencies" element={<DependenciesSectionLayout />}>{PLUGIN_DEPENDENCIES.getDataStudioDependencyRoutes()}</Route>) : (- <Route path="dependencies" component={DependenciesUpsellPage} />+ <Route path="dependencies" element={<DependenciesUpsellPage />} />)}{PLUGIN_DEPENDENCIES.isEnabled ? (<Routepath="dependency-diagnostics"- component={DependencyDiagnosticsSectionLayout}+ element={<DependencyDiagnosticsSectionLayout />}>{PLUGIN_DEPENDENCIES.getDataStudioDependencyDiagnosticsRoutes()}</Route>) : (<Routepath="dependency-diagnostics"- component={DependencyDiagnosticsUpsellPage}+ element={<DependencyDiagnosticsUpsellPage />}/>)}{PLUGIN_SCHEMA_VIEWER.isEnabled ? (@@ -81,9 +88,9 @@ export function getDataStudioRoutes({PLUGIN_SCHEMA_VIEWER.getDataStudioSchemaViewerRoutes()}</Route>) : (- <Route path="schema-viewer" component={SchemaViewerUpsellPage} />+ <Route path="schema-viewer" element={<SchemaViewerUpsellPage />} />)}- <Route path="git-sync" component={GitSyncSectionLayout} />+ <Route path="git-sync" element={<GitSyncSectionLayout />} /></Route></Route>);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 0d868910b5f..382c6a66f8c 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@@ -63,9 +63,9 @@ describe("PublishedTableSegmentBreadcrumbs", () => {renderWithProviders(<Routepath="/"- component={() => (+ element={<PublishedTableSegmentBreadcrumbs table={table} segment={segment} />- )}+ }/>,{ withRouter: true },);@@ -186,9 +186,9 @@ describe("DataModelSegmentBreadcrumbs", () => {renderWithProviders(<Routepath="/"- component={() => (+ element={<DataModelSegmentBreadcrumbs table={table} segment={segment} />- )}+ }/>,{ withRouter: true },);diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsxindex f64a26c4aad..10fcf9eb0da 100644--- a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDependenciesPage/DataModelSegmentDependenciesPage.tsx@@ -1,6 +1,5 @@-import type { ReactNode } from "react";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Outlet } from "metabase/router";import { Center } from "metabase/ui";import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";@@ -16,12 +15,10 @@ type DataModelSegmentDependenciesPageParams = {type DataModelSegmentDependenciesPageProps = {params: DataModelSegmentDependenciesPageParams;- children?: ReactNode;};export function DataModelSegmentDependenciesPage({params,- children,}: DataModelSegmentDependenciesPageProps) {const { isLoading, error, segment, table, tabUrls, onRemove } =useDataModelSegmentPage(params);@@ -43,7 +40,7 @@ export function DataModelSegmentDependenciesPage({}onRemove={onRemove}>- {children}+ <Outlet /></SegmentDependenciesPage>);}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 4415b927d2b..0517a901f90 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@@ -63,7 +63,7 @@ function setup({ table = TEST_TABLE }: SetupOpts = {}) {const { history } = renderWithProviders(<Routepath="/"- component={() => (+ element={<NewSegmentPage// Unjustified type cast. FIXMEroute={{ path: "/" } as never}@@ -71,7 +71,7 @@ function setup({ table = TEST_TABLE }: SetupOpts = {}) {breadcrumbs={<DataModelSegmentBreadcrumbs table={table} />}getSuccessUrl={getSuccessUrl}/>- )}+ }/>,{withRouter: true,diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsxindex cb7dabf1e67..3157ac7bd7d 100644--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDependenciesPage/PublishedTableSegmentDependenciesPage.tsx@@ -1,6 +1,5 @@-import type { ReactNode } from "react";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Outlet } from "metabase/router";import { Center } from "metabase/ui";import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";@@ -14,12 +13,10 @@ type PublishedTableSegmentDependenciesPageParams = {type PublishedTableSegmentDependenciesPageProps = {params: PublishedTableSegmentDependenciesPageParams;- children?: ReactNode;};export function PublishedTableSegmentDependenciesPage({params,- children,}: PublishedTableSegmentDependenciesPageProps) {const { isLoading, error, segment, table, tabUrls, onRemove } =usePublishedTableSegmentPage(params);@@ -41,7 +38,7 @@ export function PublishedTableSegmentDependenciesPage({}onRemove={onRemove}>- {children}+ <Outlet /></SegmentDependenciesPage>);}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 eb5e74c5255..91a49c62a82 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@@ -124,7 +124,7 @@ export function setup({renderWithProviders(<Routepath="/"- component={() => (+ element={<SegmentDetailPage// Unjustified type cast. FIXMEroute={{ path: "/" } as never}@@ -135,7 +135,7 @@ export function setup({}onRemove={onRemove}/>- )}+ }/>,{withRouter: true,diff --git a/frontend/src/metabase/data-studio/segments/routes.tsx b/frontend/src/metabase/data-studio/segments/routes.tsxdeleted file mode 100644index e238e8b4c67..00000000000--- a/frontend/src/metabase/data-studio/segments/routes.tsx+++ /dev/null@@ -1,25 +0,0 @@-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Route } from "metabase/router";--import { NewSegmentPage } from "./pages/NewSegmentPage";-import { SegmentDependenciesPage } from "./pages/SegmentDependenciesPage";-import { SegmentDetailPage } from "./pages/SegmentDetailPage";-import { SegmentRevisionHistoryPage } from "./pages/SegmentRevisionHistoryPage";--export function getDataStudioSegmentRoutes() {- return (- <Route path="segments">- <Route path="new" component={NewSegmentPage} />- <Route path=":segmentId" component={SegmentDetailPage} />- <Route path=":segmentId/history" component={SegmentRevisionHistoryPage} />- {PLUGIN_DEPENDENCIES.isEnabled && (- <Route- path=":segmentId/dependencies"- component={SegmentDependenciesPage}- >- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />- </Route>- )}- </Route>- );-}diff --git a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsxindex aaae1b20265..edd017ebcf7 100644--- a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx@@ -40,12 +40,12 @@ const setup = ({renderWithProviders(<Routepath="/"- component={() => (+ element={<div><SettingsPage /><UndoListing /></div>- )}+ }/>,{storeInitialState: createMockState({diff --git a/frontend/src/metabase/data-studio/settings/routes.tsx b/frontend/src/metabase/data-studio/settings/routes.tsxindex 87644da689a..f62101e3fc9 100644--- a/frontend/src/metabase/data-studio/settings/routes.tsx+++ b/frontend/src/metabase/data-studio/settings/routes.tsx@@ -3,5 +3,5 @@ import { Route } from "metabase/router";import { SettingsPage } from "./pages/SettingsPage";export function getDataStudioSettingsRoutes() {- return <Route path="settings" component={SettingsPage} />;+ return <Route path="settings" element={<SettingsPage />} />;}diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsxindex 5cf147caf1e..8e2f9cd6391 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx@@ -35,7 +35,7 @@ const setup = (params?: SetupParams) => {}renderWithProviders(- <Route path="*" component={AdditionalHelpButtonGroup} />,+ <Route path="*" element={<AdditionalHelpButtonGroup />} />,{storeInitialState,withRouter: true,diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsxindex 805caebe274..c50661c4c23 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx@@ -22,7 +22,7 @@ const setup = (params?: SetupParams) => {});renderWithProviders(- <Route path="*" component={ContactSupportButtonSection} />,+ <Route path="*" element={<ContactSupportButtonSection />} />,{storeInitialState,withRouter: true,diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsxindex 9788b707575..bb9c2459ff2 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx@@ -14,6 +14,18 @@ import { createMockTokenFeatures } from "metabase-types/api/mocks";import { useTroubleshootingTips } from "./useTroubleshootingTips";+function TroubleshootingTipsList() {+ const tips = useTroubleshootingTips(false, true);++ return (+ <>+ {tips.map(({ body, key }) => (+ <Fragment key={key}>{body}</Fragment>+ ))}+ </>+ );+}+interface SetupOptions {isHostAndPortError: boolean;expanded: boolean;@@ -83,20 +95,7 @@ describe("useTroubleshootingTips", () => {// This time we render inside a Route component to more easily assert links presencerenderWithProviders(- <Route- path="*"- component={() => {- const tips = useTroubleshootingTips(false, true);-- return (- <>- {tips.map(({ body, key }) => (- <Fragment key={key}>{body}</Fragment>- ))}- </>- );- }}- />,+ <Route path="*" element={<TroubleshootingTipsList />} />,{withRouter: true,storeInitialState,diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsxindex 09a93427b60..27cc56e99ac 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx@@ -25,7 +25,7 @@ describe("getDocsLinkConditionally", () => {return renderWithProviders(<Routepath="*"- component={() => (+ element={<>{getDocsLinkConditionally("My Link Title",@@ -33,7 +33,7 @@ describe("getDocsLinkConditionally", () => {showMetabaseLinks,)}</>- )}+ }/>,{withRouter: true,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 d5eaceb96b8..0abc1cc14d6 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@@ -63,7 +63,7 @@ function setup({ dataset = DATASET }: SetupOpts = {}) {setupCardDataset({ dataset });- renderWithProviders(<Route path="/" component={TestComponent} />, {+ renderWithProviders(<Route path="/" element={<TestComponent />} />, {withRouter: true,storeInitialState: createMockState({entities: createMockEntitiesState({diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsxindex ab8fe926a32..6e2f33c59b6 100644--- a/frontend/src/metabase/documents/components/DocumentPage.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx@@ -40,7 +40,7 @@ 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 { push, replace } from "metabase/router";+import { Outlet, push, replace } from "metabase/router";import { Box } from "metabase/ui";import { extractEntityId } from "metabase/urls";import * as Urls from "metabase/urls";@@ -118,7 +118,6 @@ export const DocumentPage = ({params,route,location,- children,}: {params: {entityId?: string;@@ -126,7 +125,6 @@ export const DocumentPage = ({};location: Location;route: Route;- children?: ReactNode;}) => {const { entityId, childTargetId: paramsChildTargetId } = params;const previousLocationKey = usePrevious(location.key);@@ -624,7 +622,7 @@ export const DocumentPage = ({/>)}- {children}+ <Outlet /><LeaveRouteConfirmModal// `key` remounts this modal when navigating between different documents or to a new document.diff --git a/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsx b/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsxindex 3a687971047..3805fc3f1fd 100644--- a/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.unit.spec.tsx@@ -6,11 +6,13 @@ import {setupDocumentEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { createMockDocument } from "metabase-types/api/mocks";import { DocumentPage } from "./DocumentPage";+const RoutedDocumentPage = withRouteProps(DocumentPage);+const setup = () => {setupBookmarksEndpoints([]);setupDocumentEndpoints(@@ -24,7 +26,10 @@ const setup = () => {renderWithProviders(<>- <Route path="/document/:entityId" component={DocumentPage}></Route>+ <Route+ path="/document/:entityId"+ element={<RoutedDocumentPage />}+ ></Route></>,{withRouter: true,diff --git a/frontend/src/metabase/documents/routes.tsx b/frontend/src/metabase/documents/routes.tsxindex 79963f1b47b..3ef3cf6c174 100644--- a/frontend/src/metabase/documents/routes.tsx+++ b/frontend/src/metabase/documents/routes.tsx@@ -1,16 +1,15 @@-import type { ComponentProps } from "react";-+import { useParams, withRouteProps } from "metabase/router";import { extractEntityId } from "metabase/urls";import { DocumentPage } from "./components/DocumentPage";-export const DocumentPageOuter = (- props: ComponentProps<typeof DocumentPage>,-) => {- const { entityId } = props.params;+const RoutedDocumentPage = withRouteProps(DocumentPage);++export const DocumentPageOuter = () => {+ const { entityId } = useParams();const documentId = entityId === "new" ? "new" : extractEntityId(entityId);// Remounts DocumentPage when navigating to a different document.// Prevents data, state, undo history, etc from bleeding between documents.- return <DocumentPage key={documentId} {...props} />;+ return <RoutedDocumentPage key={documentId} />;};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 a1daa64989f..3d0b241a7e3 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@@ -51,7 +51,10 @@ const setup = ({});return renderWithProviders(- <Route path="/admin/embedding/setup-guide/sso" component={SetupSsoPage} />,+ <Route+ path="/admin/embedding/setup-guide/sso"+ element={<SetupSsoPage />}+ />,{storeInitialState: createMockState({settings: createMockSettingsState(settings),diff --git a/frontend/src/metabase/hoc/ScrollToTop.unit.spec.tsx b/frontend/src/metabase/hoc/ScrollToTop.unit.spec.tsxindex 0cc23a83d2d..397745a862c 100644--- a/frontend/src/metabase/hoc/ScrollToTop.unit.spec.tsx+++ b/frontend/src/metabase/hoc/ScrollToTop.unit.spec.tsx@@ -24,7 +24,7 @@ function RouteContent() {}function setup(initialRoute = "/first") {- return renderWithProviders(<Route path="*" component={RouteContent} />, {+ return renderWithProviders(<Route path="*" element={<RouteContent />} />, {withRouter: true,initialRoute,});diff --git a/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx b/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsxindex 3356aa19ce0..f56d358b484 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx@@ -55,7 +55,7 @@ export async function setup({}renderWithProviders(- <Route path="/" component={EmbedHomepage} />,+ <Route path="/" element={<EmbedHomepage />} />,{storeInitialState: state,diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsxindex bc783b7c0a9..0cd54405e80 100644--- a/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx+++ b/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx@@ -40,8 +40,8 @@ const setup = async ({ dashboardId }: SetupOpts = {}) => {renderWithProviders(<>- <Route path="/" component={HomePage} />- <Route path="/dashboard/:slug" component={TestDashboard} />+ <Route path="/" element={<HomePage />} />+ <Route path="/dashboard/:slug" element={<TestDashboard />} /></>,{withRouter: true,diff --git a/frontend/src/metabase/home/components/LandingPageRedirect/LandingPageRedirect.unit.spec.tsx b/frontend/src/metabase/home/components/LandingPageRedirect/LandingPageRedirect.unit.spec.tsxindex fe1e6f19e58..c8840b55b53 100644--- a/frontend/src/metabase/home/components/LandingPageRedirect/LandingPageRedirect.unit.spec.tsx+++ b/frontend/src/metabase/home/components/LandingPageRedirect/LandingPageRedirect.unit.spec.tsx@@ -16,8 +16,8 @@ describe("LandingPageRedirect", () => {const setup = () =>renderWithProviders(<>- <Route path="/" component={LandingPageRedirect} />- <Route path="/custom" component={() => <div>custom page</div>} />+ <Route path="/" element={<LandingPageRedirect />} />+ <Route path="/custom" element={<div>custom page</div>} /></>,{ withRouter: true, initialRoute: "/" },);diff --git a/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx b/frontend/src/metabase/home/components/Onboarding/tests/setup.tsxindex 9494bc159d7..c618514e7fc 100644--- a/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx+++ b/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx@@ -72,7 +72,7 @@ export const setup = ({});renderWithProviders(- <Route path="/getting-started" component={Onboarding} />,+ <Route path="/getting-started" element={<Onboarding />} />,{initialRoute: "/getting-started",storeInitialState: state,diff --git a/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsxindex 7d2680f9263..b873686fb4e 100644--- a/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx@@ -46,7 +46,7 @@ function setup({);const { store } = renderWithProviders(- <Route path="*" component={TestComponent} />,+ <Route path="*" element={<TestComponent />} />,{withRouter: true,initialRoute: pathname,diff --git a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsxindex 69763182d87..e6d10f2d8fd 100644--- a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx@@ -5,43 +5,35 @@ import {useUserMetabotPermissions,} from "metabase/metabot/hooks";import { useDispatch } from "metabase/redux";-import { Route, replace } from "metabase/router";+import { Route, replace, useRouter } from "metabase/router";import { Loader } from "metabase/ui";-export const getMetabotQuickLinks = () => {- return (- <Route- key="metabot"- path="metabot/new"- component={(props) => {- const { canUseMetabot, isLoading } = useUserMetabotPermissions();- const { submitInput } = useMetabotAgent("omnibot");- const prompt = String(props.location.query?.q ?? "");- const dispatch = useDispatch();- const [hasSubmitted, setHasSubmitted] = useState(false);+function MetabotNewRoute() {+ const { location } = useRouter();+ const { canUseMetabot, isLoading } = useUserMetabotPermissions();+ const { submitInput } = useMetabotAgent("omnibot");+ const prompt = String(location.query?.q ?? "");+ const dispatch = useDispatch();+ const [hasSubmitted, setHasSubmitted] = useState(false);++ useEffect(() => {+ if (isLoading || hasSubmitted) {+ return;+ }- useEffect(() => {- if (isLoading || hasSubmitted) {- return;- }+ dispatch(replace("/"));- dispatch(replace("/"));+ if (prompt && canUseMetabot) {+ void submitInput(prompt, { focusInput: true });+ setHasSubmitted(true);+ }+ }, [isLoading, canUseMetabot, prompt, submitInput, dispatch, hasSubmitted]);- if (prompt && canUseMetabot) {- void submitInput(prompt, { focusInput: true });- setHasSubmitted(true);- }- }, [- isLoading,- canUseMetabot,- prompt,- submitInput,- dispatch,- hasSubmitted,- ]);+ return <Loader m="5rem auto" display="block" size="xl" />;+}- return <Loader m="5rem auto" display="block" size="xl" />;- }}- />+export const getMetabotQuickLinks = () => {+ return (+ <Route key="metabot" path="metabot/new" element={<MetabotNewRoute />} />);};diff --git a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsxindex 04ee0b7ebec..6effef86ac3 100644--- a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx@@ -26,7 +26,7 @@ function setup() {);const { store } = renderWithProviders(- <Route path="*" component={TestComponent} />,+ <Route path="*" element={<TestComponent />} />,{withRouter: true,storeInitialState: createMockState({ metabot: metabotInitialState }),diff --git a/frontend/src/metabase/metabot/routes.tsx b/frontend/src/metabase/metabot/routes.tsxindex 58a0cac698f..6fa391c03ef 100644--- a/frontend/src/metabase/metabot/routes.tsx+++ b/frontend/src/metabase/metabot/routes.tsx@@ -7,7 +7,7 @@ export const getMetabotRoutes = () => {return (<>{getMetabotQuickLinks()}- <Route path="slack-connect-success" component={SlackConnectSuccess} />+ <Route path="slack-connect-success" element={<SlackConnectSuccess />} /></>);};diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsxindex 29d68028d66..87a2ec7a262 100644--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsx+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.unit.spec.tsx@@ -16,7 +16,7 @@ function setup({ table = createMockTable(), fieldId }: SetupOpts = {}) {renderWithProviders(<Routepath="/"- component={() => (+ element={<TableSectiontable={table}fieldId={fieldId}@@ -24,7 +24,7 @@ function setup({ table = createMockTable(), fieldId }: SetupOpts = {}) {getFieldHref={(fieldId) => `/field/${fieldId}`}onSyncOptionsClick={onSyncOptionsClick}/>- )}+ }/>,{ withRouter: true },);diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsxindex b60d0f1885b..89b0b9c5ce7 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx@@ -1,6 +1,6 @@import { useDisclosure, useWindowEvent } from "@mantine/hooks";import type { Location } from "history";-import { type ReactNode, useMemo, useState } from "react";+import { useMemo, useState } from "react";import { t } from "ttag";import _ from "underscore";@@ -10,6 +10,7 @@ import {} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import { Outlet } from "metabase/router";import { Box, Flex, Stack, rem } from "metabase/ui";import * as Urls from "metabase/urls";@@ -32,12 +33,11 @@ import type { RouteParams } from "./types";import { getTableMetadataQuery, parseRouteParams } from "./utils";interface Props {- children?: ReactNode;location: Location;params: RouteParams;}-export const DataModelV1 = ({ children, location, params }: Props) => {+export const DataModelV1 = ({ location, params }: Props) => {const parsedParams = parseRouteParams(params);const { databaseId, fieldId, schemaName, tableId } = parsedParams;const { data: databasesData, isLoading: isLoadingDatabases } =@@ -117,7 +117,7 @@ export const DataModelV1 = ({ children, location, params }: Props) => {</Box></Stack>- {isSegments && children}+ {isSegments && <Outlet />}{!isSegments && (<>diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsxindex 3f974373e7a..d99d273ac7f 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx@@ -21,7 +21,7 @@ import {} from "__support__/ui";import { getNextId } from "__support__/utils";import { getRawTableFieldId } from "metabase/metadata/utils/field";-import { Link, Route, redirect } from "metabase/router";+import { Link, Route, redirect, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { registerVisualizations } from "metabase/visualizations/register";@@ -58,6 +58,8 @@ import type { ParsedRouteParams } from "./types";registerVisualizations();+const RoutedDataModelV1 = withRouteProps(DataModelV1);+const DEFAULT_ROUTE_PARAMS: ParsedRouteParams = {databaseId: undefined,schemaName: undefined,@@ -216,22 +218,22 @@ async function setup({const { history } = renderWithProviders(<>- <Route path="notAdmin" component={OtherComponent} />+ <Route path="notAdmin" element={<OtherComponent />} /><Route path="admin/datamodel">- <Route index component={redirect("database")} />- <Route path="database" component={DataModelV1} />- <Route path="database/:databaseId" component={DataModelV1} />+ <Route index element={redirect("database")} />+ <Route path="database" element={<RoutedDataModelV1 />} />+ <Route path="database/:databaseId" element={<RoutedDataModelV1 />} /><Routepath="database/:databaseId/schema/:schemaId"- component={DataModelV1}+ element={<RoutedDataModelV1 />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId"- component={DataModelV1}+ element={<RoutedDataModelV1 />}/><Routepath="database/:databaseId/schema/:schemaId/table/:tableId/field/:fieldId"- component={DataModelV1}+ element={<RoutedDataModelV1 />}/></Route></>,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 97432f9022b..98e295dcf18 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@@ -111,7 +111,7 @@ function setup({);renderWithProviders(- withModal ? <Route path="/" component={() => toolbar} /> : toolbar,+ withModal ? <Route path="/" element={toolbar} /> : toolbar,withModal? { storeInitialState: state, withRouter: true, initialRoute: "/" }: { storeInitialState: state },diff --git a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsxindex 406fc9e8e66..fb0458cb60d 100644--- a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsx+++ b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.unit.spec.tsx@@ -30,7 +30,7 @@ function setup() {const { history } = renderWithProviders(<Routepath="/"- component={() => <MetricPageShell card={card} urls={metricUrls} />}+ element={<MetricPageShell card={card} urls={metricUrls} />}/>,{ withRouter: true, withUndos: true },);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 e7640e0daef..6949c6ec247 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@@ -103,10 +103,7 @@ function setup({setupEnterprisePlugins();renderWithProviders(- <Route- path="/"- component={() => <DescriptionSection card={card} urls={URLS} />}- />,+ <Route path="/" element={<DescriptionSection card={card} urls={URLS} />} />,{storeInitialState: state,withRouter: true,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 dcdeacb739a..9399ac15c7b 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@@ -77,10 +77,7 @@ function setup(card: Card, dataset: Dataset = SCALAR_DATASET) {setupMetricEndpoint(createMockMetric({ id: card.id, name: card.name }));renderWithProviders(- <Route- path="/"- component={() => <MetricAbout card={card} urls={mockUrls} />}- />,+ <Route path="/" element={<MetricAbout card={card} urls={mockUrls} />} />,{storeInitialState: createMockState(),withRouter: true,diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsxindex 62544fce5bf..2000eb145f7 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx@@ -9,7 +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 { Route, withRouteProps } from "metabase/router";import type { Card } from "metabase-types/api";import {createMockCard,@@ -24,6 +24,8 @@ import {import { MetricAboutPage } from "./MetricAboutPage";+const RoutedMetricAboutPage = withRouteProps(MetricAboutPage);+const SAMPLE_DB = createSampleDatabase();const CARD_ID = 42;@@ -58,10 +60,7 @@ function setupBaseEndpoints(card: Card) {function renderPage() {renderWithProviders(- <Route- path="/metric/:cardId"- component={(props: any) => <MetricAboutPage params={props.params} />}- />,+ <Route path="/metric/:cardId" element={<RoutedMetricAboutPage />} />,{withRouter: true,initialRoute: `/metric/${CARD_ID}`,diff --git a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsxindex 1413397e42e..17ce891e0d2 100644--- a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx@@ -1,26 +1,20 @@-import type { ReactNode } from "react";-import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import type { MetricPageProps } from "metabase/common/metrics/types";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { Outlet } from "metabase/router";import { Card } from "metabase/ui";import { MetricPageCard } from "../../components/MetricPageCard";import { MetricPageShell } from "../../components/MetricPageShell";import { metricUrls as defaultUrls } from "../../urls";-interface MetricDependenciesPageProps extends MetricPageProps {- children?: ReactNode;-}-export function MetricDependenciesPage({params,- children,urls = defaultUrls,renderBreadcrumbs,showAppSwitcher,showDataStudioLink = true,-}: MetricDependenciesPageProps) {+}: MetricPageProps) {return (<MetricPageCard cardId={params.cardId}>{(card) => (@@ -39,7 +33,7 @@ export function MetricDependenciesPage({}}><Card withBorder p={0} flex={1}>- {children}+ <Outlet /></Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider></PageContainer>diff --git a/frontend/src/metabase/metrics/routes.tsx b/frontend/src/metabase/metrics/routes.tsxindex ca30a9f662e..6d35cc7a677 100644--- a/frontend/src/metabase/metrics/routes.tsx+++ b/frontend/src/metabase/metrics/routes.tsx@@ -1,5 +1,5 @@import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { MetricAboutPage } from "./pages/MetricAboutPage";import { MetricDependenciesPage } from "./pages/MetricDependenciesPage";@@ -8,19 +8,29 @@ import { MetricOverviewPage } from "./pages/MetricOverviewPage";import { MetricQueryPage } from "./pages/MetricQueryPage";import { NewMetricPage } from "./pages/NewMetricPage";+const RoutedNewMetricPage = withRouteProps(NewMetricPage);+const RoutedMetricAboutPage = withRouteProps(MetricAboutPage);+const RoutedMetricOverviewPage = withRouteProps(MetricOverviewPage);+const RoutedMetricQueryPage = withRouteProps(MetricQueryPage);+const RoutedMetricDependenciesPage = withRouteProps(MetricDependenciesPage);+const RoutedMetricHistoryPage = withRouteProps(MetricHistoryPage);+export function getMetricRoutes() {return (<Route path="metric">- <Route path="new" component={NewMetricPage} />- <Route path=":cardId" component={MetricAboutPage} />- <Route path=":cardId/overview" component={MetricOverviewPage} />- <Route path=":cardId/query" component={MetricQueryPage} />+ <Route path="new" element={<RoutedNewMetricPage />} />+ <Route path=":cardId" element={<RoutedMetricAboutPage />} />+ <Route path=":cardId/overview" element={<RoutedMetricOverviewPage />} />+ <Route path=":cardId/query" element={<RoutedMetricQueryPage />} />{PLUGIN_DEPENDENCIES.isEnabled && (- <Route path=":cardId/dependencies" component={MetricDependenciesPage}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route+ path=":cardId/dependencies"+ element={<RoutedMetricDependenciesPage />}+ >+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}- <Route path=":cardId/history" component={MetricHistoryPage} />+ <Route path=":cardId/history" element={<RoutedMetricHistoryPage />} /></Route>);}diff --git a/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx b/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsxindex 462aeda9b8a..9438fee2bca 100644--- a/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx+++ b/frontend/src/metabase/models/components/NewModelOption.unit.spec.tsx@@ -14,7 +14,7 @@ const setup = (props = {}) =>renderWithProviders(<Routepath="*"- component={() => <NewModelOption {...defaultProps} {...props} />}+ element={<NewModelOption {...defaultProps} {...props} />}/>,{ withRouter: true },);diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsxindex c4587be030f..9ad84b01e83 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx@@ -16,7 +16,7 @@ import { loadMetadataForCard } from "metabase/questions/actions";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { fetchTableForeignKeys } from "metabase/redux/tables";-import { replace } from "metabase/router";+import { Outlet, replace } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";@@ -28,7 +28,6 @@ type OwnProps = {params: {slug: string;};- children: React.ReactNode;};type EntityLoadersProps = {@@ -51,7 +50,6 @@ const mapDispatchToProps = {function ModelActions({model,- children,loadMetadataForCard,fetchTableForeignKeys,onChangeLocation,@@ -112,14 +110,13 @@ function ModelActions({shouldShowActionsUI={shouldShowActionsUI}/>{/* Required for rendering child modal routes */}- {children}+ <Outlet /></>);}function ModelActionsLoader({params,- children,...dispatchProps}: OwnProps & DispatchProps) {const modelId = Urls.extractEntityId(params.slug);@@ -134,15 +131,11 @@ function ModelActionsLoader({return <LoadingAndErrorWrapper loading={isLoading} error={error} />;}- return (- <ModelActions model={model} params={params} {...dispatchProps}>- {children}- </ModelActions>- );+ return <ModelActions model={model} params={params} {...dispatchProps} />;}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default connect<null, DispatchProps, OwnProps, State>(+export default connect<unknown, DispatchProps, OwnProps, State>(null,mapDispatchToProps,)(ModelActionsLoader);diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsxindex 742ef14ad4d..b510a003bab 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx@@ -23,7 +23,7 @@ import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import { checkNotNull } from "metabase/utils/types";import { TYPE } from "metabase-lib/v1/types/constants";@@ -56,6 +56,8 @@ import {import ModelActions from "./ModelActions";+const RoutedModelActions = withRouteProps(ModelActions);+// eslint-disable-next-line react/display-namejest.mock("metabase/actions/containers/ActionCreator", () => () => (<div data-testid="mock-action-editor" />@@ -222,8 +224,8 @@ async function setup({const { history } = renderWithProviders(<><Route path="/model/:slug/detail">- <Route index component={redirect("actions")} />- <Route path="actions" component={ModelActions}>+ <Route index element={redirect("actions")} />+ <Route path="actions" element={<RoutedModelActions />}>{modalRoute("new", ActionCreator, {modalProps: { transitionProps: { duration: 0 } },})}@@ -232,7 +234,7 @@ async function setup({})}</Route></Route>- <Route path="/question/:slug" component={() => null} />+ <Route path="/question/:slug" element={null} /></>,{ withRouter: true, initialRoute: baseUrl, storeInitialState },);diff --git a/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx b/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsxindex 12d1a42f6b9..1a86dd38290 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx@@ -2,7 +2,7 @@ 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 { Route, withRouteProps } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import {createMockTokenFeatures,@@ -12,6 +12,8 @@ import {import NewModelOptions from "../NewModelOptions";+const RoutedNewModelOptions = withRouteProps(NewModelOptions);+export interface SetupOpts {canCreateQueries?: boolean;canCreateNativeQueries?: boolean;@@ -44,8 +46,11 @@ export function setup({setupEnterpriseOnlyPlugin(plugin);});- renderWithProviders(<Route path="*" component={NewModelOptions}></Route>, {- withRouter: true,- storeInitialState: state,- });+ renderWithProviders(+ <Route path="*" element={<RoutedNewModelOptions />}></Route>,+ {+ withRouter: true,+ storeInitialState: state,+ },+ );}diff --git a/frontend/src/metabase/models/routes.tsx b/frontend/src/metabase/models/routes.tsxindex e4185fc5063..3239a1f9a87 100644--- a/frontend/src/metabase/models/routes.tsx+++ b/frontend/src/metabase/models/routes.tsx@@ -2,12 +2,15 @@ import ActionCreatorModal from "metabase/actions/containers/ActionCreatorModal/Aimport { modalRoute } from "metabase/common/components/ModalRoute";import { ModelDetailPage } from "metabase/detail-view/pages/ModelDetailPage/ModelDetailPage";import ModelActions from "metabase/models/containers/ModelActions/ModelActions";-import { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import {type ModalProps,PREVENT_AUTOCOMPLETE_CLIPPING_MODAL_PROPS,} from "metabase/ui";+const RoutedModelActions = withRouteProps(ModelActions);+const RoutedModelDetailPage = withRouteProps(ModelDetailPage);+export const getRoutes = () => {const modalProps: Partial<ModalProps> = {...PREVENT_AUTOCOMPLETE_CLIPPING_MODAL_PROPS,@@ -15,15 +18,15 @@ export const getRoutes = () => {};return (<Route path="/model/:slug/detail">- <Route path="actions" component={ModelActions}>+ <Route path="actions" element={<RoutedModelActions />}>{modalRoute("new", ActionCreatorModal, { modalProps })}{modalRoute(":actionId", ActionCreatorModal, { modalProps })}</Route>- <Route path=":rowId" component={ModelDetailPage} />- <Route index component={redirect("actions")} />- <Route path="usage" component={redirect("actions")} />- <Route path="schema" component={redirect("actions")} />- <Route path="*" component={redirect("actions")} />+ <Route path=":rowId" element={<RoutedModelDetailPage />} />+ <Route index element={redirect("actions")} />+ <Route path="usage" element={redirect("actions")} />+ <Route path="schema" element={redirect("actions")} />+ <Route path="*" element={redirect("actions")} /></Route>);};diff --git a/frontend/src/metabase/monitor/dependency-diagnostics/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx b/frontend/src/metabase/monitor/dependency-diagnostics/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsxindex 2d49500db62..8e1b6bec611 100644--- a/frontend/src/metabase/monitor/dependency-diagnostics/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx+++ b/frontend/src/metabase/monitor/dependency-diagnostics/DependencyDiagnosticsSectionLayout/DependencyDiagnosticsSectionLayout.tsx@@ -1,17 +1,15 @@-import type { ReactNode } from "react";import { t } from "ttag";import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";import { usePageTitle } from "metabase/hooks/use-page-title";+import { Outlet } from "metabase/router";-type DependencyDiagnosticsSectionLayoutProps = {- children?: ReactNode;-};--export function DependencyDiagnosticsSectionLayout({- children,-}: DependencyDiagnosticsSectionLayoutProps) {+export function DependencyDiagnosticsSectionLayout() {usePageTitle(t`Dependency diagnostics`);- return <SectionLayout>{children}</SectionLayout>;+ return (+ <SectionLayout>+ <Outlet />+ </SectionLayout>+ );}diff --git a/frontend/src/metabase/monitor/tools/components/Help/Help.tsx b/frontend/src/metabase/monitor/tools/components/Help/Help.tsxindex 24e05564af9..d18c09e3078 100644--- a/frontend/src/metabase/monitor/tools/components/Help/Help.tsx+++ b/frontend/src/metabase/monitor/tools/components/Help/Help.tsx@@ -1,5 +1,5 @@import cx from "classnames";-import { type PropsWithChildren, useMemo } from "react";+import { useMemo } from "react";import { t } from "ttag";import _ from "underscore";@@ -15,6 +15,7 @@ import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { PLUGIN_SUPPORT } from "metabase/plugins";import { useSelector } from "metabase/redux";+import { Outlet } from "metabase/router";import { getIsPaidPlan } from "metabase/selectors/settings";import { Box, Code, Group } from "metabase/ui";import { getBasename } from "metabase/utils/basename";@@ -98,7 +99,7 @@ const InfoBlock = ({ children }: InfoBlockProps) => (</Box>);-export const Help = ({ children }: PropsWithChildren) => {+export const Help = () => {const { tag } = useSetting("version");const isPaidPlan = useSelector(getIsPaidPlan);@@ -151,8 +152,8 @@ export const Help = ({ children }: PropsWithChildren) => {link={getConnectionPoolDetailsUrl()}/></SettingsSection>- {/* render 'children' so that the child modal routes can show up */}- {children}+ {/* render the outlet so that the child modal routes can show up */}+ <Outlet /></SettingsPageWrapper>);};diff --git a/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsx b/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsxindex c91fe48fb9d..cc8b0b5f545 100644--- a/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsx+++ b/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import type { ReactNode } from "react";import { t } from "ttag";import {@@ -11,7 +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 { push } from "metabase/router";+import { Outlet, push } from "metabase/router";import { Ellipsified, Flex, Stack } from "metabase/ui";import type { Job } from "metabase-types/api";@@ -75,11 +74,7 @@ const JobsTable = ({ jobs }: JobsTableProps) => {);};-interface JobInfoAppProps {- children?: ReactNode;-}--export const JobInfoApp = ({ children }: JobInfoAppProps) => {+export const JobInfoApp = () => {const { data, error, isFetching } = useGetTasksInfoQuery();return (@@ -93,8 +88,8 @@ export const JobInfoApp = ({ children }: JobInfoAppProps) => {<JobsTable jobs={data?.jobs} /></SettingsSection>{- // render 'children' so that the individual task modals show up- children+ // render the outlet so that the individual task modals show up+ <Outlet />}</Stack></LoadingAndErrorWrapper>diff --git a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsxindex dff5be11205..1654e262f51 100644--- a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx+++ b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx@@ -1,6 +1,6 @@import type { Location } from "history";import * as React from "react";-import { type ReactNode, useMemo } from "react";+import { useMemo } from "react";import reactAnsiStyle from "react-ansi-style";import { t } from "ttag";@@ -10,7 +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 { Link, Outlet, withRouter } from "metabase/router";import {Button,DefaultSelectItem,@@ -31,7 +31,6 @@ import {} from "./utils";interface LogsProps {- children?: ReactNode;location: Location;// NOTE: fetching logs could come back from any machine if there's multiple machines backing a MB instance// make this frequent enough that you will most likely get every log from every machine in some reasonable@@ -42,7 +41,6 @@ interface LogsProps {export const DEFAULT_POLLING_DURATION_MS = 1000;const LogsBase = ({- children,location,pollingDurationMs = DEFAULT_POLLING_DURATION_MS,}: LogsProps) => {@@ -178,8 +176,8 @@ const LogsBase = ({</SettingsPageWrapper>{- // render 'children' so that the modals show up- children+ // render the outlet so that the modals show up+ <Outlet />}</>);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 156814ccbd5..d34422f10f6 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@@ -35,7 +35,7 @@ function setup({}),}: SetupOpts = {}) {return renderWithProviders(- <Route path={location.pathname} component={() => <Logs />} />,+ <Route path={location.pathname} element={<Logs />} />,{initialRoute: `${location.pathname}${location.search}`,storeInitialState: {diff --git a/frontend/src/metabase/monitor/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx b/frontend/src/metabase/monitor/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsxindex dfb505a05c4..c8a6c9d998e 100644--- a/frontend/src/metabase/monitor/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx+++ b/frontend/src/metabase/monitor/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx@@ -20,6 +20,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { usePagination } from "metabase/common/hooks/use-pagination";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";+import { Outlet } from "metabase/router";import { Icon, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";import { capitalize } from "metabase/utils/formatting";@@ -178,13 +179,13 @@ export function ModelCacheRefreshJobs() {);}-export function ModelCachePage({ children }: { children?: React.ReactNode }) {+export function ModelCachePage() {return (<SettingsPageWrapper title={t`Model cache log`}><SettingsSection><ModelCacheRefreshJobs /></SettingsSection>- {children /* refresh modal */}+ <Outlet /> {/* refresh modal */}</SettingsPageWrapper>);}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 4e7918a6558..9c2f8afcd61 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@@ -11,7 +11,7 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import type { Task } from "metabase-types/api";import { createMockTask } from "metabase-types/api/mocks";@@ -19,6 +19,8 @@ import { createSampleDatabase } from "metabase-types/api/mocks/presets";import { TaskDetailsPage } from "./TaskDetailsPage";+const RoutedTaskDetailsPage = withRouteProps(TaskDetailsPage);+jest.mock("@mantine/hooks", () => ({...jest.requireActual("@mantine/hooks"),useClipboard: jest.fn(),@@ -38,7 +40,7 @@ const setup = ({ task = createMockTask() }: SetupOpts = {}) => {setupTaskEndpoint(task);return renderWithProviders(- <Route path={PATHNAME} component={TaskDetailsPage} />,+ <Route path={PATHNAME} element={<RoutedTaskDetailsPage />} />,{initialRoute: Urls.adminToolsTaskDetails(task.id),withRouter: true,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 db314264ad1..c36e9589be7 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@@ -17,7 +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 { Route, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import type { ListTasksResponse } from "metabase-types/api";import { createMockTask } from "metabase-types/api/mocks";@@ -25,6 +25,8 @@ import { createSampleDatabase } from "metabase-types/api/mocks/presets";import { TaskListPage } from "./TaskListPage";+const RoutedTaskListPage = withRouteProps(TaskListPage);+interface SetupOpts {error?: boolean;location?: Location;@@ -50,7 +52,7 @@ const setup = ({}return renderWithProviders(- <Route path={PATHNAME} component={TaskListPage} />,+ <Route path={PATHNAME} element={<RoutedTaskListPage />} />,{initialRoute: `${location.pathname}${location.search}`,withRouter: true,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 4bbb272a768..46c3620132a 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@@ -8,13 +8,15 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import type { TaskRunExtended } from "metabase-types/api";import { createMockTaskRunExtended } from "metabase-types/api/mocks";import { TaskRunDetailsPage } from "./TaskRunDetailsPage";+const RoutedTaskRunDetailsPage = withRouteProps(TaskRunDetailsPage);+jest.mock("@mantine/hooks", () => ({...jest.requireActual("@mantine/hooks"),useClipboard: jest.fn(),@@ -33,7 +35,7 @@ const setup = ({ taskRun = createMockTaskRunExtended() }: SetupOpts = {}) => {setupTaskRunEndpoint(taskRun);return renderWithProviders(- <Route path={PATHNAME} component={TaskRunDetailsPage} />,+ <Route path={PATHNAME} element={<RoutedTaskRunDetailsPage />} />,{initialRoute: Urls.adminToolsTaskRunDetails(taskRun.id),withRouter: true,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 77e179b4f69..1c3b7be181c 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@@ -35,7 +35,7 @@ const setup = ({}return renderWithProviders(- <Route path={PATHNAME} component={TaskRunsPage} />,+ <Route path={PATHNAME} element={<TaskRunsPage />} />,{initialRoute,withRouter: true,diff --git a/frontend/src/metabase/monitor/tools/components/ToolsApp.tsx b/frontend/src/metabase/monitor/tools/components/ToolsApp.tsxindex cb349bf6787..ea24132c435 100644--- a/frontend/src/metabase/monitor/tools/components/ToolsApp.tsx+++ b/frontend/src/metabase/monitor/tools/components/ToolsApp.tsx@@ -1,5 +1,4 @@import type { Location } from "history";-import type { ReactNode } from "react";import { t } from "ttag";import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";@@ -8,14 +7,14 @@ import {type AdminNavItemProps,AdminNavWrapper,} from "metabase/admin/components/AdminNav";+import { Outlet } from "metabase/router";import * as Urls from "metabase/urls";type ToolsAppProps = {location: Location;- children?: ReactNode;};-export function ToolsApp({ location, children }: ToolsAppProps) {+export function ToolsApp({ location }: ToolsAppProps) {return (<AdminSettingsLayoutmaw="100rem"@@ -67,7 +66,7 @@ export function ToolsApp({ location, children }: ToolsAppProps) {</AdminNavWrapper>}>- {children}+ <Outlet /></AdminSettingsLayout>);}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 fd1af5a7033..cdcf43af480 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@@ -21,7 +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 { Route, withRouteProps } from "metabase/router";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import type { AdminNotification, UserListResult } from "metabase-types/api";import {@@ -39,6 +39,8 @@ import {import { NotificationsAdminPage } from "./NotificationsAdminPage";import { PAGE_SIZE } from "./constants";+const RoutedNotificationsAdminPage = withRouteProps(NotificationsAdminPage);+const PATHNAME = "/admin/tools/notifications";const ANN = createMockUserInfo({@@ -179,7 +181,7 @@ const setup = ({return renderWithProviders(<Routepath="/admin/tools/notifications(/:notificationId)"- component={NotificationsAdminPage}+ element={<RoutedNotificationsAdminPage />}/>,{ withRouter: true, initialRoute },);diff --git a/frontend/src/metabase/monitor/tools/notifications/routes.tsx b/frontend/src/metabase/monitor/tools/notifications/routes.tsxindex 7c19d991090..430b7b6c139 100644--- a/frontend/src/metabase/monitor/tools/notifications/routes.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/routes.tsx@@ -1,10 +1,12 @@-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { NotificationsAdminPage } from "./NotificationsAdminPage";+const RoutedNotificationsAdminPage = withRouteProps(NotificationsAdminPage);+export const getRoutes = () => (<>- <Route index component={NotificationsAdminPage} />- <Route path=":notificationId" component={NotificationsAdminPage} />+ <Route index element={<RoutedNotificationsAdminPage />} />+ <Route path=":notificationId" element={<RoutedNotificationsAdminPage />} /></>);diff --git a/frontend/src/metabase/monitor/tools/routes.tsx b/frontend/src/metabase/monitor/tools/routes.tsxindex 5a4dbc512a3..aa1b014a598 100644--- a/frontend/src/metabase/monitor/tools/routes.tsx+++ b/frontend/src/metabase/monitor/tools/routes.tsx@@ -1,17 +1,21 @@-import { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import { TaskDetailsPage } from "./components/TaskDetailsPage";import { TaskListPage } from "./components/TaskListPage";import { TaskRunDetailsPage } from "./components/TaskRunDetailsPage";import { TaskRunsPage } from "./components/TaskRunsPage";+const RoutedTaskListPage = withRouteProps(TaskListPage);+const RoutedTaskDetailsPage = withRouteProps(TaskDetailsPage);+const RoutedTaskRunDetailsPage = withRouteProps(TaskRunDetailsPage);+export const getTasksRoutes = () => (<>- <Route index component={redirect("list")} />- <Route path="list" component={TaskListPage} />- <Route path="list/:taskId" component={TaskDetailsPage} />- <Route path="runs" component={TaskRunsPage} />- <Route path="runs/:runId" component={TaskRunDetailsPage} />+ <Route index element={redirect("list")} />+ <Route path="list" element={<RoutedTaskListPage />} />+ <Route path="list/:taskId" element={<RoutedTaskDetailsPage />} />+ <Route path="runs" element={<TaskRunsPage />} />+ <Route path="runs/:runId" element={<RoutedTaskRunDetailsPage />} /></>);diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsxindex 7a36d63e019..c1e83db5863 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx@@ -23,10 +23,7 @@ const setup = ({ isAdmin = false, isPaidPlan = false }) => {});return renderWithProviders(- <Route- path="/"- component={() => <AdminNavbar path="/admin" adminPaths={[]} />}- />,+ <Route path="/" element={<AdminNavbar path="/admin" adminPaths={[]} />} />,{storeInitialState: state,withRouter: true,diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsxindex 275fc248f51..e80c9e15ec7 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx@@ -73,9 +73,9 @@ async function setup({renderWithProviders(<>- <Route path="/" component={AppSwitcher} />- <Route path="/admin" component={AppSwitcher} />- <Route path="/data-studio" component={AppSwitcher} />+ <Route path="/" element={<AppSwitcher />} />+ <Route path="/admin" element={<AppSwitcher />} />+ <Route path="/data-studio" element={<AppSwitcher />} /></>,{withRouter: true,diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsxindex 03ce51496fd..4ad0016f09e 100644--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.unit.spec.tsx@@ -25,13 +25,13 @@ function setup() {return renderWithProviders(<Routepath="*"- component={() => (+ element={<CollectionBreadcrumbsbaseCollectionId={null}collection={COLLECTION}dashboard={DASHBOARD}/>- )}+ }/>,{ withRouter: true },);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 4075248c59c..5e6ebfb64c7 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@@ -69,7 +69,7 @@ const setup = ({setupCollectionsEndpoints({ collections: [] });const { history } = renderWithProviders(- <Route path="*" component={SearchBar} />,+ <Route path="*" element={<SearchBar />} />,{withRouter: true,initialRoute,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 f9c3244ddd8..95c588c20f0 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@@ -5,7 +5,7 @@ import { SearchButton } from "./SearchButton";describe("SearchButton", () => {it("should show the current search query on the search page (UXW-3370)", () => {- renderWithProviders(<Route path="*" component={() => <SearchButton />} />, {+ renderWithProviders(<Route path="*" element={<SearchButton />} />, {withKBar: true,withRouter: true,initialRoute: "/search?q=products",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 ebd0b666fd3..fa400e5ec61 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@@ -59,7 +59,7 @@ const setup = async ({const { history } = renderWithProviders(<Routepath="*"- component={() => (+ element={<SearchResultsonEntitySelect={onEntitySelect}forceEntitySelect={forceEntitySelect}@@ -67,7 +67,7 @@ const setup = async ({footerComponent={footer}context="search-bar"/>- )}+ }/>,{withRouter: true,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 1d4eb8cbe12..532e91e4a0c 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@@ -65,14 +65,14 @@ const setup = async ({const { history } = renderWithProviders(<Routepath="*"- component={() => (+ element={<SearchResultsDropdownsearchText={searchText}onSearchItemSelect={onSearchItemSelect}goToSearchApp={goToSearchApp}context="search-bar"/>- )}+ }/>,{withRouter: true,diff --git a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsxindex 1c86c8f14cd..84fafc9d9bd 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx@@ -89,13 +89,13 @@ export const setup = ({return renderWithProviders(<Routepath="/"- component={() => (+ element={<NavbarLibrarySectioncollections={collections}selectedId={undefined}onItemSelect={jest.fn()}/>- )}+ }/>,{storeInitialState: state,diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsxindex 0bd8b0209ca..e02805fd2c7 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx@@ -25,7 +25,7 @@ import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import * as iframeUtils from "metabase/utils/iframe";import type {Card,@@ -43,6 +43,8 @@ import {import { MainNavbar } from "../MainNavbar";+const RoutedMainNavbar = withRouteProps(MainNavbar);+export type SetupOpts = {pathname?: string;route?: string;@@ -225,9 +227,7 @@ export async function setup({renderWithProviders(<Routepath={route}- component={(props) => (- <MainNavbar {...props} isOpen dashboard={storeDashboard} />- )}+ element={<RoutedMainNavbar isOpen dashboard={storeDashboard} />}/>,{storeInitialState,diff --git a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx b/frontend/src/metabase/palette/components/Palette.unit.spec.tsxindex 14809f48853..34a10754caa 100644--- a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx+++ b/frontend/src/metabase/palette/components/Palette.unit.spec.tsx@@ -39,7 +39,7 @@ const setup = ({renderWithProviders(<Routepath={initialRoute ? "*" : "/"}- component={Palette}+ element={<Palette />}props={routeProps}/>,{diff --git a/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx b/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsxindex 51d2c09f254..d9094aff254 100644--- a/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx+++ b/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx@@ -48,7 +48,7 @@ const setupInList = ({ item }: { item: Partial<PaletteActionImpl> }) => {<><Routepath="/"- component={() => (+ element={<PaletteResultListitems={items.map((item) => mockPaletteActionImpl(item))}maxHeight={580}@@ -68,9 +68,9 @@ const setupInList = ({ item }: { item: Partial<PaletteActionImpl> }) => {return <PaletteResultItem item={item} active={active} />;}}/>- )}+ }/>- <Route path="search" component={() => null} />+ <Route path="search" element={null} /></>,{ withRouter: true, withKBar: true },);diff --git a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsxindex 1e6cd5d4d93..35967d8fe64 100644--- a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx+++ b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx@@ -172,7 +172,7 @@ export const commonSetup = ({}renderWithProviders(- <Route path="/" component={() => <TestComponent q={query} isLoggedIn />} />,+ <Route path="/" element={<TestComponent q={query} isLoggedIn />} />,{withKBar: true,withRouter: true,diff --git a/frontend/src/metabase/plugins/oss/tenants.ts b/frontend/src/metabase/plugins/oss/tenants.tsindex aa18bfa6f1a..66a55cec0d1 100644--- a/frontend/src/metabase/plugins/oss/tenants.ts+++ b/frontend/src/metabase/plugins/oss/tenants.ts@@ -99,13 +99,11 @@ const getDefaultPluginTenants = () => ({TenantCollectionList: PluginPlaceholder,// Unjustified type cast. FIXMECanAccessTenantSpecificRoute: PluginPlaceholder as React.ComponentType<{- children: React.ReactNode;+ children?: React.ReactNode;}>,TenantUsersList: PluginPlaceholder,// Unjustified type cast. FIXME- TenantUsersPersonalCollectionList: PluginPlaceholder as React.ComponentType<{- params: { tenantId: string };- }>,+ TenantUsersPersonalCollectionList: PluginPlaceholder as React.ComponentType,GroupDescription: (_props: { group: Group }) =>// Unjustified type cast. FIXMEnull as React.ReactElement | null,@@ -189,12 +187,10 @@ export const PLUGIN_TENANTS: {}) => React.ReactElement | null;TenantCollectionList: React.ComponentType;CanAccessTenantSpecificRoute: React.ComponentType<{- children: React.ReactNode;+ children?: React.ReactNode;}>;TenantUsersList: React.ComponentType;- TenantUsersPersonalCollectionList: React.ComponentType<{- params: { tenantId: string };- }>;+ TenantUsersPersonalCollectionList: React.ComponentType;GroupDescription: (props: { group: Group }) => React.ReactElement | null;EditUserStrategyModal: (props: {onClose: () => void;diff --git a/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsxindex 31934289b9a..56e3a4dd74a 100644--- a/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsx+++ b/frontend/src/metabase/public/containers/PublicAction/PublicAction.unit.spec.tsx@@ -7,7 +7,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type {ParametersForActionExecution,PublicWritebackAction,@@ -21,6 +21,8 @@ import PublicApp from "../PublicApp";import PublicAction from "./PublicActionLoader";+const RoutedPublicAction = withRouteProps(PublicAction);+const TEST_PUBLIC_ID = "test-public-id";const SIZE_PARAMETER = createMockActionParameter({@@ -75,14 +77,9 @@ async function setup({});renderWithProviders(- <Route- path="/public/action/:uuid"- component={(props) => (- <PublicApp {...props}>- <PublicAction {...props} />- </PublicApp>- )}- />,+ <Route path="/public/action/:uuid" element={<PublicApp />}>+ <Route index element={<RoutedPublicAction />} />+ </Route>,{mode: "public",initialRoute: `/public/action/${TEST_PUBLIC_ID}`,diff --git a/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx b/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsxindex 8b32a26d7a0..046486c07b6 100644--- a/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx+++ b/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx@@ -5,20 +5,17 @@ import { PublicError } from "metabase/public/components/PublicError";import { PublicNotFound } from "metabase/public/components/PublicNotFound";import { connect, useSelector } from "metabase/redux";import type { AppErrorDescriptor, State } from "metabase/redux/store";+import { Outlet } from "metabase/router";import { getErrorPage } from "metabase/selectors/app";import { getApplicationName } from "metabase/selectors/whitelabel";import { PublicStatusListing } from "metabase/status/components/PublicStatusListing";import { isWithinIframe } from "metabase/utils/iframe";-interface OwnProps {- children: JSX.Element;-}-interface StateProps {errorPage?: AppErrorDescriptor | null;}-type Props = OwnProps & StateProps;+type Props = StateProps;function mapStateToProps(state: State) {return {@@ -26,7 +23,7 @@ function mapStateToProps(state: State) {};}-function PublicApp({ errorPage, children }: Props) {+function PublicApp({ errorPage }: Props) {const applicationName = useSelector(getApplicationName);usePageTitle(applicationName, { titleIndex: 0 });@@ -43,13 +40,13 @@ function PublicApp({ errorPage, children }: Props) {return (<>- {children}+ <Outlet /><PublicStatusListing /></>);}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default connect<StateProps, unknown, OwnProps, State>(mapStateToProps)(+export default connect<StateProps, unknown, unknown, State>(mapStateToProps)(PublicApp,);diff --git a/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsxindex 64c8cc0dfce..defe63d0056 100644--- a/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsx+++ b/frontend/src/metabase/public/containers/PublicApp/PublicApp.unit.spec.tsx@@ -29,16 +29,16 @@ function setup({const settings = mockSettings({ "hide-embed-branding?": !hasEmbedBranding });renderWithProviders(- <Route- path="/public/dashboard/:id"- component={(props) => (- <PublicApp {...props}>+ <Route path="/public/dashboard/:id" element={<PublicApp />}>+ <Route+ index+ element={<SyncedEmbedFrame {...embedFrameProps}><h1 data-testid="test-content">Test</h1></SyncedEmbedFrame>- </PublicApp>- )}- />,+ }+ />+ </Route>,{mode: "public",initialRoute: `/public/dashboard/UUID${hash}`,diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsxindex 459375035ae..153f84cee9a 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx@@ -7,7 +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 { Route, withRouteProps } from "metabase/router";import { registerStaticVisualizations } from "metabase/static-viz/register";import type {DashboardCard,@@ -25,6 +25,10 @@ import {import { PublicOrEmbeddedDashboardPage } from "../PublicOrEmbeddedDashboardPage";+const RoutedPublicOrEmbeddedDashboardPage = withRouteProps(+ PublicOrEmbeddedDashboardPage,+);+const MOCK_TOKEN ="eyJhbGciOiJIUzI1NiJ9.eyJyZXNvdXJjZSI6eyJkYXNoYm9hcmQiOjExfSwicGFyYW1zIjp7fSwiaWF0IjoxNzEyNjg0NTA1LCJfZW1iZWRkaW5nX3BhcmFtcyI6e319.WbZTB-cQYh4gjh61ZzoLOcFbJ6j6RlOY3GS4fwzv3W4";@@ -113,7 +117,7 @@ export async function setup(const view = renderWithProviders(<Routepath="embed/dashboard/:token"- component={PublicOrEmbeddedDashboardPage}+ element={<RoutedPublicOrEmbeddedDashboardPage />}/>,{storeInitialState: createMockState(),diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsxindex e94fe0cec2d..348c27a39f5 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx@@ -13,7 +13,7 @@ import {waitForLoaderToBeRemoved,} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { registerStaticVisualizations } from "metabase/static-viz/register";import type { VisualizationProps } from "metabase/visualizations/types";import type { TokenFeatures } from "metabase-types/api";@@ -27,6 +27,8 @@ import { PublicOrEmbeddedQuestion } from "../PublicOrEmbeddedQuestion";registerStaticVisualizations();+const RoutedPublicOrEmbeddedQuestion = withRouteProps(PublicOrEmbeddedQuestion);+function VisualizationMock({onUpdateVisualizationSettings,rawSeries,@@ -111,7 +113,10 @@ export async function setup(}renderWithProviders(- <Route path="public/question/:uuid" component={PublicOrEmbeddedQuestion} />,+ <Route+ path="public/question/:uuid"+ element={<RoutedPublicOrEmbeddedQuestion />}+ />,{storeInitialState: createMockState({ settings }),withRouter: true,diff --git a/frontend/src/metabase/query_builder/components/QuestionHashRedirect.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionHashRedirect.unit.spec.tsxindex 4cb6eb6505c..928a25f58a1 100644--- a/frontend/src/metabase/query_builder/components/QuestionHashRedirect.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionHashRedirect.unit.spec.tsx@@ -6,10 +6,10 @@ import { QuestionHashRedirect } from "./QuestionHashRedirect";const setup = (initialRoute: string) =>renderWithProviders(<>- <Route path="/q" component={QuestionHashRedirect} />- <Route path="/card/:slug" component={QuestionHashRedirect} />- <Route path="/question" component={() => <div>question</div>} />- <Route path="/question/:slug" component={() => <div>question</div>} />+ <Route path="/q" element={<QuestionHashRedirect />} />+ <Route path="/card/:slug" element={<QuestionHashRedirect />} />+ <Route path="/question" element={<div>question</div>} />+ <Route path="/question/:slug" element={<div>question</div>} /></>,{ withRouter: true, initialRoute },);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 58664423e5a..7b684fd38b1 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@@ -192,10 +192,7 @@ function setup({};renderWithProviders(- <Route- path="/"- component={() => <ViewTitleHeader {...viewTitleHeaderProps} />}- />,+ <Route path="/" element={<ViewTitleHeader {...viewTitleHeaderProps} />} />,{withRouter: true,storeInitialState,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 927c5fdd6d3..695a44ba87d 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@@ -170,7 +170,7 @@ async function setup({setupCollectionsEndpoints({ collections });const { history } = renderWithProviders(- <Route path="*" component={() => <ModelUsageDetails model={model} />} />,+ <Route path="*" element={<ModelUsageDetails model={model} />} />,{withRouter: true,storeInitialState,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 aaf4a95e9e2..e71997c5e40 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@@ -57,13 +57,10 @@ const setup = async ({};}- return renderWithProviders(- <Route path="/" component={() => <QuestionSources />} />,- {- withRouter: true,- storeInitialState: state,- },- );+ return renderWithProviders(<Route path="/" element={<QuestionSources />} />, {+ withRouter: true,+ storeInitialState: state,+ });};describe("QuestionSources", () => {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 bf3a3b4113b..c65f6ac2452 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@@ -71,10 +71,13 @@ export const setup = async ({<QuestionInfoSidebar question={question} onSave={onSave} />);- renderWithProviders(<Route path="*" component={TestQuestionInfoSidebar} />, {- withRouter: true,- storeInitialState: state,- });+ renderWithProviders(+ <Route path="*" element={<TestQuestionInfoSidebar />} />,+ {+ withRouter: true,+ storeInitialState: state,+ },+ );await waitForLoaderToBeRemoved();};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 edeb70700fc..54ea437280a 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@@ -86,7 +86,7 @@ export const setup = async ({);renderWithProviders(- <Route path="*" component={TestQuestionSettingsSidebar} />,+ <Route path="*" element={<TestQuestionSettingsSidebar />} />,{withRouter: true,storeInitialState: state,diff --git a/frontend/src/metabase/query_builder/containers/test-utils.tsx b/frontend/src/metabase/query_builder/containers/test-utils.tsxindex a56b2d7e5c6..2f2e8a61817 100644--- a/frontend/src/metabase/query_builder/containers/test-utils.tsx+++ b/frontend/src/metabase/query_builder/containers/test-utils.tsx@@ -36,7 +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 { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { checkNotNull } from "metabase/utils/types";import type { Card, Dataset, Timeline, UnsavedCard } from "metabase-types/api";import {@@ -216,6 +216,8 @@ const TestQueryBuilder = ();};+const RoutedTestQueryBuilder = withRouteProps(TestQueryBuilder);+const TestHome = () => <NewItemMenu trigger={<button>New</button>} />;const TestRedirect = () => <div />;@@ -287,25 +289,25 @@ export const setup = async ({const { container, history, store } = renderWithProviders(<div><Route>- <Route path="/" component={TestHome} />+ <Route path="/" element={<TestHome />} /><Route path="/model">- <Route path="query" component={TestQueryBuilder} />- <Route path="columns" component={TestQueryBuilder} />- <Route path="metadata" component={TestQueryBuilder} />- <Route path="notebook" component={TestQueryBuilder} />- <Route path=":slug" component={TestQueryBuilder} />- <Route path=":slug/query" component={TestQueryBuilder} />- <Route path=":slug/columns" component={TestQueryBuilder} />- <Route path=":slug/metadata" component={TestQueryBuilder} />- <Route path=":slug/notebook" component={TestQueryBuilder} />+ <Route path="query" element={<RoutedTestQueryBuilder />} />+ <Route path="columns" element={<RoutedTestQueryBuilder />} />+ <Route path="metadata" element={<RoutedTestQueryBuilder />} />+ <Route path="notebook" element={<RoutedTestQueryBuilder />} />+ <Route path=":slug" element={<RoutedTestQueryBuilder />} />+ <Route path=":slug/query" element={<RoutedTestQueryBuilder />} />+ <Route path=":slug/columns" element={<RoutedTestQueryBuilder />} />+ <Route path=":slug/metadata" element={<RoutedTestQueryBuilder />} />+ <Route path=":slug/notebook" element={<RoutedTestQueryBuilder />} /></Route><Route path="/question">- <Route index component={TestQueryBuilder} />- <Route path="notebook" component={TestQueryBuilder} />- <Route path=":slug" component={TestQueryBuilder} />- <Route path=":slug/notebook" component={TestQueryBuilder} />+ <Route index element={<RoutedTestQueryBuilder />} />+ <Route path="notebook" element={<RoutedTestQueryBuilder />} />+ <Route path=":slug" element={<RoutedTestQueryBuilder />} />+ <Route path=":slug/notebook" element={<RoutedTestQueryBuilder />} /></Route>- <Route path="/redirect" component={TestRedirect} />+ <Route path="/redirect" element={<TestRedirect />} /></Route></div>,{diff --git a/frontend/src/metabase/reference/components/ListItem/ListItem.unit.spec.tsx b/frontend/src/metabase/reference/components/ListItem/ListItem.unit.spec.tsxindex e19243631fd..0994855ff48 100644--- a/frontend/src/metabase/reference/components/ListItem/ListItem.unit.spec.tsx+++ b/frontend/src/metabase/reference/components/ListItem/ListItem.unit.spec.tsx@@ -9,7 +9,7 @@ const PLACEHOLDER_TEXT = "Placeholder text";function setup({ name, ...opts }: ListItemProps) {return renderWithProviders(- <Route path="/" component={() => <ListItem name={name} {...opts} />} />,+ <Route path="/" element={<ListItem name={name} {...opts} />} />,{ withRouter: true },);}diff --git a/frontend/src/metabase/reference/databases/DatabaseListContainer.unit.spec.tsx b/frontend/src/metabase/reference/databases/DatabaseListContainer.unit.spec.tsxindex bfb0f8dc649..c662a1263d7 100644--- a/frontend/src/metabase/reference/databases/DatabaseListContainer.unit.spec.tsx+++ b/frontend/src/metabase/reference/databases/DatabaseListContainer.unit.spec.tsx@@ -10,7 +10,7 @@ const database = createMockDatabase({ id: 1, name: "Test Database" });function setup() {setupDatabasesEndpoints([database]);return renderWithProviders(- <Route path="/" component={DatabaseListContainer} />,+ <Route path="/" element={<DatabaseListContainer />} />,{ withRouter: true, initialRoute: "/" },);}diff --git a/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx b/frontend/src/metabase/reference/databases/TableList.unit.spec.tsxindex 0dd57f44ecd..a4126b5fde4 100644--- a/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx+++ b/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx@@ -48,9 +48,7 @@ function setup() {return renderWithProviders(<Routepath="/"- component={() => (- <TableList params={{ databaseId: String(databaseId) }} />- )}+ element={<TableList params={{ databaseId: String(databaseId) }} />}/>,{ storeInitialState, withRouter: true },);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 05cd7d7ee64..03a54af24b5 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@@ -212,7 +212,7 @@ describe("SmartLink", () => {const props = createProps("dashboard", dashboard);renderWithProviders(<Router history={historyWithBasename}>- <Route path="*" component={() => <SmartLinkComponent {...props} />} />+ <Route path="*" element={<SmartLinkComponent {...props} />} /></Router>,);@@ -242,7 +242,7 @@ describe("SmartLink", () => {const props = createProps("dashboard", dashboard);renderWithProviders(<Router history={historyNoBasename}>- <Route path="*" component={() => <SmartLinkComponent {...props} />} />+ <Route path="*" element={<SmartLinkComponent {...props} />} /></Router>,);diff --git a/frontend/src/metabase/router/Link.unit.spec.tsx b/frontend/src/metabase/router/Link.unit.spec.tsxindex 11cd3c88e70..b2aee9198a4 100644--- a/frontend/src/metabase/router/Link.unit.spec.tsx+++ b/frontend/src/metabase/router/Link.unit.spec.tsx@@ -6,7 +6,7 @@ import { Route } from "./route";describe("router/Link", () => {it("re-exports the to-based Link", () => {const Host = () => <Link to="/foo">go</Link>;- renderWithProviders(<Route path="*" component={Host} />, {+ renderWithProviders(<Route path="*" element={<Host />} />, {withRouter: true,});diff --git a/frontend/src/metabase/router/Navigate.unit.spec.tsx b/frontend/src/metabase/router/Navigate.unit.spec.tsxindex cdebffa5b0a..ddc4bbb498b 100644--- a/frontend/src/metabase/router/Navigate.unit.spec.tsx+++ b/frontend/src/metabase/router/Navigate.unit.spec.tsx@@ -15,7 +15,7 @@ describe("router/Navigate", () => {it("pushes to the destination on mount, re-asserting it on back", async () => {const Host = () => <Navigate to="/dest" />;const { history } = renderWithProviders(- <Route path="*" component={Host} />,+ <Route path="*" element={<Host />} />,{withRouter: true,initialRoute: "/home",@@ -37,7 +37,7 @@ describe("router/Navigate", () => {it("replaces the current entry and carries state when asked", async () => {const Host = () => <Navigate to="/dest" replace state={HOME_STATE} />;const { history } = renderWithProviders(- <Route path="*" component={Host} />,+ <Route path="*" element={<Host />} />,{withRouter: true,initialRoute: "/home",@@ -66,7 +66,7 @@ describe("router/Navigate", () => {);};const { history } = renderWithProviders(- <Route path="*" component={Host} />,+ <Route path="*" element={<Host />} />,{withRouter: true,initialRoute: "/home",@@ -87,7 +87,7 @@ describe("router/Navigate", () => {it("passes state through by reference without serializing it", async () => {const Host = () => <Navigate to="/dest" state={RICH_STATE} />;const { history } = renderWithProviders(- <Route path="*" component={Host} />,+ <Route path="*" element={<Host />} />,{withRouter: true,initialRoute: "/home",diff --git a/frontend/src/metabase/router/Outlet.tsx b/frontend/src/metabase/router/Outlet.tsxindex f067b004c77..7140a6f089c 100644--- a/frontend/src/metabase/router/Outlet.tsx+++ b/frontend/src/metabase/router/Outlet.tsx@@ -5,10 +5,23 @@ import type { Route } from "./route";const OutletContext = createContext<ReactNode>(null);+const RouteContext = createContext<Route | null>(null);++/**+ * The route matched for the nearest `element`-based route ancestor. On v3 the+ * matched route is injected as a `route` prop; this exposes it to `element`+ * routes, which are not passed props. Replaces threading the v3 `route` prop+ * through pages (e.g. for `setRouteLeaveHook`). Native `useMatch`/route context+ * takes over at the engine swap.+ */+export function useRoute(): Route | null {+ return useContext(RouteContext);+}+/*** react-router v7's `<Outlet>`: renders the matched child route (or nothing when- * there is none). On v3 the child is injected as `props.children`, which- * `withOutlet` exposes through context.+ * there is none). On v3 the child is injected as `props.children`, which the+ * `element` bridge exposes through context.** @see https://reactrouter.com/7.18.1/api/components/Outlet*/@@ -73,26 +86,11 @@ function elementType(element: ReactNode): object | null {function makeRouteElementComponent(): RouteElementComponent {return function RouteElement({ children, route }) {return (- <OutletContext.Provider value={children}>- {route?.element}- </OutletContext.Provider>- );- };-}--/**- * Wraps a v7-style component so it can be used as a react-router v3 route- * `component`. The child route that v3 injects as `props.children` is exposed- * through context, letting the wrapped component render it with `<Outlet/>`.- */-export function withOutlet(- Component: ComponentType,-): ComponentType<{ children?: ReactNode }> {- return function RoutedComponent({ children }) {- return (- <OutletContext.Provider value={children}>- <Component />- </OutletContext.Provider>+ <RouteContext.Provider value={route ?? null}>+ <OutletContext.Provider value={children}>+ {route?.element}+ </OutletContext.Provider>+ </RouteContext.Provider>);};}diff --git a/frontend/src/metabase/router/Outlet.unit.spec.tsx b/frontend/src/metabase/router/Outlet.unit.spec.tsxindex bb56570abd3..758d33424d2 100644--- a/frontend/src/metabase/router/Outlet.unit.spec.tsx+++ b/frontend/src/metabase/router/Outlet.unit.spec.tsx@@ -1,26 +1,8 @@import { renderWithProviders, screen } from "__support__/ui";-import { Outlet, withOutlet } from "./Outlet";--function ParentPage() {- return (- <div>- <span>parent chrome</span>- <Outlet />- </div>- );-}+import { Outlet } from "./Outlet";describe("router/Outlet", () => {- it("renders the matched child exposed by withOutlet", () => {- const RoutedParent = withOutlet(ParentPage);-- renderWithProviders(<RoutedParent>child content</RoutedParent>);-- expect(screen.getByText("parent chrome")).toBeInTheDocument();- expect(screen.getByText("child content")).toBeInTheDocument();- });-it("renders nothing when there is no matched child", () => {renderWithProviders(<Outlet />);expect(screen.queryByText("child content")).not.toBeInTheDocument();diff --git a/frontend/src/metabase/router/RouterProvider.tsx b/frontend/src/metabase/router/RouterProvider.tsxindex 0b31640415e..a25af587f61 100644--- a/frontend/src/metabase/router/RouterProvider.tsx+++ b/frontend/src/metabase/router/RouterProvider.tsx@@ -1,10 +1,14 @@import type { History } from "history";-import { type PropsWithChildren, createContext } from "react";+import { type PropsWithChildren, createContext, useMemo } from "react";import { useHistory } from "metabase/history";-import { Router, type WithRouterProps, withRouter } from "./react-router";-import { Route } from "./route";+import {+ ReactRouterRoute,+ Router,+ type WithRouterProps,+ withRouter,+} from "./react-router";type RouterContextType = WithRouterProps;@@ -17,10 +21,19 @@ const RouterContextProviderBase = ({routes,children,}: PropsWithChildren<RouterContextType>) => {+ // Memoize on the injected parts so a re-render that leaves them unchanged does+ // not hand consumers a fresh object. Under the `element` bridge, navigation+ // commits twice (the facade context update, then v3's own route re-render), and+ // an unmemoized value would re-propagate on that second, location-unchanged+ // render. That extra render breaks pages that derive transient state from+ // `usePrevious(location.key)` (e.g. the document /new -> /new leave prompt),+ // which `component`-based v3 routes never saw because v3 re-renders them once.+ const value = useMemo(+ () => ({ router, location, params, routes }),+ [router, location, params, routes],+ );return (- <RouterContext.Provider value={{ router, location, params, routes }}>- {children}- </RouterContext.Provider>+ <RouterContext.Provider value={value}>{children}</RouterContext.Provider>);};@@ -35,6 +48,10 @@ type RouterProviderProps = {* This is v3's only solution to provide a router and routes.* Without extra Route component it doesn't work.* Additionally, it provides the history reference+ *+ * Uses the raw v3 `Route` here (not the facade's `element`-based one): this is the+ * component that establishes the router context, so it cannot itself consume that+ * context through `<Outlet/>`.*/export const RouterProvider = ({children,@@ -42,7 +59,9 @@ export const RouterProvider = ({const { history } = useHistory();return (<Router history={history}>- <Route component={RouterContextProvider}>{children}</Route>+ <ReactRouterRoute component={RouterContextProvider}>+ {children}+ </ReactRouterRoute></Router>);};diff --git a/frontend/src/metabase/router/RouterProvider.unit.spec.tsx b/frontend/src/metabase/router/RouterProvider.unit.spec.tsxnew file mode 100644index 00000000000..f1cd4a49c31--- /dev/null+++ b/frontend/src/metabase/router/RouterProvider.unit.spec.tsx@@ -0,0 +1,45 @@+import { usePrevious } from "react-use";++import { act, renderWithProviders, screen } from "__support__/ui";++import { Route } from "./route";+import { useParams } from "./use-params";+import { withRouteProps } from "./with-route-props";++// Mirrors the document /new -> /new leave prompt: a page that derives transient+// state from `usePrevious(location.key)` and expects to stay rendered until the+// user acts on it. It only holds if a same-path navigation re-renders the page+// exactly once, the way v3 `component` routes did.+const LeavePrompt = ({ location }: { location: { key?: string } }) => {+ const previousKey = usePrevious(location.key);+ const navigatedInPlace =+ previousKey !== undefined && location.key !== previousKey;+ return <div>{navigatedInPlace ? "leave-prompt" : "no-prompt"}</div>;+};++const RoutedLeavePrompt = withRouteProps(LeavePrompt);++const Page = () => {+ const { id } = useParams();+ return <RoutedLeavePrompt key={id} />;+};++describe("router/RouterProvider context stability", () => {+ it("keeps a page's usePrevious(location.key) state after a same-path navigation", async () => {+ const { history } = renderWithProviders(+ <Route path="doc/:id" element={<Page />} />,+ { withRouter: true, initialRoute: "/doc/new" },+ );++ expect(await screen.findByText("no-prompt")).toBeInTheDocument();++ act(() => {+ history?.push("/doc/new");+ });++ // The context value is memoized, so v3's post-navigation re-render (with an+ // unchanged location) does not re-propagate and wipe the transient state.+ expect(await screen.findByText("leave-prompt")).toBeInTheDocument();+ expect(screen.getByText("leave-prompt")).toBeInTheDocument();+ });+});diff --git a/frontend/src/metabase/router/guards.tsx b/frontend/src/metabase/router/guards.tsxindex 613e4ea5de9..db8d3c66ed5 100644--- a/frontend/src/metabase/router/guards.tsx+++ b/frontend/src/metabase/router/guards.tsx@@ -1,4 +1,4 @@-import { type ReactElement, useEffect } from "react";+import { type ReactElement, type ReactNode, useEffect } from "react";import { canAccessDataStudio } from "metabase/common/data-studio/selectors";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";@@ -16,7 +16,12 @@ import { Outlet } from "./Outlet";import type { Location } from "./types";import { useLocation } from "./use-location";-type Props = { children: ReactElement };+/**+ * Guards double as route elements and as wrapper components. As a route element+ * (`element={<IsAuthenticated/>}`) no `children` are passed, so they fall back to+ * `<Outlet/>` and render whatever nested route matched.+ */+type Props = { children?: ReactNode };/** Paths that are handled by the backend server, not the frontend SPA router. */export const BACKEND_ONLY_PATH_PREFIXES = ["/oauth/", "/auth/sso/"];@@ -100,7 +105,7 @@ function createGuard({ isAllowed, isAuthenticating = NEVER_AUTHENTICATING }: GuardSelectors,renderRedirect: (location: Location) => ReactElement | null,) {- return function Guard({ children }: Props) {+ return function Guard({ children = <Outlet /> }: Props) {const location = useLocation();const allowed = useSelector(isAllowed);const authenticating = useSelector(isAuthenticating);diff --git a/frontend/src/metabase/router/guards.unit.spec.tsx b/frontend/src/metabase/router/guards.unit.spec.tsxindex c5ce3be3fb1..430819fe699 100644--- a/frontend/src/metabase/router/guards.unit.spec.tsx+++ b/frontend/src/metabase/router/guards.unit.spec.tsx@@ -39,10 +39,10 @@ describe("route-guards", () => {const { history } = renderWithProviders(<><Route element={<IsAuthenticated />}>- <Route path="/dashboard/:slug" component={Dashboard} />+ <Route path="/dashboard/:slug" element={<Dashboard />} /></Route><Route element={<IsNotAuthenticated />}>- <Route path="/auth/login" component={LoginPage} />+ <Route path="/auth/login" element={<LoginPage />} /></Route></>,{@@ -74,9 +74,9 @@ describe("route-guards", () => {const { history } = renderWithProviders(<><Route element={<IsAdmin />}>- <Route path="/admin/settings" component={Protected} />+ <Route path="/admin/settings" element={<Protected />} /></Route>- <Route path="/unauthorized" component={Unauthorized} />+ <Route path="/unauthorized" element={<Unauthorized />} /></>,{storeInitialState: state,@@ -102,9 +102,9 @@ describe("route-guards", () => {const { history } = renderWithProviders(<><Route element={<IsNotAuthenticated />}>- <Route path="/auth/login" component={LoginPage} />+ <Route path="/auth/login" element={<LoginPage />} /></Route>- <Route path="/" component={Home} />+ <Route path="/" element={<Home />} /></>,{storeInitialState: state,@@ -138,7 +138,7 @@ describe("route-guards", () => {const { history } = renderWithProviders(<Route element={<IsNotAuthenticated />}>- <Route path="/auth/login" component={LoginPage} />+ <Route path="/auth/login" element={<LoginPage />} /></Route>,{storeInitialState: state,diff --git a/frontend/src/metabase/router/redirect.tsx b/frontend/src/metabase/router/redirect.tsxindex d6fc48a95d7..56c1301ba61 100644--- a/frontend/src/metabase/router/redirect.tsx+++ b/frontend/src/metabase/router/redirect.tsx@@ -1,4 +1,3 @@-import type { ComponentType } from "react";import { useState } from "react";import { Navigate } from "./Navigate";@@ -7,38 +6,40 @@ import { useRouter } from "./use-router";type RouteParams = Record<string, string | undefined>;-/**- * Reproduces react-router v3's `<Redirect>` as a v7-style redirecting component.- * Mounted as a route `component`, it interpolates `:params` and the `*` splat- * into `to`, resolves a relative `to` against the parent route (using v3's own- * matched-route resolution, so encoding and splats behave identically), and- * preserves the current query string and history state (dropping the hash, as v3- * did). It collapses to a bare `<Navigate>` once the engine swap supplies native- * relative resolution.- */-export function redirect(to: string): ComponentType {- return function RedirectRoute(): JSX.Element {- const { routes, params, location } = useRouter();+function RedirectRoute({ to }: { to: string }): JSX.Element {+ const { routes, params, location } = useRouter();++ // Resolve the target once, from the match this redirect was rendered into.+ // The router context is shared and updates as soon as the redirect fires, so+ // a later render (before this component unmounts) would resolve a relative+ // `to` against the already-changed, deeper location. v3's <Redirect> computed+ // its target once in `onEnter`, so freeze it here to match.+ const [target] = useState(() => ({+ pathname: resolveTarget(to, routes, params),+ search: location.search,+ state: location.state,+ }));- // Resolve the target once, from the match this redirect was rendered into.- // The router context is shared and updates as soon as the redirect fires, so- // a later render (before this component unmounts) would resolve a relative- // `to` against the already-changed, deeper location. v3's <Redirect> computed- // its target once in `onEnter`, so freeze it here to match.- const [target] = useState(() => ({- pathname: resolveTarget(to, routes, params),- search: location.search,- state: location.state,- }));+ return (+ <Navigate+ to={{ pathname: target.pathname, search: target.search }}+ state={target.state}+ replace+ />+ );+}- return (- <Navigate- to={{ pathname: target.pathname, search: target.search }}- state={target.state}- replace- />- );- };+/**+ * Reproduces react-router v3's `<Redirect>` as a v7-style redirecting route+ * element. Used as `<Route path="x" element={redirect("y")} />`, it interpolates+ * `:params` and the `*` splat into `to`, resolves a relative `to` against the+ * parent route (using v3's own matched-route resolution, so encoding and splats+ * behave identically), and preserves the current query string and history state+ * (dropping the hash, as v3 did). It collapses to a bare `<Navigate>` once the+ * engine swap supplies native relative resolution.+ */+export function redirect(to: string): JSX.Element {+ return <RedirectRoute to={to} />;}/**diff --git a/frontend/src/metabase/router/redirect.unit.spec.tsx b/frontend/src/metabase/router/redirect.unit.spec.tsxindex 1df7c8c79dc..ca65f3eeb20 100644--- a/frontend/src/metabase/router/redirect.unit.spec.tsx+++ b/frontend/src/metabase/router/redirect.unit.spec.tsx@@ -1,15 +1,18 @@-import type { PropsWithChildren } from "react";-import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { Outlet } from "./Outlet";import { redirect } from "./redirect";import { Route } from "./route";-const Parent = ({ children }: PropsWithChildren) => <div>{children}</div>;-const DataLayout = ({ children }: PropsWithChildren) => (+const Parent = () => (+ <div>+ <Outlet />+ </div>+);+const DataLayout = () => (<div><aside data-testid="perm-side">side</aside>- {children}+ <Outlet /></div>);const GroupPage = () => <div>group page</div>;@@ -26,12 +29,12 @@ describe("router/redirect", () => {it("resolves a chained two-level index redirect (permissions repro)", async () => {const history = mountRoutes(<Route path="/admin">- <Route path="permissions" component={Parent}>+ <Route path="permissions" element={<Parent />}><Route>- <Route index component={redirect("data")} />- <Route path="data" component={DataLayout}>- <Route index component={redirect("group")} />- <Route path="group" component={GroupPage} />+ <Route index element={redirect("data")} />+ <Route path="data" element={<DataLayout />}>+ <Route index element={redirect("group")} />+ <Route path="group" element={<GroupPage />} /></Route></Route></Route>@@ -50,7 +53,7 @@ describe("router/redirect", () => {it("redirects to an absolute target", async () => {const history = mountRoutes(- <Route path="start" component={redirect("/browse/models")} />,+ <Route path="start" element={redirect("/browse/models")} />,"/start",);@@ -61,8 +64,8 @@ describe("router/redirect", () => {it("resolves a relative target against the parent of the `from` match", async () => {const history = mountRoutes(- <Route path="collection" component={Parent}>- <Route path="archive" component={redirect("trash")} />+ <Route path="collection" element={<Parent />}>+ <Route path="archive" element={redirect("trash")} /></Route>,"/collection/archive",);@@ -74,11 +77,8 @@ describe("router/redirect", () => {it("interpolates params into a relative target", async () => {const history = mountRoutes(- <Route path="browse" component={Parent}>- <Route- path=":dbId-:slug"- component={redirect("databases/:dbId-:slug")}- />+ <Route path="browse" element={<Parent />}>+ <Route path=":dbId-:slug" element={redirect("databases/:dbId-:slug")} /></Route>,"/browse/5-orders",);@@ -94,8 +94,8 @@ describe("router/redirect", () => {const from = "table/:tableId/field/:fieldId/:section";const to = "table/:tableId/field/:fieldId";const history = mountRoutes(- <Route path="model" component={Parent}>- <Route path={from} component={redirect(to)} />+ <Route path="model" element={<Parent />}>+ <Route path={from} element={redirect(to)} /></Route>,"/model/table/9/field/3/settings",);@@ -111,8 +111,8 @@ describe("router/redirect", () => {const from = "database/:databaseId/schema/:schemaId/table/:tableId";const to = `${from}/details`;const history = mountRoutes(- <Route path="data-studio/data" component={Parent}>- <Route path={from} component={redirect(to)} />+ <Route path="data-studio/data" element={<Parent />}>+ <Route path={from} element={redirect(to)} /></Route>,// `1:PUBLIC` arrives encoded as `1%3APUBLIC`"/data-studio/data/database/1/schema/1%3APUBLIC/table/2",@@ -131,7 +131,7 @@ describe("router/redirect", () => {const history = mountRoutes(<Routepath="admin/transforms/*"- component={redirect("/data-studio/transforms/*")}+ element={redirect("/data-studio/transforms/*")}/>,"/admin/transforms/jobs/7",);@@ -145,8 +145,8 @@ describe("router/redirect", () => {it("redirects from an index route to a relative sibling of the parent", async () => {const history = mountRoutes(- <Route path="tools" component={Parent}>- <Route index component={redirect("list")} />+ <Route path="tools" element={<Parent />}>+ <Route index element={redirect("list")} /></Route>,"/tools",);@@ -158,7 +158,7 @@ describe("router/redirect", () => {it("preserves the query string and drops the hash, like v3", async () => {const history = mountRoutes(- <Route path="start" component={redirect("/dest")} />,+ <Route path="start" element={redirect("/dest")} />,"/start?foo=bar#frag",);diff --git a/frontend/src/metabase/router/route.tsx b/frontend/src/metabase/router/route.tsxindex 0e05fcb7de9..16bfff014b7 100644--- a/frontend/src/metabase/router/route.tsx+++ b/frontend/src/metabase/router/route.tsx@@ -20,7 +20,10 @@ import {* `component` or `element`. `element` is bridged to a v3 `component` that renders* it and exposes the matched child through `<Outlet/>`.*/-export type RouteElementProps = RouteProps & {+// `component` is intentionally omitted: routes must use `element={<X/>}`. The+// bridge still sets a `component` on the built v3 route config internally, and+// the raw v3 `Route` (ReactRouterRoute) remains for the facade's own bootstrap.+export type RouteElementProps = Omit<RouteProps, "component"> & {index?: boolean;element?: ReactNode;};@@ -72,7 +75,12 @@ export const Route: RouteConfigElement = Object.assign(// route config so the bridge component can render it off the injected// `route` prop, letting sibling routes that share a component reconcile// instead of remounting. Goes away at the engine swap.- if (route?.element != null) {+ //+ // The guard is `!== undefined`, not `!= null`, to match v7: an explicit+ // `element={null}` renders nothing (bridged to a component that renders+ // null), while an omitted `element` falls through to v3's render-children+ // default, which is v7's implicit `<Outlet/>`.+ if (route != null && route.element !== undefined) {route.component = routeElementToComponent(route.element);}diff --git a/frontend/src/metabase/router/route.unit.spec.tsx b/frontend/src/metabase/router/route.unit.spec.tsxindex 002969c9e3a..581845e7a26 100644--- a/frontend/src/metabase/router/route.unit.spec.tsx+++ b/frontend/src/metabase/router/route.unit.spec.tsx@@ -1,20 +1,37 @@-import { type PropsWithChildren, useEffect } from "react";+import { useEffect } from "react";import { act, renderWithProviders, screen } from "__support__/ui";import { checkNotNull } from "metabase/utils/types";-import { Outlet } from "./Outlet";+import { Outlet, useRoute } from "./Outlet";import { Route } from "./route";-const Parent = ({ children }: PropsWithChildren) => <div>{children}</div>;+const Parent = () => (+ <div>+ <Outlet />+ </div>+);const IndexPage = () => <div>index-page</div>;const ChildPage = () => <div>child-page</div>;+function ParentPage() {+ return (+ <div>+ <span>parent chrome</span>+ <Outlet />+ </div>+ );+}++function LeafPage() {+ return <span>leaf content</span>;+}+function setup(initialRoute: string) {return renderWithProviders(- <Route path="parent" component={Parent}>- <Route index component={IndexPage} />- <Route path="child" component={ChildPage} />+ <Route path="parent" element={<Parent />}>+ <Route index element={<IndexPage />} />+ <Route path="child" element={<ChildPage />} /></Route>,{ withRouter: true, initialRoute },);@@ -36,7 +53,7 @@ describe("router/Route", () => {});it("renders a plain (non-index) route like v3", async () => {- renderWithProviders(<Route path="solo" component={ChildPage} />, {+ renderWithProviders(<Route path="solo" element={<ChildPage />} />, {withRouter: true,initialRoute: "/solo",});@@ -45,55 +62,82 @@ describe("router/Route", () => {});});-const Wrapper = () => (- <div>- <span>wrapper chrome</span>- <Outlet />- </div>-);+describe("router/Route element", () => {+ function setupElement(initialRoute: string) {+ return renderWithProviders(+ <Route path="/" element={<ParentPage />}>+ <Route path="leaf" element={<LeafPage />} />+ </Route>,+ { withRouter: true, initialRoute },+ );+ }-const Inner = () => (- <div>- <span>inner chrome</span>- <Outlet />- </div>-);+ it("renders a route `element` on v3", () => {+ setupElement("/");+ expect(screen.getByText("parent chrome")).toBeInTheDocument();+ });-describe("router/Route element adapter", () => {- it("renders an `element` wrapper with the matched child exposed via <Outlet/>", async () => {- renderWithProviders(- <Route element={<Wrapper />}>- <Route path="/nested" component={ChildPage} />+ it("renders a nested `element` into the parent's <Outlet/>", () => {+ setupElement("/leaf");+ expect(screen.getByText("parent chrome")).toBeInTheDocument();+ expect(screen.getByText("leaf content")).toBeInTheDocument();+ });++ it("renders nothing in the <Outlet/> when no child matches", () => {+ setupElement("/");+ expect(screen.queryByText("leaf content")).not.toBeInTheDocument();+ });+});++function RoutePathProbe({ label }: { label: string }) {+ // The matched route is a v3 route config; read its `path` for the assertion.+ const route = useRoute() as { path?: string } | null;+ return (+ <div>+ <span>{`${label}:${route?.path ?? "none"}`}</span>+ <Outlet />+ </div>+ );+}++describe("router/useRoute", () => {+ function setupNested(initialRoute: string) {+ return renderWithProviders(+ <Route path="/" element={<RoutePathProbe label="parent" />}>+ <Route path="child" element={<RoutePathProbe label="child" />} /></Route>,- { withRouter: true, initialRoute: "/nested" },+ { withRouter: true, initialRoute },);+ }- expect(await screen.findByText("child-page")).toBeInTheDocument();- expect(screen.getByText("wrapper chrome")).toBeInTheDocument();+ it("exposes the matched route to an `element` route", () => {+ setupNested("/child");+ expect(screen.getByText("child:child")).toBeInTheDocument();});- it("composes nested `element` wrappers", async () => {+ it("gives each route its own route, not the deepest match", () => {+ setupNested("/child");+ // The parent still sees its own route even though a deeper child matched.+ expect(screen.getByText("parent:/")).toBeInTheDocument();+ });+});++describe("router/Route element={null}", () => {+ it("renders nothing for an explicit null, matching v7 (not v3's render-children)", async () => {renderWithProviders(- <Route element={<Wrapper />}>- <Route element={<Inner />}>- <Route path="/deep" component={ChildPage} />+ <Route path="/" element={<ParentPage />}>+ <Route path="empty" element={null}>+ <Route index element={<LeafPage />} /></Route></Route>,- { withRouter: true, initialRoute: "/deep" },+ { withRouter: true, initialRoute: "/empty" },);- expect(await screen.findByText("child-page")).toBeInTheDocument();- expect(screen.getByText("wrapper chrome")).toBeInTheDocument();- expect(screen.getByText("inner chrome")).toBeInTheDocument();- });-- it("still passes `component` routes straight through to v3", async () => {- renderWithProviders(<Route path="/plain" component={ChildPage} />, {- withRouter: true,- initialRoute: "/plain",- });-- expect(await screen.findByText("child-page")).toBeInTheDocument();+ // The `empty` route matches, so the parent chrome renders. But `element={null}`+ // renders nothing and provides no <Outlet/>, so its own index child stays+ // hidden. With v3's render-children default the child would show instead.+ expect(await screen.findByText("parent chrome")).toBeInTheDocument();+ expect(screen.queryByText("leaf content")).not.toBeInTheDocument();});});diff --git a/frontend/src/metabase/router/use-location.unit.spec.tsx b/frontend/src/metabase/router/use-location.unit.spec.tsxindex 4bbaf48b71e..0d7347bf68a 100644--- a/frontend/src/metabase/router/use-location.unit.spec.tsx+++ b/frontend/src/metabase/router/use-location.unit.spec.tsx@@ -18,7 +18,7 @@ function LocationProbe() {describe("router/useLocation", () => {it("exposes the current location in v7 shape", () => {- renderWithProviders(<Route path="foo/bar" component={LocationProbe} />, {+ renderWithProviders(<Route path="foo/bar" element={<LocationProbe />} />, {withRouter: true,initialRoute: "/foo/bar?x=1&y=2#section",});@@ -29,7 +29,7 @@ describe("router/useLocation", () => {});it("returns exactly the v7 Location fields, without v3's `query`", () => {- renderWithProviders(<Route path="foo/bar" component={LocationProbe} />, {+ renderWithProviders(<Route path="foo/bar" element={<LocationProbe />} />, {withRouter: true,initialRoute: "/foo/bar?x=1",});@@ -41,7 +41,7 @@ describe("router/useLocation", () => {});it("defaults state to null like v7 (not v3's undefined)", () => {- renderWithProviders(<Route path="foo/bar" component={LocationProbe} />, {+ renderWithProviders(<Route path="foo/bar" element={<LocationProbe />} />, {withRouter: true,initialRoute: "/foo/bar",});diff --git a/frontend/src/metabase/router/use-navigate.unit.spec.tsx b/frontend/src/metabase/router/use-navigate.unit.spec.tsxindex e580ee50cb1..c9b1b755a91 100644--- a/frontend/src/metabase/router/use-navigate.unit.spec.tsx+++ b/frontend/src/metabase/router/use-navigate.unit.spec.tsx@@ -42,7 +42,7 @@ function IdentityProbe() {}function setup(initialRoute = "/") {- return renderWithProviders(<Route path="*" component={NavigateProbe} />, {+ return renderWithProviders(<Route path="*" element={<NavigateProbe />} />, {withRouter: true,initialRoute,});@@ -103,7 +103,7 @@ describe("router/useNavigate", () => {// v3 rebuilds the matched `routes` on every transition, so anything derived// from them must not leak into `navigate`'s identity: a mounted <Navigate>// re-runs its effect on a new identity and would push its target forever.- renderWithProviders(<Route path="*" component={IdentityProbe} />, {+ renderWithProviders(<Route path="*" element={<IdentityProbe />} />, {withRouter: true,initialRoute: "/same",});diff --git a/frontend/src/metabase/router/use-params.unit.spec.tsx b/frontend/src/metabase/router/use-params.unit.spec.tsxindex 9591ef84189..4d3a70a4e1e 100644--- a/frontend/src/metabase/router/use-params.unit.spec.tsx+++ b/frontend/src/metabase/router/use-params.unit.spec.tsx@@ -28,7 +28,7 @@ describe("router/useParams", () => {renderWithProviders(<Routepath="reference/segments/:segmentId/fields/:fieldId"- component={ParamsProbe}+ element={<ParamsProbe />}/>,{withRouter: true,@@ -41,7 +41,7 @@ describe("router/useParams", () => {});it("exposes the splat under v7's `*` key, not v3's `splat`", () => {- renderWithProviders(<Route path="files/**" component={SplatProbe} />, {+ renderWithProviders(<Route path="files/**" element={<SplatProbe />} />, {withRouter: true,initialRoute: "/files/a/b",});diff --git a/frontend/src/metabase/router/use-search-params.unit.spec.tsx b/frontend/src/metabase/router/use-search-params.unit.spec.tsxindex 194126a3fc7..0ce857b294d 100644--- a/frontend/src/metabase/router/use-search-params.unit.spec.tsx+++ b/frontend/src/metabase/router/use-search-params.unit.spec.tsx@@ -36,7 +36,7 @@ function SearchParamsProbe() {function setup(initialRoute: string) {return renderWithProviders(- <Route path="foo" component={SearchParamsProbe} />,+ <Route path="foo" element={<SearchParamsProbe />} />,{withRouter: true,initialRoute,@@ -121,7 +121,7 @@ describe("router/useSearchParams", () => {</button>);};- renderWithProviders(<Route path="foo" component={MutatingProbe} />, {+ renderWithProviders(<Route path="foo" element={<MutatingProbe />} />, {withRouter: true,initialRoute: "/foo?x=1",});@@ -146,7 +146,7 @@ function DefaultProbe() {}function setupDefault(initialRoute: string) {- return renderWithProviders(<Route path="foo" component={DefaultProbe} />, {+ return renderWithProviders(<Route path="foo" element={<DefaultProbe />} />, {withRouter: true,initialRoute,});diff --git a/frontend/src/metabase/router/with-route-props.tsx b/frontend/src/metabase/router/with-route-props.tsxindex 2ebe03b7430..c22a21df175 100644--- a/frontend/src/metabase/router/with-route-props.tsx+++ b/frontend/src/metabase/router/with-route-props.tsx@@ -1,33 +1,48 @@+import type { Location } from "history";import type { ComponentType } from "react";-import type { Location, Params } from "./types";-import { useLocation } from "./use-location";-import { useParams } from "./use-params";+import { useRoute } from "./Outlet";+import type { InjectedRouter, PlainRoute } from "./react-router";+import type { Route } from "./route";+import type { Params } from "./types";+import { useRouter } from "./use-router";/**- * The router props injected by the facade hooks into a wrapped component.+ * The v3 router props a wrapped component may read. `params`/`location` are+ * always injected; the rest are optional so a component that reads only a subset+ * still satisfies the constraint.*/export interface InjectedRouteProps {params: Params;location: Location;+ route?: Route;+ router?: InjectedRouter;+ routes?: PlainRoute[];}/*** Temporary shim for the react-router v7 migration. Wraps a legacy component- * that still reads `params` and `location` from props, feeding them in from the- * facade hooks so the router no longer needs to inject them directly. This lets- * the engine swap happen without touching the wrapped components. Removed in- * Phase 4 once they read the hooks themselves.+ * that still reads the v3-injected router props (`params`, `location`, `route`,+ * `router`, `routes`) and feeds them in from the router context, so the+ * component runs as an `element` route without being rewritten. Removed in+ * Phase 4 once these components read the hooks themselves.*/-export function withRouteProps<Props extends InjectedRouteProps>(+export function withRouteProps<Props extends object>(WrappedComponent: ComponentType<Props>,): ComponentType<Omit<Props, keyof InjectedRouteProps>> {function WithRouteProps(props: Omit<Props, keyof InjectedRouteProps>) {- const params = useParams();- const location = useLocation();+ const { router, location, params, routes } = useRouter();+ const route = useRoute();// TS cannot see that re-adding the omitted route props reconstructs `Props`.- const injectedProps = { ...props, params, location } as Props;+ const injectedProps = {+ ...props,+ router,+ location,+ params,+ routes,+ route,+ } as unknown as Props;return <WrappedComponent {...injectedProps} />;}diff --git a/frontend/src/metabase/router/with-route-props.unit.spec.tsx b/frontend/src/metabase/router/with-route-props.unit.spec.tsxindex 7436301c22f..a57606e34aa 100644--- a/frontend/src/metabase/router/with-route-props.unit.spec.tsx+++ b/frontend/src/metabase/router/with-route-props.unit.spec.tsx@@ -25,7 +25,7 @@ describe("router/withRouteProps", () => {renderWithProviders(<Routepath="reference/segments/:segmentId"- component={WrappedComponent}+ element={<WrappedComponent />}/>,{withRouter: true,diff --git a/frontend/src/metabase/routes-embed.tsx b/frontend/src/metabase/routes-embed.tsxindex 50ccd5b2746..7c70edcb614 100644--- a/frontend/src/metabase/routes-embed.tsx+++ b/frontend/src/metabase/routes-embed.tsx@@ -1,20 +1,28 @@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 { Route, withRouteProps } from "metabase/router";import { PublicOrEmbeddedDashboardPage } from "./public/containers/PublicOrEmbeddedDashboard";+const RoutedPublicOrEmbeddedQuestion = withRouteProps(PublicOrEmbeddedQuestion);+const RoutedPublicOrEmbeddedDashboardPage = withRouteProps(+ PublicOrEmbeddedDashboardPage,+);+export const getRoutes = () => (<Route>- <Route path="embed" component={PublicApp}>- <Route path="question/:token" component={PublicOrEmbeddedQuestion} />+ <Route path="embed" element={<PublicApp />}>+ <Route+ path="question/:token"+ element={<RoutedPublicOrEmbeddedQuestion />}+ /><Routepath="dashboard/:token"- component={PublicOrEmbeddedDashboardPage}+ element={<RoutedPublicOrEmbeddedDashboardPage />}/>- <Route path="*" component={PublicNotFound} />+ <Route path="*" element={<PublicNotFound />} /></Route>- <Route path="*" component={PublicNotFound} />+ <Route path="*" element={<PublicNotFound />} /></Route>);diff --git a/frontend/src/metabase/routes-public.tsx b/frontend/src/metabase/routes-public.tsxindex 7fbcf50e990..1fb4d5b8a3c 100644--- a/frontend/src/metabase/routes-public.tsx+++ b/frontend/src/metabase/routes-public.tsx@@ -4,22 +4,32 @@ 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";+import { Route, withRouteProps } from "metabase/router";++const RoutedPublicAction = withRouteProps(PublicAction);+const RoutedPublicOrEmbeddedQuestion = withRouteProps(PublicOrEmbeddedQuestion);+const RoutedPublicOrEmbeddedDashboardPage = withRouteProps(+ PublicOrEmbeddedDashboardPage,+);+const RoutedPublicDocument = withRouteProps(PublicDocument);export const getRoutes = () => {return (<Route>- <Route path="public" component={PublicApp}>- <Route path="action/:uuid" component={PublicAction} />- <Route path="question/:uuid" component={PublicOrEmbeddedQuestion} />+ <Route path="public" element={<PublicApp />}>+ <Route path="action/:uuid" element={<RoutedPublicAction />} />+ <Route+ path="question/:uuid"+ element={<RoutedPublicOrEmbeddedQuestion />}+ /><Routepath="dashboard/:uuid(/:tabSlug)"- component={PublicOrEmbeddedDashboardPage}+ element={<RoutedPublicOrEmbeddedDashboardPage />}/>- <Route path="document/:uuid" component={PublicDocument} />- <Route path="*" component={PublicNotFound} />+ <Route path="document/:uuid" element={<RoutedPublicDocument />} />+ <Route path="*" element={<PublicNotFound />} /></Route>- <Route path="*" component={PublicNotFound} />+ <Route path="*" element={<PublicNotFound />} /></Route>);};diff --git a/frontend/src/metabase/routes-stable-id-aware.tsx b/frontend/src/metabase/routes-stable-id-aware.tsxindex f617d926466..99fd0b81c62 100644--- a/frontend/src/metabase/routes-stable-id-aware.tsx+++ b/frontend/src/metabase/routes-stable-id-aware.tsx@@ -143,9 +143,7 @@ function handleResults({export function createEntityIdRedirect(config: {parametersToTranslate: ParamConfig[];}) {- const Component = () => (+ return (<EntityIdRedirect parametersToTranslate={config.parametersToTranslate} />);-- return Component;}diff --git a/frontend/src/metabase/routes.tsx b/frontend/src/metabase/routes.tsxindex 1c7081f5034..17ab88443b7 100644--- a/frontend/src/metabase/routes.tsx+++ b/frontend/src/metabase/routes.tsx@@ -66,7 +66,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 { Route, redirect } from "metabase/router";+import { Route, redirect, withRouteProps } from "metabase/router";import {CanAccessDataModel,CanAccessDataStudio,@@ -88,37 +88,57 @@ type AppStore = Store<State> & {dispatch: ThunkDispatch<State, void, UnknownAction>;};+// Legacy containers that still read v3 router props (`params`/`location`/+// `route`/`router`/`routes`), fed from the router context so they run as+// `element` routes. Removed with the shim.+const RoutedApp = withRouteProps(App);+const RoutedLogin = withRouteProps(Login);+const RoutedResetPassword = withRouteProps(ResetPassword);+const RoutedSearchApp = withRouteProps(SearchApp);+const RoutedCollectionLanding = withRouteProps(CollectionLanding);+const RoutedQueryBuilder = withRouteProps(QueryBuilder);+const RoutedMetabotQueryBuilder = withRouteProps(MetabotQueryBuilder);+const RoutedNewModelOptions = withRouteProps(NewModelOptions);+const RoutedBrowseSchemas = withRouteProps(BrowseSchemas);+const RoutedBrowseTables = withRouteProps(BrowseTables);+const RoutedMetricsViewerPage = withRouteProps(MetricsViewerPage);+const RoutedTableDetailPage = withRouteProps(TableDetailPage);+const RoutedUnsubscribePage = withRouteProps(UnsubscribePage);+export const getRoutes = (store: AppStore) => {return (- <Route component={App}>+ <Route element={<RoutedApp />}>{/* SETUP */}- <Route component={RedirectIfSetup}>+ <Route element={<RedirectIfSetup />}><Routepath="/setup"- component={Setup}+ element={<Setup />}props={{ disableCommandPalette: true }}/></Route>{/* For compatibility: use the standard setup for embedding */}- <Route path="/setup/embedding" component={redirect("/setup")} />+ <Route path="/setup/embedding" element={redirect("/setup")} />{/* APP */}- <Route component={LoadCurrentUser}>+ <Route element={<LoadCurrentUser />}>{/* AUTH */}<Route path="/auth">- <Route index component={redirect("/auth/login")} />+ <Route index element={redirect("/auth/login")} /><Route element={<IsNotAuthenticated />}>- <Route path="login" component={Login} />- <Route path="login/:provider" component={Login} />+ <Route path="login" element={<RoutedLogin />} />+ <Route path="login/:provider" element={<RoutedLogin />} /></Route>- <Route path="logout" component={Logout} />- <Route path="forgot_password" component={ForgotPassword} />- <Route path="reset_password/:token" component={ResetPassword} />+ <Route path="logout" element={<Logout />} />+ <Route path="forgot_password" element={<ForgotPassword />} />+ <Route+ path="reset_password/:token"+ element={<RoutedResetPassword />}+ />{/* FE routes can sometimes be prioritized over BEreloading will correctly pick the SSO flow back up from the BE */}- <Route path="sso" component={SsoReload} />- <Route path="sso/:provider" component={SsoReload} />+ <Route path="sso" element={<SsoReload />} />+ <Route path="sso/:provider" element={<SsoReload />} /></Route>{/* MAIN */}@@ -128,18 +148,18 @@ export const getRoutes = (store: AppStore) => {{PLUGIN_DATA_APPS.isEnabled && PLUGIN_DATA_APPS.getRoutes()}{/* The global all hands routes, things in here are for all the folks */}- <Route path="/" component={LandingPageRedirect} />+ <Route path="/" element={<LandingPageRedirect />} /><Route path="getting-started" element={<CanAccessOnboarding />}>- <Route index component={Onboarding} />+ <Route index element={<Onboarding />} /></Route>- <Route path="search" component={SearchApp} />+ <Route path="search" element={<RoutedSearchApp />} />{/* Send historical /archive route to trash - can remove in v52 */}- <Route path="archive" component={redirect("trash")} />- <Route path="trash" component={TrashCollectionLanding} />+ <Route path="archive" element={redirect("trash")} />+ <Route path="trash" element={<TrashCollectionLanding />} />- <Route path="document/:entityId" component={DocumentPageOuter}>+ <Route path="document/:entityId" element={<DocumentPageOuter />}>{modalRoute("comments/:childTargetId", CommentsSidesheet, {noWrap: true,})}@@ -147,7 +167,7 @@ export const getRoutes = (store: AppStore) => {<Routepath="collection/entity/:entity_id(**)"- component={createEntityIdRedirect({+ element={createEntityIdRedirect({parametersToTranslate: [{name: "entity_id",@@ -159,25 +179,25 @@ export const getRoutes = (store: AppStore) => {/><Route path="collection/users" element={<IsAdmin />}>- <Route index component={UserCollectionList} />+ <Route index element={<UserCollectionList />} /></Route><Routepath="collection/tenant-specific"- component={PLUGIN_TENANTS.CanAccessTenantSpecificRoute}+ element={<PLUGIN_TENANTS.CanAccessTenantSpecificRoute />}>- <Route index component={PLUGIN_TENANTS.TenantCollectionList} />+ <Route index element={<PLUGIN_TENANTS.TenantCollectionList />} /></Route><Route path="collection/tenant-users" element={<IsAdmin />}>- <Route index component={PLUGIN_TENANTS.TenantUsersList} />+ <Route index element={<PLUGIN_TENANTS.TenantUsersList />} /><Routepath=":tenantId"- component={PLUGIN_TENANTS.TenantUsersPersonalCollectionList}+ element={<PLUGIN_TENANTS.TenantUsersPersonalCollectionList />}/></Route>- <Route path="collection/:slug" component={CollectionLanding}>+ <Route path="collection/:slug" element={<RoutedCollectionLanding />}>{modalRoute("move", MoveCollectionModal, { noWrap: true })}{modalRoute("archive", ArchiveCollectionModal, { noWrap: true })}{modalRoute("permissions", CollectionPermissionsModal)}@@ -191,7 +211,7 @@ export const getRoutes = (store: AppStore) => {<Routepath="dashboard/entity/:entity_id(**)"- component={createEntityIdRedirect({+ element={createEntityIdRedirect({parametersToTranslate: [{name: "entity_id",@@ -207,7 +227,7 @@ export const getRoutes = (store: AppStore) => {})}/>- <Route path="dashboard/:slug" component={DashboardApp}>+ <Route path="dashboard/:slug" element={<DashboardApp />}>{modalRoute("move", DashboardMoveModalConnected, { noWrap: true })}{modalRoute("copy", DashboardCopyModalConnected, { noWrap: true })}{modalRoute("archive", ArchiveDashboardModalConnected, {@@ -218,7 +238,7 @@ export const getRoutes = (store: AppStore) => {<Route path="/question"><Routepath="/question/entity/:entity_id(**)"- component={createEntityIdRedirect({+ element={createEntityIdRedirect({parametersToTranslate: [{name: "entity_id",@@ -228,43 +248,43 @@ export const getRoutes = (store: AppStore) => {],})}/>- <Route index component={QueryBuilder} />- <Route path="notebook" component={QueryBuilder} />- <Route path="ask" component={MetabotQueryBuilder} />- <Route path=":slug" component={QueryBuilder} />- <Route path=":slug/notebook" component={QueryBuilder} />- <Route path=":slug/metabot" component={QueryBuilder} />- <Route path=":slug/:objectId" component={QueryBuilder} />+ <Route index element={<RoutedQueryBuilder />} />+ <Route path="notebook" element={<RoutedQueryBuilder />} />+ <Route path="ask" element={<RoutedMetabotQueryBuilder />} />+ <Route path=":slug" element={<RoutedQueryBuilder />} />+ <Route path=":slug/notebook" element={<RoutedQueryBuilder />} />+ <Route path=":slug/metabot" element={<RoutedQueryBuilder />} />+ <Route path=":slug/:objectId" element={<RoutedQueryBuilder />} /></Route>{/* MODELS */}{getModelRoutes()}<Route path="/model">- <Route index component={QueryBuilder} />- <Route path="new" component={NewModelOptions} />- <Route path=":slug" component={QueryBuilder} />- <Route path=":slug/notebook" component={QueryBuilder} />- <Route path=":slug/query" component={QueryBuilder} />- <Route path=":slug/columns" component={QueryBuilder} />- <Route path=":slug/metadata" component={QueryBuilder} />- <Route path=":slug/metabot" component={QueryBuilder} />- <Route path=":slug/:objectId" component={QueryBuilder} />- <Route path="query" component={QueryBuilder} />- <Route path="metabot" component={QueryBuilder} />+ <Route index element={<RoutedQueryBuilder />} />+ <Route path="new" element={<RoutedNewModelOptions />} />+ <Route path=":slug" element={<RoutedQueryBuilder />} />+ <Route path=":slug/notebook" element={<RoutedQueryBuilder />} />+ <Route path=":slug/query" element={<RoutedQueryBuilder />} />+ <Route path=":slug/columns" element={<RoutedQueryBuilder />} />+ <Route path=":slug/metadata" element={<RoutedQueryBuilder />} />+ <Route path=":slug/metabot" element={<RoutedQueryBuilder />} />+ <Route path=":slug/:objectId" element={<RoutedQueryBuilder />} />+ <Route path="query" element={<RoutedQueryBuilder />} />+ <Route path="metabot" element={<RoutedQueryBuilder />} /></Route>{getMetricRoutes()}<Route path="browse">- <Route index component={redirect("/browse/models")} />- <Route path="metrics" component={BrowseMetrics} />- <Route path="models" component={BrowseModels} />- <Route path="databases" component={BrowseDatabases} />- <Route path="databases/:slug" component={BrowseSchemas} />+ <Route index element={redirect("/browse/models")} />+ <Route path="metrics" element={<BrowseMetrics />} />+ <Route path="models" element={<BrowseModels />} />+ <Route path="databases" element={<BrowseDatabases />} />+ <Route path="databases/:slug" element={<RoutedBrowseSchemas />} /><Routepath="databases/:dbId/schema/:schemaName"- component={BrowseTables}+ element={<RoutedBrowseTables />}/>{PLUGIN_TABLE_EDITING.getRoutes()}@@ -272,75 +292,78 @@ export const getRoutes = (store: AppStore) => {{/* These two Redirects support legacy paths in v48 and earlier */}<Routepath=":dbId-:slug"- component={redirect("databases/:dbId-:slug")}+ element={redirect("databases/:dbId-:slug")}/><Routepath=":dbId/schema/:schemaName"- component={redirect("databases/:dbId/schema/:schemaName")}+ element={redirect("databases/:dbId/schema/:schemaName")}/></Route>- <Route path="explore" component={MetricsViewerPage} />+ <Route path="explore" element={<RoutedMetricsViewerPage />} /><Route path="table">- <Route path=":slug" component={QueryBuilder} />- <Route path=":tableId/detail/:rowId" component={TableDetailPage} />+ <Route path=":slug" element={<RoutedQueryBuilder />} />+ <Route+ path=":tableId/detail/:rowId"+ element={<RoutedTableDetailPage />}+ /></Route>{/* INDIVIDUAL DASHBOARDS */}- <Route path="/auto/dashboard/*" component={AutomaticDashboardApp} />+ <Route path="/auto/dashboard/*" element={<AutomaticDashboardApp />} />{/* REFERENCE */}<Route path="/reference">- <Route index component={redirect("/reference/databases")} />- <Route path="segments" component={SegmentListContainer} />+ <Route index element={redirect("/reference/databases")} />+ <Route path="segments" element={<SegmentListContainer />} /><Routepath="segments/:segmentId"- component={SegmentDetailContainer}+ element={<SegmentDetailContainer />}/><Routepath="segments/:segmentId/fields"- component={SegmentFieldListContainer}+ element={<SegmentFieldListContainer />}/><Routepath="segments/:segmentId/fields/:fieldId"- component={SegmentFieldDetailContainer}+ element={<SegmentFieldDetailContainer />}/><Routepath="segments/:segmentId/questions"- component={SegmentQuestionsContainer}+ element={<SegmentQuestionsContainer />}/><Routepath="segments/:segmentId/revisions"- component={SegmentRevisionsContainer}+ element={<SegmentRevisionsContainer />}/>- <Route path="databases" component={DatabaseListContainer} />+ <Route path="databases" element={<DatabaseListContainer />} /><Routepath="databases/:databaseId"- component={DatabaseDetailContainer}+ element={<DatabaseDetailContainer />}/><Routepath="databases/:databaseId/tables"- component={TableListContainer}+ element={<TableListContainer />}/><Routepath="databases/:databaseId/tables/:tableId"- component={TableDetailContainer}+ element={<TableDetailContainer />}/><Routepath="databases/:databaseId/tables/:tableId/fields"- component={FieldListContainer}+ element={<FieldListContainer />}/><Routepath="databases/:databaseId/tables/:tableId/fields/:fieldId"- component={FieldDetailContainer}+ element={<FieldDetailContainer />}/><Routepath="databases/:databaseId/tables/:tableId/questions"- component={TableQuestionsContainer}+ element={<TableQuestionsContainer />}/>- <Route path="glossary" component={GlossaryContainer} />+ <Route path="glossary" element={<GlossaryContainer />} /></Route>{/* ACCOUNT */}@@ -360,31 +383,31 @@ export const getRoutes = (store: AppStore) => {{/* DEPRECATED */}{/* NOTE: these custom routes are needed because <Redirect> doesn't preserve the hash */}- <Route path="/q" component={QuestionHashRedirect} />- <Route path="/card/:slug" component={QuestionHashRedirect} />+ <Route path="/q" element={<QuestionHashRedirect />} />+ <Route path="/card/:slug" element={<QuestionHashRedirect />} /><Routepath="/dash/:dashboardId"- component={redirect("/dashboard/:dashboardId")}+ element={redirect("/dashboard/:dashboardId")}/><Routepath="/collections/permissions"- component={redirect("/admin/permissions/collections")}+ element={redirect("/admin/permissions/collections")}/>{/* Transforms moved from /admin to /data-studio */}<Routepath="/admin/transforms"- component={redirect("/data-studio/transforms")}+ element={redirect("/data-studio/transforms")}/><Routepath="/admin/transforms/*"- component={redirect("/data-studio/transforms/*")}+ element={redirect("/data-studio/transforms/*")}/>{/* MISC */}- <Route path="/unsubscribe" component={UnsubscribePage} />- <Route path="/unauthorized" component={Unauthorized} />- <Route path="/*" component={NotFoundFallbackPage} />+ <Route path="/unsubscribe" element={<RoutedUnsubscribePage />} />+ <Route path="/unauthorized" element={<Unauthorized />} />+ <Route path="/*" element={<NotFoundFallbackPage />} /></Route>);};diff --git a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsxindex a5d0dbaef65..6835a94f479 100644--- a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx+++ b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx@@ -14,7 +14,7 @@ import {within,} from "__support__/ui";import type { SearchFilters } from "metabase/common/search/types";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { SearchApp } from "metabase/search/containers/SearchApp";import { checkNotNull } from "metabase/utils/types";import type { EnabledSearchModel, SearchResult } from "metabase-types/api";@@ -31,6 +31,8 @@ jest.mock("metabase/search/containers/constants", () => ({PAGE_SIZE: 4,}));+const RoutedSearchApp = withRouteProps(SearchApp);+const TYPE_FILTER_LABELS: Record<EnabledSearchModel, string> = {collection: "Collection",dashboard: "Dashboard",@@ -96,7 +98,7 @@ const setup = async ({const initialRoute = searchParams ? `/search?${searchParams}` : `/search`;const { history } = renderWithProviders(- <Route path="search" component={SearchApp} />,+ <Route path="search" element={<RoutedSearchApp />} />,{withRouter: true,initialRoute,diff --git a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsx b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsxindex 51c48c8694e..261e7d2e9fc 100644--- a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsx+++ b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsx@@ -2,7 +2,7 @@ import type { ReactNode } from "react";import { useState } from "react";import { useSelector } from "metabase/redux";-import { Navigate } from "metabase/router";+import { Navigate, Outlet } from "metabase/router";import { getSetting } from "metabase/selectors/settings";/**@@ -12,7 +12,11 @@ import { getSetting } from "metabase/selectors/settings";* `/api/setup` and reloads settings, flipping `has-user-setup` to true midway* through the flow. Reading it live would redirect the user out of setup.*/-export function RedirectIfSetup({ children }: { children: ReactNode }) {+export function RedirectIfSetup({+ children = <Outlet />,+}: {+ children?: ReactNode;+}) {const hasUserSetup = useSelector((state) =>getSetting(state, "has-user-setup"),);diff --git a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsxindex a5d7f159cbe..4aa3ac728f3 100644--- a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx@@ -19,10 +19,10 @@ describe("RedirectIfSetup", () => {const setup = (hasUserSetup: boolean) =>renderWithProviders(<>- <Route component={RedirectIfSetup}>- <Route path="setup" component={() => <div>setup page</div>} />+ <Route element={<RedirectIfSetup />}>+ <Route path="setup" element={<div>setup page</div>} /></Route>- <Route path="/" component={() => <div>home page</div>} />+ <Route path="/" element={<div>home page</div>} /></>,{storeInitialState: createMockState({diff --git a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsx b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsxindex ebaf506d0c2..2f1dc27c418 100644--- a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.unit.spec.tsx@@ -17,14 +17,14 @@ function setup({renderWithProviders(<Routepath="/"- component={() => (+ element={<JobEditorjob={job}onNameChange={jest.fn()}onScheduleChange={jest.fn()}onTagListChange={jest.fn()}/>- )}+ }/>,{ withRouter: true, initialRoute: "/" },);diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsxindex 7c826532f3d..f57e91c7356 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx@@ -28,13 +28,13 @@ function setup({ hasMenu = true, isEditMode = false }: SetupOpts = {}) {renderWithProviders(<Route- component={() => (+ element={<TransformHeadertransform={transform}hasMenu={hasMenu}isEditMode={isEditMode}/>- )}+ }path="/"/>,{diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsxindex bbc71ae1a1e..2c132c7a135 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx@@ -33,11 +33,14 @@ const setup = ({ isAdmin = true, tokenFeatures = {} }: SetupOpts = {}) => {});const path = "/transforms";- renderWithProviders(<Route path={path} component={EnableTransformsPage} />, {- storeInitialState: state,- withRouter: true,- initialRoute: path,- });+ renderWithProviders(+ <Route path={path} element={<EnableTransformsPage />} />,+ {+ storeInitialState: state,+ withRouter: true,+ initialRoute: path,+ },+ );};const ADMINS_ONLY_COPY = "Only Admins can create and run transforms";diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsxindex 3cb7855f80a..6e5f0c3e131 100644--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx@@ -86,7 +86,7 @@ async function setup({const path = Urls.transformJobList();const { history } = renderWithProviders(- <Route path={path} component={JobListPage} />,+ <Route path={path} element={<JobListPage />} />,{withRouter: true,initialRoute: path,diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsxindex f8e34c09415..730e8c413ad 100644--- a/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx@@ -8,7 +8,7 @@ import {setupListTransformTagsEndpoint,} from "__support__/server-mocks/transform";import { act, renderWithProviders, screen, within } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import type { TransformJob } from "metabase-types/api";import {@@ -18,6 +18,8 @@ import {import { JobPage } from "./JobPage";+const RoutedJobPage = withRouteProps(JobPage);+const TRANSFORMS_DELAY = 1000;type SetupOpts = {@@ -39,7 +41,10 @@ const setup = ({const path = Urls.transformJob(job.id);renderWithProviders(- <Route path="/data-studio/transforms/jobs/:jobId" component={JobPage} />,+ <Route+ path="/data-studio/transforms/jobs/:jobId"+ element={<RoutedJobPage />}+ />,{ withRouter: true, initialRoute: path },);};diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsxindex 8d65ed21240..47f723b0789 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx@@ -17,7 +17,7 @@ import {waitFor,within,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { POLLING_INTERVAL } from "metabase/transforms/constants";import type {TransformJobRun,@@ -33,6 +33,8 @@ import {import { JobRunListPage } from "./JobRunListPage";+const RoutedJobRunListPage = withRouteProps(JobRunListPage);+const JOB_ID = 3;type SetupOpts = {@@ -66,10 +68,13 @@ function setup({const path = "/data-studio/transforms/jobs/:jobId/runs";- renderWithProviders(<Route path={path} component={JobRunListPage} />, {- withRouter: true,- initialRoute,- });+ renderWithProviders(+ <Route path={path} element={<RoutedJobRunListPage />} />,+ {+ withRouter: true,+ initialRoute,+ },+ );return {setRuns(nextRuns: TransformJobRun[]) {diff --git a/frontend/src/metabase/transforms/pages/JobSectionLayout/JobSectionLayout.tsx b/frontend/src/metabase/transforms/pages/JobSectionLayout/JobSectionLayout.tsxindex 7cdebf338ff..fe733626338 100644--- a/frontend/src/metabase/transforms/pages/JobSectionLayout/JobSectionLayout.tsx+++ b/frontend/src/metabase/transforms/pages/JobSectionLayout/JobSectionLayout.tsx@@ -1,18 +1,14 @@-import type { ReactNode } from "react";import { t } from "ttag";import { usePageTitle } from "metabase/hooks/use-page-title";+import { Outlet } from "metabase/router";import { Flex } from "metabase/ui";-interface TransformTopNavLayoutProps {- children: ReactNode;-}--export const JobSectionLayout = ({ children }: TransformTopNavLayoutProps) => {+export const JobSectionLayout = () => {usePageTitle(t`Jobs`, { titleIndex: 0 });return (<Flex direction="column" w="100%" h="100%">- {children}+ <Outlet /></Flex>);};diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsxindex 3f2dcaf0250..8ccd1823269 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx@@ -12,7 +12,7 @@ import {screen,within,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import type { TransformRun } from "metabase-types/api";import {@@ -23,6 +23,8 @@ import {import { RunListPage } from "./RunListPage";+const RoutedRunListPage = withRouteProps(RunListPage);+type SetupOpts = {runs?: TransformRun[];};@@ -41,7 +43,7 @@ function setup({ runs = [] }: SetupOpts = {}) {const path = Urls.transformRunList();- renderWithProviders(<Route path={path} component={RunListPage} />, {+ renderWithProviders(<Route path={path} element={<RoutedRunListPage />} />, {withRouter: true,initialRoute: path,});diff --git a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsxindex 0f56bab9a7e..2f3bf33097d 100644--- a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx@@ -1,9 +1,8 @@-import type { ReactNode } from "react";-import { skipToken, useGetTransformQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { Outlet } from "metabase/router";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Card, Center } from "metabase/ui";import * as Urls from "metabase/urls";@@ -17,12 +16,10 @@ export type TransformDependenciesPageParams = {type TransformDependenciesPageProps = {params?: TransformDependenciesPageParams;- children?: ReactNode;};export function TransformDependenciesPage({params,- children,}: TransformDependenciesPageProps) {const id = Urls.extractEntityId(params?.transformId);const {@@ -54,7 +51,7 @@ export function TransformDependenciesPage({}}><Card flex={1} p={0} withBorder>- {children}+ <Outlet /></Card></PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider></PageContainer>diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsxindex b8dc97f9dcc..0f47960316c 100644--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx@@ -12,7 +12,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import * as Urls from "metabase/urls";import type {TableIndexEntry,@@ -30,6 +30,8 @@ import {import { TransformIndexesPage } from "./TransformIndexesPage";+const RoutedTransformIndexesPage = withRouteProps(TransformIndexesPage);+type SetupOpts = {transform?: Transform;indexes?: TableIndexEntry[];@@ -57,10 +59,13 @@ function setup({const initialRoute = Urls.transformIndexes(transform.id);const path = initialRoute.replace(`/${transform.id}/`, "/:transformId/");- renderWithProviders(<Route path={path} component={TransformIndexesPage} />, {- withRouter: true,- initialRoute,- });+ renderWithProviders(+ <Route path={path} element={<RoutedTransformIndexesPage />} />,+ {+ withRouter: true,+ initialRoute,+ },+ );return { transform };}diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsxindex 76ee52b21a2..d8765b88862 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx@@ -1,12 +1,5 @@import type { Row } from "@tanstack/react-table";-import {- type PropsWithChildren,- useCallback,- useEffect,- useMemo,- useRef,- useState,-} from "react";+import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { t } from "ttag";import {@@ -26,7 +19,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 { Outlet, 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";@@ -101,12 +94,9 @@ const globalFilterFn = ();};-type TransformListPageProps = WithRouterProps & PropsWithChildren;+type TransformListPageProps = WithRouterProps;-export const TransformListPage = ({- children,- location,-}: TransformListPageProps) => {+export const TransformListPage = ({ location }: TransformListPageProps) => {const { transformsDatabases = [], isLoadingDatabases } =useTransformPermissions();const targetCollectionId =@@ -369,7 +359,7 @@ export const TransformListPage = ({)}</Card></Stack>- {children}+ <Outlet /></PageContainer>);};diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsxindex 97ef8e1bc4e..a8802194a4d 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx@@ -13,12 +13,14 @@ import {waitForLoaderToBeRemoved,} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type { TokenFeatures } from "metabase-types/api";import { createMockTokenFeatures } from "metabase-types/api/mocks";import { TransformListPage } from "./TransformListPage";+const RoutedTransformListPage = withRouteProps(TransformListPage);+type MockInstance = {table: {getRowModel: () => { rows: Array<{ original: { name: string } }> };@@ -66,11 +68,14 @@ async function setup({ tokenFeatures = {} }: SetupOpts = {}) {});const path = "/transforms";- renderWithProviders(<Route path={path} component={TransformListPage} />, {- storeInitialState: state,- withRouter: true,- initialRoute: path,- });+ renderWithProviders(+ <Route path={path} element={<RoutedTransformListPage />} />,+ {+ storeInitialState: state,+ withRouter: true,+ initialRoute: path,+ },+ );await waitForLoaderToBeRemoved();}diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsxindex dfd08ecf51f..70253f50056 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.unit.spec.tsx@@ -70,7 +70,7 @@ function setup({const { unmount } = renderWithProviders(<Route- component={() => (+ element={<TransformPaneHeaderActionshandleCancel={handleCancel}handleSave={handleSave}@@ -80,7 +80,7 @@ function setup({source={resolvedSource}transform={transform}/>- )}+ }path="/"/>,{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 a03d6981bb7..9c643ece8ce 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@@ -89,7 +89,7 @@ function setup({renderWithProviders(<Routepath={Urls.transform(transform.id)}- component={() => <TransformSettingsSection transform={transform} />}+ element={<TransformSettingsSection transform={transform} />}/>,{withRouter: true,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 397797e2348..8792ee7dc09 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@@ -88,7 +88,7 @@ function setup({renderWithProviders(<Routepath={Urls.transform(transform.id)}- component={() => <TransformSettingsSection transform={transform} />}+ element={<TransformSettingsSection transform={transform} />}/>,{withRouter: true,diff --git a/frontend/src/metabase/transforms/routes.tsx b/frontend/src/metabase/transforms/routes.tsxindex cbdac159347..bbef73f2d40 100644--- a/frontend/src/metabase/transforms/routes.tsx+++ b/frontend/src/metabase/transforms/routes.tsx@@ -3,7 +3,7 @@ import {PLUGIN_REPLACEMENT,PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import { JobListPage } from "./pages/JobListPage";import { JobPage } from "./pages/JobPage";@@ -24,33 +24,55 @@ import { TransformRunPage } from "./pages/TransformRunPage";import { TransformSettingsPage } from "./pages/TransformSettingsPage";import { TransformsNotDisabled } from "./route-guards";+const RoutedTransformListPage = withRouteProps(TransformListPage);+const RoutedRunListPage = withRouteProps(RunListPage);+const RoutedNewJobPage = withRouteProps(NewJobPage);+const RoutedJobPage = withRouteProps(JobPage);+const RoutedJobRunListPage = withRouteProps(JobRunListPage);+const RoutedNewQueryTransformPage = withRouteProps(NewQueryTransformPage);+const RoutedNewNativeTransformPage = withRouteProps(NewNativeTransformPage);+const RoutedNewCardTransformPage = withRouteProps(NewCardTransformPage);+const RoutedTransformQueryPage = withRouteProps(TransformQueryPage);+const RoutedTransformRunPage = withRouteProps(TransformRunPage);+const RoutedTransformSettingsPage = withRouteProps(TransformSettingsPage);+const RoutedTransformIndexesPage = withRouteProps(TransformIndexesPage);+const RoutedTransformDependenciesPage = withRouteProps(+ TransformDependenciesPage,+);+export function getDataStudioTransformRoutes() {return (- <Route component={TransformsNotDisabled}>- <Route index component={TransformListPage} />- <Route path="runs" component={RunListPage} />- <Route path="jobs" component={JobSectionLayout}>- <Route index component={JobListPage} />- <Route path="new" component={NewJobPage} />- <Route path=":jobId" component={JobPage} />- <Route path=":jobId/runs" component={JobRunListPage} />+ <Route element={<TransformsNotDisabled />}>+ <Route index element={<RoutedTransformListPage />} />+ <Route path="runs" element={<RoutedRunListPage />} />+ <Route path="jobs" element={<JobSectionLayout />}>+ <Route index element={<JobListPage />} />+ <Route path="new" element={<RoutedNewJobPage />} />+ <Route path=":jobId" element={<RoutedJobPage />} />+ <Route path=":jobId/runs" element={<RoutedJobRunListPage />} /></Route>- <Route path="new/query" component={NewQueryTransformPage} />- <Route path="new/native" component={NewNativeTransformPage} />- <Route path="new/card/:cardId" component={NewCardTransformPage} />- <Route path=":transformId" component={TransformQueryPage} />- <Route path=":transformId/edit" component={TransformQueryPage} />- <Route path=":transformId/run" component={TransformRunPage} />- <Route path=":transformId/settings" component={TransformSettingsPage} />- <Route path=":transformId/indexes" component={TransformIndexesPage} />+ <Route path="new/query" element={<RoutedNewQueryTransformPage />} />+ <Route path="new/native" element={<RoutedNewNativeTransformPage />} />+ <Route path="new/card/:cardId" element={<RoutedNewCardTransformPage />} />+ <Route path=":transformId" element={<RoutedTransformQueryPage />} />+ <Route path=":transformId/edit" element={<RoutedTransformQueryPage />} />+ <Route path=":transformId/run" element={<RoutedTransformRunPage />} />+ <Route+ path=":transformId/settings"+ element={<RoutedTransformSettingsPage />}+ />+ <Route+ path=":transformId/indexes"+ element={<RoutedTransformIndexesPage />}+ />{PLUGIN_TRANSFORMS_PYTHON.getInspectorRoutes()}{PLUGIN_DEPENDENCIES.isEnabled && (<Routepath=":transformId/dependencies"- component={TransformDependenciesPage}+ element={<RoutedTransformDependenciesPage />}>- <Route index component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ <Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} /></Route>)}{PLUGIN_TRANSFORMS_PYTHON.getPythonTransformsRoutes()}diff --git a/frontend/src/metabase/urls/data-studio.ts b/frontend/src/metabase/urls/data-studio.tsindex 9184338559d..5adbcfe6358 100644--- a/frontend/src/metabase/urls/data-studio.ts+++ b/frontend/src/metabase/urls/data-studio.ts@@ -337,10 +337,6 @@ export function dataStudioArchivedSnippets() {return `${dataStudioLibrary()}/snippets/archived`;}-export function dataStudioSegment(segmentId: SegmentId) {- return `${dataStudioLibrary()}/segments/${segmentId}`;-}-export function dataStudioSettings() {return `${dataStudio()}/settings`;}diff --git a/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsx b/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsxindex 5b52afdc240..d4391a36e32 100644--- a/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/legend/LegendLabel.unit.spec.tsx@@ -13,23 +13,23 @@ describe("LegendLabel", () => {const onMouseEnter = jest.fn();const history = createMemoryHistory();- const component = () => {- return (- <LegendLabel- href="#hello"- onClick={onClick}- onFocus={onFocus}- onMouseEnter={onMouseEnter}- {...props}- >- Test- </LegendLabel>- );- };render(<Router history={history}>- <Route path="/" component={component} />+ <Route+ path="/"+ element={+ <LegendLabel+ href="#hello"+ onClick={onClick}+ onFocus={onFocus}+ onMouseEnter={onMouseEnter}+ {...props}+ >+ Test+ </LegendLabel>+ }+ /></Router>,);diff --git a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsxindex 68d690fc089..947ffbd6aae 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx@@ -36,7 +36,7 @@ export const setup = ({setupEnterpriseOnlyPlugin(plugin);});- renderWithProviders(<Route path="*" component={CustomMapFooter} />, {+ renderWithProviders(<Route path="*" element={<CustomMapFooter />} />, {storeInitialState: state,withRouter: true,});diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsxindex e1007b0b1ef..d705bf8f11f 100644--- a/frontend/test/__support__/ui.tsx+++ b/frontend/test/__support__/ui.tsx@@ -29,7 +29,7 @@ import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import {- Route,+ ReactRouterRoute,RouterProvider,routerMiddleware,routing as routingReducer,@@ -144,7 +144,7 @@ export function renderHookWithProviders<TProps, TResult>(const WrapperWithRoute = ({ children, ...props }: any) => {return (<Wrapper {...props}>- <Route path="/" component={() => <>{children}</>} />+ <ReactRouterRoute path="/" component={() => <>{children}</>} /></Wrapper>);};