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
fix: use new router syntax (#78119)
Uladzimir Havenchyke270803b7844
diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsxindex daa4373b1b6..20711c84279 100644--- a/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsx+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsx@@ -8,7 +8,7 @@ import {} from "__support__/ui";import { BrowseSchemas } from "metabase/browse/schemas/BrowseSchemas";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 {createMockDatabase,@@ -18,6 +18,8 @@ import {import { BrowseDatabases } from "./BrowseDatabases";+const RoutedBrowseSchemas = withRouteProps(BrowseSchemas);+type setupOpts = {isAdmin?: boolean;};@@ -48,8 +50,11 @@ describe("BrowseDatabases", () => {setupDatabasesEndpoints(databases);return renderWithProviders(<>- <Route path="/browse/databases" component={BrowseDatabases} />- <Route path="/browse/databases/:slug" component={BrowseSchemas} />+ <Route path="/browse/databases" element={<BrowseDatabases />} />+ <Route+ path="/browse/databases/:slug"+ element={<RoutedBrowseSchemas />}+ /></>,{storeInitialState: createMockState({ currentUser: createMockUser() }),diff --git a/frontend/src/metabase/browse/schemas/BrowseSchemas.unit.spec.tsx b/frontend/src/metabase/browse/schemas/BrowseSchemas.unit.spec.tsxindex 227383b5dcb..09fe85417a7 100644--- a/frontend/src/metabase/browse/schemas/BrowseSchemas.unit.spec.tsx+++ b/frontend/src/metabase/browse/schemas/BrowseSchemas.unit.spec.tsx@@ -3,12 +3,14 @@ import fetchMock from "fetch-mock";import { setupDatabasesEndpoints } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type { Database } from "metabase-types/api";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";import { BrowseSchemas } from "./BrowseSchemas";+const RoutedBrowseSchemas = withRouteProps(BrowseSchemas);+const setup = ({databases,initialRoute,@@ -18,7 +20,7 @@ const setup = ({}) => {setupDatabasesEndpoints(databases);return renderWithProviders(- <Route path="/browse/databases/:slug" component={BrowseSchemas} />,+ <Route path="/browse/databases/:slug" element={<RoutedBrowseSchemas />} />,{ withRouter: true, initialRoute },);};diff --git a/frontend/src/metabase/browse/tables/BrowseTables.unit.spec.tsx b/frontend/src/metabase/browse/tables/BrowseTables.unit.spec.tsxindex 5df7efabe7c..4fe83eb58d7 100644--- a/frontend/src/metabase/browse/tables/BrowseTables.unit.spec.tsx+++ b/frontend/src/metabase/browse/tables/BrowseTables.unit.spec.tsx@@ -2,12 +2,14 @@ import fetchMock from "fetch-mock";import { setupDatabasesEndpoints } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type { Database } from "metabase-types/api";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";import { BrowseTables } from "./BrowseTables";+const RoutedBrowseTables = withRouteProps(BrowseTables);+const setup = ({databases,initialRoute,@@ -19,7 +21,7 @@ const setup = ({return renderWithProviders(<Routepath="/browse/databases/:dbId/schema/:schemaName"- component={BrowseTables}+ element={<RoutedBrowseTables />}/>,{ withRouter: true, initialRoute },);diff --git a/frontend/src/metabase/browse/tables/TablePermalinkRedirect.unit.spec.tsx b/frontend/src/metabase/browse/tables/TablePermalinkRedirect.unit.spec.tsxindex 0a8c8768387..d92170aba74 100644--- a/frontend/src/metabase/browse/tables/TablePermalinkRedirect.unit.spec.tsx+++ b/frontend/src/metabase/browse/tables/TablePermalinkRedirect.unit.spec.tsx@@ -5,12 +5,14 @@ import {setupTablesEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { Route } from "metabase/router";+import { Route, withRouteProps } from "metabase/router";import type { Database, Table } from "metabase-types/api";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";import { TablePermalinkRedirect } from "./TablePermalinkRedirect";+const RoutedTablePermalinkRedirect = withRouteProps(TablePermalinkRedirect);+const PERMALINK_PATH ="/browse/databases/:dbName/schema/:schemaName/table/:tableName";const PERMALINK_PATH_NO_SCHEMA = "/browse/databases/:dbName/table/:tableName";@@ -41,9 +43,9 @@ const setup = ({<><Routepath={noSchema ? PERMALINK_PATH_NO_SCHEMA : PERMALINK_PATH}- component={TablePermalinkRedirect}+ element={<RoutedTablePermalinkRedirect />}/>- <Route path="/table/:slug" component={() => <div>Table page</div>} />+ <Route path="/table/:slug" element={<div>Table page</div>} /></>,{ withRouter: true, initialRoute },);diff --git a/frontend/src/metabase/routes.tsx b/frontend/src/metabase/routes.tsxindex e1b4fb12a00..9e1d0f55aa2 100644--- a/frontend/src/metabase/routes.tsx+++ b/frontend/src/metabase/routes.tsx@@ -102,6 +102,7 @@ const RoutedMetabotQueryBuilder = withRouteProps(MetabotQueryBuilder);const RoutedNewModelOptions = withRouteProps(NewModelOptions);const RoutedBrowseSchemas = withRouteProps(BrowseSchemas);const RoutedBrowseTables = withRouteProps(BrowseTables);+const RoutedTablePermalinkRedirect = withRouteProps(TablePermalinkRedirect);const RoutedMetricsViewerPage = withRouteProps(MetricsViewerPage);const RoutedTableDetailPage = withRouteProps(TableDetailPage);const RoutedUnsubscribePage = withRouteProps(UnsubscribePage);@@ -288,8 +289,12 @@ export const getRoutes = (store: AppStore) => {element={<RoutedBrowseTables />}/><Route- path="databases/:dbName(/schema/:schemaName)/table/:tableName"- component={TablePermalinkRedirect}+ path="databases/:dbName/schema/:schemaName/table/:tableName"+ element={<RoutedTablePermalinkRedirect />}+ />+ <Route+ path="databases/:dbName/table/:tableName"+ element={<RoutedTablePermalinkRedirect />}/>{PLUGIN_TABLE_EDITING.getRoutes()}