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
Re-own react-router-redux behind the metabase/router facade (#77142)
Romeo Van Snick836e12b526a7
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsxindex 9801b989a85..a3dc214b4b4 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx@@ -1,6 +1,5 @@import type { Location } from "history";import { useCallback } from "react";-import { push } from "react-router-redux";import { useMount } from "react-use";import { updateDataPermission } from "metabase/admin/permissions/permissions";@@ -9,7 +8,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { useDatabaseQuery } from "metabase/common/hooks";import { getParentPath } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";-import { withRouter } from "metabase/router";+import { push, withRouter } from "metabase/router";import { updateImpersonation } from "metabase-enterprise/advanced_permissions/reducer";import { getImpersonation } from "metabase-enterprise/advanced_permissions/selectors";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.js b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.jsindex a02e473fab5..70c4600e277 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.js+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.js@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -17,6 +16,7 @@ import {PLUGIN_DATA_PERMISSIONS,PLUGIN_REDUCERS,} from "metabase/plugins";+import { push } from "metabase/router";import { hasPremiumFeature } from "metabase-enterprise/settings";import { DataPermissionValue } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.ts b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.tsindex 065cd005197..8776637390b 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.ts+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.ts@@ -1,6 +1,5 @@import type { PayloadAction } from "@reduxjs/toolkit";import { createAction, createSlice } from "@reduxjs/toolkit";-import { push } from "react-router-redux";import {LOAD_DATA_PERMISSIONS,@@ -11,6 +10,7 @@ import {DATABASES_BASE_PATH,GROUPS_BASE_PATH,} from "metabase/admin/permissions/utils/urls";+import { push } from "metabase/router";import {DataPermission,DataPermissionValue,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsxindex 27f9517baec..6cb7e686208 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx@@ -1,8 +1,8 @@import { useLayoutEffect } from "react";-import { replace } from "react-router-redux";import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";const FALLBACK_PATH = "/admin/metabot/";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsxindex 11a21b48d4c..161cb277156 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx@@ -3,13 +3,13 @@ import "../components/AuditTableVisualization";import { chain } from "icepick";import PropTypes from "prop-types";import { useState } from "react";-import { push } from "react-router-redux";import _ from "underscore";import { PaginationControls } from "metabase/common/components/PaginationControls";import { usePagination } from "metabase/common/hooks/use-pagination";import CS from "metabase/css/core/index.css";import { connect } from "metabase/redux";+import { push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Flex } from "metabase/ui";import Question from "metabase-lib/v1/Question";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/lib/mode.js b/enterprise/frontend/src/metabase-enterprise/audit_app/lib/mode.jsindex 4f8003b54f1..1521e676664 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/lib/mode.js+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/lib/mode.js@@ -1,6 +1,7 @@-import { push } from "react-router-redux";import _ from "underscore";+import { push } from "metabase/router";+export const getColumnName = (column) => column.remapped_to || column.name;export const getRowValuesByColumns = (row, cols) =>diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsxindex 383bd4eae42..9b2710e7382 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx@@ -1,6 +1,5 @@import dayjs from "dayjs";import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";@@ -11,6 +10,7 @@ import { useUrlState } from "metabase/common/hooks/use-url-state";import { serializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";import { useDispatch } from "metabase/redux";import type { WithRouterProps } from "metabase/router";+import { push } from "metabase/router";import { Button, Flex, SimpleGrid, Tabs, Text, Title } from "metabase/ui";import { hasPremiumFeature } from "metabase-enterprise/settings";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsxindex 52cce563e1d..fc90701cd92 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import { push } from "react-router-redux";import { t } from "ttag";import { DateTime } from "metabase/common/components/DateTime";@@ -9,6 +8,7 @@ import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { renderMetabotProfileLabel } from "metabase/metabot/constants";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Badge, Ellipsified, Flex, Tooltip } from "metabase/ui";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";import { formatNumber } from "metabase/utils/formatting";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.tsindex 52382c89b55..4448b4a0565 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.ts+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.ts@@ -1,8 +1,7 @@-import { push } from "react-router-redux";-import { getMetabotConversation } from "metabase/metabot/state";import type { MetabotSlashCommandHandler } from "metabase/plugins/oss/audit";import { addUndo } from "metabase/redux/undo";+import { push } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import * as EnterpriseUrls from "../../urls";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js b/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.jsindex 6d1135c9b3a..8528a0a06cb 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js+++ b/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js@@ -1,7 +1,7 @@import Cookies from "js-cookie";-import { replace } from "react-router-redux";import { logout, refreshSession } from "metabase/redux/auth";+import { replace } from "metabase/router";import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";export const SESSION_KEY = "metabase.TIMEOUT";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.unit.spec.js b/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.unit.spec.jsindex 1ed49bf8c15..42fd2308432 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.unit.spec.js+++ b/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.unit.spec.js@@ -1,8 +1,8 @@import FakeTimers from "@sinonjs/fake-timers";import Cookie from "js-cookie";-import { replace } from "react-router-redux";import { logout, refreshSession } from "metabase/redux/auth";+import { replace } from "metabase/router";import {COOKIE_POOLING_TIMEOUT,@@ -15,7 +15,8 @@ jest.mock("metabase/redux/auth", () => ({logout: jest.fn(),refreshSession: jest.fn(() => Promise.resolve()),}));-jest.mock("react-router-redux", () => ({+jest.mock("metabase/router", () => ({+ ...jest.requireActual("metabase/router"),replace: jest.fn(),}));diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsxindex 36bfee35044..351255ca88e 100644--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/CustomVizPage.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect } from "react";-import { push } from "react-router-redux";import { jt, t } from "ttag";import * as Yup from "yup";@@ -16,6 +15,7 @@ import {FormSubmitButton,} from "metabase/forms";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Box,Button,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsxindex dab822c5e13..eb21a76cfa9 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx@@ -1,5 +1,4 @@import { useDisclosure } from "@mantine/hooks";-import { push } from "react-router-redux";import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";@@ -7,6 +6,7 @@ import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics"import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { setOpenModalWithProps } from "metabase/redux/ui";+import { push } from "metabase/router";import {canUserCreateNativeQueries,canUserCreateQueries,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsxindex 5a41a2cea39..972ebbe7dd3 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { jt, t } from "ttag";import { useGetTableSelectionInfoQuery } from "metabase/api";@@ -14,6 +13,7 @@ import {import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_LIBRARY, type PublishTablesModalProps } from "metabase/plugins";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Box,Button,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsxindex 8687edeffb5..580ba26098e 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx@@ -1,11 +1,10 @@-import { push } from "react-router-redux";import { t } from "ttag";import { useUpdateSnippetMutation } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";-import { Link } from "metabase/router";+import { Link, push } from "metabase/router";import { Button, Group, Modal, Stack, Text } from "metabase/ui";import * as Urls from "metabase/urls";import type { NativeQuerySnippet } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsxindex c2cb62ef2e2..835d69cef4e 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx@@ -1,6 +1,5 @@import { sql } from "@codemirror/lang-sql";import { useEffect, useMemo, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useCreateSnippetMutation } from "metabase/api";@@ -21,6 +20,7 @@ import { useToast } from "metabase/common/hooks";import { PLUGIN_REMOTE_SYNC, PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import { Card, Flex, Stack } from "metabase/ui";import * as Urls from "metabase/urls";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsxindex 7e4dd432389..c07333866a4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import { push } from "react-router-redux";import { c, t } from "ttag";import { collectionApi } from "metabase/api";@@ -8,6 +7,7 @@ import { CollectionPickerModal } from "metabase/common/components/Pickers";import { useSetCollection } from "metabase/common/hooks/use-set-collection";import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { ActionIcon, Box, FixedSizeIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import type { CollectionId, CollectionItem, Table } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsxindex a41caac218a..f2a1491f9ca 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import { push, replace } from "react-router-redux";import { t } from "ttag";import { DatabaseEditConnectionForm } from "metabase/admin/databases/components/DatabaseEditConnectionForm";@@ -11,6 +10,7 @@ import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import type { Route } from "metabase/router";+import { push, replace } from "metabase/router";import { Flex, Icon, Modal, Text } from "metabase/ui";import * as Urls from "metabase/urls";import { useCreateDestinationDatabaseMutation } from "metabase-enterprise/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsxindex 30578b5be66..b15ba945b36 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx@@ -1,7 +1,7 @@-import { push } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Modal } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsxindex f53850c7fc9..9b35a29480d 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx@@ -1,10 +1,10 @@-import { push } from "react-router-redux";import { t } from "ttag";import { DeleteDatabaseModal } from "metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal";import { useDeleteDatabaseMutation, useGetDatabaseQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Modal } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts b/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.tsindex dacb93adc7f..e62a835f6be 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts@@ -1,7 +1,7 @@import { useEffect } from "react";-import { replace } from "react-router-redux";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import * as Urls from "metabase-enterprise/urls";import type { Database } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsxindex a3c2eddd3eb..5f6ccbbe579 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx@@ -1,9 +1,9 @@import { useDisclosure } from "@mantine/hooks";import { useState } from "react";-import { push } from "react-router-redux";import { trackDependencyEntitySelected } from "metabase/common/data-studio/analytics";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Card } from "metabase/ui";import type {DependencyEntry,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.tsindex 8e63f44ac00..8d0a51bb00f 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import { Messages } from "metabase/admin/permissions/constants/messages";@@ -17,6 +16,7 @@ import {getTablesPermission,} from "metabase/admin/permissions/utils/graph";import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";+import { push } from "metabase/router";import {DataPermission,DataPermissionValue,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.tsindex adfec980162..af3a01e764e 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import { Messages } from "metabase/admin/permissions/constants/messages";@@ -17,6 +16,7 @@ import {getTablesPermission,} from "metabase/admin/permissions/utils/graph";import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";+import { push } from "metabase/router";import {DataPermission,DataPermissionValue,diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts b/enterprise/frontend/src/metabase-enterprise/group_managers/actions.tsindex cb50e6fb238..e7624f3890f 100644--- a/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts@@ -1,7 +1,6 @@-import { push } from "react-router-redux";-import { permissionApi } from "metabase/api";import { createThunkAction } from "metabase/redux";+import { push } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";import {diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsxindex 6268ad94722..f6f6d61b6b0 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsx@@ -1,9 +1,9 @@import type { Location } from "history";import { useEffect, useMemo, useRef } from "react";-import { replace } from "react-router-redux";import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import type * as Urls from "metabase/urls";import { DependencyDiagnostics } from "metabase-enterprise/monitor/dependency-diagnostics/components";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/tools/mode.ts b/enterprise/frontend/src/metabase-enterprise/monitor/tools/mode.tsindex d832bfacf21..36d3d248f33 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/tools/mode.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/tools/mode.ts@@ -1,6 +1,6 @@-import { push } from "react-router-redux";import { t } from "ttag";+import { push } from "metabase/router";import { card } from "metabase/urls";import type { ClickObject } from "metabase-lib/v1/queries/drills/types";diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsxindex f75cac9ecbc..a31044979ab 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx@@ -1,5 +1,4 @@import type { Location } from "history";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -10,6 +9,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { getParentPath } from "metabase/hoc/ModalRoute";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { parseIntParam } from "metabase/urls";import { getGroupTableAccessPolicy } from "metabase-enterprise/sandboxes/selectors";import type { GroupTableAccessPolicy } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.js b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.jsindex bd344a2e591..9cd99f25ede 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.js+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.js@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -18,6 +17,7 @@ import {PLUGIN_DATA_PERMISSIONS,PLUGIN_REDUCERS,} from "metabase/plugins";+import { push } from "metabase/router";import { hasPremiumFeature } from "metabase-enterprise/settings";import { DataPermissionValue } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsxindex 3e8555a043b..494de697ac9 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsx+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SchemaPickerInput/SchemaPickerInput.tsx@@ -1,5 +1,4 @@import { useCallback, useState } from "react";-import { push } from "react-router-redux";import { match } from "ts-pattern";import { t } from "ttag";@@ -7,6 +6,7 @@ import { skipToken, useGetDatabaseQuery } from "metabase/api";import { MiniPicker } from "metabase/common/components/Pickers/MiniPicker";import type { MiniPickerPickableItem } from "metabase/common/components/Pickers/MiniPicker/types";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Button, FixedSizeIcon, Text } from "metabase/ui";import * as Urls from "metabase/urls";import { isNamelessSchema } from "metabase-lib/v1/metadata/utils/schema";diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.ts b/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.tsindex 9ebd7943750..761afe49193 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.ts+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.ts@@ -1,9 +1,9 @@import { useEffect, useMemo, useRef } from "react";-import { replace } from "react-router-redux";import { useListDatabasesQuery } from "metabase/api";import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import * as Urls from "metabase/urls";import type { DatabaseId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsxindex f8d016bf522..2f1e500e040 100644--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx@@ -1,10 +1,10 @@-import { push } from "react-router-redux";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PaginationControls } from "metabase/common/components/PaginationControls";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Box, Button, Flex, LoadingOverlay, Text, Title } from "metabase/ui";import { adminToolsGrantAccess } from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.tsindex 410234c6a80..979f18b00c0 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts@@ -1,9 +1,9 @@import type { Location } from "history";import { useCallback, useEffect, useMemo } from "react";-import { push } from "react-router-redux";import { loadMetadataForTable } from "metabase/questions/actions";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { b64url_to_utf8, utf8_to_b64url } from "metabase/utils/encoding";import * as Lib from "metabase-lib";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsxindex b8984f7d8f6..1e39407d74f 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx@@ -1,5 +1,4 @@import { useEffect, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { permissionApi } from "metabase/api";@@ -8,6 +7,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { useToast } from "metabase/common/hooks";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Button, Flex, Group, Modal, Radio, Stack, Text } from "metabase/ui";import S from "./EditUserStrategyModal.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsxindex b11bd3d5361..f72bfe1e003 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -30,6 +29,7 @@ import { useListCollectionsTreeQuery } from "metabase/api";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import type { Route } from "metabase/router";+import { push } from "metabase/router";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsxindex 6607b618352..842bc93afea 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";@@ -22,6 +21,7 @@ import { assertNumericId } from "metabase/admin/permissions/types";import { useListCollectionsTreeQuery } from "metabase/api";import { useDispatch, useSelector } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsxindex 347b6bfd716..a8335f248d6 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx@@ -1,5 +1,4 @@import { useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { AdminContentTable } from "metabase/admin/components/AdminContentTable";@@ -12,6 +11,7 @@ import { ForwardRefLink } from "metabase/common/components/Link";import { UserAvatar } from "metabase/common/components/UserAvatar";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Box,Button,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsxindex 1c0336d4f53..881fa87d81d 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx@@ -1,11 +1,11 @@import type { ReactNode } from "react";import { useMemo } from "react";-import { push } from "react-router-redux";import { jt, msgid, ngettext, t } from "ttag";import { RelatedSettingCard } from "metabase/admin/components/RelatedSettingsSection";import type { CreatedTenantData } from "metabase/plugins/oss/tenants";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Button, Flex, SimpleGrid, Stack, Text, Title } from "metabase/ui";import { conjunct } from "metabase/utils/formatting/strings";import type { DataSegregationStrategy } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.tsindex 007ca96754b..548679957e3 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts@@ -1,9 +1,9 @@import type { Location } from "history";import { useCallback, useEffect, useMemo, useState } from "react";-import { push, replace } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/redux";+import { push, replace } from "metabase/router";import type { InspectorLensMetadata } from "metabase-types/api";import type { LensHandle, RouteParams } from "../../types";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsxindex 9d75ee8871e..9904c350dc9 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx@@ -1,12 +1,12 @@import { useCallback, useMemo, useState } from "react";import { ResizableBox } from "react-resizable";-import { push } from "react-router-redux";import { useWindowSize } from "react-use";import { t } from "ttag";import { clickableTokens } from "metabase/common/components/CodeMirror";import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsxindex b6389b6aa43..41cbae7bc5f 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/AdminConnectionInfoPage/AdminConnectionInfoPage.tsx@@ -1,5 +1,4 @@import { useMemo, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";@@ -14,6 +13,7 @@ import { DatabaseForm } from "metabase/databases/components/DatabaseForm";import type { DatabaseFormConfig } from "metabase/databases/types";import { useDispatch } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import { Box, Flex, ScrollArea, Title } from "metabase/ui";import * as Urls from "metabase/urls";import type { Database, DatabaseData } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/SetupWorkspaceModal.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/SetupWorkspaceModal.tsxindex 0df69ef01ad..377849a1ee0 100644--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/SetupWorkspaceModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/SetupWorkspaceModal/SetupWorkspaceModal.tsx@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { jt, t } from "ttag";import {@@ -9,6 +8,7 @@ import {FormSubmitButton,} from "metabase/forms";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Button,Code,diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsxindex 61b11ffa9f9..4f4666e53cb 100644--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx@@ -1,5 +1,4 @@import { useMemo, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";@@ -14,6 +13,7 @@ import { DatabaseForm } from "metabase/databases/components/DatabaseForm";import type { DatabaseFormConfig } from "metabase/databases/types";import { useDispatch } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import { Box, Flex, ScrollArea, Title } from "metabase/ui";import * as Urls from "metabase/urls";import type { Database, DatabaseData } from "metabase-types/api";diff --git a/eslint.config.mjs b/eslint.config.mjsindex 5f3c90bb2e7..2546e5fa548 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -53,6 +53,10 @@ const baseMetabaseRestrictedConfig = {name: "react-router",message: "Please import routing from `metabase/router` instead.",},+ {+ name: "react-router-redux",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",@@ -647,6 +651,10 @@ const configs = [name: "react-router",message: "Please import routing from `metabase/router` instead.",},+ {+ name: "react-router-redux",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@emotion/styled",message: "Please style components using css modules.",@@ -687,6 +695,10 @@ const configs = [name: "react-router",message: "Please import routing from `metabase/router` instead.",},+ {+ name: "react-router-redux",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",@@ -865,6 +877,10 @@ const configs = [name: "react-router",message: "Please import routing from `metabase/router` instead.",},+ {+ name: "react-router-redux",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",@@ -942,6 +958,10 @@ const configs = [name: "react-router",message: "Please import routing from `metabase/router` instead.",},+ {+ name: "react-router-redux",+ message: "Please import routing from `metabase/router` instead.",+ },{name: "@mantine/core",message: "Please import from `metabase/ui` instead.",diff --git a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsxindex 2947b718b24..46c02b6e685 100644--- a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx+++ b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx@@ -1,8 +1,8 @@import type { Location } from "history";-import { push } from "react-router-redux";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";+import { push } from "metabase/router";import { getUser } from "metabase/selectors/user";import AccountLayout from "../../components/AccountLayout";diff --git a/frontend/src/metabase/account/notifications/actions.ts b/frontend/src/metabase/account/notifications/actions.tsindex 8e5ed1e103f..3e2d52d6e43 100644--- a/frontend/src/metabase/account/notifications/actions.ts+++ b/frontend/src/metabase/account/notifications/actions.ts@@ -1,6 +1,5 @@-import { push } from "react-router-redux";-import type { NotificationListItem } from "metabase/notifications/types";+import { push } from "metabase/router";const PREFIX = `/account/notifications`;diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsxindex a598db76658..18a04bd3dea 100644--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx@@ -1,6 +1,5 @@import type { LocationDescriptor } from "history";import { useEffect } from "react";-import { replace } from "react-router-redux";import { skipToken, useGetActionQuery, useGetCardQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -9,6 +8,7 @@ import { connect, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import type { AppErrorDescriptor } from "metabase/redux/store";import type { Route } from "metabase/router";+import { replace } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsxindex 1aea550db01..d11a7581949 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx@@ -1,5 +1,4 @@import { useCallback } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -15,6 +14,7 @@ import {isDbModifiable,} from "metabase/common/utils/database";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Button, Flex, Tooltip } from "metabase/ui";import { isSyncCompleted } from "metabase/utils/syncing";import type { Database } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsxindex 115a892ac2a..f35c4bca6d3 100644--- a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx+++ b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx@@ -1,11 +1,11 @@import type { FormEvent, MouseEventHandler } from "react";import { useEffect, useRef, useState } from "react";-import { push } from "react-router-redux";import { jt, t } from "ttag";import { useGetDatabaseUsageInfoQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Alert,Box,diff --git a/frontend/src/metabase/admin/databases/database.ts b/frontend/src/metabase/admin/databases/database.tsindex 5dc82710781..0353b310ca4 100644--- a/frontend/src/metabase/admin/databases/database.ts+++ b/frontend/src/metabase/admin/databases/database.ts@@ -1,5 +1,4 @@import { createAction, createReducer } from "@reduxjs/toolkit";-import { push } from "react-router-redux";import { databaseApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";@@ -7,6 +6,7 @@ import { combineReducers } from "metabase/redux";import { createDatabase } from "metabase/redux/databases";import { updateMetadata } from "metabase/redux/metadata";import type { Dispatch } from "metabase/redux/store";+import { push } from "metabase/router";import { DatabaseSchema } from "metabase/schema";import type { DatabaseData, DatabaseId } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts b/frontend/src/metabase/admin/databases/hooks/use-database-connection.tsindex a4dbf4c2c85..1b5e7e66089 100644--- a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts+++ b/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";@@ -6,6 +5,7 @@ import { getDefaultEngineKey } from "metabase/databases/utils/engine";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { PLUGIN_DB_ROUTING } from "metabase/plugins";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import type { DatabaseId, Engine, EngineKey } from "metabase-types/api";interface UseDatabaseConnectionProps {diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsxindex 5cd69ae3a57..aa57399ec6f 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx@@ -1,5 +1,4 @@import { useCallback, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -15,6 +14,7 @@ import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import type {CreateSegmentRequest,Segment,diff --git a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsxindex d447e6f3249..fb3b95bc8d6 100644--- a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx+++ b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx@@ -1,7 +1,6 @@import cx from "classnames";import type { Location } from "history";import { type ComponentType, type ReactNode, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { skipToken, useGetTableQuery } from "metabase/api";@@ -9,6 +8,7 @@ import { FieldSet } from "metabase/common/components/FieldSet";import CS from "metabase/css/core/index.css";import { DatabaseSchemaAndTableDataSelector } from "metabase/querying/common/components/DataSelector";import { connect, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Icon } from "metabase/ui";import type { ConcreteTableId, Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsxindex f7989fd943e..7e823d38516 100644--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsx+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EmbeddingThemeEditorApp.tsx@@ -1,5 +1,4 @@import { useRef } from "react";-import { push } from "react-router-redux";import { useDeleteThemeFlow } from "metabase/admin/embedding/hooks";import { useEmbeddingThemeEditor } from "metabase/admin/embedding/hooks/use-embedding-theme-editor";@@ -8,6 +7,7 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { useBeforeUnload } from "metabase/common/hooks/use-before-unload";import { useDispatch } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import { Flex, Loader, Stack } from "metabase/ui";import { EditorPanel } from "./EditorPanel";diff --git a/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.tsx b/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.tsxindex b9f730bf465..9b2d284e6be 100644--- a/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.tsx+++ b/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.tsx@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import { useDeleteThemeFlow } from "metabase/admin/embedding/hooks";@@ -9,6 +8,7 @@ import {} from "metabase/api/embedding-theme";import { useHasTokenFeature, useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Loader, SimpleGrid, Stack, Text, Title } from "metabase/ui";import { EmbeddingThemeCard } from "./EmbeddingThemeCard";diff --git a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx b/frontend/src/metabase/admin/people/containers/NewUserModal.tsxindex 86e8305f4ad..ba6524e2534 100644--- a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx+++ b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import { useCreateUserMutation } from "metabase/api";@@ -6,6 +5,7 @@ import { isEmailAlreadyInUse } from "metabase/api/utils/errors";import { trackUserInvited } from "metabase/common/analytics";import { PLUGIN_TENANTS } from "metabase/plugins";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Modal } from "metabase/ui";import * as Urls from "metabase/urls";import { generatePassword } from "metabase/utils/password";diff --git a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsxindex f0ba50975d4..d27ada3f70a 100644--- a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx+++ b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx@@ -1,6 +1,5 @@import cx from "classnames";import { useEffect } from "react";-import { push, replace } from "react-router-redux";import { jt, t } from "ttag";import { useGetUserQuery } from "metabase/api";@@ -11,6 +10,7 @@ import { PasswordReveal } from "metabase/common/components/PasswordReveal";import CS from "metabase/css/core/index.css";import { PLUGIN_TENANTS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";+import { push, replace } from "metabase/router";import { getSetting, isSsoEnabled } from "metabase/selectors/settings";import { Box } from "metabase/ui";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsxindex 0adffe68013..54bcc94ce5a 100644--- a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx+++ b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx@@ -1,8 +1,7 @@import { useEffect, useRef } from "react";-import { push } from "react-router-redux";import { useDispatch } from "metabase/redux";-import { useRouter } from "metabase/router";+import { push, useRouter } from "metabase/router";type Props = {shouldConfirm: boolean;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsxindex deb7da0dd18..7755767e569 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -20,6 +19,7 @@ import { useToggle } from "metabase/common/hooks/use-toggle";import { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";import type { Route } from "metabase/router";+import { push } from "metabase/router";import {Group,Button as NewButton,diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsxindex 99f4900bca2..622d4eb50f7 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -8,6 +7,7 @@ import { useListCollectionsTreeQuery } from "metabase/api";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import type { Route } from "metabase/router";+import { push } from "metabase/router";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsxindex 6779ecce341..f33c39a6d78 100644--- a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx@@ -1,5 +1,4 @@import { Fragment, type ReactNode, useCallback } from "react";-import { push } from "react-router-redux";import { useAsync } from "react-use";import { t } from "ttag";import _ from "underscore";@@ -8,6 +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 { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";diff --git a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsxindex a3246e444c9..fea1f3c1e09 100644--- a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx@@ -1,5 +1,4 @@import { Fragment, type ReactNode, useCallback } from "react";-import { push } from "react-router-redux";import { useAsync } from "react-use";import { t } from "ttag";import _ from "underscore";@@ -8,6 +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 { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";import type { GroupId } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/permissions/permissions.ts b/frontend/src/metabase/admin/permissions/permissions.tsindex 114ee0cf54a..c3b09193caa 100644--- a/frontend/src/metabase/admin/permissions/permissions.ts+++ b/frontend/src/metabase/admin/permissions/permissions.ts@@ -5,7 +5,6 @@ import {current, // immer and icepick don't play nicely together} from "@reduxjs/toolkit";import { assocIn, merge } from "icepick";-import { push } from "react-router-redux";import { isBoolean } from "underscore";import {@@ -30,6 +29,7 @@ import {createAction,createThunkAction,} from "metabase/redux";+import { push } from "metabase/router";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {diff --git a/frontend/src/metabase/admin/utils.ts b/frontend/src/metabase/admin/utils.tsindex 9af8fdcb071..7b722a091f0 100644--- a/frontend/src/metabase/admin/utils.ts+++ b/frontend/src/metabase/admin/utils.ts@@ -1,11 +1,11 @@import { useLayoutEffect } from "react";-import { push, replace, routerActions } from "react-router-redux";import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";import { shouldShowTenantsUpsell } from "metabase/admin/people/selectors";import { connect, metabaseReduxContext } from "metabase/redux";import type { State } from "metabase/redux/store";import type { AdminPath } from "metabase/redux/store/admin";+import { push, replace, routerActions } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";import { getSetting } from "metabase/selectors/settings";diff --git a/frontend/src/metabase/app-main.js b/frontend/src/metabase/app-main.jsindex b31da451d46..296cbe20ee0 100644--- a/frontend/src/metabase/app-main.js+++ b/frontend/src/metabase/app-main.js@@ -2,7 +2,6 @@// MUST be imported BEFORE `react` and `react-dom`import "metabase-dev";-import { push } from "react-router-redux";import _ from "underscore";import { api } from "metabase/api/client";@@ -12,6 +11,7 @@ import { PLUGIN_API } from "metabase/plugins";import { mainReducers } from "metabase/reducers-main";import { setErrorPage } from "metabase/redux/app";import { clearCurrentUser } from "metabase/redux/user";+import { push } from "metabase/router";import { getRoutes } from "metabase/routes";import { IFRAMED_IN_SELF, isWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex d82c755618d..075cdf53886 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -27,7 +27,6 @@ import { createHistory } from "history";import { DragDropContextProvider } from "react-dnd";import { createPortal } from "react-dom";import { createRoot } from "react-dom/client";-import { syncHistoryWithStore } from "react-router-redux";import { initializePlugins } from "ee-plugins";import { AppThemeProvider } from "metabase/AppThemeProvider";@@ -39,7 +38,7 @@ import { MetabotProvider } from "metabase/metabot/context";import { PLUGIN_APP_INIT_FUNCTIONS } from "metabase/plugins";import { MetabaseReduxProvider } from "metabase/redux";import { refreshSiteSettings } from "metabase/redux/settings";-import { useRouterHistory } from "metabase/router";+import { syncHistoryWithStore, useRouterHistory } from "metabase/router";import { getUserId } from "metabase/selectors/user";import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";import { PortalContainer } from "metabase/ui";diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsxindex 0b5f2bb57e0..afca3036382 100644--- a/frontend/src/metabase/app/nav/AppBar.tsx+++ b/frontend/src/metabase/app/nav/AppBar.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import { skipToken, useGetDashboardQuery } from "metabase/api";import {getCollectionId,@@ -31,7 +29,7 @@ import {import { connect, useDispatch, useSelector } from "metabase/redux";import { closeNavbar, toggleNavbar } from "metabase/redux/app";import type { State } from "metabase/redux/store";-import { withRouter } from "metabase/router";+import { push, withRouter } from "metabase/router";import type { RouterProps } from "metabase/selectors/app";import { getDetailViewState, getIsNavbarOpen } from "metabase/selectors/app";import { getIsEmbeddingIframe } from "metabase/selectors/embed";diff --git a/frontend/src/metabase/archive/actions.ts b/frontend/src/metabase/archive/actions.tsindex afbc5a3a7e9..907024d1a8e 100644--- a/frontend/src/metabase/archive/actions.ts+++ b/frontend/src/metabase/archive/actions.ts@@ -1,8 +1,8 @@-import { push } from "react-router-redux";import { t } from "ttag";import { createThunkAction } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { push } from "metabase/router";export const deletePermanently = createThunkAction("metabase/archive/DELETE_PERMANENTLY",diff --git a/frontend/src/metabase/archive/hooks/use-restore.ts b/frontend/src/metabase/archive/hooks/use-restore.tsindex 52e2a03db0e..39f3735a25e 100644--- a/frontend/src/metabase/archive/hooks/use-restore.ts+++ b/frontend/src/metabase/archive/hooks/use-restore.ts@@ -1,5 +1,4 @@import { useCallback } from "react";-import { push } from "react-router-redux";import { match } from "ts-pattern";import { t } from "ttag";import _ from "underscore";@@ -15,6 +14,7 @@ import { listTag } from "metabase/api/tags";import { TRASHABLE_MODELS, getParentEntityLink } from "metabase/archive/utils";import { useToast } from "metabase/common/hooks/use-toast";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import type {Card,CardId,diff --git a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsxindex a489f356713..2fe5834e02b 100644--- a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx+++ b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx@@ -1,6 +1,5 @@import type { Location } from "history";import { useCallback } from "react";-import { replace } from "react-router-redux";import { t } from "ttag";import { useGetPasswordResetTokenStatusQuery } from "metabase/api";@@ -9,6 +8,7 @@ import { useValidatePassword } from "metabase/common/hooks";import { useToast } from "metabase/common/hooks/use-toast";import { useDispatch } from "metabase/redux";import { resetPassword } from "metabase/redux/auth";+import { replace } from "metabase/router";import { Button } from "metabase/ui";import type { ResetPasswordData } from "../../types";diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex ce72e4a368f..4afb7fb2f42 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -1,6 +1,5 @@import cx from "classnames";import { type MouseEvent, useCallback, useMemo, useState } from "react";-import { push } from "react-router-redux";import { c, t } from "ttag";import {@@ -25,6 +24,7 @@ import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utilimport { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Button,FixedSizeIcon,diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex 23ec9725661..34955d4f782 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -1,6 +1,5 @@import cx from "classnames";import { type MouseEvent, useCallback, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { getCollectionName } from "metabase/common/collections/utils";@@ -21,6 +20,7 @@ import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";import { useGetIcon } from "metabase/hooks/use-icon";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Ellipsified,FixedSizeIcon,diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsxindex b6f5792cc8b..e9b856139e2 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx@@ -1,7 +1,6 @@import { useDisclosure } from "@mantine/hooks";import { useCallback, useEffect, useMemo, useState } from "react";import { type FileRejection, useDropzone } from "react-dropzone";-import { push } from "react-router-redux";import { usePrevious } from "react-use";import { match } from "ts-pattern";import { t } from "ttag";@@ -42,6 +41,7 @@ import { useListSelect } from "metabase/common/hooks/use-list-select";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { MAX_UPLOAD_SIZE, MAX_UPLOAD_STRING } from "metabase/redux/uploads";+import { push } from "metabase/router";import type Database from "metabase-lib/v1/metadata/Database";import type {Bookmark,diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsxindex 4054280404e..1ef53a2030b 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx@@ -1,9 +1,9 @@-import { push } from "react-router-redux";import { t } from "ttag";import { Link } from "metabase/common/components/Link/Link";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsxindex c36703a531d..e3de3415aa3 100644--- a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx+++ b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx@@ -1,9 +1,9 @@import type { ReactNode } from "react";import { useEffect } from "react";-import { replace } from "react-router-redux";import { useGetCollectionQuery } from "metabase/api";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import { extractCollectionId } from "metabase/urls";import { isNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/comments/utils.ts b/frontend/src/metabase/comments/utils.tsindex d93c61a1c86..f8c1dd85c4c 100644--- a/frontend/src/metabase/comments/utils.ts+++ b/frontend/src/metabase/comments/utils.ts@@ -1,9 +1,9 @@import dayjs from "dayjs";-import { replace } from "react-router-redux";import type { LocationSensorState } from "react-use/lib/useLocation";import { match } from "ts-pattern";import type { DispatchFn } from "metabase/redux";+import { replace } from "metabase/router";import type { Comment, CommentEntityType, EntityId } from "metabase-types/api";import type { CommentThread } from "./types";diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsxindex b8e6971b9d4..9f38e173fe0 100644--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx@@ -1,9 +1,9 @@import { useCallback } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import type { SdkCollectionId } from "embedding-sdk-bundle/types";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Modal, type ModalProps } from "metabase/ui";import * as Urls from "metabase/urls";import type { CollectionId, Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsxindex f9e2ab82495..eb682db5375 100644--- a/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx+++ b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx@@ -1,11 +1,11 @@import { useCallback } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useCreateCollectionMutation } from "metabase/api";import { getCollectionPathAsArray } from "metabase/common/collections/utils";import { PLUGIN_LIBRARY } from "metabase/plugins";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Modal } from "metabase/ui";import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsxindex 1395acd1f42..60ccaa74e5b 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx@@ -1,7 +1,6 @@import { QueryStatus } from "@reduxjs/toolkit/query";import type { Location } from "history";import { useEffect } from "react";-import { replace } from "react-router-redux";import { t } from "ttag";import {@@ -12,7 +11,7 @@ import {import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { withRouter } from "metabase/router";+import { replace, withRouter } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsxindex 06a1a9d9342..c1accb70c21 100644--- a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx+++ b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx@@ -1,10 +1,10 @@import type { LocationDescriptor } from "history";-import { replace } from "react-router-redux";import { useMount } from "react-use";import { NotFound } from "metabase/common/components/ErrorPages";import { connect } from "metabase/redux";import { refreshCurrentUser } from "metabase/redux/user";+import { replace } from "metabase/router";type DispatchProps = {refreshCurrentUser: () => any;diff --git a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsxindex 096d94dea92..36d6298ab43 100644--- a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx+++ b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx@@ -2,12 +2,12 @@ import cx from "classnames";import type { LocationDescriptorObject } from "history";import type { AnchorHTMLAttributes, HTMLAttributes, MouseEvent } from "react";import { forwardRef, useCallback } from "react";-import { push } from "react-router-redux";import { Markdown } from "metabase/common/components/Markdown";import { trackSearchClick } from "metabase/common/search/analytics";import { PLUGIN_MODERATION } from "metabase/plugins";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import type { AnchorProps, BoxProps, StackProps } from "metabase/ui";import {Anchor,diff --git a/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts b/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.tsindex e5e3da9c728..f97dcf3891b 100644--- a/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts+++ b/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts@@ -1,10 +1,10 @@import type { Location } from "history";import { useCallback, useEffect, useState } from "react";-import { goBack, push, replace } from "react-router-redux";import { match } from "ts-pattern";import { useDispatch } from "metabase/redux";import type { InjectedRouter, Route } from "metabase/router";+import { goBack, push, replace } from "metabase/router";import { useBeforeUnload } from "./use-before-unload";diff --git a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.tsindex 087fdf0ec67..11e6da950a3 100644--- a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts+++ b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts@@ -1,10 +1,10 @@import type { Location, Query } from "history";import { useCallback, useEffect, useState } from "react";-import { push, replace } from "react-router-redux";import { useEffectOnce, useLatest } from "react-use";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { useDispatch } from "metabase/redux";+import { push, replace } from "metabase/router";type BaseState = Record<string, unknown>;diff --git a/frontend/src/metabase/dashboard/actions/core.ts b/frontend/src/metabase/dashboard/actions/core.tsindex 49424642f78..db1bc8867be 100644--- a/frontend/src/metabase/dashboard/actions/core.ts+++ b/frontend/src/metabase/dashboard/actions/core.ts@@ -1,7 +1,7 @@import { createAction } from "@reduxjs/toolkit";-import { push } from "react-router-redux";import type { Dispatch, GetState } from "metabase/redux/store";+import { push } from "metabase/router";import { getLocation } from "metabase/selectors/routing";import type {DashCardId,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex a604c94a91b..07e25f3fc87 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -1,7 +1,6 @@import cx from "classnames";import type { LocationDescriptorObject } from "history";import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -21,6 +20,7 @@ import {import { EmbeddingEntityContextProvider } from "metabase/embedding/context";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { Flex, Group, type IconProps, Menu, Title } from "metabase/ui";import { isVirtualDashCard } from "metabase/utils/dashboard";diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsxindex a8f1fc82389..9def6176ad7 100644--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx@@ -1,7 +1,6 @@import type { Location } from "history";import { dissoc } from "icepick";import { useState } from "react";-import { replace } from "react-router-redux";import { t } from "ttag";import { useCopyDashboardMutation } from "metabase/api";@@ -9,7 +8,7 @@ import { useInitialCollectionId } from "metabase/common/collections/hooks";import type { CopyDashboardFormProperties } from "metabase/common/components/CopyDashboardForm";import { CopyModal } from "metabase/common/components/CopyModal";import { useDispatch, useSelector } from "metabase/redux";-import { withRouter } from "metabase/router";+import { replace, withRouter } from "metabase/router";import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.tsindex 17c3df4f103..28687cbd327 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts@@ -1,7 +1,6 @@-import { push } from "react-router-redux";-import { getDashboard } from "metabase/dashboard/selectors";import { createThunkAction } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsxindex ea4a3186d10..3c6e05bf0c7 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx@@ -1,7 +1,6 @@import cx from "classnames";import type { PropsWithChildren } from "react";import { useState } from "react";-import { replace } from "react-router-redux";import ErrorBoundary from "metabase/ErrorBoundary";import { isRouteInSync } from "metabase/common/hooks/is-route-in-sync";@@ -34,6 +33,7 @@ import {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 * as Urls from "metabase/urls";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";import type { DashboardId, Dashboard as IDashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/context/context.redux.ts b/frontend/src/metabase/dashboard/context/context.redux.tsindex dfdf0e173d8..cc5ab4a171b 100644--- a/frontend/src/metabase/dashboard/context/context.redux.ts+++ b/frontend/src/metabase/dashboard/context/context.redux.ts@@ -1,5 +1,4 @@import type { ConnectedProps } from "react-redux";-import { push } from "react-router-redux";import { deletePermanently } from "metabase/archive/actions";import {@@ -58,6 +57,7 @@ import {showAddParameterPopover,} from "metabase/redux/dashboard";import type { State } from "metabase/redux/store";+import { push } from "metabase/router";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import {canManageSubscriptions,diff --git a/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.ts b/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.tsindex 64231767483..20f34eeda0b 100644--- a/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.ts+++ b/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.ts@@ -1,8 +1,8 @@import type { LocationDescriptorObject } from "history";import { useCallback, useMemo } from "react";-import { replace } from "react-router-redux";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";import type { DashCardId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.tsindex f652b54eccd..3c9dd9470d1 100644--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts@@ -1,6 +1,5 @@import type { Location } from "history";import { useEffect, useMemo } from "react";-import { push, replace } from "react-router-redux";import { usePrevious } from "react-use";import _ from "underscore";@@ -9,6 +8,7 @@ import { isEmbedPreview } from "metabase/embedding/config";import { useDispatch, useSelector } from "metabase/redux";import { selectTab } from "metabase/redux/dashboard";import type { InjectedRouter } from "metabase/router";+import { push, replace } from "metabase/router";import * as Urls from "metabase/urls";import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsx b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsxindex c55d3df0ab5..ba2518c660a 100644--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsx@@ -1,6 +1,5 @@import { act } from "@testing-library/react";import type { Location } from "history";-import { push, replace } from "react-router-redux";import { renderHookWithProviders } from "__support__/ui";import { isEmbedPreview } from "metabase/embedding/config";@@ -11,6 +10,7 @@ import {createMockState,createMockStoreDashboard,} from "metabase/redux/store/mocks";+import { push, replace } from "metabase/router";import type { ParameterValueOrArray } from "metabase-types/api";import { createMockParameter } from "metabase-types/api/mocks";@@ -21,8 +21,8 @@ import { useDashboardUrlQuery } from "./use-dashboard-url-query";// tab subscription. The react-router migration re-plumbs both of these, and// router.listen has no direct v7 equivalent, so this locks current behavior.-jest.mock("react-router-redux", () => ({- ...jest.requireActual("react-router-redux"),+jest.mock("metabase/router", () => ({+ ...jest.requireActual("metabase/router"),push: jest.fn((descriptor) => ({ type: "MOCK_PUSH", payload: descriptor })),replace: jest.fn((descriptor) => ({type: "MOCK_REPLACE",diff --git a/frontend/src/metabase/dashboard/hooks/use-location-sync.ts b/frontend/src/metabase/dashboard/hooks/use-location-sync.tsindex fa200c15fbd..144079fee1f 100644--- a/frontend/src/metabase/dashboard/hooks/use-location-sync.ts+++ b/frontend/src/metabase/dashboard/hooks/use-location-sync.ts@@ -1,10 +1,10 @@import type { Location } from "history";import { useEffect, useMemo } from "react";-import { replace } from "react-router-redux";import { usePrevious } from "react-use";import { omit } from "underscore";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";import { isNullOrUndefined } from "metabase/utils/types";diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsxindex 3dbb085c7fb..83204801ca9 100644--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx@@ -1,7 +1,7 @@import { useCallback, useEffect, useState } from "react";-import { replace } from "react-router-redux";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import * as Urls from "metabase/urls";import type { RouteParams } from "../../pages/DataModel/types";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsxindex e55c072c7e4..9d4fd9a5788 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx@@ -1,5 +1,4 @@import { memo, useCallback, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -24,6 +23,7 @@ import {PLUGIN_REMOTE_SYNC,} from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import {Box,Button,diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.tsindex 3781752c9b4..1a179269dd6 100644--- a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts+++ b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts@@ -1,5 +1,4 @@import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -10,6 +9,7 @@ import {import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.tsindex 4c1c8a08da9..72e566bfacd 100644--- a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts+++ b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts@@ -1,5 +1,4 @@import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -10,6 +9,7 @@ import {import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";import { useToast } from "metabase/common/hooks/use-toast";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { MeasureTabUrls } from "../types";diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsxindex 8a611628d9c..e51a01a374d 100644--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback, useEffect, useRef, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useCreateMeasureMutation } from "metabase/api";@@ -11,6 +10,7 @@ import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/getimport { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch, useSelector } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.tsindex 832e4124448..9a5f0788ec3 100644--- a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts+++ b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts@@ -1,5 +1,4 @@import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -10,6 +9,7 @@ import {import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.tsindex 95db3cd7f4b..e4d79fa49b4 100644--- a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts+++ b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts@@ -1,5 +1,4 @@import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -10,6 +9,7 @@ import {import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";import { useToast } from "metabase/common/hooks/use-toast";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { SegmentTabUrls } from "../types";diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsxindex 71a739a21aa..81bbcdbdf3e 100644--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx@@ -1,6 +1,5 @@import type { ReactNode } from "react";import { useCallback, useEffect, useRef, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useCreateSegmentMutation } from "metabase/api";@@ -11,6 +10,7 @@ import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/getimport { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch, useSelector } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/documents/actions.ts b/frontend/src/metabase/documents/actions.tsindex 0f5cfdc5f9f..38fbbe802a9 100644--- a/frontend/src/metabase/documents/actions.ts+++ b/frontend/src/metabase/documents/actions.ts@@ -1,8 +1,7 @@-import { push } from "react-router-redux";-import { openUrl } from "metabase/redux/app";import { NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";import type { Dispatch } from "metabase/redux/store";+import { push } from "metabase/router";import type { Document } from "metabase-types/api";export const navigateBackToDocument =diff --git a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsxindex b7775304283..6ac64f14430 100644--- a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx+++ b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import { Api, useDeleteDocumentMutation } from "metabase/api";@@ -8,6 +7,7 @@ import { useSetArchive } from "metabase/archive/hooks";import { useSetCollection } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { push } from "metabase/router";import { getCurrentDocument } from "../selectors";diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsxindex 0cd9d44a39f..ab8fe926a32 100644--- a/frontend/src/metabase/documents/components/DocumentPage.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx@@ -11,7 +11,6 @@ import {useRef,useState,} from "react";-import { push, replace } from "react-router-redux";import { usePrevious, useUnmount } from "react-use";import useBeforeUnload from "react-use/lib/useBeforeUnload";import { t } from "ttag";@@ -41,6 +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 { Box } from "metabase/ui";import { extractEntityId } from "metabase/urls";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx b/frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsxindex 9a2d303c4a0..c6cedd59886 100644--- a/frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx+++ b/frontend/src/metabase/embedding/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx@@ -1,7 +1,7 @@-import { push } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Button, Group, Modal, Stack, Text } from "metabase/ui";// Path to the admin embedding setup guide. Inlined here (rather thandiff --git a/frontend/src/metabase/embedding/interactive-embedding/initialize.ts b/frontend/src/metabase/embedding/interactive-embedding/initialize.tsindex bfaa5694309..e689f7df167 100644--- a/frontend/src/metabase/embedding/interactive-embedding/initialize.ts+++ b/frontend/src/metabase/embedding/interactive-embedding/initialize.ts@@ -1,9 +1,9 @@-import { push } from "react-router-redux";import _ from "underscore";import CS from "metabase/css/core/index.css";import { setInitialUrlOptions } from "metabase/redux/embed";import type { Dispatch } from "metabase/redux/store";+import { push } from "metabase/router";import { isWithinIframe } from "metabase/utils/iframe";export type FrameSpec = {diff --git a/frontend/src/metabase/hoc/ModalRoute.tsx b/frontend/src/metabase/hoc/ModalRoute.tsxindex 1c1b27dccfa..a6b635e1e2d 100644--- a/frontend/src/metabase/hoc/ModalRoute.tsx+++ b/frontend/src/metabase/hoc/ModalRoute.tsx@@ -1,9 +1,8 @@import type { Location, LocationDescriptor } from "history";import { Component, cloneElement } from "react";-import { push } from "react-router-redux";import { connect } from "metabase/redux";-import { Route } from "metabase/router";+import { Route, push } from "metabase/router";import { Modal, type ModalProps } from "metabase/ui";import MetabaseSettings from "metabase/utils/settings";diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.tsxindex 29a173746f5..9cf39e74ce9 100644--- a/frontend/src/metabase/home/components/HomePage/HomePage.tsx+++ b/frontend/src/metabase/home/components/HomePage/HomePage.tsx@@ -1,5 +1,4 @@import { useLayoutEffect } from "react";-import { replace } from "react-router-redux";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -7,6 +6,7 @@ import { useHomepageDashboard } from "metabase/common/hooks/use-homepage-dashboaimport { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";import { addUndo } from "metabase/redux/undo";+import { replace } from "metabase/router";import { getHasDismissedCustomHomePageToast } from "metabase/selectors/app";import { HomeContent } from "../HomeContent";diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex c5c40d7adbc..bec32ba7ad0 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -3,7 +3,6 @@ import { useDisclosure } from "@mantine/hooks";import type { UnknownAction } from "@reduxjs/toolkit";import cx from "classnames";import { useContext, useMemo, useState } from "react";-import { push } from "react-router-redux";import { useLocation, useMount } from "react-use";import { P, match } from "ts-pattern";import { t } from "ttag";@@ -21,6 +20,7 @@ import {import { useMetadataToasts } from "metabase/metadata/hooks";import EditorS from "metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.module.css";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import {Button,diff --git a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsxindex a597cc545f7..69763182d87 100644--- a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx@@ -1,12 +1,11 @@import { useEffect, useState } from "react";-import { replace } from "react-router-redux";import {useMetabotAgent,useUserMetabotPermissions,} from "metabase/metabot/hooks";import { useDispatch } from "metabase/redux";-import { Route } from "metabase/router";+import { Route, replace } from "metabase/router";import { Loader } from "metabase/ui";export const getMetabotQuickLinks = () => {diff --git a/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx b/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsxindex a69d2582f2f..1d31250af3e 100644--- a/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx+++ b/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx@@ -1,9 +1,9 @@-import { replace } from "react-router-redux";import { useMount } from "react-use";import { t } from "ttag";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { replace } from "metabase/router";export const SlackConnectSuccess = () => {const dispatch = useDispatch();diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tsindex a30993a6373..b3b8ead33c4 100644--- a/frontend/src/metabase/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -1,5 +1,4 @@import { type UnknownAction, isRejected, nanoid } from "@reduxjs/toolkit";-import { push } from "react-router-redux";import { P, isMatching, match } from "ts-pattern";import { t } from "ttag";import _ from "underscore";@@ -15,6 +14,7 @@ import { setIsNativeEditorOpen } from "metabase/redux/query-builder";import type { Dispatch, State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import { createAsyncThunk } from "metabase/redux/utils";+import { push } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";import type {diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsxindex 31b7edd032d..b2de6434a78 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx@@ -1,7 +1,7 @@import { useCallback, useEffect, useState } from "react";-import { push, replace } from "react-router-redux";import { useDispatch, useSelector } from "metabase/redux";+import { push, replace } from "metabase/router";import { getLocation } from "metabase/selectors/routing";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.tsindex cc08240a6a4..d0d217de904 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts@@ -1,10 +1,10 @@import type { Location } from "history";import { useEffect, useRef } from "react";-import { push, replace } from "react-router-redux";import { t } from "ttag";import { useToast } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";+import { push, replace } from "metabase/router";import * as Urls from "metabase/urls";import type { MeasureId } from "metabase-types/api";import type { MetricId } from "metabase-types/api/metric";diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsxindex 54a08cedb9a..1a1646fce5c 100644--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx@@ -1,5 +1,4 @@import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -7,6 +6,7 @@ import type { DimensionType } from "metabase/common/metrics/utils/dimension-typeimport { trackMetricPageShowMoreClicked } from "metabase/metrics/analytics";import { useMetricDimensionQuery } from "metabase/metrics/common/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import {Button,Flex,diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex f175e0902b2..5f8cfbb08a2 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import { push } from "react-router-redux";import { c, t } from "ttag";import {@@ -23,6 +22,7 @@ import { CardCopyModal } from "metabase/questions/components/CardCopyModal";import { MoveCardModal } from "metabase/questions/components/MoveCardModal";import { useDispatch, useSelector } from "metabase/redux";import { openUrl } from "metabase/redux/app";+import { push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { ActionIcon, Icon, Menu } from "metabase/ui";diff --git a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsxindex 33bddeb285f..0febe4b1c61 100644--- a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx+++ b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx@@ -1,5 +1,4 @@import type { ReactNode } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useDeleteCardMutation, useUpdateCardMutation } from "metabase/api";@@ -8,6 +7,7 @@ import type { CollectionPickerValueItem } from "metabase/common/components/Pickeimport type { MetricUrls } from "metabase/common/metrics/types";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { push } from "metabase/router";import type { Card } from "metabase-types/api";import { CollectionBreadcrumbs } from "../CollectionBreadcrumbs";diff --git a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsxindex 2ef974c889a..72c913745e8 100644--- a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx@@ -1,5 +1,4 @@import { useEffect } from "react";-import { replace } from "react-router-redux";import { useGetMetricQuery } from "metabase/api/metric";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -9,6 +8,7 @@ import type {MetricUrls,} from "metabase/common/metrics/types";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import { Center } from "metabase/ui";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsxindex f08d0535e3e..81528f8441e 100644--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -2,7 +2,6 @@ import { useDisclosure } from "@mantine/hooks";import type { Location } from "history";import type { ReactNode } from "react";import { useMemo, useState } from "react";-import { goBack, push } from "react-router-redux";import { t } from "ttag";import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";@@ -20,6 +19,7 @@ import { NAME_MAX_LENGTH } from "metabase/metrics/constants";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";import type { Route } from "metabase/router";+import { goBack, push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { Breadcrumbs, Card, Icon } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsxindex bf5a65e9b80..a0fce2841b0 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx@@ -1,6 +1,5 @@import type { LocationDescriptor } from "history";import { useEffect, useMemo, useState } from "react";-import { replace } from "react-router-redux";import { useMount } from "react-use";import {@@ -17,6 +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 { getMetadata } from "metabase/selectors/metadata";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsx b/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsxindex 5a8287aaf1d..c91fe48fb9d 100644--- a/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsx+++ b/frontend/src/metabase/monitor/tools/components/JobInfoApp.tsx@@ -1,6 +1,5 @@import cx from "classnames";import type { ReactNode } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -12,6 +11,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 { Ellipsified, Flex, Stack } from "metabase/ui";import type { Job } from "metabase-types/api";diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TasksTable.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TasksTable.tsxindex 2f3a866a822..bc5ea9dc430 100644--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TasksTable.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TasksTable.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -10,6 +9,7 @@ import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { TaskStatusBadge } from "metabase/monitor/tools/components/TaskStatusBadge";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Box, Ellipsified, Flex } from "metabase/ui";import * as Urls from "metabase/urls";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsxindex 8037d15d430..476cf163e80 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import { push } from "react-router-redux";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";@@ -10,7 +9,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";-import { Link } from "metabase/router";+import { Link, push } from "metabase/router";import {Anchor,Box,diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsTable.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsTable.tsxindex 33266b28424..ae5fd98e8aa 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsTable.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsTable.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import { push } from "react-router-redux";import { t } from "ttag";import { DateTime } from "metabase/common/components/DateTime";@@ -7,6 +6,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 { Box, Ellipsified, Flex } from "metabase/ui";import * as Urls from "metabase/urls";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";diff --git a/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx b/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsxindex 94faaf24fdf..c3d544ea25c 100644--- a/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx+++ b/frontend/src/metabase/monitor/tools/components/TasksTabs/TasksTabs.tsx@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { t } from "ttag";import {@@ -6,6 +5,7 @@ import {SettingsSection,} from "metabase/admin/components/SettingsSection";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { type WithRouterProps, withRouter } from "metabase/router";import { Flex, Icon, Tabs, Title, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsxindex 79f75abbe9f..3af00153b17 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsx@@ -1,8 +1,8 @@-import { push } from "react-router-redux";import { t } from "ttag";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { push } from "metabase/router";import {ActionIcon,Flex,diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsxindex e0ed61b0df5..ad404c48a8b 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx@@ -1,6 +1,5 @@import type { Row, SortingState } from "@tanstack/react-table";import { useCallback, useEffect, useMemo, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";@@ -20,6 +19,7 @@ import { useUrlState } from "metabase/common/hooks/use-url-state";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import type { WithRouterProps } from "metabase/router";+import { push } from "metabase/router";import { Flex, type SelectionState, Title } from "metabase/ui";import * as Urls from "metabase/urls";import type {diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsxindex c81561783c5..7d581b6cc16 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx@@ -1,6 +1,5 @@import { useClickOutside } from "@mantine/hooks";import { useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { Link } from "metabase/common/components/Link";@@ -9,6 +8,7 @@ import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut"import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import type { AdminPath } from "metabase/redux/store";+import { push } from "metabase/router";import { getIsPaidPlan } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Flex, Group, Icon } from "metabase/ui";diff --git a/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx b/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsxindex 729cf7cfa73..237ee1b1d21 100644--- a/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx+++ b/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx@@ -1,8 +1,7 @@-import { push } from "react-router-redux";-import { useListRecentsQuery } from "metabase/api";import { RecentsListContent } from "metabase/nav/components/search/RecentsList/RecentsListContent";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Paper } from "metabase/ui";import { getName } from "metabase/utils/name";import type {diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsxindex d32705b6ef4..860891ec3cc 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx@@ -6,7 +6,6 @@ import type {KeyboardEvent as ReactKeyboardEvent,} from "react";import { useCallback, useEffect, useMemo, useRef, useState } from "react";-import { push } from "react-router-redux";import { usePrevious } from "react-use";import { t } from "ttag";@@ -22,7 +21,7 @@ import type { SearchAwareLocation } from "metabase/common/search/types";import { RecentsList } from "metabase/nav/components/search/RecentsList";import { SearchResultsDropdown } from "metabase/nav/components/search/SearchResultsDropdown";import { useDispatch, useSelector } from "metabase/redux";-import { withRouter } from "metabase/router";+import { push, withRouter } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { Icon } from "metabase/ui";import { modelToUrl } from "metabase/urls";diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsxindex a536d86aec6..5726087fef4 100644--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx@@ -1,5 +1,4 @@import { useEffect, useMemo, useState } from "react";-import { push } from "react-router-redux";import { useDebounce } from "react-use";import { t } from "ttag";@@ -15,6 +14,7 @@ import {SearchResultsList,} from "metabase/nav/components/search/SearchResults/SearchResults.styled";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Loader } from "metabase/ui";import { modelToUrl } from "metabase/urls";import {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsxindex 2c7df1af8bc..658e3b98ea5 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx@@ -1,6 +1,5 @@import type { LocationDescriptor } from "history";import { useEffect, useMemo } from "react";-import { push } from "react-router-redux";import {skipToken,@@ -11,6 +10,7 @@ import { NavbarPromoSlot } from "metabase/nav/components/NavbarPromoSlot";import { connect } from "metabase/redux";import { closeNavbar, openNavbar } from "metabase/redux/app";import type { State } from "metabase/redux/store";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import Question from "metabase-lib/v1/Question";import type { CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsxindex e28abf2d7bd..8de33d6e52c 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx@@ -1,8 +1,7 @@-import { push } from "react-router-redux";-import { DatabaseEngineList } from "metabase/databases/components/DatabaseEngineList";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { trackDatabaseSelect } from "../analytics";diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex 091bae8fd67..bdd183df175 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -1,5 +1,4 @@import { useCallback, useEffect } from "react";-import { push } from "react-router-redux";import { useLocation } from "react-use";import ActionCreator from "metabase/actions/containers/ActionCreator";@@ -21,7 +20,7 @@ import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { closeModal, setOpenModal } from "metabase/redux/ui";import type { WithRouterProps } from "metabase/router";-import { withRouter } from "metabase/router";+import { push, withRouter } from "metabase/router";import { getCurrentOpenModalState } from "metabase/selectors/ui";import { Modal, PREVENT_AUTOCOMPLETE_CLIPPING_MODAL_PROPS } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex 69338938045..6ac850759c6 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -1,6 +1,5 @@import { useRegisterActions } from "kbar";import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { useLatest } from "react-use";import { t } from "ttag";@@ -18,6 +17,7 @@ import {setOpenModalWithProps,} from "metabase/redux/ui";import type { WithRouterProps } from "metabase/router";+import { push } from "metabase/router";import { getHasDatabaseWithActionsEnabled } from "metabase/selectors/data";import {canUserCreateNativeQueries,diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.tsindex 8bf27a4f1af..c741c510f85 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts@@ -1,5 +1,4 @@import type { LocationDescriptorObject } from "history";-import { replace } from "react-router-redux";import { cardApi, databaseApi, snippetApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";@@ -23,6 +22,7 @@ import type {QueryBuilderUIControls,} from "metabase/redux/store";import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";+import { replace } from "metabase/router";import { FieldSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";import { canUserCreateQueries, getUser } from "metabase/selectors/user";diff --git a/frontend/src/metabase/query_builder/actions/models.ts b/frontend/src/metabase/query_builder/actions/models.tsindex 18a27bf7703..117035e7ed0 100644--- a/frontend/src/metabase/query_builder/actions/models.ts+++ b/frontend/src/metabase/query_builder/actions/models.ts@@ -1,4 +1,3 @@-import { push } from "react-router-redux";import { createAction } from "redux-actions";import { t } from "ttag";@@ -8,6 +7,7 @@ import type {GetState,} from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";+import { push } from "metabase/router";import { getQuestion } from "../selectors";diff --git a/frontend/src/metabase/query_builder/actions/url.ts b/frontend/src/metabase/query_builder/actions/url.tsindex ebf05970bb5..21140533d8e 100644--- a/frontend/src/metabase/query_builder/actions/url.ts+++ b/frontend/src/metabase/query_builder/actions/url.ts@@ -1,10 +1,10 @@import { parse as parseUrl } from "url";import type { LocationDescriptor } from "history";-import { push, replace } from "react-router-redux";import { isEqualCard } from "metabase/common/utils/card";import { createThunkAction } from "metabase/redux";+import { push, replace } from "metabase/router";import { getBasename } from "metabase/utils/basename";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex b249d94131b..5055943e9fe 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -1,5 +1,4 @@import { useCallback } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -28,6 +27,7 @@ import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModalimport { MoveCardModal } from "metabase/questions/components/MoveCardModal";import { useDispatch, useSelector } from "metabase/redux";import type { QueryBuilderMode } from "metabase/redux/store";+import { push } from "metabase/router";import { Modal, Text } from "metabase/ui";import * as Urls from "metabase/urls";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex 05329a7097e..cde80886475 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -2,7 +2,6 @@ import { useHotkeys } from "@mantine/hooks";import type { Location } from "history";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import type { ConnectedProps } from "react-redux";-import { push } from "react-router-redux";import { useMount, usePrevious, useUnmount } from "react-use";import { t } from "ttag";import _ from "underscore";@@ -53,6 +52,7 @@ import {} from "metabase/redux/query-builder";import type { QueryBuilderUIControls, State } from "metabase/redux/store";import type { Route, WithRouterProps } from "metabase/router";+import { push } from "metabase/router";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsxindex a41bfb57df9..5c541abfeec 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import { push } from "react-router-redux";import { c, t } from "ttag";import _ from "underscore";@@ -18,6 +17,7 @@ import { MoveModal } from "metabase/common/components/Pickers";import { useDispatch } from "metabase/redux";import { API_UPDATE_QUESTION } from "metabase/redux/query-builder";import { addUndo } from "metabase/redux/undo";+import { push } from "metabase/router";import { Box, Icon, Radio, Title } from "metabase/ui";import * as Urls from "metabase/urls";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/redux/app.ts b/frontend/src/metabase/redux/app.tsindex 5bf4179832a..dcb30817730 100644--- a/frontend/src/metabase/redux/app.ts+++ b/frontend/src/metabase/redux/app.ts@@ -3,7 +3,6 @@ import {createAction,createSlice,} from "@reduxjs/toolkit";-import { LOCATION_CHANGE, push } from "react-router-redux";import { combineReducers, handleActions } from "metabase/redux";import type {@@ -13,6 +12,7 @@ import type {TempStorageKey,TempStorageValue,} from "metabase/redux/store";+import { LOCATION_CHANGE, push } from "metabase/router";import { isSmallScreen, openInBlankWindow } from "metabase/utils/dom";import { shouldOpenInBlankWindow } from "metabase/visualizations/lib/open-url";diff --git a/frontend/src/metabase/redux/auth.ts b/frontend/src/metabase/redux/auth.tsindex 98629294a43..f5f5125ab9a 100644--- a/frontend/src/metabase/redux/auth.ts+++ b/frontend/src/metabase/redux/auth.ts@@ -4,7 +4,6 @@ import {createAction,createReducer,} from "@reduxjs/toolkit";-import { push } from "react-router-redux";import { loadLocalization } from "metabase/api/localization";import { sessionApi } from "metabase/api/session";@@ -12,6 +11,7 @@ import { openNavbar } from "metabase/redux/app";import { refreshSiteSettings } from "metabase/redux/settings";import { clearCurrentUser, refreshCurrentUser } from "metabase/redux/user";import { createAsyncThunk } from "metabase/redux/utils";+import { push } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/redux/routing-contract.unit.spec.ts b/frontend/src/metabase/redux/routing-contract.unit.spec.tsindex 6b8388313c5..0d59d042eb5 100644--- a/frontend/src/metabase/redux/routing-contract.unit.spec.ts+++ b/frontend/src/metabase/redux/routing-contract.unit.spec.ts@@ -1,30 +1,28 @@import { configureStore } from "@reduxjs/toolkit";import { createMemoryHistory } from "history";+import {goBack,push,replace,routerMiddleware,- routerReducer,+ routing,syncHistoryWithStore,-} from "react-router-redux";-+} from "metabase/router";import { getLocation } from "metabase/selectors/routing";// Keystone characterization test for the navigation TRANSPORT seam.//-// The router migration replaces react-router-redux's `push`/`replace`/`goBack`-// action creators + `routerMiddleware` + `routerReducer` + `syncHistoryWithStore`-// with our own ~50-line equivalents (see TANSTACK-MIGRATION-PLAN.md, the-// "react-router-redux" section). This test pins the observable contract that the-// replacement must preserve byte-for-byte:+// `metabase/router` re-owns react-router-redux's `push`/`replace`/`goBack`+// action creators + `routerMiddleware` + `routing` reducer ++// `syncHistoryWithStore`. This test pins the observable contract that the+// replacement preserves byte-for-byte://// dispatch(push/replace/goBack) -> state.routing + @@router/LOCATION_CHANGE//-// It wires up the SAME transport `store.js` / `app.js` use (routerMiddleware +-// routerReducer + a memory history + syncHistoryWithStore), isolated from the-// rest of the app graph. POST-MIGRATION: swap the four react-router-redux imports-// for their `metabase/router` equivalents and this test must still pass.+// It wires up the SAME transport `store.js` / `app.js` use (the router+// middleware + the routing reducer + a memory history + syncHistoryWithStore),+// isolated from the rest of the app graph.const LOCATION_CHANGE = "@@router/LOCATION_CHANGE";@@ -37,7 +35,7 @@ const setup = () => {const history = createMemoryHistory();const store = configureStore({- reducer: { routing: routerReducer },+ reducer: { routing },middleware: (getDefaultMiddleware) =>getDefaultMiddleware({serializableCheck: false,diff --git a/frontend/src/metabase/redux/store/mocks/routing.ts b/frontend/src/metabase/redux/store/mocks/routing.tsindex 970b50c4b72..6509acb374c 100644--- a/frontend/src/metabase/redux/store/mocks/routing.ts+++ b/frontend/src/metabase/redux/store/mocks/routing.ts@@ -1,14 +1,15 @@import type { Location } from "history";-import type { RouterState } from "react-router-redux";++import type { RouterState } from "metabase/router";export const createMockRoutingState = (opts?: Partial<RouterState>,): RouterState => {+ const location = opts?.locationBeforeTransitions;return {...opts,- locationBeforeTransitions: createMockLocation(- opts?.locationBeforeTransitions,- ),+ locationBeforeTransitions:+ location === null ? null : createMockLocation(location),};};diff --git a/frontend/src/metabase/redux/store/state.ts b/frontend/src/metabase/redux/store/state.tsindex c2d16705e7d..b8ea00d018c 100644--- a/frontend/src/metabase/redux/store/state.ts+++ b/frontend/src/metabase/redux/store/state.ts@@ -1,7 +1,6 @@-import type { RouterState } from "react-router-redux";-import type { Api } from "metabase/api/api";import type { DocumentsState } from "metabase/redux/store/documents";+import type { RouterState } from "metabase/router";import type { User } from "metabase-types/api";import type { AdminState } from "./admin";diff --git a/frontend/src/metabase/reference/databases/DatabaseDetail.tsx b/frontend/src/metabase/reference/databases/DatabaseDetail.tsxindex 6f003acaee7..16c98b95ebc 100644--- a/frontend/src/metabase/reference/databases/DatabaseDetail.tsx+++ b/frontend/src/metabase/reference/databases/DatabaseDetail.tsx@@ -1,6 +1,5 @@import cx from "classnames";import { useFormik } from "formik";-import { push } from "react-router-redux";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -11,6 +10,7 @@ import Detail from "metabase/reference/components/Detail";import { EditHeader } from "metabase/reference/components/EditHeader";import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";import * as actions from "metabase/reference/reference";+import { push } from "metabase/router";import { getShallowFields as getFields } from "metabase/selectors/metadata";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/databases/FieldDetail.tsx b/frontend/src/metabase/reference/databases/FieldDetail.tsxindex 24cf6bc4092..9eed2bd7b05 100644--- a/frontend/src/metabase/reference/databases/FieldDetail.tsx+++ b/frontend/src/metabase/reference/databases/FieldDetail.tsx@@ -1,6 +1,5 @@import cx from "classnames";import { useFormik } from "formik";-import { push } from "react-router-redux";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -14,6 +13,7 @@ import EditableReferenceHeader from "metabase/reference/components/EditableReferimport FieldTypeDetail from "metabase/reference/components/FieldTypeDetail";import UsefulQuestions from "metabase/reference/components/UsefulQuestions";import * as actions from "metabase/reference/reference";+import { push } from "metabase/router";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { FieldId, User } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/databases/TableDetail.tsx b/frontend/src/metabase/reference/databases/TableDetail.tsxindex 7051e5e04f3..92a19a5e745 100644--- a/frontend/src/metabase/reference/databases/TableDetail.tsx+++ b/frontend/src/metabase/reference/databases/TableDetail.tsx@@ -1,6 +1,5 @@import cx from "classnames";import { useFormik } from "formik";-import { push } from "react-router-redux";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";@@ -13,6 +12,7 @@ import { EditHeader } from "metabase/reference/components/EditHeader";import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";import UsefulQuestions from "metabase/reference/components/UsefulQuestions";import * as actions from "metabase/reference/reference";+import { push } from "metabase/router";import {getShallowFields as getFields,getMetadata,diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsxindex e684ecf2f58..a7311d5e127 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx@@ -11,7 +11,6 @@ import {} from "@tiptap/react";import cx from "classnames";import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { ExplicitSizeRefreshModeContext } from "metabase/common/components/ExplicitSize/ExplicitSize";@@ -25,6 +24,7 @@ import {MAX_GROUP_SIZE,} from "metabase/rich_text_editing/tiptap/extensions/shared/constants";import { DropZone } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/DropZone";+import { push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import {Box,diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsxindex 647e9c98077..930a03c961d 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx@@ -11,13 +11,13 @@ import {ReactNodeViewRenderer,} from "@tiptap/react";import cx from "classnames";-import { push } from "react-router-redux";import { t } from "ttag";import { useDispatch, useSelector } from "metabase/redux/hooks";import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";import { DropZone } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/DropZone";import { useDndHelpers } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/use-dnd-helpers";+import { push } from "metabase/router";import { Box } from "metabase/ui";import { isWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsxindex 5e5e27de959..b9bb49fcd9e 100644--- a/frontend/src/metabase/route-guards.tsx+++ b/frontend/src/metabase/route-guards.tsx@@ -1,10 +1,10 @@-import { routerActions } from "react-router-redux";import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";import { canAccessDataStudio } from "metabase/common/data-studio/selectors";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";import { metabaseReduxContext } from "metabase/redux";import type { State } from "metabase/redux/store";+import { routerActions } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";import { getCanAccessOnboardingPage } from "metabase/selectors/onboarding";import { getSetting } from "metabase/selectors/settings";diff --git a/frontend/src/metabase/route-guards.unit.spec.tsx b/frontend/src/metabase/route-guards.unit.spec.tsxindex 8a069575d09..288555bbba2 100644--- a/frontend/src/metabase/route-guards.unit.spec.tsx+++ b/frontend/src/metabase/route-guards.unit.spec.tsx@@ -1,11 +1,10 @@import { type Context, createContext } from "react";-import { routerActions } from "react-router-redux";import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { metabaseReduxContext } from "metabase/redux/context";import { createMockState } from "metabase/redux/store/mocks";-import { Route } from "metabase/router";+import { Route, routerActions } from "metabase/router";import {IsAuthenticated,diff --git a/frontend/src/metabase/router/index.ts b/frontend/src/metabase/router/index.tsindex a4d0c9dc808..90c51d0d36f 100644--- a/frontend/src/metabase/router/index.ts+++ b/frontend/src/metabase/router/index.ts@@ -1,7 +1,11 @@export * from "./Link";+export * from "./middleware";+export * from "./navigation";export * from "./Navigate";export * from "./react-router";export * from "./Outlet";+export * from "./routing-reducer";+export * from "./sync";export * from "./RouterProvider";export * from "./types";export * from "./use-location";diff --git a/frontend/src/metabase/router/middleware.ts b/frontend/src/metabase/router/middleware.tsnew file mode 100644index 00000000000..ad0e7a2e4e9--- /dev/null+++ b/frontend/src/metabase/router/middleware.ts@@ -0,0 +1,42 @@+import type { Middleware } from "@reduxjs/toolkit";+import type { History } from "history";+import { match } from "ts-pattern";++import {+ CALL_HISTORY_METHOD,+ type CallHistoryMethodAction,+} from "./navigation";++function isCallHistoryMethod(+ action: unknown,+): action is CallHistoryMethodAction {+ return (+ typeof action === "object" &&+ action !== null &&+ "type" in action &&+ action.type === CALL_HISTORY_METHOD+ );+}++/**+ * Re-owned equivalent of react-router-redux's `routerMiddleware`.+ *+ * Holds the `history` ref, intercepts CALL_HISTORY_METHOD actions, and applies+ * the matching method to history. These actions never reach the reducers, just+ * like the package it replaces.+ */+export function routerMiddleware(history: History): Middleware {+ return () => (next) => (action) => {+ if (!isCallHistoryMethod(action)) {+ return next(action);+ }++ match(action.payload)+ .with({ method: "push" }, ({ args }) => history.push(args[0]))+ .with({ method: "replace" }, ({ args }) => history.replace(args[0]))+ .with({ method: "go" }, ({ args }) => history.go(args[0]))+ .with({ method: "goBack" }, () => history.goBack())+ .with({ method: "goForward" }, () => history.goForward())+ .exhaustive();+ };+}diff --git a/frontend/src/metabase/router/navigation.ts b/frontend/src/metabase/router/navigation.tsnew file mode 100644index 00000000000..83e05b8c2c1--- /dev/null+++ b/frontend/src/metabase/router/navigation.ts@@ -0,0 +1,72 @@+import type { LocationDescriptor } from "history";++/**+ * Re-owned equivalent of react-router-redux's navigation action creators.+ *+ * `push`/`replace`/`go`/`goBack`/`goForward` dispatch a CALL_HISTORY_METHOD+ * action that `routerMiddleware` intercepts and applies to the history+ * ref. The action type string is preserved so the transport stays byte-identical+ * with the package we are shadowing.+ */+export const CALL_HISTORY_METHOD = "@@router/CALL_HISTORY_METHOD";++export type HistoryPushAction = {+ type: typeof CALL_HISTORY_METHOD;+ payload: { method: "push"; args: [LocationDescriptor] };+};++export type HistoryReplaceAction = {+ type: typeof CALL_HISTORY_METHOD;+ payload: { method: "replace"; args: [LocationDescriptor] };+};++export type HistoryGoAction = {+ type: typeof CALL_HISTORY_METHOD;+ payload: { method: "go"; args: [number] };+};++export type HistoryGoBackAction = {+ type: typeof CALL_HISTORY_METHOD;+ payload: { method: "goBack"; args: [] };+};++export type HistoryGoForwardAction = {+ type: typeof CALL_HISTORY_METHOD;+ payload: { method: "goForward"; args: [] };+};++export type CallHistoryMethodAction =+ | HistoryPushAction+ | HistoryReplaceAction+ | HistoryGoAction+ | HistoryGoBackAction+ | HistoryGoForwardAction;++export const push = (location: LocationDescriptor): HistoryPushAction => ({+ type: CALL_HISTORY_METHOD,+ payload: { method: "push", args: [location] },+});++export const replace = (+ location: LocationDescriptor,+): HistoryReplaceAction => ({+ type: CALL_HISTORY_METHOD,+ payload: { method: "replace", args: [location] },+});++export const go = (n: number): HistoryGoAction => ({+ type: CALL_HISTORY_METHOD,+ payload: { method: "go", args: [n] },+});++export const goBack = (): HistoryGoBackAction => ({+ type: CALL_HISTORY_METHOD,+ payload: { method: "goBack", args: [] },+});++export const goForward = (): HistoryGoForwardAction => ({+ type: CALL_HISTORY_METHOD,+ payload: { method: "goForward", args: [] },+});++export const routerActions = { push, replace, go, goBack, goForward };diff --git a/frontend/src/metabase/router/routing-reducer.ts b/frontend/src/metabase/router/routing-reducer.tsnew file mode 100644index 00000000000..517300fe9da--- /dev/null+++ b/frontend/src/metabase/router/routing-reducer.ts@@ -0,0 +1,40 @@+import type { Action } from "@reduxjs/toolkit";+import type { Location } from "history";++/**+ * Re-owned equivalent of react-router-redux's `routerReducer`.+ *+ * Mirrors the current location into `state.routing.locationBeforeTransitions`.+ * Both the slice shape and the LOCATION_CHANGE action type are preserved so+ * `getLocation` and the `isNavbarOpen` / `errorPage` reducers keep working+ * unchanged.+ */+export const LOCATION_CHANGE = "@@router/LOCATION_CHANGE";++export interface RouterState {+ locationBeforeTransitions: Location | null;+}++// react-router-redux's reducer starts with a null location and relies on+// `getLocation`'s default to guard reads until the history sync populates it.+const INITIAL_STATE: RouterState = {+ locationBeforeTransitions: null,+};++interface LocationChangeAction extends Action<typeof LOCATION_CHANGE> {+ payload: Location;+}++function isLocationChange(action: Action): action is LocationChangeAction {+ return action.type === LOCATION_CHANGE;+}++export function routing(+ state: RouterState = INITIAL_STATE,+ action: Action,+): RouterState {+ if (isLocationChange(action)) {+ return { ...state, locationBeforeTransitions: action.payload };+ }+ return state;+}diff --git a/frontend/src/metabase/router/sync.ts b/frontend/src/metabase/router/sync.tsnew file mode 100644index 00000000000..69217a4b48c--- /dev/null+++ b/frontend/src/metabase/router/sync.ts@@ -0,0 +1,54 @@+import type { History } from "history";++import { LOCATION_CHANGE, type RouterState } from "./routing-reducer";++// Only the slice of the redux store `sync` actually touches. Declared+// structurally rather than as `Store<State>` so this leaf does not instantiate+// RTK's store generic against the whole app state.+type RoutingStore = {+ getState: () => { routing: RouterState };+ dispatch: (action: { type: string; payload: unknown }) => unknown;+ subscribe: (listener: () => void) => () => void;+};++/**+ * Re-owned equivalent of react-router-redux's `syncHistoryWithStore`.+ *+ * Location flows history -> store: every history transition dispatches+ * LOCATION_CHANGE so `state.routing.locationBeforeTransitions` tracks it. The+ * returned history is enhanced so its `listen` is driven by the store, which is+ * what the v3 <Router> subscribes to, keeping the rendered route in sync with+ * redux.+ */+export function syncHistoryWithStore(+ history: History,+ store: RoutingStore,+): History {+ const getLocationInStore = () =>+ store.getState().routing.locationBeforeTransitions;++ history.listen((location) => {+ store.dispatch({ type: LOCATION_CHANGE, payload: location });+ });++ // history@3 does not call listeners synchronously on subscribe, so mirror the+ // initial location into the store ourselves.+ store.dispatch({+ type: LOCATION_CHANGE,+ payload: history.getCurrentLocation(),+ });++ return {+ ...history,+ listen(listener) {+ let lastLocation = getLocationInStore();+ return store.subscribe(() => {+ const location = getLocationInStore();+ if (location && location !== lastLocation) {+ lastLocation = location;+ listener(location);+ }+ });+ },+ };+}diff --git a/frontend/src/metabase/search/containers/SearchApp.tsx b/frontend/src/metabase/search/containers/SearchApp.tsxindex 85796404e26..05843eeccf4 100644--- a/frontend/src/metabase/search/containers/SearchApp.tsx+++ b/frontend/src/metabase/search/containers/SearchApp.tsx@@ -1,6 +1,5 @@import type { LocationDescriptorObject } from "history";import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { jt, t } from "ttag";import _ from "underscore";@@ -24,6 +23,7 @@ import type {} from "metabase/common/search/types";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { SearchSidebar } from "metabase/search/components/SearchSidebar";import {SearchBody,diff --git a/frontend/src/metabase/selectors/routing.ts b/frontend/src/metabase/selectors/routing.tsindex d1e6af0f3cb..f56a1ad4266 100644--- a/frontend/src/metabase/selectors/routing.ts+++ b/frontend/src/metabase/selectors/routing.ts@@ -1,6 +1,16 @@+import type { Location } from "history";+import type { State } from "metabase/redux/store";-const DEFAULT_LOCATION = { pathname: "" };+const DEFAULT_LOCATION: Location = {+ pathname: "",+ search: "",+ query: {},+ hash: "",+ state: undefined,+ action: "POP",+ key: "",+};export const getLocation = (state: State) =>state.routing?.locationBeforeTransitions ?? DEFAULT_LOCATION;diff --git a/frontend/src/metabase/selectors/routing.unit.spec.ts b/frontend/src/metabase/selectors/routing.unit.spec.tsindex 32a43ae7c93..df29d9adf8c 100644--- a/frontend/src/metabase/selectors/routing.unit.spec.ts+++ b/frontend/src/metabase/selectors/routing.unit.spec.ts@@ -27,11 +27,17 @@ describe("getLocation", () => {expect(result.hash).toBe("#abc");});- it("falls back to { pathname: '' } when routing is absent", () => {- // The optional-chaining fallback in the selector — relied on before the- // history sync has run.+ it("falls back to a default location when routing is absent", () => {const state = { ...createMockState(), routing: undefined } as any;- expect(getLocation(state)).toEqual({ pathname: "" });+ expect(getLocation(state)).toEqual(createMockLocation({ pathname: "" }));+ });++ it("falls back to a default location before the history sync has run", () => {+ const state = createMockState({+ routing: createMockRoutingState({ locationBeforeTransitions: null }),+ });++ expect(getLocation(state)).toEqual(createMockLocation({ pathname: "" }));});});diff --git a/frontend/src/metabase/store.js b/frontend/src/metabase/store.jsindex 89b022ce74c..0649d3b82a6 100644--- a/frontend/src/metabase/store.js+++ b/frontend/src/metabase/store.js@@ -1,8 +1,8 @@import { combineReducers, configureStore } from "@reduxjs/toolkit";-import { routerMiddleware, routerReducer as routing } from "react-router-redux";import { Api } from "metabase/api";import { PLUGIN_REDUX_MIDDLEWARES } from "metabase/plugins";+import { routerMiddleware, routing } from "metabase/router";export function getStore(reducers,diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsxindex e50bbee32ed..9b5941a714d 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useDeleteTimelineEventMutation,@@ -9,6 +7,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import DeleteEventModal from "metabase/timelines/common/components/DeleteEventModal";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsxindex c7c707ee565..a5a56f2b7eb 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useDeleteTimelineMutation,@@ -8,6 +6,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import DeleteTimelineModal from "metabase/timelines/common/components/DeleteTimelineModal";import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsxindex 5bfff70d5a6..11848f1515c 100644--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useGetTimelineEventQuery,@@ -9,6 +7,7 @@ import {import { useSetArchive } from "metabase/archive/hooks";import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import EditEventModal from "metabase/timelines/common/components/EditEventModal";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsxindex 91ab649ef80..d9d498451a7 100644--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useGetTimelineQuery,@@ -8,6 +6,7 @@ import {import { useSetArchive } from "metabase/archive/hooks";import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import EditTimelineModal from "metabase/timelines/common/components/EditTimelineModal";import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsxindex d2073f7d51a..28e38d269fa 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useGetCollectionQuery,@@ -7,6 +5,7 @@ import {useListTimelinesQuery,} from "metabase/api";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import MoveEventModal, {type MoveEventModalProps,} from "metabase/timelines/common/components/MoveEventModal";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsxindex 0d17be5682b..a860280f41d 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx@@ -1,5 +1,4 @@import { useCallback } from "react";-import { push } from "react-router-redux";import {collectionApi,@@ -11,6 +10,7 @@ import { useSetCollection } from "metabase/common/hooks";import { getDefaultTimelineName } from "metabase/common/utils/timelines";import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import MoveTimelineModal from "metabase/timelines/common/components/MoveTimelineModal";import * as Urls from "metabase/urls";import type { CollectionId, Timeline } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsxindex 44ff34ba34e..35ebf35d933 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useCreateTimelineEventMutation,@@ -7,6 +5,7 @@ import {} from "metabase/api";import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import NewEventModal from "metabase/timelines/common/components/NewEventModal";import * as Urls from "metabase/urls";import type {diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsxindex a5427e00797..37e3f1ffb8f 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useCreateTimelineEventMutation,@@ -8,6 +6,7 @@ import {} from "metabase/api";import { getDefaultTimeline } from "metabase/common/utils/timelines";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import NewEventModal from "metabase/timelines/common/components/NewEventModal";import * as Urls from "metabase/urls";import type {diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsxindex 2b20da2aa46..8a4633d239c 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx@@ -1,11 +1,10 @@-import { push } from "react-router-redux";-import {skipToken,useCreateTimelineMutation,useGetCollectionQuery,} from "metabase/api";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";import * as Urls from "metabase/urls";import type { CreateTimelineRequest, Timeline } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsxindex 9e1034ad8f5..e30bf8ab76f 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx@@ -1,9 +1,8 @@-import { push } from "react-router-redux";-import { skipToken, useGetTimelineQuery } from "metabase/api";import { useSetArchive } from "metabase/archive/hooks";import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsxindex 8e2ea01d1bd..72336ffa2c6 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useGetTimelineQuery,@@ -7,6 +5,7 @@ import {} from "metabase/api";import { useSetArchive } from "metabase/archive/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsxindex 822d70c2ec1..a2476b57ab1 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx@@ -1,5 +1,3 @@-import { push } from "react-router-redux";-import {skipToken,useGetCollectionQuery,@@ -7,6 +5,7 @@ import {} from "metabase/api";import { useSetArchive } from "metabase/archive/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { Collection, Timeline } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsxindex 39576284a06..9f9cbdc91c0 100644--- a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx@@ -1,6 +1,5 @@import type { Row } from "@tanstack/react-table";import { useCallback, useMemo } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useListTransformJobTransformsQuery } from "metabase/api";@@ -9,6 +8,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { TitleSection } from "metabase/common/data-studio/components/TitleSection";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";import * as Urls from "metabase/urls";import type { Transform, TransformJobId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsx b/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsxindex 986eb56b0bb..e902cdbc9f6 100644--- a/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsx+++ b/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsx@@ -1,10 +1,10 @@import { type MouseEvent, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useUpdateTransformJobMutation } from "metabase/api";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { ActionIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import type { TransformJob } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsxindex e0dc6c184a7..9419e08db45 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx@@ -1,9 +1,9 @@import { type MouseEvent, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";import { ActionIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import type { Transform } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsxindex ea64bcce865..1f8a6f03e7c 100644--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx@@ -1,5 +1,4 @@import { useCallback, useMemo, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { useListTransformJobsQuery } from "metabase/api";@@ -12,6 +11,7 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContaiimport { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";import { useSetting } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";import { TransformBadge } from "metabase/transforms/components/TransformBadge/TransformBadge";diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsxindex 206e8d2396f..03dad5fd4fd 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx@@ -2,7 +2,6 @@ import { useDisclosure, useElementSize } from "@mantine/hooks";import cx from "classnames";import type { Location } from "history";import { useCallback, useLayoutEffect, useMemo, useState } from "react";-import { replace } from "react-router-redux";import { t } from "ttag";import {@@ -19,7 +18,7 @@ import {} from "metabase/common/data-studio/components/PaneHeader";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";-import { Link } from "metabase/router";+import { Link, replace } from "metabase/router";import { POLLING_INTERVAL } from "metabase/transforms/constants";import { formatRunMethod, formatStatus } from "metabase/transforms/utils";import { Center, Flex, Group, Select, Stack } from "metabase/ui";diff --git a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsxindex 5fb4e960f12..6b350c7f802 100644--- a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx@@ -1,5 +1,4 @@import { useMemo, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -12,6 +11,7 @@ import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeimport { useMetadataToasts } from "metabase/metadata/hooks";import { useDispatch } from "metabase/redux";import type { Route } from "metabase/router";+import { push } from "metabase/router";import * as Urls from "metabase/urls";import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsxindex 8da71017a73..a039fc702c8 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -1,7 +1,6 @@import { useDisclosure } from "@mantine/hooks";import type { Location } from "history";import { useCallback, useMemo, useRef, useState } from "react";-import { push } from "react-router-redux";import { t } from "ttag";import { skipToken, useGetCardQuery } from "metabase/api";@@ -18,6 +17,7 @@ import {import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { Link, type Route } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsxindex d1449445ef3..c9c5e19cdcf 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx@@ -2,7 +2,6 @@ import { useDisclosure, useElementSize } from "@mantine/hooks";import cx from "classnames";import type { Location } from "history";import { useCallback, useLayoutEffect, useMemo, useState } from "react";-import { replace } from "react-router-redux";import { t } from "ttag";import {@@ -16,6 +15,7 @@ import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";import { useSetting } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/redux";+import { replace } from "metabase/router";import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";import { POLLING_INTERVAL } from "metabase/transforms/constants";import { Center, Flex, Stack } from "metabase/ui";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsxindex 308c89e9753..e7e7fbbd04d 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx@@ -1,5 +1,4 @@import { useDisclosure } from "@mantine/hooks";-import { push } from "react-router-redux";import { t } from "ttag";import { useListDatabasesQuery } from "metabase/api";@@ -8,6 +7,7 @@ import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGimport { useHasTokenFeature } from "metabase/common/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";+import { push } from "metabase/router";import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex da3f197777b..c9ec1446aba 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -1,6 +1,5 @@import { useDisclosure } from "@mantine/hooks";import { useEffect, useLayoutEffect, useMemo, useState } from "react";-import { push } from "react-router-redux";import { useLatest } from "react-use";import { t } from "ttag";@@ -20,6 +19,7 @@ import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useDispatch, useSelector } from "metabase/redux";import type { Route, RouteProps } from "metabase/router";+import { push } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";diff --git a/frontend/src/metabase/visualizations/lib/action.ts b/frontend/src/metabase/visualizations/lib/action.tsindex 1fe00af958d..e4485df5699 100644--- a/frontend/src/metabase/visualizations/lib/action.ts+++ b/frontend/src/metabase/visualizations/lib/action.ts@@ -1,8 +1,8 @@import type { LocationDescriptorObject } from "history";-import { push } from "react-router-redux";import _ from "underscore";import type { Dispatch } from "metabase/redux/store";+import { push } from "metabase/router";import type Question from "metabase-lib/v1/Question";import type {diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsxindex 0af3401aac2..3a4130ad3d8 100644--- a/frontend/test/__support__/ui.tsx+++ b/frontend/test/__support__/ui.tsx@@ -14,7 +14,6 @@ import { useCallback, useMemo, useState } from "react";import { DragDropContextProvider } from "react-dnd";import HTML5Backend from "react-dnd-html5-backend";import { createPortal } from "react-dom";-import { routerMiddleware, routerReducer } from "react-router-redux";import _ from "underscore";import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";@@ -29,7 +28,13 @@ import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";-import { Route, RouterProvider, useRouterHistory } from "metabase/router";+import {+ Route,+ RouterProvider,+ routerMiddleware,+ routing as routingReducer,+ useRouterHistory,+} from "metabase/router";import { getMetabaseCssVariables } from "metabase/styled-components/theme/css-variables";import type { MantineThemeOverride } from "metabase/ui";import { PortalContainer, ThemeProvider, useMantineTheme } from "metabase/ui";@@ -190,7 +195,7 @@ export function getTestStoreAndWrapper({}if (withRouter) {- Object.assign(reducers, { routing: routerReducer });+ Object.assign(reducers, { routing: routingReducer });Object.assign(initialState, { routing });}if (customReducers) {