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
Clean up `utils/redux` and `utils/entities` (#72832)
Romeo Van Snickcf67b911e6b3
diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.tsindex 09c72d7bcac..e47ead8843f 100644--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts@@ -38,8 +38,8 @@ import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/typesimport { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";import { loadSettings, refreshSiteSettings } from "metabase/redux/settings";import { refreshCurrentUser } from "metabase/redux/user";+import { createAsyncThunk } from "metabase/redux/utils";import api from "metabase/utils/api";-import { createAsyncThunk } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import type { Settings } from "metabase-types/api";diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx b/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsxindex 8cbc07b8cc7..2582c773491 100644--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx@@ -5,7 +5,7 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { useHasEmailSetup } from "metabase/common/hooks";import { toggleSharing } from "metabase/dashboard/actions";import { useDashboardContext } from "metabase/dashboard/context";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";/*** @internal Do not import this component directly, use either SDK or EAJS EE plugins instead.diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsxindex d021c734edd..ad213ae91a9 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx@@ -12,11 +12,11 @@ import { Questions } from "metabase/entities/questions";import { Schemas } from "metabase/entities/schemas";import { Search } from "metabase/entities/search";import { Tables } from "metabase/entities/tables";+import { connect } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { canUserCreateQueries } from "metabase/selectors/user";import { Box, Popover } from "metabase/ui";-import { connect } from "metabase/utils/redux";import {SAVED_QUESTIONS_VIRTUAL_DB_ID,getQuestionIdFromVirtualTableId,diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsxindex 08eb8989006..e128159b162 100644--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx@@ -14,8 +14,8 @@ import {PERSONAL_COLLECTIONS,buildCollectionTree,} from "metabase/entities/collections";+import { connect } from "metabase/redux";import { Box, Icon } from "metabase/ui";-import { connect } from "metabase/utils/redux";import SavedEntityList from "./SavedEntityList";import SavedEntityPickerS from "./SavedEntityPicker.module.css";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 91076fdfa11..47a0ccc4213 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@@ -13,7 +13,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useDatabaseQuery } from "metabase/common/hooks";import { getParentPath } from "metabase/hoc/ModalRoute";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";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/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsxindex e4055e352ea..e509afaa074 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsx@@ -4,9 +4,9 @@ import {SettingsPageWrapper,SettingsSection,} from "metabase/admin/components/SettingsSection";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Text, Textarea } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useAdminSettingWithDebouncedInput } from "metabase-enterprise/ai-controls/hooks";import S from "./MetabotSystemPromptsPage.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsxindex 39a61268b98..1ec4cb8c8f1 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx@@ -6,7 +6,7 @@ import { ApplicationPermissionsHelp } from "metabase/admin/permissions/componentimport { PermissionsEditor } from "metabase/admin/permissions/components/PermissionsEditor";import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";import { Groups } from "metabase/entities/groups";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import {initializeApplicationPermissions,saveApplicationPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.jsindex 9573bc0339f..cb0ceedc204 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js@@ -2,13 +2,13 @@ import { assocIn } from "icepick";import { t } from "ttag";import { getErrorMessage } from "metabase/api/utils";-import { addUndo } from "metabase/redux/undo";import {combineReducers,createAction,createThunkAction,handleActions,-} from "metabase/utils/redux";+} from "metabase/redux";+import { addUndo } from "metabase/redux/undo";import { ApplicationPermissionsApi } from "./api";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsxindex 977afd14e48..769e42d2efd 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx@@ -9,8 +9,8 @@ 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 { getMetadata } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import Question from "metabase-lib/v1/Question";import { AuditMode } from "../lib/mode";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsxindex 2e9150348a8..ab8e5665a09 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx@@ -26,9 +26,9 @@ import {FormSubmitButton,FormTextInput,} from "metabase/forms";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Button, Flex, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {type CustomOidcConfig,type OidcCheckRequest,diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsxindex 04d630cd26b..89180a289a7 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsx@@ -2,8 +2,8 @@ import { useCallback, useEffect } from "react";import { t } from "ttag";import { AuthButton } from "metabase/auth/components/AuthButton";+import { useDispatch } from "metabase/redux";import { isWithinIframe } from "metabase/utils/iframe";-import { useDispatch } from "metabase/utils/redux";import { loginSSO } from "../../actions";diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsxindex bb0b5d522fa..8dc53d4f299 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx@@ -8,8 +8,8 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { useUserSetting } from "metabase/common/hooks";import { useListSelect } from "metabase/common/hooks/use-list-select";import { Search } from "metabase/entities/search";+import { useDispatch } from "metabase/redux";import { Flex, Modal } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";import type { SortingOptions } from "metabase-types/api/sorting";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsxindex 77ed90993cc..9020f18e3c4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx@@ -5,12 +5,12 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { trackMetricCreateStarted } from "metabase/data-studio/analytics";import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import {canUserCreateNativeQueries,canUserCreateQueries,} from "metabase/selectors/user";import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsxindex 2c0e8521784..d97161ff9b9 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx@@ -23,6 +23,7 @@ import {import type { ExpandedState } from "metabase/data-studio/data-model/components/TablePicker/types";import { LibraryUpsellPage } from "metabase/data-studio/upsells/pages";import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { useRouter } from "metabase/router";import {Anchor,@@ -38,7 +39,6 @@ import {TreeTableSkeleton,useTreeTableInstance,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { Collection, CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsxindex c23412096cf..05ac4e0c468 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx@@ -1,9 +1,9 @@import { Link } from "react-router";import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { dataStudioArchivedSnippets } from "metabase/utils/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.tsindex e897245f3ea..bd9f51431f1 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts@@ -10,8 +10,8 @@ import type {} from "metabase/data-studio/common/types";import { createEmptyStateItem } from "metabase/data-studio/common/utils";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useSelector } from "metabase/redux";import { getIcon } from "metabase/utils/icon";-import { useSelector } from "metabase/utils/redux";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { Collection, CollectionId } from "metabase-types/api";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 2326703fcb4..63c8c147f02 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@@ -12,6 +12,7 @@ import {} from "metabase/forms";import { useMetadataToasts } from "metabase/metadata/hooks";import type { PublishTablesModalProps } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import {Box,Button,@@ -22,7 +23,6 @@ import {Stack,Text,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { usePublishTablesMutation } from "metabase-enterprise/api";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsxindex 63c85014ec3..ca87c4708fc 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx@@ -15,7 +15,7 @@ import {} from "metabase/data-studio/common/components/PaneHeader";import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";import { PLUGIN_DEPENDENCIES, PLUGIN_REMOTE_SYNC } from "metabase/plugins";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import * as Urls from "metabase/utils/urls";import type { NativeQuerySnippet } from "metabase-types/api";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 6857249cf73..82346c9c910 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@@ -5,8 +5,8 @@ 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 { Button, Group, Modal, Stack, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { NativeQuerySnippet } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsxindex f05da6347fa..08356df7362 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx@@ -7,6 +7,7 @@ import {isEmptyStateData,} from "metabase/data-studio/common/utils";import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import {ActionIcon,EntityNameCell,@@ -14,7 +15,6 @@ import {Tooltip,type TreeTableColumnDef,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { CollectionItem } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsxindex 702aa573c1a..7ef958acb46 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx@@ -19,8 +19,8 @@ import { useToast } from "metabase/common/hooks";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { Alert, Card, Center, Flex, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";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 6dbbca3f36a..dd4e51a5baf 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@@ -20,8 +20,8 @@ import {PaneHeaderInput,} from "metabase/data-studio/common/components/PaneHeader";import { PLUGIN_REMOTE_SYNC, PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { Card, Flex, Stack } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type {NativeQuerySnippet,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 da683dc9662..d2664349a35 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@@ -4,8 +4,8 @@ import { c, t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { ActionIcon, Icon, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Table } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsxindex b8f023bf7f4..f9ca917065d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx@@ -6,8 +6,8 @@ import {PaneHeaderTabs,} from "metabase/data-studio/common/components/PaneHeader";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Table } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsxindex 2ba69d926b9..c5dbad0e06e 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx@@ -6,8 +6,8 @@ import {EntityListItem,} from "metabase/data-studio/common/components/EntityList";import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";+import { useSelector } from "metabase/redux";import { Flex } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { ConcreteTableId, Table } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsxindex e84fa75c279..952b133286f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Flex, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsxindex 3404e30f1b8..026bca70ae7 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx@@ -6,8 +6,8 @@ import {EntityListItem,} from "metabase/data-studio/common/components/EntityList";import { getUserCanWriteSegments } from "metabase/data-studio/selectors";+import { useSelector } from "metabase/redux";import { Flex } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { ConcreteTableId, Table } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsxindex 0bfd10c1d9f..3f1cac56df6 100644--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { useSelector } from "metabase/redux";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Button, Flex, Group, Icon, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export const DatabaseReplicationError = ({error,diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsxindex 0d1363688ba..075ea69f07a 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx@@ -19,6 +19,7 @@ import {import { getErrorMessage } from "metabase/api/utils";import { useSetting } from "metabase/common/hooks";import { useToast } from "metabase/common/hooks/use-toast";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import {Alert,@@ -33,7 +34,6 @@ import {Tooltip,UnstyledButton,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useUpdateRouterDatabaseMutation } from "metabase-enterprise/api";import { renderUserAttributesForSelect } from "metabase-enterprise/sandboxes/utils";import * as Urls from "metabase-enterprise/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsxindex 3fce594301f..a44bb603335 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx@@ -9,9 +9,9 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useDocsUrl } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { Flex, Icon, Modal, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { useCreateDestinationDatabaseMutation } from "metabase-enterprise/api";import type { Database, DatabaseData } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsxindex 3eceafe548d..2563d404792 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx@@ -6,9 +6,9 @@ import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/componentimport { useListDatabasesQuery } from "metabase/api";import { ForwardRefLink } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Icon, Menu, Text, UnstyledButton } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase-enterprise/urls";import type { Database, DatabaseId } from "metabase-types/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 53193a876ef..acf8e7ddf67 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import { t } from "ttag";+import { useDispatch } from "metabase/redux";import { Modal } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { DestinationDatabasesList } from "../DestinationDatabasesList";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsxindex 7334e22aeca..db756621d0a 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx@@ -4,8 +4,8 @@ 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 { Modal } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";export const RemoveDestinationDatabaseModal = ({diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts b/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.tsindex 2e1de343193..dacb93adc7f 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/utils/redux";+import { useDispatch } from "metabase/redux";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 0c05eb72111..285d5d3dbf8 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@@ -3,8 +3,8 @@ import { useState } from "react";import { push } from "react-router-redux";import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";+import { useDispatch } from "metabase/redux";import { Card } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type {DependencyEntry,DependencyNode,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.tsindex 31a783ba7af..90e81476748 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts@@ -5,7 +5,7 @@ import type {UseCheckDependenciesResult,} from "metabase/plugins";import { getSubmittableQuestion } from "metabase/query_builder/selectors";-import { useStore } from "metabase/utils/redux";+import { useStore } from "metabase/redux";import { useLazyCheckCardDependenciesQuery } from "metabase-enterprise/api";import type Question from "metabase-lib/v1/Question";import type { CheckCardDependenciesRequest } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsxindex fa90dda61ef..4e28dda3855 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx@@ -3,7 +3,7 @@ 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/utils/redux";+import { useDispatch } from "metabase/redux";import type * as Urls from "metabase/utils/urls";import { DependencyDiagnostics } from "../../components/DependencyDiagnostics";diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsxindex 68aee04ba06..5ac723a49e3 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx@@ -11,6 +11,7 @@ import {ContactAdminAlert,INNER_WIDTH,} from "metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import {Alert,@@ -24,7 +25,6 @@ import {Text,Title,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getSubpathSafeUrl } from "metabase/utils/urls";import { useGetGsheetsFolderQuery } from "metabase-enterprise/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsxindex 2438204e6b3..46456d65698 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx@@ -7,6 +7,7 @@ import { skipToken, useGetUserQuery } from "metabase/api";import { CopyButton } from "metabase/common/components/CopyButton";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Markdown } from "metabase/common/components/Markdown";+import { useDispatch } from "metabase/redux";import {Box,Button,@@ -18,7 +19,6 @@ import {Text,TextInput,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { getUserName } from "metabase/utils/user";import {useGetGsheetsFolderQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsxindex 015299b46ad..5e072798073 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx@@ -6,9 +6,9 @@ import { t } from "ttag";import { Api, skipToken } from "metabase/api";import { tag } from "metabase/api/tags";import { getErrorMessage } from "metabase/api/utils";+import { useDispatch, useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import StatusLarge from "metabase/status/components/StatusLarge";-import { useDispatch, useSelector } from "metabase/utils/redux";import { useGetGsheetsFolderQuery } from "metabase-enterprise/api";import { EnterpriseApi } from "metabase-enterprise/api/api";import type { DatabaseId, GdrivePayload } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsxindex e332c12970a..f1f68db80f0 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx@@ -9,8 +9,8 @@ import {} from "__support__/server-mocks";import { act, renderWithProviders, screen, waitFor } from "__support__/ui";import { useListDatabasesQuery, useListTablesQuery } from "metabase/api";+import { useDispatch } from "metabase/redux";import { createMockSettingsState } from "metabase/redux/store/mocks";-import { useDispatch } from "metabase/utils/redux";import { EnterpriseApi } from "metabase-enterprise/api/api";import type { GdrivePayload } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsxindex b2ac3b6c062..67790848885 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx@@ -3,10 +3,10 @@ import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useSetting, useStoreUrl } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { _FileUploadErrorModal } from "metabase/status/components/FileUploadStatusLarge/FileUploadErrorModal";import { Box, Button, Modal, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import databaseError from "./database-error.svg?component";diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsxindex 59fa710dee8..88430e94eef 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { skipToken } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import {useDeleteGsheetsFolderLinkMutation,useGetServiceAccountQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts b/enterprise/frontend/src/metabase-enterprise/group_managers/actions.tsindex 1dd0f1a5d97..6c245c46ac7 100644--- a/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts@@ -2,7 +2,7 @@ import { push } from "react-router-redux";import { getAdminPaths } from "metabase/admin/app/selectors";import { permissionApi } from "metabase/api";-import { createThunkAction } from "metabase/utils/redux";+import { createThunkAction } from "metabase/redux";import {getRevokeManagerGroupsRedirect,diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsxindex 7a7a0fa5fb6..88c9c370302 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx@@ -13,10 +13,10 @@ import { useGetAdminSettingsDetailsQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSetting, useToast } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUpgradeUrl } from "metabase/selectors/settings";import { Box, Divider, Flex, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useGetBillingInfoQuery } from "metabase-enterprise/api";import { useLicense } from "metabase-enterprise/settings/hooks/use-license";import type { TokenStatus } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.tsindex dd38c2fcf2d..53ac39d8200 100644--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts@@ -3,9 +3,9 @@ import { t } from "ttag";import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";import { useSetting, useStoreUrl, useToast } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { getIsHosted } from "metabase/setup/selectors";-import { useSelector } from "metabase/utils/redux";import { useLicense } from "metabase-enterprise/settings/hooks/use-license";const NOTIFICATION_TIMEOUT = 30_000;diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsxindex 27a21898c23..7ea6ebae435 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx@@ -10,6 +10,7 @@ import { getErrorMessage } from "metabase/api/utils";import { useSetting } from "metabase/common/hooks";import { useMetabotSetupContext } from "metabase/metabot/components/MetabotAdmin/MetabotSetup";import { MetabotManagedProviderLimitActions } from "metabase/metabot/components/MetabotManagedProviderLimit";+import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";import {Anchor,@@ -26,7 +27,6 @@ import {UnstyledButton,} from "metabase/ui";import { formatNumber } from "metabase/utils/formatting";-import { useSelector } from "metabase/utils/redux";import {type MetabotUsageResponse,useGetMetabotUsageQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsxindex fc8f5e7a62f..a6d3654f197 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx@@ -1,8 +1,8 @@import { skipToken, useGetUserQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { FixedSizeIcon, Flex, Icon, Text as UIText } from "metabase/ui";import { alpha } from "metabase/ui/colors";-import { useSelector } from "metabase/utils/redux";import { getRelativeTime } from "metabase/utils/time-dayjs";import {getIconForReview,diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsxindex 67bef185480..9ec7cbaf5ab 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx@@ -2,7 +2,7 @@ import PropTypes from "prop-types";import { Fragment } from "react";import { useEditItemVerificationMutation } from "metabase/api";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import { getIsModerator } from "metabase-enterprise/moderation/selectors";import { getLatestModerationReview } from "metabase-enterprise/moderation/service";diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsxindex 80e06c91885..40dad5fc9de 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx@@ -1,8 +1,8 @@import _ from "underscore";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import type { User } from "metabase-types/api";import ModerationReviewIcon from "../../components/ModerationReviewIcon";diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsxindex 2f3400c6de9..53d1c2414ae 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { useEditItemVerificationMutation } from "metabase/api";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Icon, Menu } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Card, Dashboard, ModerationReview } from "metabase-types/api";import {diff --git a/enterprise/frontend/src/metabase-enterprise/redux.ts b/enterprise/frontend/src/metabase-enterprise/redux.tsindex 6ca948c4900..5a9ca2f88e1 100644--- a/enterprise/frontend/src/metabase-enterprise/redux.ts+++ b/enterprise/frontend/src/metabase-enterprise/redux.ts@@ -1,10 +1,10 @@import type { TypedUseSelectorHook } from "react-redux";import { createSelectorHook } from "react-redux";-import { MetabaseReduxContext } from "metabase/utils/redux";+import { metabaseReduxContext } from "metabase/redux";// TODO: use the real type after we figure out what it istype EnterpriseState = any;export const useEnterpriseSelector: TypedUseSelectorHook<EnterpriseState> =- createSelectorHook(MetabaseReduxContext);+ createSelectorHook(metabaseReduxContext);diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsxindex 45155a440e4..5876f51c1ae 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx@@ -4,8 +4,8 @@ import { useCallback, useState } from "react";import { t } from "ttag";import { useToast } from "metabase/common/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { Button, Combobox, Icon, Loader, Text, useCombobox } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import {useGetHasRemoteChangesQuery,useImportChangesMutation,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsxindex 5ed015f7ead..39a85b7b824 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { useSetting } from "metabase/common/hooks";import type { GitSyncSetupMenuItemProps } from "metabase/plugins/types";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { FixedSizeIcon, Text, Tooltip, UnstyledButton } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import S from "./GitSyncSetupMenuItem.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsxindex add5a1645bf..3cd1fa904ad 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx@@ -21,6 +21,7 @@ import {FormTextInput,} from "metabase/forms";import { PLUGIN_TRANSFORMS } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import {Box,@@ -32,7 +33,6 @@ import {Text,Tooltip,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import {useCreateLibraryMutation,useGetLibraryCollectionQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsxindex 69483ad4742..b0fda5d764e 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsx@@ -1,8 +1,8 @@import { useMemo } from "react";import { t } from "ttag";+import { useSelector } from "metabase/redux";import { Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getCurrentTask } from "metabase-enterprise/remote_sync/selectors";export const SetupConflictInfo = () => {diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsxindex 78adb7aeed3..2baa9fabd76 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { useGetSettingsQuery } from "metabase/api";import { useSetting } from "metabase/common/hooks";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useSelector } from "metabase/redux";import { Box, Button, Group, Icon, Modal } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {useGetBranchesQuery,useUpdateRemoteSyncSettingsMutation,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsxindex f60998d39d9..46dfef1d60d 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { ActionButton } from "metabase/common/components/ActionButton";import { useToast } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Button, Group, Modal, Progress, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useCancelRemoteSyncCurrentTaskMutation } from "metabase-enterprise/api";import type { RemoteSyncTaskType } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.tsindex 8ad8618bf92..a33ec9083da 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts@@ -1,6 +1,6 @@import { useAdminSetting } from "metabase/api/utils";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { BRANCH_KEY, REMOTE_SYNC_KEY, TYPE_KEY } from "../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsxindex 3fcc3068a48..567f90af691 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx@@ -1,5 +1,5 @@import { useSetting } from "metabase/common/hooks";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { useGetRemoteSyncCurrentTaskQuery } from "metabase-enterprise/api";import { SyncProgressModal } from "../components/SyncProgressModal";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsxindex 0d987ea3248..fc46c6c3060 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import type { SourceReplacementButtonProps } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { useListSourceReplacementRunsQuery } from "metabase-enterprise/api";export function SourceReplacementButton({diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsxindex dbcd193d0b0..65dff93e0f1 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import { Api, skipToken, useGetCardQuery } from "metabase/api";import { useGetTableQuery } from "metabase/api/table";import type { TagType } from "metabase/api/tags";+import { useDispatch } from "metabase/redux";import StatusLarge from "metabase/status/components/StatusLarge";import StatusSmall from "metabase/status/components/StatusSmall";import {@@ -12,7 +13,6 @@ import {} from "metabase/status/components/utils/status";import useStatusVisibility from "metabase/status/hooks/use-status-visibility";import type { IconName } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import visualizations from "metabase/visualizations";import {useGetSourceReplacementRunQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsxindex cfdbc28f6c2..cd886bbef02 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx@@ -2,9 +2,9 @@ import { Link } from "react-router";import { t } from "ttag";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Button, Icon, Menu, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";export function TransformToolsMenu() {diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.js b/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.jsindex 8caa866c0f2..b7e631b0a1e 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.js+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.js@@ -11,33 +11,15 @@ import {DataPermissionType,DataPermissionValue,} from "metabase/admin/permissions/types";-import { GTAPApi } from "metabase/services";import {combineReducers,createAction,createThunkAction,handleActions,- withRequestState,-} from "metabase/utils/redux";+} from "metabase/redux";import { getPolicyKey, getPolicyKeyFromParams } from "./utils";-export const FETCH_POLICY = "metabase-enterprise/sandboxes/FETCH_POLICY";-export const fetchPolicy = withRequestState((params) => [- "plugins",- "sandboxesPlugin",- "policies",- getPolicyKeyFromParams(params),-])(- createThunkAction(- FETCH_POLICY,- ({ groupId: group_id, tableId: table_id }) =>- async () => {- return await GTAPApi.list({ group_id, table_id });- },- ),-);-export const UPDATE_TABLE_SANDBOXING_PERMISSION ="metabase-enterprise/sandboxes/UPDATE_TABLE_SANDBOXING_PERMISSION";export const updateTableSandboxingPermission = createThunkAction(@@ -129,23 +111,7 @@ const groupTableAccessPolicies = handleActions({},);-const originalGroupTableAccessPolicies = handleActions(- {- [FETCH_POLICY]: {- next: (state, { payload }) => {- const key = getPolicyKey(payload);- return {- ...state,- [key]: payload,- };- },- },- },- {},-);-// eslint-disable-next-line import/no-default-export -- deprecated usageexport default combineReducers({- originalGroupTableAccessPolicies,groupTableAccessPolicies,});diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsxindex 62c02b2a7a9..d32b38efa41 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx@@ -1,117 +1,101 @@import type { Location } from "history";-import { useEffect } from "react";-import { withRouter } from "react-router";import { push } from "react-router-redux";-import _ from "underscore";+import { t } from "ttag";-import { useListUserAttributesQuery } from "metabase/api";+import {+ skipToken,+ useGetGroupTableAccessPolicyQuery,+ useListUserAttributesQuery,+} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { getParentPath } from "metabase/hoc/ModalRoute";-import { connect } from "metabase/utils/redux";-import {- getGroupTableAccessPolicy,- getPolicyRequestState,-} from "metabase-enterprise/sandboxes/selectors";-import { fetchUserAttributes } from "metabase-enterprise/shared/reducer";-import { getUserAttributes } from "metabase-enterprise/shared/selectors";-import type {- GroupTableAccessPolicy,- UserAttributeKey,-} from "metabase-types/api";+import { useDispatch, useSelector } from "metabase/redux";+import { parseIntParam } from "metabase/utils/urls";+import { getGroupTableAccessPolicy } from "metabase-enterprise/sandboxes/selectors";+import type { GroupTableAccessPolicy } from "metabase-types/api";-import {- fetchPolicy,- updatePolicy,- updateTableSandboxingPermission,-} from "../actions";+import { updatePolicy, updateTableSandboxingPermission } from "../actions";import EditSandboxingModal from "../components/EditSandboxingModal";import type { GroupTableAccessPolicyParams, SandboxesState } from "../types";interface EditSandboxingModalContainerProps {- policy: GroupTableAccessPolicy;- attributes: UserAttributeKey[];- push: (path: string) => void;params: GroupTableAccessPolicyParams;location: Location;- route: any;- policyRequestState: any;- fetchPolicy: (params: GroupTableAccessPolicyParams) => void;- fetchUserAttributes: () => void;- updatePolicy: (policy: GroupTableAccessPolicy) => void;- updateTableSandboxingPermission: (- params: GroupTableAccessPolicyParams,- ) => void;+ route: { path: string };}const EditSandboxingModalContainer = ({- policy,- push,params,location,route,- fetchPolicy,- fetchUserAttributes,- policyRequestState,- updatePolicy,- updateTableSandboxingPermission,}: EditSandboxingModalContainerProps) => {- useEffect(() => {- fetchPolicy(params);- fetchUserAttributes();- }, [fetchPolicy, params, fetchUserAttributes]);+ const dispatch = useDispatch();++ const groupId = parseIntParam(params.groupId);+ const tableId = parseIntParam(params.tableId);++ const {+ data: fetchedPolicy,+ isLoading: isPoliciesLoading,+ error: policiesError,+ } = useGetGroupTableAccessPolicyQuery(+ tableId == null || groupId == null+ ? skipToken+ : {+ group_id: groupId,+ table_id: tableId,+ },+ );++ const {+ data: attributes = [],+ isLoading: isAttributesLoading,+ error: attributesError,+ } = useListUserAttributesQuery();++ // The plugins state is added dynamically by the enterprise plugin system,+ // so we need to cast to SandboxesState (same approach as the old connect-based mapStateToProps).+ const draftPolicy = useSelector((state) =>+ getGroupTableAccessPolicy(state as unknown as SandboxesState, { params }),+ );++ if (tableId == null) {+ return <LoadingAndErrorWrapper error={t`Invalid table id`} />;+ }++ const policy = draftPolicy ?? fetchedPolicy;- const { data: attributes } = useListUserAttributesQuery();- const isLoading = policyRequestState?.loading || !attributes;+ const isLoading = isPoliciesLoading || isAttributesLoading;+ const error = policiesError || attributesError;- if (!policyRequestState?.loaded) {- return null;+ if (error) {+ return <LoadingAndErrorWrapper error={error} />;+ }++ if (isLoading) {+ return <LoadingAndErrorWrapper loading />;}const close = () => {- return push(getParentPath(route, location));+ return dispatch(push(getParentPath(route, location)));};const handleSave = async (policy: GroupTableAccessPolicy) => {- updatePolicy(policy);- updateTableSandboxingPermission(params);+ dispatch(updatePolicy(policy));+ dispatch(updateTableSandboxingPermission(params));close();};return (- <LoadingAndErrorWrapper- loading={isLoading}- error={policyRequestState?.error}- >- <EditSandboxingModal- policy={policy}- attributes={attributes || []}- params={params}- onCancel={close}- onSave={handleSave}- />- </LoadingAndErrorWrapper>+ <EditSandboxingModal+ policy={policy}+ attributes={attributes || []}+ params={params}+ onCancel={close}+ onSave={handleSave}+ />);};-const mapStateToProps = (- state: SandboxesState,- props: EditSandboxingModalContainerProps,-) => ({- policy: getGroupTableAccessPolicy(state, props),- policyRequestState: getPolicyRequestState(state, props),- attributes: getUserAttributes(state),-});--const mapDispatchToProps = {- push,- fetchPolicy,- updatePolicy,- fetchUserAttributes,- updateTableSandboxingPermission,-};-// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- withRouter,- connect(mapStateToProps, mapDispatchToProps),-)(EditSandboxingModalContainer);+export default EditSandboxingModalContainer;diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/selectors.ts b/enterprise/frontend/src/metabase-enterprise/sandboxes/selectors.tsindex d2f38dc2738..c94c47bbe88 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/selectors.ts@@ -3,25 +3,13 @@ import { createSelector } from "@reduxjs/toolkit";import type { GroupTableAccessPolicyParams, SandboxesState } from "./types";import { getPolicyKeyFromParams } from "./utils";-export const getPolicyRequestState = (- state: SandboxesState,- { params }: { params: GroupTableAccessPolicyParams },-) => {- const { groupId, tableId } = params;- const key = getPolicyKeyFromParams({ groupId, tableId });- return state.requests?.plugins?.sandboxesPlugin?.policies?.[key];-};-export const getGroupTableAccessPolicy = (state: SandboxesState,{ params }: { params: GroupTableAccessPolicyParams },) => {const key = getPolicyKeyFromParams(params);- return (- state.plugins.sandboxingPlugin.groupTableAccessPolicies[key] ??- state.plugins.sandboxingPlugin.originalGroupTableAccessPolicies[key]- );+ return state.plugins.sandboxingPlugin.groupTableAccessPolicies[key];};export const getDraftPolicies = (state: SandboxesState) => {diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/types.ts b/enterprise/frontend/src/metabase-enterprise/sandboxes/types.tsindex 14e0c3fea80..4638ac1a002 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/types.ts@@ -1,4 +1,3 @@-import type { RequestState, RequestsState } from "metabase/redux/store";import type { EnterpriseSharedState } from "metabase-enterprise/shared/reducer";import type { EnterpriseState } from "metabase-enterprise/shared/types";import type {@@ -10,18 +9,9 @@ import type {export type GroupTableAccessPolicyParams = { groupId: string; tableId: string };export interface SandboxesState extends EnterpriseState {- requests: RequestsState & {- plugins: {- sandboxesPlugin: {- policies: Record<string, RequestState>;- };- shared: EnterpriseSharedState;- };- };plugins: {sandboxingPlugin: {groupTableAccessPolicies: Record<string, GroupTableAccessPolicy>;- originalGroupTableAccessPolicies: Record<string, GroupTableAccessPolicy>;};shared: EnterpriseSharedState;};diff --git a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsxindex 35bbc84f35c..2d1b2464fc7 100644--- a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx@@ -8,9 +8,9 @@ import { UpsellSemanticSearchPill } from "metabase/admin/upsells/UpsellSemanticSimport { getErrorMessage, useAdminSetting } from "metabase/api/utils";import { getPlan, isProPlan } from "metabase/common/utils/plan";import type { SearchSettingsWidgetProps } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Box, Progress, Stack, Text, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useGetSemanticSearchStatusQuery } from "metabase-enterprise/api/search";function useLatch(bool: boolean) {diff --git a/enterprise/frontend/src/metabase-enterprise/shared/reducer.ts b/enterprise/frontend/src/metabase-enterprise/shared/reducer.tsindex 75b846646e9..7884d088e98 100644--- a/enterprise/frontend/src/metabase-enterprise/shared/reducer.ts+++ b/enterprise/frontend/src/metabase-enterprise/shared/reducer.ts@@ -1,7 +1,7 @@import { createSlice } from "@reduxjs/toolkit";+import { createAsyncThunk } from "metabase/redux/utils";import { GTAPApi } from "metabase/services";-import { createAsyncThunk } from "metabase/utils/redux";import type { UserAttributeKey } from "metabase-types/api";export const fetchUserAttributes = createAsyncThunk(diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsxindex d4426845420..e22a1c5dc30 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx@@ -14,9 +14,9 @@ import type { OmniPickerItem } from "metabase/common/components/Pickers";import { isItemInCollectionOrItsDescendants } from "metabase/common/components/Pickers/utils";import { SnippetCollections } from "metabase/entities/snippet-collections";import { Form, FormProvider } from "metabase/forms";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import * as Errors from "metabase/utils/errors";-import { connect } from "metabase/utils/redux";import type { Collection, CollectionId } from "metabase-types/api";const SNIPPET_COLLECTION_SCHEMA = Yup.object({diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsxindex d61a31fddb0..754ce084d7e 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx@@ -4,6 +4,7 @@ import { snippetApi, useUpdateCollectionMutation } from "metabase/api";import { listTag } from "metabase/api/tags";import { isRootCollection } from "metabase/collections/utils";import type { SnippetCollectionMenuProps } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { getUserIsAdmin } from "metabase/selectors/user";import {@@ -14,7 +15,6 @@ import {Menu,Tooltip,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";export function SnippetCollectionMenu({diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsxindex 1d78665157a..ca45f92e6d8 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx@@ -4,7 +4,7 @@ import CollectionPermissionsModal from "metabase/admin/permissions/components/Coimport { Modal } from "metabase/common/components/Modal";import { SnippetCollections } from "metabase/entities/snippet-collections";import type { SnippetCollectionPermissionsModalProps } from "metabase/plugins";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";export function SnippetCollectionPermissionsModal({collectionId,diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsxindex e5c7cd79f3e..b53ab748da3 100644--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx@@ -4,8 +4,8 @@ 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 { Box, Button, Flex, LoadingOverlay, Text, Title } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { adminToolsGrantAccess } from "metabase/utils/urls";import { useAccessGrantsQuery } from "../../hooks/useAccessGrantsQuery";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsxindex d941b03634f..1ab85ec1f37 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsx@@ -10,9 +10,9 @@ import {} from "metabase/common/components/BulkActionBar";import { GenericError } from "metabase/common/components/ErrorPages";import { useCloseNavbarOnMount } from "metabase/common/hooks/use-close-navbar-on-mount";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { extractRemappedColumns } from "metabase/visualizations";import type { TableEditingActionScope } from "../api/types";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsxindex 85499c1066f..220b2c327c9 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx@@ -1,7 +1,7 @@import { useMemo } from "react";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { useDispatch } from "metabase/utils/redux";import { ErrorUpdateToast } from "./ErrorUpdateToast";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 60565741140..410234c6a80 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@@ -3,9 +3,9 @@ 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 { getMetadata } from "metabase/selectors/metadata";import { b64url_to_utf8, utf8_to_b64url } from "metabase/utils/encoding";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type { OpaqueDatasetQuery } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.tsindex 9f2fb46ec22..34137efddf6 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.ts+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.ts@@ -2,7 +2,7 @@ import type { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";import { useCallback, useMemo } from "react";import { datasetApi } from "metabase/api";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { checkNotNull } from "metabase/utils/types";import type { DatasetQuery } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsxindex 22d77c94508..b8984f7d8f6 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx@@ -7,8 +7,8 @@ import { useAdminSetting } from "metabase/api/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks";import { useConfirmation } from "metabase/common/hooks/use-confirmation";+import { useDispatch } from "metabase/redux";import { Button, Flex, Group, Modal, Radio, Stack, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import S from "./EditUserStrategyModal.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsxindex 4bc177c8f1b..552e0c461e9 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx@@ -3,8 +3,8 @@ import type { ReactNode } from "react";import { useGetCollectionQuery } from "metabase/api";import { Unauthorized } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";type Props = {children: ReactNode;diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsxindex 498f0a19937..29577b66208 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx@@ -6,9 +6,9 @@ import {} from "__support__/server-mocks";import { waitFor } from "__support__/ui";import { mainReducers as reducers } from "metabase/reducers-main";+import { MetabaseReduxProvider } from "metabase/redux";import { createMockState } from "metabase/redux/store/mocks";import { getStore } from "metabase/store";-import { MetabaseReduxProvider } from "metabase/utils/redux";import type { FieldId, RowValue } from "metabase-types/api";import { createMockField, createMockTable } from "metabase-types/api/mocks";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsxindex c0d0d796a8e..9ce4c53a001 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx@@ -16,9 +16,9 @@ import {SidebarSection,} from "metabase/nav/containers/MainNavbar/MainNavbar.styled";import { SidebarCollectionLink } from "metabase/nav/containers/MainNavbar/SidebarItems";+import { useSelector } from "metabase/redux";import { getIsTenantUser, getUserIsAdmin } from "metabase/selectors/user";import { ActionIcon, Flex, Icon, Modal, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {tenantSpecificCollections,tenantUsersPersonalCollections,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsxindex a584f48a514..31b6d670c69 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx@@ -29,8 +29,8 @@ import type {import { assertNumericId } from "metabase/admin/permissions/types";import { Collections } from "metabase/entities/collections";import { Groups } from "metabase/entities/groups";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";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 e263eb12937..0cc9dbddd5e 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx@@ -23,7 +23,7 @@ import type { PermissionEditorEntity } from "metabase/admin/permissions/types";import { assertNumericId } from "metabase/admin/permissions/types";import { Collections } from "metabase/entities/collections";import { Groups } from "metabase/entities/groups";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";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 ff0a91e4adc..a6221519641 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx@@ -11,6 +11,7 @@ import { AdminContentTable } from "metabase/common/components/AdminContentTable"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 {Box,Button,@@ -21,7 +22,6 @@ import {Text,UnstyledButton,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { tenantIdToColor } from "metabase-enterprise/tenants/utils/colors";import * as Urls from "metabase-enterprise/urls";import type { Tenant } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsxindex 73fa647a030..1c0336d4f53 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx@@ -5,9 +5,9 @@ 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 { Button, Flex, SimpleGrid, Stack, Text, Title } from "metabase/ui";import { conjunct } from "metabase/utils/formatting/strings";-import { useDispatch } from "metabase/utils/redux";import type { DataSegregationStrategy } from "metabase-types/api";import { useListTenantsQuery } from "../../../api/tenants";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsxindex 3ece73c7a8a..0c818e312a0 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsx@@ -2,9 +2,9 @@ import type { Location } from "history";import { useMemo } from "react";import { t } from "ttag";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { Modal } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { useCreateTenantMutation } from "metabase-enterprise/api";import type { Tenant } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsxindex 0c6ac138276..9338a40908e 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { ConfirmModal } from "metabase/common/components/ConfirmModal";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { useDispatch } from "metabase/utils/redux";import {useGetTenantQuery,useUpdateTenantMutation,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsxindex 8777b470a69..e1d30ac46b2 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx@@ -7,9 +7,9 @@ import {type ActiveStatus,} from "metabase/admin/people/constants";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Group, Tabs, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useListTenantsQuery } from "metabase-enterprise/api";import { EditUserStrategySettingsButton } from "../EditUserStrategySettingsButton";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsxindex b956b91242c..95be98f6c61 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx@@ -23,11 +23,11 @@ import {PLUGIN_ADMIN_USER_MENU_ROUTES,PLUGIN_TENANTS,} from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getIsTenantUser, getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Text } from "metabase/ui";import { getGroupNameLocalized } from "metabase/utils/groups";-import { useSelector } from "metabase/utils/redux";import { useListTenantsQuery } from "metabase-enterprise/api";import { hasPremiumFeature } from "metabase-enterprise/settings";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 c088b964f85..007ca96754b 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@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";import { push, replace } from "react-router-redux";import { t } from "ttag";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";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 7e8e1b2113a..04fb28d5d25 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@@ -6,8 +6,8 @@ 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 { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { SHARED_LIB_IMPORT_PATH } from "../../../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsxindex 6ddf05e3137..daec01c573e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx@@ -5,10 +5,10 @@ import {useListDatabasesQuery,} from "metabase/api";import { DatabaseDataSelector } from "metabase/querying/common/components/DataSelector";+import { useSelector } from "metabase/redux";import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";import { doesDatabaseSupportTransforms } from "metabase/transforms/utils";import { Flex } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";import type { Database, DatabaseId, Transform } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsxindex 0792cdba039..eaa715548e7 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx@@ -6,9 +6,9 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useSelector } from "metabase/redux";import { Alert, Box, Card, Stack } from "metabase/ui";import { isResourceNotFoundError } from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import type * as Urls from "metabase/utils/urls";import {useGetPythonLibraryQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsxindex ce3cc2fbc11..e038fb2eba4 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { trackUpsellViewed } from "metabase/common/components/upsells/components/analytics";import { useStoreUrl } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";import { getIsHosted } from "metabase/setup/selectors";import {@@ -17,7 +18,6 @@ import {Text,Title,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useTransformsBilling } from "metabase-enterprise/transforms/upsells/hooks";import { CloudPurchaseContent } from "./CloudPurchaseContent";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.tsindex 63b3cbebb70..d1dd892758f 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts@@ -1,6 +1,6 @@import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import { getIsHosted } from "metabase/databases/selectors";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import {useGetBillingInfoQuery,useListAddOnsQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsxindex f8c6b54511d..acf09d012ec 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx@@ -8,6 +8,7 @@ import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { DottedBackground } from "metabase/data-studio/upsells/components/DottedBackground";import { LineDecorator } from "metabase/data-studio/upsells/components/LineDecorator";import type { BillingPeriod } from "metabase/data-studio/upsells/types";+import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";import {Card,@@ -19,7 +20,6 @@ import {Text,Title,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useTransformsBilling } from "../../hooks/useTransformsBilling";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsxindex b7d8b35e771..c88691e7e9c 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx@@ -4,8 +4,8 @@ import PropTypes from "prop-types";import { Component } from "react";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import { parseDataUri } from "metabase/utils/data-url";-import { connect } from "metabase/utils/redux";import {getIsDefaultMetabaseLogo,getLogoUrl,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 bc16414f9bf..101146679d2 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@@ -13,8 +13,8 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { DatabaseForm } from "metabase/databases/components/DatabaseForm";import type { DatabaseFormConfig } from "metabase/databases/types";+import { useDispatch } from "metabase/redux";import { Box, Flex, ScrollArea, Title } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Database, DatabaseData } from "metabase-types/api";diff --git a/eslint.config.mjs b/eslint.config.mjsindex f4e87c41525..68b51198b1e 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -47,7 +47,7 @@ const baseMetabaseRestrictedConfig = {{name: "react-redux",importNames: ["useSelector", "useDispatch", "connect"],- message: "Please import from `metabase/utils/redux` instead.",+ message: "Please import from `metabase/redux` instead.",},{name: "@mantine/core",@@ -581,7 +581,7 @@ const configs = [},},{- files: ["frontend/src/metabase/utils/redux/hooks.ts"],+ files: ["frontend/src/metabase/redux/hooks.ts"],rules: {"no-restricted-imports": "off",},@@ -643,7 +643,7 @@ const configs = [{name: "react-redux",importNames: ["useSelector", "useDispatch", "connect"],- message: "Please import from `metabase/utils/redux` instead.",+ message: "Please import from `metabase/redux` instead.",},{name: "@mantine/core",@@ -870,7 +870,7 @@ const configs = [message: 'Please use "useSdkSelector", "useSdkDispatch"',},{- name: "metabase/utils/redux",+ name: "metabase/redux",importNames: ["useStore", "useDispatch"],message: 'Please use "useSdkStore", "useSdkDispatch"',},diff --git a/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.js b/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.jsindex 32957ce06f6..5187104e9dd 100644--- a/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.js+++ b/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.js@@ -21,7 +21,7 @@ const ruleTester = new RuleTester({const VALID_CASES = [{code: `-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";@@ -31,7 +31,7 @@ const docsLink = useSelector(state =>},{code: `-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";@@ -76,7 +76,7 @@ const INVALID_CASES = [{name: "Detect getDocsUrl()",code: `-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";const docsLink = useSelector(state =>@@ -88,7 +88,7 @@ const docsLink = useSelector(state =>{name: "Detect getLearnUrl()",code: `-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { getLearnUrl } from "metabase/selectors/settings";const docsLink = useSelector(state =>diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsxindex 33760a82d45..74cc07c3141 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsx@@ -3,8 +3,8 @@ import { Global, css } from "@emotion/react";import { useMemo } from "react";import { defaultFontFiles } from "metabase/css/core/fonts.styled";+import { useSelector } from "metabase/redux";import { getFontFiles } from "metabase/styled-components/selectors";-import { useSelector } from "metabase/utils/redux";/*** css style to define the font files for the SDKdiff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsxindex d80bbcdca04..276cf724322 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx@@ -7,10 +7,10 @@ import {isQuestionRunnable,} from "metabase/querying/common/utils/question";import { Notebook as QBNotebook } from "metabase/querying/notebook/components/Notebook";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { ScrollArea } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsxindex cac16eca33c..7bc3445cbf3 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx@@ -3,9 +3,9 @@ import { useLatest } from "react-use";import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";import { ResponsiveParametersList } from "metabase/query_builder/components/ResponsiveParametersList";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Box } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";import type { ParameterId } from "metabase-types/api";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsxindex bfa70ccad1a..196f68a4c84 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx@@ -7,11 +7,11 @@ import { useEmbeddingThemeOverride } from "embedding-sdk-bundle/hooks/private/usimport { EnsureSingleInstance } from "embedding-sdk-shared/components/EnsureSingleInstance/EnsureSingleInstance";import { useSetting } from "metabase/common/hooks";import type { MetabaseEmbeddingTheme } from "metabase/embedding-sdk/theme";+import { useSelector } from "metabase/redux";import { getFont } from "metabase/styled-components/selectors";import { getMetabaseSdkCssVariables } from "metabase/styled-components/theme/css-variables";import { ThemeProvider, useMantineTheme } from "metabase/ui";import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";-import { useSelector } from "metabase/utils/redux";interface Props {theme?: MetabaseEmbeddingTheme;diff --git a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsxindex d7d7e1bc369..1bed6d819a8 100644--- a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx@@ -22,9 +22,9 @@ import { useInstanceLocale } from "metabase/common/hooks/use-instance-locale";import { isEmbeddingEajs } from "metabase/embedding-sdk/config";import { isEmbeddingThemeV1 } from "metabase/embedding-sdk/theme";import { LocaleProvider } from "metabase/public/LocaleProvider";+import { MetabaseReduxProvider, useSelector } from "metabase/redux";import { setOptions } from "metabase/redux/embed";import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";-import { MetabaseReduxProvider, useSelector } from "metabase/utils/redux";import { initializePlugins } from "sdk-ee-plugins";import { SCOPED_CSS_RESET } from "../../private/PublicComponentStylesWrapper";diff --git a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsxindex d295a5d9816..789d56831e4 100644--- a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx@@ -9,7 +9,7 @@ import type {} from "embedding-sdk-bundle/types";import { useCollectionQuery, useLocale } from "metabase/common/hooks";import { CreateDashboardModal as CreateDashboardModalCore } from "metabase/dashboard/containers/CreateDashboardModal";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { createDashboardModalSchema } from "./CreateDashboardModal.schema";diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsxindex 0e5b048e881..a4a0fdc9829 100644--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx@@ -63,11 +63,11 @@ import type { RefreshPeriod } from "metabase/dashboard/types";import { EmbeddingEntityContextProvider } from "metabase/embedding/context";import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";+import { useSelector } from "metabase/redux";import { resetErrorPage, setErrorPage } from "metabase/redux/app";import { dismissAllUndo } from "metabase/redux/undo";import { getErrorPage } from "metabase/selectors/app";import { isStaticEmbeddingEntityLoadingError } from "metabase/utils/errors/is-static-embedding-entity-loading-error";-import { useSelector } from "metabase/utils/redux";import type { CardDisplayType } from "metabase-types/api";import type {diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.tsindex e00bde8afc6..302d12b7df2 100644--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.ts+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.ts@@ -1,7 +1,7 @@import { useCallback, useEffect, useRef } from "react";import type { PublicOrEmbeddedDashboardEventHandlersProps } from "metabase/public/containers/PublicOrEmbeddedDashboard/types";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import type { Dashboard } from "metabase-types/api";import { getEventHandlers } from "../../store/selectors";diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.tsindex a51552ed699..f18ba7d2624 100644--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts@@ -11,11 +11,11 @@ import {isEmbeddingThemeV2,} from "metabase/embedding-sdk/theme";import { setGlobalEmbeddingColors } from "metabase/embedding-sdk/theme/embedding-color-palette";+import { useSelector } from "metabase/redux";import { getFont } from "metabase/styled-components/selectors";import type { MantineThemeOverride } from "metabase/ui";import { deriveFullMetabaseTheme } from "metabase/ui/colors";import { getColorShades } from "metabase/ui/utils/colors";-import { useSelector } from "metabase/utils/redux";/*** Returns the Mantine theme override for modular embedding.diff --git a/frontend/src/embedding-sdk-bundle/store/auth/auth.ts b/frontend/src/embedding-sdk-bundle/store/auth/auth.tsindex b7aa3756867..fec4acc9028 100644--- a/frontend/src/embedding-sdk-bundle/store/auth/auth.ts+++ b/frontend/src/embedding-sdk-bundle/store/auth/auth.ts@@ -2,7 +2,7 @@ import type { Dispatch } from "@reduxjs/toolkit";import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";-import { createAsyncThunk } from "metabase/utils/redux";+import { createAsyncThunk } from "metabase/redux/utils";// This is an SDK-only plugin and we co-locate it with its OSS usage for convenience and better three-shaking.export const PLUGIN_EMBEDDING_SDK_AUTH = {diff --git a/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts b/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.tsindex 6407f6d4170..b932a59a071 100644--- a/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts+++ b/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts@@ -6,8 +6,8 @@ import type { SdkStoreState } from "embedding-sdk-bundle/store/types";import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils/request-session-token";import { isEmbeddingEajs } from "metabase/embedding-sdk/config";+import { createAsyncThunk } from "metabase/redux/utils";import { decodeJwt } from "metabase/utils/jwt";-import { createAsyncThunk } from "metabase/utils/redux";import { getSessionTokenState } from "../selectors";diff --git a/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts b/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.tsindex b7ade29f8ca..2951d99851c 100644--- a/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts+++ b/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts@@ -5,8 +5,8 @@ import { overrideRequestsForGuestEmbeds } from "metabase/embedding/lib/override-import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";import type { OnBeforeRequestHandlerConfig } from "metabase/plugins/oss/api";import { refreshSiteSettings } from "metabase/redux/settings";+import { createAsyncThunk } from "metabase/redux/utils";import { isJWT } from "metabase/utils/jwt";-import { createAsyncThunk } from "metabase/utils/redux";import { getOrRefreshGuestSession } from "./auth";diff --git a/frontend/src/embedding-sdk-bundle/store/index.ts b/frontend/src/embedding-sdk-bundle/store/index.tsindex 32d91f9d30c..c5ddb112a32 100644--- a/frontend/src/embedding-sdk-bundle/store/index.ts+++ b/frontend/src/embedding-sdk-bundle/store/index.ts@@ -4,13 +4,9 @@ import { useContext } from "react";import * as pulse from "metabase/notifications/pulse/reducers";import * as qb from "metabase/query_builder/reducers";import { commonReducers } from "metabase/reducers-common";+import { metabaseReduxContext, useDispatch, useStore } from "metabase/redux";import { DEFAULT_EMBEDDING_ENTITY_TYPES } from "metabase/redux/embedding-data-picker";import { getStore } from "metabase/store";-import {- MetabaseReduxContext,- useDispatch,- useStore,-} from "metabase/utils/redux";import { reducer as visualizer } from "metabase/visualizer/visualizer.slice";import { sdk } from "./reducer";@@ -49,7 +45,7 @@ export const useSdkStore = () => {};const useCheckSdkReduxContext = () => {- const context = useContext(MetabaseReduxContext);+ const context = useContext(metabaseReduxContext);if (!context) {console.warn(diff --git a/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts b/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.tsindex 37df454f27c..889d47bb041 100644--- a/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts+++ b/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts@@ -3,19 +3,19 @@ import type { TypedUseSelectorHook } from "react-redux";import { createSelectorHook } from "react-redux";import type { SdkStoreState } from "embedding-sdk-bundle/store/types";-import { MetabaseReduxContext } from "metabase/utils/redux";+import { metabaseReduxContext } from "metabase/redux";// eslint-disable-next-line metabase/no-literal-metabase-strings -- this string only shows in the console.export const USE_OUTSIDE_OF_CONTEXT_MESSAGE = `Hooks from the Metabase modular embedding SDK must be used within a component wrapped by the MetabaseProvider`;const _useSdkSelector: TypedUseSelectorHook<SdkStoreState> =- createSelectorHook(MetabaseReduxContext);+ createSelectorHook(metabaseReduxContext);export const useSdkSelector: TypedUseSelectorHook<SdkStoreState> = (selector,options,) => {- const context = useContext(MetabaseReduxContext);+ const context = useContext(metabaseReduxContext);if (!context) {throw new Error(USE_OUTSIDE_OF_CONTEXT_MESSAGE);diff --git a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsxindex 05226c21e91..f4d15e3a538 100644--- a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx+++ b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx@@ -9,11 +9,11 @@ import { createMockSdkState } from "embedding-sdk-bundle/test/mocks/state";import type { MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-provider";import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";import { Api } from "metabase/api";+import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import type { MantineThemeOverride } from "metabase/ui";import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";-import { MetabaseReduxProvider } from "metabase/utils/redux";export interface RenderWithSDKProvidersOptions {storeInitialState?: Partial<State>;diff --git a/frontend/src/metabase/App.tsx b/frontend/src/metabase/App.tsxindex ad00f822b55..ae477865bb9 100644--- a/frontend/src/metabase/App.tsx+++ b/frontend/src/metabase/App.tsx@@ -18,6 +18,7 @@ import ScrollToTop from "metabase/hoc/ScrollToTop";import { usePageTitle } from "metabase/hooks/use-page-title";import AppBar from "metabase/nav/containers/AppBar";import Navbar from "metabase/nav/containers/Navbar";+import { connect, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import type { AppErrorDescriptor, State } from "metabase/redux/store";import {@@ -30,7 +31,6 @@ import {import { getApplicationName } from "metabase/selectors/whitelabel";import { StatusListing } from "metabase/status/components/StatusListing";import { initializeIframeResizer } from "metabase/utils/dom";-import { connect, useSelector } from "metabase/utils/redux";import { AppContainer, AppContent, AppContentContainer } from "./App.styled";import ErrorBoundary from "./ErrorBoundary";diff --git a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsxindex 3ad7a09e492..2947b718b24 100644--- a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx+++ b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx@@ -1,9 +1,9 @@import type { Location } from "history";import { push } from "react-router-redux";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import AccountLayout from "../../components/AccountLayout";diff --git a/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsx b/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsxindex 0bf3ec89172..2b3c6266a1b 100644--- a/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsx+++ b/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsx@@ -3,8 +3,8 @@ import { jt, t } from "ttag";import { Button } from "metabase/common/components/Button";import { ExternalLink } from "metabase/common/components/ExternalLink";import { ModalContent } from "metabase/common/components/ModalContent";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";import Settings from "metabase/utils/settings";import { ModalMessage } from "./HelpModal.styled";diff --git a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsxindex ff318352ad4..06791a527bf 100644--- a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx+++ b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx@@ -6,8 +6,8 @@ import {useUpdateSubscriptionMutation,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { ArchiveNotificationModal } from "../../components/ArchiveModal";import { getPulseId } from "../../selectors";diff --git a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsxindex 17e9537bba2..86a79483b5e 100644--- a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx+++ b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx@@ -4,11 +4,11 @@ import { useMemo } from "react";import type { NotificationListItem } from "metabase/account/notifications/types";import { skipToken, useListNotificationsQuery } from "metabase/api";import { Pulses } from "metabase/entities/pulses";+import { useDispatch, useSelector } from "metabase/redux";import {canManageSubscriptions as canManageSubscriptionsSelector,getUser,} from "metabase/selectors/user";-import { useDispatch, useSelector } from "metabase/utils/redux";import { parseTimestamp } from "metabase/utils/time-dayjs";import type { DashboardSubscription } from "metabase-types/api";diff --git a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsxindex 4639602fe35..f1a4ecf8afa 100644--- a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx@@ -9,8 +9,8 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks/use-toast";import { UnsubscribeConfirmModal } from "metabase/notifications/modals/UnsubscribeConfirmModal";+import { useDispatch, useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { Notification, User } from "metabase-types/api";import { getAlertId } from "../../selectors";diff --git a/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx b/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsxindex 778b0b7326f..04cf9a03de1 100644--- a/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx@@ -2,8 +2,8 @@ import { skipToken } from "@reduxjs/toolkit/query/react";import { useGetSubscriptionQuery, useUnsubscribeMutation } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useDispatch, useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useDispatch, useSelector } from "metabase/utils/redux";import { navigateToArchive } from "../../actions";import { UnsubscribeModal } from "../../components/UnsubscribeModal";diff --git a/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx b/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsxindex e8c3bf73a1b..5babf56766b 100644--- a/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx+++ b/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx@@ -1,6 +1,6 @@+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import { validatePassword } from "../../actions";diff --git a/frontend/src/metabase/account/profile/actions.ts b/frontend/src/metabase/account/profile/actions.tsindex cb7bdc5172a..b787501485e 100644--- a/frontend/src/metabase/account/profile/actions.ts+++ b/frontend/src/metabase/account/profile/actions.ts@@ -1,5 +1,5 @@import { userApi } from "metabase/api";-import { createThunkAction } from "metabase/utils/redux";+import { createThunkAction } from "metabase/redux";import type { User } from "metabase-types/api";import type { UserProfileData } from "./types";diff --git a/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx b/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsxindex 06f58abfbff..e60f56aafa5 100644--- a/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx+++ b/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx@@ -1,6 +1,6 @@+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import { updateUser } from "../../actions";diff --git a/frontend/src/metabase/actions/components/ActionViz/Action.tsx b/frontend/src/metabase/actions/components/ActionViz/Action.tsxindex b5c99146fee..8711934b1ed 100644--- a/frontend/src/metabase/actions/components/ActionViz/Action.tsx+++ b/frontend/src/metabase/actions/components/ActionViz/Action.tsx@@ -11,10 +11,10 @@ import {getParameterValues,} from "metabase/dashboard/selectors";import { getActionIsEnabledInDatabase } from "metabase/dashboard/utils";+import { connect, useSelector } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { Tooltip } from "metabase/ui";-import { connect, useSelector } from "metabase/utils/redux";import type { VisualizationProps } from "metabase/visualizations/types";import Question from "metabase-lib/v1/Question";import type {diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsxindex 101e1b45d5f..4efe38296cd 100644--- a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx+++ b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx@@ -6,7 +6,7 @@ import { Button } from "metabase/common/components/Button";import { EmptyState } from "metabase/common/components/EmptyState";import CS from "metabase/css/core/index.css";import { setActionForDashcard } from "metabase/dashboard/actions";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type {ActionDashboardCard,Dashboard,diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsxindex 51960feb92b..2d71d46ba84 100644--- a/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsx+++ b/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsx@@ -6,7 +6,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";import type { SelectChangeEvent } from "metabase/common/components/Select";import { Select } from "metabase/common/components/Select";import { setParameterMapping } from "metabase/dashboard/actions";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type Question from "metabase-lib/v1/Question";import type {ActionDashboardCard,diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsxindex 818b2699b5e..ed245038dee 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx@@ -15,9 +15,9 @@ import type {import { Actions } from "metabase/entities/actions";import { Databases } from "metabase/entities/databases";import { Questions } from "metabase/entities/questions";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsxindex 291e7e563cd..6ac40793121 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx@@ -1,9 +1,9 @@import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";import { InfoText } from "./Description.styled";diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsxindex 0a58174d9d4..8e900da8343 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -10,11 +10,11 @@ import { SidebarContent } from "metabase/common/components/SidebarContent";import { TextArea } from "metabase/common/components/TextArea";import { useUniqueId } from "metabase/common/hooks/use-unique-id";import { Actions } from "metabase/entities/actions/actions";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { Switch, Tooltip } from "metabase/ui";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type {ActionFormSettings,diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsxindex 29b12b176d2..80cd893e975 100644--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx@@ -6,9 +6,9 @@ import _ from "underscore";import { skipToken, useGetActionQuery } from "metabase/api";import { Questions } from "metabase/entities/questions";+import { connect } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import type { AppErrorDescriptor, State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type Question from "metabase-lib/v1/Question";import type { WritebackAction } from "metabase-types/api";diff --git a/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsx b/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsxindex f8fb8c6d0ef..665cedc52e6 100644--- a/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsx+++ b/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsx@@ -3,8 +3,8 @@ import { useCallback } from "react";import { skipToken, useGetActionQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useDispatch } from "metabase/redux";import { Modal } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import type {ParametersForActionExecution,diff --git a/frontend/src/metabase/admin/admin.ts b/frontend/src/metabase/admin/admin.tsindex c30fe561f90..3c82e66ec7e 100644--- a/frontend/src/metabase/admin/admin.ts+++ b/frontend/src/metabase/admin/admin.ts@@ -5,7 +5,7 @@ import { databasesReducer as databases } from "metabase/admin/databases/databaseimport { datamodel } from "metabase/admin/datamodel/datamodel";import { people } from "metabase/admin/people/people";import { permissions } from "metabase/admin/permissions/permissions";-import { combineReducers } from "metabase/utils/redux";+import { combineReducers } from "metabase/redux";export const admin = combineReducers({app,diff --git a/frontend/src/metabase/admin/app/actions.ts b/frontend/src/metabase/admin/app/actions.tsindex bfd10e5d4db..6e9f8ede05e 100644--- a/frontend/src/metabase/admin/app/actions.ts+++ b/frontend/src/metabase/admin/app/actions.ts@@ -1,5 +1,5 @@import { updateSetting } from "metabase/redux/settings";-import { createAsyncThunk } from "metabase/utils/redux";+import { createAsyncThunk } from "metabase/redux/utils";import { getCurrentVersion } from "./selectors";diff --git a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsxindex 0edb90b297a..18d71e66d50 100644--- a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx+++ b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx@@ -1,8 +1,8 @@import _ from "underscore";import { Databases } from "metabase/entities/databases";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import type Database from "metabase-lib/v1/metadata/Database";import { disableNotice } from "../../actions";diff --git a/frontend/src/metabase/admin/app/reducers.ts b/frontend/src/metabase/admin/app/reducers.tsindex 71bd5495a99..35d08ea9e6b 100644--- a/frontend/src/metabase/admin/app/reducers.ts+++ b/frontend/src/metabase/admin/app/reducers.ts@@ -2,9 +2,9 @@ import { createReducer } from "@reduxjs/toolkit";import { t } from "ttag";import { PLUGIN_ADMIN_ALLOWED_PATH_GETTERS } from "metabase/plugins";+import { combineReducers } from "metabase/redux";import type { AdminPath, AdminPathKey } from "metabase/redux/store";import { refreshCurrentUser } from "metabase/redux/user";-import { combineReducers } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";export const getAdminPaths: () => AdminPath[] = () => {diff --git a/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsx b/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsxindex e7648007d1d..fb89db97302 100644--- a/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsx+++ b/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsx@@ -1,6 +1,7 @@import type React from "react";import { Link } from "metabase/common/components/Link";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import {Icon,@@ -10,7 +11,6 @@ import {Stack,type StackProps,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export const AdminNavWrapper = ({children,diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsxindex 31b39713b06..da87c2fc9d8 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx@@ -9,8 +9,8 @@ import {} from "metabase/api";import { ActionButton } from "metabase/common/components/ActionButton";import { Tables } from "metabase/entities/tables";+import { useDispatch } from "metabase/redux";import { Button, Flex, Tooltip } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { isSyncCompleted } from "metabase/utils/syncing";import type { Database } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsxindex 68509e7c7ed..7bbb8052b20 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx@@ -15,9 +15,9 @@ import type {DatabaseFormConfig,FormLocation,} from "metabase/databases/types";+import { useDispatch } from "metabase/redux";import type { Dispatch } from "metabase/redux/store";import { Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type {DatabaseData,DatabaseEditErrorType,diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsxindex 2b1f8a2ce9e..9614e10a6ad 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx@@ -7,6 +7,7 @@ import { useDocsUrl, useSetting } from "metabase/common/hooks";import { getHelpUrl } from "metabase/common/utils/help-url";import CS from "metabase/css/core/index.css";import { getEngines } from "metabase/databases/selectors";+import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import {@@ -19,7 +20,6 @@ import {ScrollArea,Title,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { EngineKey } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsxindex 4506713752f..fb218b45eec 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx@@ -2,9 +2,9 @@ import type { ComponentProps } from "react";import { Link } from "react-router";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getDocsUrl } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export const MarkdownLink = ({ href, children }: ComponentProps<"a">) => {const parsedUrl = useSelector((state) => getParsedMDLinkUrl(state, href));diff --git a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsxindex 16a987862e9..74964c86b92 100644--- a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx+++ b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx@@ -5,6 +5,7 @@ import { useAsync } from "react-use";import { jt, t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useDispatch } from "metabase/redux";import { MetabaseApi } from "metabase/services";import {Alert,@@ -19,7 +20,6 @@ import {Text,UnstyledButton,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Database, DatabaseUsageInfo } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsxindex 19b840580c7..a7b74e41f25 100644--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx@@ -1,8 +1,8 @@import { c } from "ttag";import { getEngines } from "metabase/databases/selectors";+import { useSelector } from "metabase/redux";import { Flex, Stack, Text, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Database } from "metabase-types/api";import { isEngineKey } from "metabase-types/guards";diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsxindex de9e14b7d3e..dae70f2832e 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx@@ -22,9 +22,9 @@ import {PLUGIN_TABLE_EDITING,PLUGIN_WRITABLE_CONNECTION,} from "metabase/plugins";+import { connect, useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Divider, Flex } from "metabase/ui";-import { connect, useSelector } from "metabase/utils/redux";import type { DatabaseId, Database as DatabaseType } from "metabase-types/api";import { DatabaseConnectionInfoSection } from "../components/DatabaseConnectionInfoSection";diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsxindex 3fed9f00b4f..d806bbe73fc 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx@@ -7,8 +7,8 @@ import {import { LoadingAndGenericErrorWrapper } from "metabase/common/components/LoadingAndGenericErrorWrapper";import { useSetting } from "metabase/common/hooks";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { isSyncInProgress } from "metabase/utils/syncing";import { DatabaseList } from "../components/DatabaseList";diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsxindex c4b2022d124..c8faa7ebe7f 100644--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx@@ -5,6 +5,7 @@ import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { getEngines } from "metabase/databases/selectors";+import { useSelector } from "metabase/redux";import {Box,Button,@@ -15,7 +16,6 @@ import {Text,Title,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { EngineKey } from "metabase-types/api";import { DatabaseEditConnectionForm } from "../components/DatabaseEditConnectionForm";diff --git a/frontend/src/metabase/admin/databases/database.ts b/frontend/src/metabase/admin/databases/database.tsindex 6cdeec3246e..8de8e944111 100644--- a/frontend/src/metabase/admin/databases/database.ts+++ b/frontend/src/metabase/admin/databases/database.ts@@ -2,8 +2,8 @@ import { createAction, createReducer } from "@reduxjs/toolkit";import { push } from "react-router-redux";import { Databases } from "metabase/entities/databases";+import { combineReducers } from "metabase/redux";import type { Dispatch } from "metabase/redux/store";-import { combineReducers } from "metabase/utils/redux";import type { DatabaseData, DatabaseId } from "metabase-types/api";import { editParamsForUserControlledScheduling } from "./editParamsForUserControlledScheduling";diff --git a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts b/frontend/src/metabase/admin/databases/hooks/use-database-connection.tsindex 1ae80f0ecd4..d728cff072c 100644--- a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts+++ b/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts@@ -5,7 +5,7 @@ import { skipToken, useGetDatabaseQuery } from "metabase/api";import { getDefaultEngineKey } from "metabase/databases/utils/engine";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";import { PLUGIN_DB_ROUTING } from "metabase/plugins";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { DatabaseId, Engine, EngineKey } from "metabase-types/api";interface UseDatabaseConnectionProps {diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsxindex 0b837dfd70b..b4b466f529c 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx@@ -12,9 +12,9 @@ import {getSegmentQuery,getSegmentQueryDefinition,} from "metabase/querying/segments/utils";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Alert } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { DatasetQuery, Segment, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsxindex 4172d71612f..51b7df620bc 100644--- a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx@@ -3,9 +3,9 @@ import _ from "underscore";import { Segments } from "metabase/entities/segments";import { Tables } from "metabase/entities/tables";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import type { Revision, RevisionId, Segment, User } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsxindex 51f087473eb..c285625f831 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx@@ -10,8 +10,8 @@ import { trackSegmentCreated } from "metabase/data-studio/analytics";import { Segments } from "metabase/entities/segments";import { Tables } from "metabase/entities/tables";import { useMetadataToasts } from "metabase/metadata/hooks";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import type { Segment } from "metabase-types/api";import { SegmentForm } from "../components/SegmentForm";diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsxindex 41f80eaecc5..de96d5758b9 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx@@ -12,9 +12,9 @@ import CS from "metabase/css/core/index.css";import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";import { Segments } from "metabase/entities/segments";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUserIsAdmin } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/datamodel/datamodel.ts b/frontend/src/metabase/admin/datamodel/datamodel.tsindex 1689f3f7c15..929366f11cb 100644--- a/frontend/src/metabase/admin/datamodel/datamodel.ts+++ b/frontend/src/metabase/admin/datamodel/datamodel.ts@@ -1,9 +1,9 @@-import { RevisionsApi } from "metabase/services";import {combineReducers,createThunkAction,handleActions,-} from "metabase/utils/redux";+} from "metabase/redux";+import { RevisionsApi } from "metabase/services";import type { Revision, RevisionId } from "metabase-types/api";export const FETCH_REVISIONS = "metabase/admin/datamodel/FETCH_REVISIONS";diff --git a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsxindex 933c50157e5..4cebf80d74f 100644--- a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx+++ b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx@@ -8,9 +8,9 @@ import { FieldSet } from "metabase/common/components/FieldSet";import CS from "metabase/css/core/index.css";import { Tables } from "metabase/entities/tables";import { DatabaseSchemaAndTableDataSelector } from "metabase/querying/common/components/DataSelector";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Icon } from "metabase/ui";-import { connect } from "metabase/utils/redux";import type { ConcreteTableId, Segment, Table } from "metabase-types/api";type LocationWithQuery = Location<{diff --git a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsx b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsxindex 7becdd95b59..141a174b79c 100644--- a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsx+++ b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsx@@ -6,9 +6,9 @@ import {AdminNavWrapper,} from "metabase/admin/components/AdminNav";import { useHasTokenFeature } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import { Divider, Flex, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function EmbeddingNav() {const hasSimpleEmbedding = useHasTokenFeature("embedding_simple");diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsxindex ef31d131650..ef7ce4398fd 100644--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx@@ -11,6 +11,7 @@ import { AdminPaneLayout } from "metabase/common/components/AdminPaneLayout";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { useToast } from "metabase/common/hooks/use-toast";import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { Box, Button, Text } from "metabase/ui";import {canEditMembership,@@ -18,7 +19,6 @@ import {isAdminGroup,isDefaultGroup,} from "metabase/utils/groups";-import { useDispatch } from "metabase/utils/redux";import type { Group, Member, Membership, User } from "metabase-types/api";import { Alert } from "./Alert";diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsxindex 43e70d717ec..484aee0c976 100644--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx@@ -7,10 +7,10 @@ import { Link } from "metabase/common/components/Link";import { PaginationControls } from "metabase/common/components/PaginationControls";import { usePagination } from "metabase/common/hooks/use-pagination";import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Box, Flex, Icon, Text, Tooltip, UnstyledButton } from "metabase/ui";import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";-import { useSelector } from "metabase/utils/redux";import { getFullName } from "metabase/utils/user";import type { Group, Member, Membership } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/people/components/PeopleList.tsx b/frontend/src/metabase/admin/people/components/PeopleList.tsxindex 0915618f048..33f6d5bf137 100644--- a/frontend/src/metabase/admin/people/components/PeopleList.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleList.tsx@@ -15,8 +15,8 @@ import { useConfirmation } from "metabase/common/hooks/use-confirmation";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { PLUGIN_GROUP_MANAGERS } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { Box, Flex, Icon, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type {GroupId,GroupInfo,diff --git a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx b/frontend/src/metabase/admin/people/components/PeopleListRow.tsxindex 600f776673e..b1916863ff0 100644--- a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleListRow.tsx@@ -5,6 +5,7 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { UserAvatar } from "metabase/common/components/UserAvatar";import { PLUGIN_ADMIN_USER_MENU_ITEMS, PLUGIN_TENANTS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import {Box,@@ -15,7 +16,6 @@ import {Tooltip,UnstyledButton,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { getFullName } from "metabase/utils/user";import type {diff --git a/frontend/src/metabase/admin/people/components/PeopleNav.tsx b/frontend/src/metabase/admin/people/components/PeopleNav.tsxindex 51275e49c29..f601203aa8f 100644--- a/frontend/src/metabase/admin/people/components/PeopleNav.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleNav.tsx@@ -8,9 +8,9 @@ import {import { shouldNudgeToPro } from "metabase/admin/people/selectors";import { UpsellSSO } from "metabase/admin/upsells";import { useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import { Divider, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function PeopleNav() {const shouldNudge = useSelector(shouldNudgeToPro) as boolean;diff --git a/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx b/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsxindex 250260d76ec..26f0c26fbd4 100644--- a/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx+++ b/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx@@ -6,8 +6,8 @@ import {useListUserMembershipsQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { GroupDetail } from "../components/GroupDetail";diff --git a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsxindex 8dc8fb73e7a..28234031150 100644--- a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx@@ -15,8 +15,8 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSetting } from "metabase/common/hooks";import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { Group } from "metabase-types/api";import { GroupsListing } from "../components/GroupsListing";diff --git a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx b/frontend/src/metabase/admin/people/containers/NewUserModal.tsxindex 03bb6de5429..d37523ab7b6 100644--- a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx+++ b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { useCreateUserMutation } from "metabase/api";import { PLUGIN_TENANTS } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { Modal } from "metabase/ui";import { generatePassword } from "metabase/utils/password";-import { useDispatch } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import * as Urls from "metabase/utils/urls";import type { User as UserType } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsxindex 986d8cfaef9..b7a0e387277 100644--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx@@ -7,9 +7,9 @@ import { useListPermissionsGroupsQuery, useListUsersQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSetting } from "metabase/common/hooks";import { PLUGIN_TENANTS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Flex, Group, Tabs, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { PeopleList } from "../../components/PeopleList";diff --git a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsxindex dd1c78d1e7a..a77ad6eb4db 100644--- a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx+++ b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx@@ -13,9 +13,9 @@ import { CopyButton } from "metabase/common/components/CopyButton";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PasswordReveal } from "metabase/common/components/PasswordReveal";import { useToast } from "metabase/common/hooks/use-toast";+import { useDispatch, useSelector } from "metabase/redux";import { Button, Flex, Modal, Text, TextInput } from "metabase/ui";import { generatePassword } from "metabase/utils/password";-import { useDispatch, useSelector } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsxindex cf28227ad47..08efa12d607 100644--- a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx+++ b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx@@ -10,9 +10,9 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { 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 { getSetting, isSsoEnabled } from "metabase/selectors/settings";import { Box } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { User } from "metabase-types/api";import { clearTemporaryPassword } from "../people";diff --git a/frontend/src/metabase/admin/people/people.ts b/frontend/src/metabase/admin/people/people.tsindex 931a8612d3f..f8c99dff470 100644--- a/frontend/src/metabase/admin/people/people.ts+++ b/frontend/src/metabase/admin/people/people.ts@@ -1,7 +1,7 @@import { type PayloadAction, createSlice } from "@reduxjs/toolkit";+import { combineReducers } from "metabase/redux";import type { TemporaryPasswordsState } from "metabase/redux/store";-import { combineReducers } from "metabase/utils/redux";const initialState: TemporaryPasswordsState = {};diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsxindex 0f178ac3ef6..18a36b4d3db 100644--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx@@ -11,6 +11,7 @@ import { ModelCachingScheduleWidget } from "metabase/admin/settings/components/wimport { ExternalLink } from "metabase/common/components/ExternalLink";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { useDocsUrl, useSetting, useToast } from "metabase/common/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { refreshSiteSettings } from "metabase/redux/settings";import {getApplicationName,@@ -18,7 +19,6 @@ import {} from "metabase/selectors/whitelabel";import { PersistedModelsApi } from "metabase/services";import { Switch, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import ModelPersistenceConfigurationS from "./ModelPersistenceConfiguration.module.css";diff --git a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx b/frontend/src/metabase/admin/performance/components/StrategyForm.tsxindex 3c82c722176..16aef5169e5 100644--- a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx+++ b/frontend/src/metabase/admin/performance/components/StrategyForm.tsx@@ -18,6 +18,7 @@ import {useFormContext,} from "metabase/forms";import { PLUGIN_CACHING } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import {Box,@@ -31,7 +32,6 @@ import {Title,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type {CacheStrategy,CacheStrategyType,diff --git a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsxindex f36df74f350..0adffe68013 100644--- a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx+++ b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx@@ -1,8 +1,8 @@import { useEffect, useRef } from "react";import { push } from "react-router-redux";+import { useDispatch } from "metabase/redux";import { useRouter } from "metabase/router";-import { useDispatch } from "metabase/utils/redux";type Props = {shouldConfirm: boolean;diff --git a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsxindex 8c7ed5e9c96..720f43d14bb 100644--- a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx+++ b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx@@ -1,8 +1,8 @@import { useCallback } from "react";import { useInvalidateCacheConfigsMutation } from "metabase/api";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { useDispatch } from "metabase/utils/redux";import type { CacheableModel } from "metabase-types/api";import { isErrorWithMessage, resolveSmoothly } from "../utils";diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxindex 4b6ae6b3c77..a878b4388eb 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx@@ -9,8 +9,8 @@ import { ModalContent } from "metabase/common/components/ModalContent";import CS from "metabase/css/core/index.css";import { Collections } from "metabase/entities/collections";import { Groups } from "metabase/entities/groups";+import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Collection, CollectionNamespace } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsxindex f80fd3884b7..e327e2f3b5c 100644--- a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx+++ b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx@@ -5,6 +5,7 @@ import { DataPermissionValue } from "metabase/admin/permissions/types";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";import { PLUGIN_TRANSFORMS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import {Accordion,@@ -17,7 +18,6 @@ import {Title,rem,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { hasPermissionValueInGraph } from "../../utils/graph/data-permissions";diff --git a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsxindex a70bdd768bc..d250199ca29 100644--- a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx+++ b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx@@ -2,9 +2,9 @@ import { Link } from "react-router";import { jt, t } from "ttag";import { useModalOpen } from "metabase/common/hooks/use-modal-open";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { Button, Flex, Modal, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export const LegacyPermissionsModal = ({isOpen,diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsxindex b86d22a82c1..e0188f58287 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx@@ -1,9 +1,9 @@import { t } from "ttag";+import { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";import { getDocsUrl } from "metabase/selectors/settings";import { Alert, Anchor, Box, Icon, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";export const PermissionsEditorSplitPermsMessage = () => {const dispatch = useDispatch();diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsxindex 41df09f81b4..ac5da99371a 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx@@ -19,6 +19,7 @@ import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { useToggle } from "metabase/common/hooks/use-toggle";import CS from "metabase/css/core/index.css";+import { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";import type { IconName } from "metabase/ui";import {@@ -27,7 +28,6 @@ import {Modal as NewModal,Text,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import {clearSaveError as clearPermissionsSaveError,diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsxindex 9eca41fe7f3..5e6239a2454 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx@@ -7,8 +7,8 @@ import _ from "underscore";import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";import { Collections } from "metabase/entities/collections";import { Groups } from "metabase/entities/groups";+import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect, useSelector } from "metabase/utils/redux";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsxindex 1743f82313e..43a57e7cd83 100644--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx@@ -6,10 +6,10 @@ import _ from "underscore";import { skipToken, useGetDatabaseMetadataQuery } from "metabase/api";import { Databases } from "metabase/entities/databases";import { Groups } from "metabase/entities/groups";+import { useDispatch, useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";-import { useDispatch, useSelector } from "metabase/utils/redux";import type Database from "metabase-lib/v1/metadata/Database";import type { DatabaseId, Group } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsxindex 5887b02a95b..6779ecce341 100644--- a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx@@ -6,10 +6,10 @@ import _ from "underscore";import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";+import { connect, useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";-import { connect, useDispatch, useSelector } from "metabase/utils/redux";import {PermissionsEditor,diff --git a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsxindex 070bcda38d7..a3246e444c9 100644--- a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx@@ -6,10 +6,10 @@ import _ from "underscore";import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";+import { connect, useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";-import { connect, useDispatch, useSelector } from "metabase/utils/redux";import type { GroupId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/permissions/permissions.ts b/frontend/src/metabase/admin/permissions/permissions.tsindex 483975cc2b9..73d22c7394d 100644--- a/frontend/src/metabase/admin/permissions/permissions.ts+++ b/frontend/src/metabase/admin/permissions/permissions.ts@@ -25,13 +25,13 @@ import {PLUGIN_ADVANCED_PERMISSIONS,PLUGIN_DATA_PERMISSIONS,} from "metabase/plugins";-import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";-import { CollectionsApi, PermissionsApi } from "metabase/services";import {combineReducers,createAction,createThunkAction,-} from "metabase/utils/redux";+} from "metabase/redux";+import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";+import { CollectionsApi, PermissionsApi } from "metabase/services";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {Collection,diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsxindex 454023d155a..11b3d84745e 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx@@ -7,10 +7,10 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useStoreUrl } from "metabase/common/hooks";import { type Plan, getPlan } from "metabase/common/utils/plan";+import { useDispatch, useSelector } from "metabase/redux";import { refreshSiteSettings } from "metabase/redux/settings";import { getSetting } from "metabase/selectors/settings";import { Box } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { CloudMigration } from "metabase-types/api/cloud-migration";import { MigrationCreationError } from "./MigrationCreationError";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsxindex f6f7ccb99bb..c0fcc3a57b0 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx@@ -6,6 +6,7 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { useSetting } from "metabase/common/hooks";import { useToggle } from "metabase/common/hooks/use-toggle";import type { Plan } from "metabase/common/utils/plan";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import {Box,@@ -17,7 +18,6 @@ import {Progress,Text,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { MigrationCard } from "./CloudPanel.styled";import type { InProgressCloudMigration, InProgressStates } from "./utils";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsxindex e5e0dac90bc..6278c735b84 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx@@ -3,10 +3,10 @@ import { jt, t } from "ttag";import { Alert } from "metabase/common/components/Alert";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { Box, Center, Stack, Text } from "metabase/ui";import { isSameOrigin } from "metabase/utils/dom";-import { useSelector } from "metabase/utils/redux";import S from "./EmbeddingAppSameSiteCookieDescription.module.css";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsxindex 5f78959cfe2..49e317f8955 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx@@ -1,8 +1,8 @@import { t } from "ttag";+import { useDispatch } from "metabase/redux";import { setOpenModalWithProps } from "metabase/redux/ui";import { Button } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";export const NewEmbedButton = () => {const dispatch = useDispatch();diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsxindex f34b9c1254c..1cc483d310d 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx@@ -10,9 +10,9 @@ import {PLUGIN_CONTENT_TRANSLATION,PLUGIN_EMBEDDING_IFRAME_SDK_SETUP,} from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUpgradeUrl } from "metabase/selectors/settings";import { Box, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { SettingTitle } from "../../SettingHeader";import { EmbeddedResources } from "../../widgets/PublicLinksListing/EmbeddedResources";diff --git a/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsx b/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsxindex 6ee476ee7c4..8ce30d7227e 100644--- a/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsx@@ -2,10 +2,10 @@ import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUpgradeUrl } from "metabase/selectors/settings";import { Box, Button, Divider, Flex, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { SettingHeader } from "../SettingHeader";diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsxindex 6e3e72982d6..515eb43e7da 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx@@ -10,9 +10,9 @@ import {import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import { Divider, Flex } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { UpdatesNavItem } from "./UpdatesNavItem";diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsxindex 851ba408380..01d5f9fcc35 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx@@ -2,8 +2,8 @@ import { t } from "ttag";import { getCurrentVersion } from "metabase/admin/app/selectors";import { useGetVersionInfoQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { Indicator } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { newVersionAvailable } from "metabase/utils/version";import { SettingsNavItem } from "./SettingsNav";diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsxindex d8b842fae68..00407639cff 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx@@ -7,9 +7,9 @@ import {} from "metabase/admin/components/SettingsSection";import { CommunityLocalizationNotice } from "metabase/common/components/CommunityLocalizationNotice";import { useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { AdminSettingInput } from "../widgets/AdminSettingInput";import { FormattingWidget } from "../widgets/FormattingWidget";diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsxindex 99a7f8315da..c787700adcf 100644--- a/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { useAdminSetting } from "metabase/api/utils";import { DashboardSelector } from "metabase/common/components/DashboardSelector";+import { useDispatch } from "metabase/redux";import { refreshCurrentUser } from "metabase/redux/user";import { Stack } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { DashboardId } from "metabase-types/api";import { trackCustomHomepageDashboardEnabled } from "../../analytics";diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsxindex c0be49a207d..03c80fb4713 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx@@ -1,10 +1,10 @@import _ from "underscore";import { Groups } from "metabase/entities/groups";+import { connect } from "metabase/redux";import { updateSetting } from "metabase/redux/settings";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";-import { connect } from "metabase/utils/redux";import type { Settings } from "metabase-types/api/settings";import { GroupMappingsWidgetView } from "./GroupMappingsWidgetView";diff --git a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsxindex b19e20f0901..c45be1dc4b7 100644--- a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx@@ -13,6 +13,7 @@ import {FormSubmitButton,FormTextInput,} from "metabase/forms";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import {Alert,@@ -27,7 +28,6 @@ import {Title,} from "metabase/ui";import { getResponseErrorMessage } from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import {type NotificationAuthMethods,type NotificationAuthType,diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsxindex 7c6bbb32ea7..133c859c042 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx@@ -6,8 +6,8 @@ import { useGetVersionInfoQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { Tabs } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { newVersionAvailable, versionIsLatest } from "metabase/utils/version";import S from "./VersionUpdateNotice.module.css";diff --git a/frontend/src/metabase/admin/settings/settings.ts b/frontend/src/metabase/admin/settings/settings.tsindex 80f11862af6..a4acde93673 100644--- a/frontend/src/metabase/admin/settings/settings.ts+++ b/frontend/src/metabase/admin/settings/settings.ts@@ -1,9 +1,9 @@import type { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";+import { createThunkAction } from "metabase/redux";import { refreshSiteSettings } from "metabase/redux/settings";import type { State } from "metabase/redux/store";import { SettingsApi } from "metabase/services";-import { createThunkAction } from "metabase/utils/redux";// ACTION TYPES AND ACTION CREATORSdiff --git a/frontend/src/metabase/admin/tools/components/Help/Help.tsx b/frontend/src/metabase/admin/tools/components/Help/Help.tsxindex a40e3d8267b..89971e2a73a 100644--- a/frontend/src/metabase/admin/tools/components/Help/Help.tsx+++ b/frontend/src/metabase/admin/tools/components/Help/Help.tsx@@ -14,10 +14,10 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { PLUGIN_SUPPORT } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";import { UtilApi } from "metabase/services";import { Box, Code, Group } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import S from "./help.module.css";diff --git a/frontend/src/metabase/admin/tools/components/JobInfoApp.tsx b/frontend/src/metabase/admin/tools/components/JobInfoApp.tsxindex 897dd380db8..5a8287aaf1d 100644--- a/frontend/src/metabase/admin/tools/components/JobInfoApp.tsx+++ b/frontend/src/metabase/admin/tools/components/JobInfoApp.tsx@@ -11,8 +11,8 @@ import { useGetTasksInfoQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";+import { useDispatch } from "metabase/redux";import { Ellipsified, Flex, Stack } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { Job } from "metabase-types/api";interface SchedulerInfoProps {diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsxindex 7ea7f879ad2..c8e9d8a9a19 100644--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx@@ -8,7 +8,7 @@ import { Link } from "metabase/common/components/Link";import { ModalContent } from "metabase/common/components/ModalContent";import ButtonsS from "metabase/css/components/buttons.module.css";import { PersistedModels } from "metabase/entities/persisted-models";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import type { ModelCacheRefreshStatus } from "metabase-types/api";import { ErrorBox } from "./ModelCacheRefreshJobs.styled";diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsxindex 03e6aa46bfb..69962ee0a04 100644--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx@@ -18,9 +18,9 @@ import { usePagination } from "metabase/common/hooks/use-pagination";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { PersistedModels } from "metabase/entities/persisted-models";+import { connect } from "metabase/redux";import { Icon, Tooltip } from "metabase/ui";import { capitalize } from "metabase/utils/formatting";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { checkCanRefreshModelCache } from "metabase-lib/v1/metadata/utils/models";import type { ModelCacheRefreshStatus } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsxindex 0e0c62925d5..f65a69ca19c 100644--- a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx@@ -9,8 +9,8 @@ import { SortableColumnHeader } from "metabase/common/components/ItemsTable/Baseimport { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";+import { useDispatch } from "metabase/redux";import { Box, Ellipsified, Flex } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type {Database,diff --git a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsxindex 395a9234364..d35820c7740 100644--- a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx@@ -10,6 +10,7 @@ import { DateTime } from "metabase/common/components/DateTime";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";+import { useDispatch } from "metabase/redux";import {Anchor,Box,@@ -21,7 +22,6 @@ import {Title,Tooltip,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Task } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsxindex bfdf72e1217..b99f2411a47 100644--- a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx@@ -6,8 +6,8 @@ import { DateTime } from "metabase/common/components/DateTime";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";+import { useDispatch } from "metabase/redux";import { Box, Ellipsified, Flex } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { TaskRun } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx b/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsxindex 43aeabc2ae9..ef3af3f1fec 100644--- a/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx+++ b/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx@@ -2,8 +2,8 @@ import { type WithRouterProps, withRouter } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";+import { useDispatch } from "metabase/redux";import { Flex, Icon, Tabs, Title, Tooltip } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import {diff --git a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsxindex acebac82696..b303921121d 100644--- a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx@@ -4,9 +4,9 @@ import { UpsellBanner } from "metabase/common/components/upsells/components";import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { getPlan } from "metabase/common/utils/plan";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export const UpsellBetterSupport = ({ location }: { location: string }) => {const campaign = "better-hosting";diff --git a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsxindex ca98273e978..7de8be930cf 100644--- a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import { UpsellPill } from "metabase/common/components/upsells/components";import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { useHasTokenFeature } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getIsHosted } from "metabase/setup/selectors";-import { useSelector } from "metabase/utils/redux";export const UpsellEmailWhitelabelPill = ({ source }: { source: string }) => {const isHosted = useSelector(getIsHosted);diff --git a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx b/frontend/src/metabase/admin/upsells/UpsellHosting.tsxindex 7d27f92fede..49faa8fe6fe 100644--- a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx@@ -3,8 +3,8 @@ import { jt, t } from "ttag";import { UpsellBanner } from "metabase/common/components/upsells/components";import { useSetting } from "metabase/common/hooks";import { getPlan, isProPlan } from "metabase/common/utils/plan";+import { useSelector } from "metabase/redux";import { getIsHosted } from "metabase/setup/selectors";-import { useSelector } from "metabase/utils/redux";export const UpsellHostingBanner = ({ location }: { location: string }) => {const isHosted = useSelector(getIsHosted);diff --git a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx b/frontend/src/metabase/admin/upsells/UpsellSSO.tsxindex 2836ded12e8..9fe98f68bcd 100644--- a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellSSO.tsx@@ -4,9 +4,9 @@ import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { hasAnySsoFeature } from "metabase/common/utils/plan";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Box, List } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export const UpsellSSO = ({ location }: { location: string }) => {const campaign = "sso";diff --git a/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsx b/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsxindex 4ca3dea3ebc..55ffdf46cdb 100644--- a/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsx@@ -5,9 +5,9 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import CS from "metabase/css/core/index.css";import linkStyles from "metabase/css/core/link.module.css";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUpgradeUrl } from "metabase/selectors/settings";import { UnstyledButton } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function UpsellSdkLink() {const campaign = "embedding-sdk";diff --git a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx b/frontend/src/metabase/admin/upsells/UpsellUploads.tsxindex 825913cf41c..c514fb16623 100644--- a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellUploads.tsx@@ -4,8 +4,8 @@ import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { getPlan } from "metabase/common/utils/plan";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export const UpsellUploads = ({ location }: { location: string }) => {const campaign = "manage-uploads";diff --git a/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx b/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsxindex d29b04802af..d2341cc6bd4 100644--- a/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx@@ -7,8 +7,8 @@ import { useUpsellLink } from "metabase/common/components/upsells/components/useimport { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { useHasTokenFeature } from "metabase/common/hooks";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export const UpsellWhitelabel = ({ source }: { source: string }) => {const isWhitelabeled = useHasTokenFeature("whitelabel");diff --git a/frontend/src/metabase/admin/utils.ts b/frontend/src/metabase/admin/utils.tsindex 6ad675842aa..40fa2ed195a 100644--- a/frontend/src/metabase/admin/utils.ts+++ b/frontend/src/metabase/admin/utils.ts@@ -3,10 +3,10 @@ import { push, replace, routerActions } from "react-router-redux";import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";import { getAdminPaths } from "metabase/admin/app/selectors";+import { connect, metabaseReduxContext } from "metabase/redux";import type { State } from "metabase/redux/store";import type { AdminPath } from "metabase/redux/store/admin";import { getSetting } from "metabase/selectors/settings";-import { MetabaseReduxContext, connect } from "metabase/utils/redux";export const createAdminRouteGuard = (routeKey: string) => {const Wrapper = connectedReduxRedirect<any, State>({@@ -16,7 +16,7 @@ export const createAdminRouteGuard = (routeKey: string) => {authenticatedSelector: (state) =>getAdminPaths(state)?.find((path) => path.key === routeKey) != null,redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});return Wrapper(({ children }) => children);@@ -62,7 +62,7 @@ export const createTenantsRouteGuard = () => {getAdminPaths(state)?.find((path) => path.key === "people") != null &&getSetting(state, "use-tenants"),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});return Wrapper(({ children }) => children);diff --git a/frontend/src/metabase/api/api.ts b/frontend/src/metabase/api/api.tsindex 476ce8d7356..ce8c01f0255 100644--- a/frontend/src/metabase/api/api.ts+++ b/frontend/src/metabase/api/api.ts@@ -10,7 +10,7 @@ import {createStoreHook,} from "react-redux";-import { MetabaseReduxContext } from "metabase/utils/redux";+import { metabaseReduxContext } from "metabase/redux";import { apiQuery } from "./query";import { TAG_TYPES } from "./tags";@@ -19,9 +19,9 @@ const createApi = buildCreateApi(coreModule(),reactHooksModule({hooks: {- useDispatch: createDispatchHook(MetabaseReduxContext),- useSelector: createSelectorHook(MetabaseReduxContext),- useStore: createStoreHook(MetabaseReduxContext),+ useDispatch: createDispatchHook(metabaseReduxContext),+ useSelector: createSelectorHook(metabaseReduxContext),+ useStore: createStoreHook(metabaseReduxContext),},}),);diff --git a/frontend/src/metabase/api/automagic-dashboards.ts b/frontend/src/metabase/api/automagic-dashboards.tsindex c5c57a77f68..a26cfb9033f 100644--- a/frontend/src/metabase/api/automagic-dashboards.ts+++ b/frontend/src/metabase/api/automagic-dashboards.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { QueryMetadataSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {Dashboard,DashboardQueryMetadata,diff --git a/frontend/src/metabase/api/card.ts b/frontend/src/metabase/api/card.tsindex dadca2241c9..c24960413a9 100644--- a/frontend/src/metabase/api/card.ts+++ b/frontend/src/metabase/api/card.ts@@ -1,6 +1,6 @@import { PLUGIN_API } from "metabase/plugins";+import { updateMetadata } from "metabase/redux/metadata";import { QueryMetadataSchema, QuestionSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {Card,CardId,diff --git a/frontend/src/metabase/api/dashboard.ts b/frontend/src/metabase/api/dashboard.tsindex a916b31fdaf..a6e196a67b6 100644--- a/frontend/src/metabase/api/dashboard.ts+++ b/frontend/src/metabase/api/dashboard.ts@@ -1,6 +1,6 @@import { PLUGIN_API } from "metabase/plugins";+import { updateMetadata } from "metabase/redux/metadata";import { QueryMetadataSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {CopyDashboardRequest,CreateDashboardRequest,diff --git a/frontend/src/metabase/api/database.ts b/frontend/src/metabase/api/database.tsindex 57c5f6fde52..e85dafcb7d9 100644--- a/frontend/src/metabase/api/database.ts+++ b/frontend/src/metabase/api/database.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { DatabaseSchema, FieldSchema, TableSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {AutocompleteRequest,AutocompleteSuggestion,diff --git a/frontend/src/metabase/api/dataset.ts b/frontend/src/metabase/api/dataset.tsindex a2ccc695d3c..4786f6268f2 100644--- a/frontend/src/metabase/api/dataset.ts+++ b/frontend/src/metabase/api/dataset.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { QueryMetadataSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {CardQueryMetadata,Dataset,diff --git a/frontend/src/metabase/api/field.ts b/frontend/src/metabase/api/field.tsindex 730a759b1e1..ac426a96059 100644--- a/frontend/src/metabase/api/field.ts+++ b/frontend/src/metabase/api/field.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { FieldSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {CreateFieldDimensionRequest,Field,diff --git a/frontend/src/metabase/api/group-table-access-policy.ts b/frontend/src/metabase/api/group-table-access-policy.tsindex 772b5f6eed8..25c593b1cdc 100644--- a/frontend/src/metabase/api/group-table-access-policy.ts+++ b/frontend/src/metabase/api/group-table-access-policy.ts@@ -5,9 +5,11 @@ import { listTag } from "./tags";export const groupTableAccessPolicyApi = Api.injectEndpoints({endpoints: (builder) => ({+ // When only one (or none) of group_id and table_id are provided+ // /api/mt/gtap returns a list of policies.listGroupTableAccessPolicies: builder.query<GroupTableAccessPolicy[],- { group_id?: number; table_id?: number } | void+ { group_id?: number } | { table_id?: number } | null | undefined>({query: (params) => ({method: "GET",@@ -16,8 +18,32 @@ export const groupTableAccessPolicyApi = Api.injectEndpoints({}),providesTags: () => [listTag("group-table-access-policy")],}),+ // When both table_id and group_id are provided /api/mt/gtap returns+ // a single policy, so we need to use a different type for that case.+ getGroupTableAccessPolicy: builder.query<+ GroupTableAccessPolicy | null,+ { group_id: number; table_id: number }+ >({+ query: (params) => ({+ method: "GET",+ url: "/api/mt/gtap",+ params,+ }),+ providesTags: () => [listTag("group-table-access-policy")],+ transformResponse(response: GroupTableAccessPolicy | "" | null) {+ // The api returns 204 No Content when there is no policy.+ // This gets interpreted as an empty string by RTK query, which is not what we want.+ // Here we coalesce the empty string into null.+ if (response === "") {+ return null;+ }+ return response;+ },+ }),}),});-export const { useListGroupTableAccessPoliciesQuery } =- groupTableAccessPolicyApi;+export const {+ useListGroupTableAccessPoliciesQuery,+ useGetGroupTableAccessPolicyQuery,+} = groupTableAccessPolicyApi;diff --git a/frontend/src/metabase/api/measure.ts b/frontend/src/metabase/api/measure.tsindex 33a987bc87f..a83ba34ab6a 100644--- a/frontend/src/metabase/api/measure.ts+++ b/frontend/src/metabase/api/measure.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { MeasureSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {CreateMeasureRequest,FieldValue,diff --git a/frontend/src/metabase/api/metric.ts b/frontend/src/metabase/api/metric.tsindex 1b39d92d0c4..45ca9ed242a 100644--- a/frontend/src/metabase/api/metric.ts+++ b/frontend/src/metabase/api/metric.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { MetricSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {Dataset,FieldValue,diff --git a/frontend/src/metabase/api/segment.ts b/frontend/src/metabase/api/segment.tsindex 8713246ba58..dd74d03b79a 100644--- a/frontend/src/metabase/api/segment.ts+++ b/frontend/src/metabase/api/segment.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { SegmentSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {CreateSegmentRequest,Segment,diff --git a/frontend/src/metabase/api/snippet.ts b/frontend/src/metabase/api/snippet.tsindex 0ce3c4bcda7..7119863bae7 100644--- a/frontend/src/metabase/api/snippet.ts+++ b/frontend/src/metabase/api/snippet.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { SnippetSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {CreateSnippetRequest,ListSnippetsParams,diff --git a/frontend/src/metabase/api/table.ts b/frontend/src/metabase/api/table.tsindex 0df678600c7..0e90edc4913 100644--- a/frontend/src/metabase/api/table.ts+++ b/frontend/src/metabase/api/table.ts@@ -1,5 +1,5 @@+import { updateMetadata } from "metabase/redux/metadata";import { ForeignKeySchema, TableSchema } from "metabase/schema";-import { updateMetadata } from "metabase/utils/redux/metadata";import type {BulkTableSelection,BulkTableSelectionInfo,diff --git a/frontend/src/metabase/api/utils/use-token-refresh.ts b/frontend/src/metabase/api/utils/use-token-refresh.tsindex 7ee9a80c681..0b12127ed89 100644--- a/frontend/src/metabase/api/utils/use-token-refresh.ts+++ b/frontend/src/metabase/api/utils/use-token-refresh.ts@@ -5,7 +5,7 @@ import {useGetSettingsQuery,useRefreshTokenStatusMutation,} from "metabase/api";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { TokenStatusFeature } from "metabase-types/api";const REFRESH_INTERVAL = 10 * 1000; // 10 secondsdiff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex 7713db0c692..e8e1c1f02c5 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -37,6 +37,7 @@ import registerDashboardVisualizations from "metabase/dashboard/visualizations/rimport { initializeInteractiveEmbedding } from "metabase/embedding/interactive-embedding";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 { getUserId } from "metabase/selectors/user";import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";@@ -44,7 +45,6 @@ import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCachePimport api from "metabase/utils/api";import { captureConsoleErrors } from "metabase/utils/errors";import { initTracing, rotateTraceId } from "metabase/utils/otel";-import { MetabaseReduxProvider } from "metabase/utils/redux/custom-context";import MetabaseSettings from "metabase/utils/settings";import registerVisualizations from "metabase/visualizations/register";diff --git a/frontend/src/metabase/archive/actions.ts b/frontend/src/metabase/archive/actions.tsindex 79789039329..afbc5a3a7e9 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 { createThunkAction } from "metabase/utils/redux";export const deletePermanently = createThunkAction("metabase/archive/DELETE_PERMANENTLY",diff --git a/frontend/src/metabase/auth/actions.ts b/frontend/src/metabase/auth/actions.tsindex 5c6233c929d..d0b44a5c9ba 100644--- a/frontend/src/metabase/auth/actions.ts+++ b/frontend/src/metabase/auth/actions.ts@@ -5,6 +5,7 @@ import { push } from "react-router-redux";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 { getSetting } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";import { SessionApi, UtilApi } from "metabase/services";@@ -12,7 +13,6 @@ import { deleteSession, initiateSLO } from "metabase/utils/auth";import { isSmallScreen, reload } from "metabase/utils/dom";import { loadLocalization } from "metabase/utils/i18n";import { passwordComplexityDescription } from "metabase/utils/password";-import { createAsyncThunk } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { LoginData } from "./types";diff --git a/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsx b/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsxindex c753e5dce66..144f2cdbb14 100644--- a/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsx+++ b/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsx@@ -2,8 +2,8 @@ import type { ReactNode } from "react";import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";import { LogoIcon } from "metabase/common/components/LogoIcon";+import { useSelector } from "metabase/redux";import { getLoginPageIllustration } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";import {LayoutBody,diff --git a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsxindex 6867a77688f..72db5e9ff6f 100644--- a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx+++ b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx@@ -3,7 +3,7 @@ import { useCallback, useState } from "react";import { t } from "ttag";import { Button } from "metabase/common/components/Button";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { forgotPassword } from "../../actions";import { getIsEmailConfigured, getIsLdapEnabled } from "../../selectors";diff --git a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsxindex f1b7d6c8710..953e25f90e5 100644--- a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx+++ b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx@@ -6,9 +6,9 @@ import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { FormInput } from "metabase/common/components/FormInput";import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";import { Form, FormProvider } from "metabase/forms";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import * as Errors from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import type { ForgotPasswordData } from "../../types";diff --git a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsxindex 52c7ac72a76..8b0663f90d2 100644--- a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx+++ b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx@@ -6,9 +6,9 @@ import { t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";import { Link } from "metabase/common/components/Link";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Checkbox, useColorScheme } from "metabase/ui";import { getCspNonce } from "metabase/utils/csp";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { loginGoogle } from "../../actions";diff --git a/frontend/src/metabase/auth/components/Login/Login.tsx b/frontend/src/metabase/auth/components/Login/Login.tsxindex ecdfef182b2..753cbaa290a 100644--- a/frontend/src/metabase/auth/components/Login/Login.tsx+++ b/frontend/src/metabase/auth/components/Login/Login.tsx@@ -4,9 +4,9 @@ import _ from "underscore";import { usePageTitle } from "metabase/hooks/use-page-title";import type { AuthProvider } from "metabase/plugins/types";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Divider } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getAuthProviders } from "../../selectors";import { AuthLayout } from "../AuthLayout";diff --git a/frontend/src/metabase/auth/components/Logout/Logout.tsx b/frontend/src/metabase/auth/components/Logout/Logout.tsxindex 8d0050ef5bc..9161d689826 100644--- a/frontend/src/metabase/auth/components/Logout/Logout.tsx+++ b/frontend/src/metabase/auth/components/Logout/Logout.tsx@@ -1,6 +1,6 @@import { useEffect } from "react";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { logout } from "../../actions";diff --git a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsxindex 63c38ca049e..929b2c100bd 100644--- a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx+++ b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import * as Urls from "metabase/utils/urls";import { getIsLdapEnabled } from "../../selectors";diff --git a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsxindex 9ebe5572fef..b8a1d9e5f92 100644--- a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx+++ b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx@@ -1,7 +1,7 @@import { useCallback } from "react";import { t } from "ttag";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { login } from "../../actions";import {diff --git a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsxindex 11161a37ad8..bd28d590264 100644--- a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx+++ b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx@@ -7,7 +7,7 @@ import { useGetPasswordResetTokenStatusQuery } from "metabase/api";import { Button } from "metabase/common/components/Button";import { Link } from "metabase/common/components/Link";import { useToast } from "metabase/common/hooks/use-toast";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { resetPassword, validatePassword } from "../../actions";import type { ResetPasswordData } from "../../types";diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.tsxindex 89a5a220665..08c862fc998 100644--- a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.tsx@@ -8,9 +8,9 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";import { getEngineLogo } from "metabase/databases/utils/engine";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Group, Stack, Text, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { newDatabase } from "metabase/utils/urls";diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsxindex 872827acc87..999030ba86c 100644--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx@@ -11,6 +11,7 @@ import { useDocsUrl } from "metabase/common/hooks";import { useFetchMetrics } from "metabase/common/hooks/use-fetch-metrics";import { trackMetricCreateStarted } from "metabase/data-studio/analytics";import { PLUGIN_CONTENT_VERIFICATION, PLUGIN_LIBRARY } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { canUserCreateQueries } from "metabase/selectors/user";import {@@ -25,7 +26,6 @@ import {Title,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import S from "../components/BrowseContainer.module.css";diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex a3cd10b4a18..95ef0b45fce 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -25,6 +25,7 @@ import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";import { Bookmarks } from "metabase/entities/bookmarks";import { Questions } from "metabase/entities/questions";+import { useDispatch } from "metabase/redux";import {Button,FixedSizeIcon,@@ -35,7 +36,6 @@ import {Repeat,Skeleton,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { SortingOptions } from "metabase-types/api";diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsxindex 7cbd8be296d..292a9769629 100644--- a/frontend/src/metabase/browse/models/BrowseModels.tsx+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx@@ -12,6 +12,7 @@ import {PLUGIN_COLLECTIONS,PLUGIN_CONTENT_VERIFICATION,} from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import {canUserCreateNativeQueries,@@ -29,7 +30,6 @@ import {Title,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import S from "../components/BrowseContainer.module.css";diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex 3cdab34cd05..e861c28ad27 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -18,6 +18,7 @@ import { Columns } from "metabase/common/components/ItemsTable/Columns";import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";+import { useDispatch } from "metabase/redux";import {Ellipsified,FixedSizeIcon,@@ -27,7 +28,6 @@ import {Skeleton,} from "metabase/ui";import { getIcon } from "metabase/utils/icon";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { SortingOptions } from "metabase-types/api";diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsxindex 30247e586c4..bba373e8528 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx@@ -1,10 +1,10 @@import _ from "underscore";import { Tables } from "metabase/entities/tables";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";-import { connect } from "metabase/utils/redux";import { isSyncInProgress } from "metabase/utils/syncing";import * as Urls from "metabase/utils/urls";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsxindex 071ec2346f4..a6382281821 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx@@ -7,10 +7,10 @@ import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { PLUGIN_TABLE_EDITING } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getShallowDatabases as getDatabases } from "metabase/selectors/metadata";import { getUserIsAdmin } from "metabase/selectors/user";import { ActionIcon, Flex, Group, Icon, Loader, Paper } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { isSyncInProgress } from "metabase/utils/syncing";import type Metadata from "metabase-lib/v1/metadata/Metadata";import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";diff --git a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.tsindex aebf468c8c1..7414bb6cef3 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts+++ b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts@@ -2,7 +2,7 @@ import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";import { Databases } from "metabase/entities/databases";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import * as Urls from "metabase/utils/urls";import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";import type { DatabaseId } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsxindex 90226d9144b..7f271bde3d4 100644--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx@@ -26,9 +26,9 @@ import { EntityItem } from "metabase/common/components/EntityItem";import { useToast } from "metabase/common/hooks/use-toast";import { bookmarks as BookmarkEntity } from "metabase/entities";import { entityForObject } from "metabase/entities/utils";+import { connect, useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";-import { connect, useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsxindex 27ee1bd0184..3d384889466 100644--- a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx+++ b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx@@ -7,7 +7,7 @@ import _ from "underscore";import { ArchiveModal } from "metabase/common/components/ArchiveModal";import { Collections } from "metabase/entities/collections";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import * as Urls from "metabase/utils/urls";const mapDispatchToProps = {diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsxindex 6e4783baf7d..6d5946b0c80 100644--- a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx@@ -8,8 +8,8 @@ import {BulkActionDangerButton,} from "metabase/common/components/BulkActionBar";import { ConfirmModal } from "metabase/common/components/ConfirmModal";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { useDispatch } from "metabase/utils/redux";import type { Collection, CollectionItem } from "metabase-types/api";type ArchivedBulkActionsProps = {diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsxindex fda7a3a8082..c593c8182ba 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx@@ -9,11 +9,11 @@ import {} from "metabase/common/hooks";import { Bookmarks } from "metabase/entities/bookmarks";import { Databases } from "metabase/entities/databases";+import { useDispatch, useSelector } from "metabase/redux";import type { UploadFileProps } from "metabase/redux/uploads";import { uploadFile as uploadFileAction } from "metabase/redux/uploads";import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";-import { useDispatch, useSelector } from "metabase/utils/redux";import type {BookmarkId,BookmarkType,diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsxindex 81c5e436926..a9288df88c7 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx@@ -34,9 +34,9 @@ import { useListSelect } from "metabase/common/hooks/use-list-select";import { Bookmarks } from "metabase/entities/bookmarks";import { Collections } from "metabase/entities/collections";import { Search } from "metabase/entities/search";+import { useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import { MAX_UPLOAD_SIZE, MAX_UPLOAD_STRING } from "metabase/redux/uploads";-import { useDispatch } from "metabase/utils/redux";import type Database from "metabase-lib/v1/metadata/Database";import type {Bookmark,diff --git a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsxindex 0199785045a..0ebed774679 100644--- a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx+++ b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { Collections } from "metabase/entities/collections";import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { entityTypeForObject } from "metabase/entities/utils";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";function mapStateToProps(state: any, props: any) {return {diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsxindex a1f5f209159..8c7133a5262 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx@@ -10,9 +10,9 @@ import {PLUGIN_COLLECTIONS,PLUGIN_COLLECTION_COMPONENTS,} from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getIsTenantUser, getUser } from "metabase/selectors/user";import { Icon } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Collection } from "metabase-types/api";import {diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsxindex 0e17fed3a6b..4b3b6a8cabe 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { useExportAnalyticsMutation } from "metabase/api";+import { useSelector } from "metabase/redux";import { hasActiveExport } from "metabase/redux/analytics-export";import { Box, Text, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { CollectionHeaderButton } from "./CollectionHeader.styled";diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsxindex cb521225fbc..826546412b2 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { ToolbarButton } from "metabase/common/components/ToolbarButton";+import { useDispatch } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";-import { useDispatch } from "metabase/utils/redux";import { trackNewCollectionFromHeaderInitiated } from "./analytics";diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsxindex a0d3509b125..6e5095968e3 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link/Link";import { ToolbarButton } from "metabase/common/components/ToolbarButton";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/urls";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsxindex 392519fecce..7bc721069d7 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { Button } from "metabase/common/components/Button";import { Link } from "metabase/common/components/Link";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Modal } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {InfoModalBody,diff --git a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsxindex 229815cab4f..46810c05f7e 100644--- a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx+++ b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx@@ -3,7 +3,7 @@ import { useEffect } from "react";import { replace } from "react-router-redux";import { useGetCollectionQuery } from "metabase/api";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { isNotNull } from "metabase/utils/types";import { extractCollectionId } from "metabase/utils/urls";diff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsxindex 07cb9a41e71..bd3f6e09a48 100644--- a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx+++ b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx@@ -19,10 +19,10 @@ import type {import { Collections } from "metabase/entities/collections";import { Form, FormProvider } from "metabase/forms";import { PLUGIN_TENANTS } from "metabase/plugins";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Flex } from "metabase/ui";import * as Errors from "metabase/utils/errors";-import { connect } from "metabase/utils/redux";import type { Collection } from "metabase-types/api";import { FormAuthorityLevelField } from "../../containers/FormAuthorityLevelFieldContainer";diff --git a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsxindex b6d38c34c2a..75240bdfdf5 100644--- a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx+++ b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx@@ -9,7 +9,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { MoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModal";import { useCollectionQuery } from "metabase/common/hooks";import { Collections } from "metabase/entities/collections";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/urls";import type { Collection, CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsxindex b45816d36ec..46100bbc4b8 100644--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx@@ -2,10 +2,10 @@ import { useMemo } from "react";import { useGetCardQuery } from "metabase/api";import { QuestionResultLoader } from "metabase/common/components/QuestionResultLoader";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import type { IconName } from "metabase/ui";import { getResponseErrorMessage } from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import {getGenericErrorMessage,getPermissionErrorMessage,diff --git a/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsxindex 5b13e9e7447..220b858a22c 100644--- a/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx+++ b/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx@@ -1,6 +1,6 @@import { Collections } from "metabase/entities/collections";+import { connect } from "metabase/redux";import { uploadFile } from "metabase/redux/uploads";-import { connect } from "metabase/utils/redux";import type { Collection } from "metabase-types/api";import CollectionHeader from "../../components/CollectionHeader";diff --git a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsxindex d893a2b2c05..a5c8110a92a 100644--- a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx+++ b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx@@ -5,9 +5,9 @@ import { t } from "ttag";import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";import { Collections } from "metabase/entities/collections";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Modal } from "metabase/ui";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx b/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsxindex ca15b49f73b..d07eb661ed2 100644--- a/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx+++ b/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx@@ -1,6 +1,6 @@import { PLUGIN_COLLECTION_COMPONENTS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";export function FormAuthorityLevelField() {const isAdmin = useSelector(getUserIsAdmin);diff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsxindex 769762ccaf4..53b26980618 100644--- a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx+++ b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx@@ -28,8 +28,8 @@ import { useUniqueId } from "metabase/common/hooks/use-unique-id";import { Collections } from "metabase/entities/collections";import { getCollectionIcon } from "metabase/entities/collections/utils";import { Dashboards } from "metabase/entities/dashboards";+import { useSelector } from "metabase/redux";import { Button, Flex, Icon } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { CollectionId, DashboardId } from "metabase-types/api";function ItemName({diff --git a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsxindex 00e6d45866d..5981eb50154 100644--- a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx+++ b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx@@ -21,8 +21,8 @@ import { TransformCollectionName } from "metabase/common/components/TransformColimport { useUniqueId } from "metabase/common/hooks/use-unique-id";import { Collections } from "metabase/entities/collections";import { PLUGIN_TENANTS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { Button, Icon, Input, type InputWrapperProps } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { CollectionId, CollectionNamespace } from "metabase-types/api";interface FormCollectionPickerProps extends InputWrapperProps {diff --git a/frontend/src/metabase/collections/hooks.ts b/frontend/src/metabase/collections/hooks.tsindex f800173c3af..caa9b78681e 100644--- a/frontend/src/metabase/collections/hooks.ts+++ b/frontend/src/metabase/collections/hooks.ts@@ -1,6 +1,6 @@import getInitialCollectionId from "metabase/entities/collections/getInitialCollectionId";import { PLUGIN_COLLECTIONS } from "metabase/plugins";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import type { CollectionId } from "metabase-types/api";export const useOSSGetDefaultCollectionId = (diff --git a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsxindex 08ef5d32eca..d31607aa336 100644--- a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx+++ b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx@@ -7,6 +7,7 @@ import { type KeyboardEventHandler, useEffect, useMemo, useState } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { EditorBubbleMenu } from "metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu";import type { FormattingOptions } from "metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/types";import { CustomStarterKit } from "metabase/rich_text_editing/tiptap/extensions/CustomStarterKit/CustomStarterKit";@@ -20,7 +21,6 @@ import { createSuggestionRenderer } from "metabase/rich_text_editing/tiptap/exteimport { getSetting } from "metabase/selectors/settings";import { ActionIcon, Box, Flex, Icon, Tooltip } from "metabase/ui";import { METAKEY } from "metabase/utils/browser";-import { useSelector } from "metabase/utils/redux";import type { DocumentContent } from "metabase-types/api";import S from "./CommentEditor.module.css";diff --git a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx b/frontend/src/metabase/comments/components/Discussion/Discussion.tsxindex 541607db22a..3dadf0ba086 100644--- a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx+++ b/frontend/src/metabase/comments/components/Discussion/Discussion.tsx@@ -10,9 +10,9 @@ import {import { getCommentsUrl } from "metabase/comments/utils";import { useToast } from "metabase/common/hooks";import { setHoveredChildTargetId } from "metabase/documents/documents.slice";+import { useDispatch, useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Avatar, Stack, Timeline, rem } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type {Comment,CommentEntityType,diff --git a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsxindex 8351d8dc115..88f00c4577f 100644--- a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx+++ b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx@@ -5,9 +5,9 @@ import { useLocation } from "react-use";import { t } from "ttag";import { formatCommentDate, getCommentNodeId } from "metabase/comments/utils";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Avatar, Box, Group, Icon, Text, Timeline, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Comment, DocumentContent } from "metabase-types/api";import { CommentEditor } from "../CommentEditor";diff --git a/frontend/src/metabase/comments/components/Discussion/Reaction.tsx b/frontend/src/metabase/comments/components/Discussion/Reaction.tsxindex 135a7406d66..86638c38881 100644--- a/frontend/src/metabase/comments/components/Discussion/Reaction.tsx+++ b/frontend/src/metabase/comments/components/Discussion/Reaction.tsx@@ -1,9 +1,9 @@import cx from "classnames";import { useCallback, useMemo } from "react";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Flex, Text, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { CommentReaction } from "metabase-types/api";import S from "./Discussion.module.css";diff --git a/frontend/src/metabase/comments/utils.ts b/frontend/src/metabase/comments/utils.tsindex 704da13d52b..d93c61a1c86 100644--- a/frontend/src/metabase/comments/utils.ts+++ b/frontend/src/metabase/comments/utils.ts@@ -3,7 +3,7 @@ import { replace } from "react-router-redux";import type { LocationSensorState } from "react-use/lib/useLocation";import { match } from "ts-pattern";-import type { DispatchFn } from "metabase/utils/redux";+import type { DispatchFn } from "metabase/redux";import type { Comment, CommentEntityType, EntityId } from "metabase-types/api";import type { CommentThread } from "./types";diff --git a/frontend/src/metabase/common/components/AdHocQuestionLoader.tsx b/frontend/src/metabase/common/components/AdHocQuestionLoader.tsxindex c348ba53324..21e6c55b522 100644--- a/frontend/src/metabase/common/components/AdHocQuestionLoader.tsx+++ b/frontend/src/metabase/common/components/AdHocQuestionLoader.tsx@@ -3,8 +3,8 @@ import { useCallback, useEffect, useRef, useState } from "react";import { deserializeCardFromUrl } from "metabase/common/utils/card";import { loadMetadataForCard } from "metabase/questions/actions";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useDispatch, useSelector } from "metabase/utils/redux";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { UnsavedCard } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx b/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsxindex 74c22365e45..d6a090e4394 100644--- a/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx+++ b/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx@@ -1,9 +1,9 @@import type { ReactNode } from "react";import { EmptyState } from "metabase/common/components/EmptyState";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import type { IconName } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";/** AdminAwareEmptyState is a component that candiff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsxindex 35a37a937ec..d188bf7ce21 100644--- a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx+++ b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx@@ -24,9 +24,9 @@ import {clausesForMode,getClauseDefinition,} from "metabase/querying/expressions";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Box, Flex, Icon, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { QueryColumnPicker } from "../QueryColumnPicker";diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsxindex 9d67d1baef4..e5bf4e96701 100644--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx@@ -10,10 +10,10 @@ import { PaymentBanner } from "metabase/nav/components/PaymentBanner/PaymentBannimport { ReadOnlyBanner } from "metabase/nav/components/ReadOnlyBanner";import { TrialBanner } from "metabase/nav/components/TrialBanner";import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { getIsHosted } from "metabase/setup/selectors";import { isWithinIframe } from "metabase/utils/iframe";-import { useSelector } from "metabase/utils/redux";import { getCurrentUTCTimestamp, shouldShowTrialBanner } from "./utils";diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsxindex 5ac3c106be0..0a097846454 100644--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx@@ -2,9 +2,9 @@ import cx from "classnames";import type { HTMLAttributes } from "react";import Animation from "metabase/css/core/animation.module.css";+import { useSelector } from "metabase/redux";import { getIsNavbarOpen } from "metabase/selectors/app";import { Box, type BoxProps, Flex, Portal, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { BulkActionsToast, ToastCard } from "./BulkActionBar.styled";diff --git a/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsx b/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsxindex 2886b71c76d..c764db4984f 100644--- a/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsx+++ b/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsx@@ -1,12 +1,12 @@import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { useSelector } from "metabase/redux";import { CROWDIN_URL } from "metabase/selectors/settings";import {getIsWhiteLabeling,getShowMetabaseLinks,} from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";export function getLocalizationNoticeText({mentionMetabase,diff --git a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsxindex 7d9479ec775..4e6f1a8353f 100644--- a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx+++ b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx@@ -9,10 +9,10 @@ import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { Api } from "metabase/api";import { commonReducers } from "metabase/reducers-common";+import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import { Stack, Text } from "metabase/ui";-import { MetabaseReduxProvider } from "metabase/utils/redux";import type { Database, DatabaseId } from "metabase-types/api";import { createMockDatabase } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsxindex 32d5ac36643..41d7263a861 100644--- a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx@@ -7,6 +7,7 @@ import { useSendBugReportMutation } from "metabase/api/bug-report";import { MetabotLogo } from "metabase/common/components/MetabotLogo";import { useSetting } from "metabase/common/hooks";import { useToggle } from "metabase/common/hooks/use-toggle";+import { useDispatch, useSelector } from "metabase/redux";import { closeDiagnostics } from "metabase/redux/app";import { addUndo } from "metabase/redux/undo";import { getIsErrorDiagnosticModalOpen } from "metabase/selectors/app";@@ -14,7 +15,6 @@ import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { getApplicationName } from "metabase/selectors/whitelabel";import { Button, Flex, Icon, Loader, Modal, Stack, Text } from "metabase/ui";import { downloadObjectAsJson } from "metabase/utils/download";-import { useDispatch, useSelector } from "metabase/utils/redux";import { BugReportModal } from "./BugReportModal";import { DownloadDiagnosticModal } from "./DownloadDiagnosticModal";diff --git a/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts b/frontend/src/metabase/common/components/ErrorPages/use-error-info.tsindex 0132082e77b..98d7c5ee7c6 100644--- a/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts+++ b/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts@@ -1,9 +1,9 @@import { useAsync } from "react-use";import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { MetabaseApi, UtilApi } from "metabase/services";-import { useSelector } from "metabase/utils/redux";import type { ErrorPayload, ReportableEntityName } from "./types";import { getBrowserInfo, getEntityDetails, hasQueryData } from "./utils";diff --git a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsxindex 34bf96cc534..b192ec43069 100644--- a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx+++ b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx@@ -4,9 +4,9 @@ import { c, t } from "ttag";import { useSetting } from "metabase/common/hooks";import type { ExportFormat } from "metabase/common/types/export";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Checkbox, SegmentedControl, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";interface ExportSettingsWidgetProps {formats: ExportFormat[];diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsxindex 22ae59b282a..54e001c1513 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx@@ -4,8 +4,8 @@ import {} from "metabase/common/components/ItemsTable/BaseItemTableRow";import type { BaseItemsTableProps } from "metabase/common/components/ItemsTable/BaseItemsTable";import { DefaultItemRenderer } from "metabase/common/components/ItemsTable/DefaultItemRenderer";+import { useSelector } from "metabase/redux";import { getIsDndAvailable } from "metabase/selectors/app";-import { useSelector } from "metabase/utils/redux";import type { CollectionItem } from "metabase-types/api";import { TBody } from "../BaseItemsTable.styled";diff --git a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsxindex 06c43059801..d5beadd05ee 100644--- a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx+++ b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx@@ -3,10 +3,10 @@ import type { MouseEventHandler } from "react";import { t } from "ttag";import { DateTime } from "metabase/common/components/DateTime";+import { connect } from "metabase/redux";import { getUser } from "metabase/selectors/user";import type { TooltipProps } from "metabase/ui";import { Text, Tooltip, UnstyledButton } from "metabase/ui";-import { connect } from "metabase/utils/redux";import type { NamedUser } from "metabase/utils/user";import { getFullName } from "metabase/utils/user";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsxindex c365c56e047..7982d39db04 100644--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx@@ -1,9 +1,9 @@import { msgid, ngettext, t } from "ttag";import { useGetFieldValuesQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { formatNumber } from "metabase/utils/formatting";-import { useSelector } from "metabase/utils/redux";import type { FieldId, FieldValue } from "metabase-types/api";import {diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsxindex 889979ca37c..bf65162d18b 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx@@ -3,7 +3,7 @@ import { useAsyncFn } from "react-use";import { t } from "ttag";import { Tables } from "metabase/entities/tables";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import type Table from "metabase-lib/v1/metadata/Table";import { Description, EmptyDescription } from "../MetadataInfo";diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsxindex b467cb4ac90..4da0f908803 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx@@ -11,9 +11,9 @@ import {useMoveCollectionDashboardQuestionCandidatesMutation,} from "metabase/api";import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";+import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { getUserIsAdmin } from "metabase/selectors/user";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { ConfirmMoveDashboardQuestionCandidatesModal } from "./ConfirmMoveDashboardQuestionCandidatesModal";diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.ts b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.tsindex 6091e8bffbf..9ccc9bf4c5b 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.ts+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.ts@@ -2,8 +2,8 @@ import {skipToken,useListCollectionDashboardQuestionCandidatesQuery,} from "metabase/api";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { CollectionId } from "metabase-types/api";export const useHasDashboardQuestionCandidates = (diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsxindex 5e227b9c7c4..9d149e95a61 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx@@ -2,6 +2,7 @@ import { push } from "react-router-redux";import _ from "underscore";import { Databases } from "metabase/entities/databases";+import { connect } from "metabase/redux";import { closeNavbar } from "metabase/redux/app";import type { State } from "metabase/redux/store";import { getHasDatabaseWithJsonEngine } from "metabase/selectors/data";@@ -9,7 +10,6 @@ import {canUserCreateNativeQueries,canUserCreateQueries,} from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import type Database from "metabase-lib/v1/metadata/Database";import { NewItemMenuView } from "./NewItemMenuView";diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsxindex bbd3d486e8c..2d63857df05 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx@@ -5,11 +5,11 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { getNewMenuItemAIExploration } from "metabase/metabot/components/NewMenuItemAIExploration";import { useUserMetabotPermissions } from "metabase/metabot/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";import { getSetting } from "metabase/selectors/settings";import { getUserCanWriteToCollections } from "metabase/selectors/user";import { Box, Icon, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsxindex 242386617e1..06a1a9d9342 100644--- a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx+++ b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx@@ -3,8 +3,8 @@ 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 { connect } from "metabase/utils/redux";type DispatchProps = {refreshCurrentUser: () => any;diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsxindex b967f80121f..29a9bc24955 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx@@ -5,6 +5,7 @@ import { VirtualizedList } from "metabase/common/components/VirtualizedList";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_MODERATION } from "metabase/plugins";import { LoadingAndErrorWrapper } from "metabase/public/containers/PublicAction/PublicAction.styled";+import { useSelector } from "metabase/redux";import { getIsTenantUser } from "metabase/selectors/user";import {Box,@@ -15,7 +16,6 @@ import {type NavLinkProps,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useOmniPickerContext } from "../../context";import type { OmniPickerItem } from "../../types";diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.tsindex c6dabbf797c..f50acf78920 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts@@ -14,7 +14,7 @@ import {} from "metabase/api";import { useGetPersonalCollection } from "metabase/common/hooks/use-get-personal-collection";import { PLUGIN_LIBRARY } from "metabase/plugins";-import { type DispatchFn, useDispatch } from "metabase/utils/redux";+import { type DispatchFn, useDispatch } from "metabase/redux";import type {Collection,CollectionNamespace,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.tsindex a018ffb52c9..dafad62cf30 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts@@ -14,12 +14,8 @@ import {} from "metabase/common/hooks";import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";import { PLUGIN_LIBRARY, PLUGIN_TENANTS } from "metabase/plugins";+import { type DispatchFn, useDispatch, useSelector } from "metabase/redux";import { getUser, getUserIsAdmin } from "metabase/selectors/user";-import {- type DispatchFn,- useDispatch,- useSelector,-} from "metabase/utils/redux";import type {Collection,CollectionNamespace,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.tsindex 427b60972e8..0ef004f7147 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts@@ -3,8 +3,8 @@ import { t } from "ttag";import { collectionApi } from "metabase/api";import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";import { PLUGIN_TENANTS } from "metabase/plugins";+import type { DispatchFn } from "metabase/redux";import { getRootCollectionItem as getTransformsRootCollectionItem } from "metabase/transforms/utils";-import type { DispatchFn } from "metabase/utils/redux";import type { CollectionNamespace } from "metabase-types/api";import type { OmniPickerCollectionItem } from "../types";diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsxindex 7caf14f2e8c..86a6aa58001 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx@@ -17,6 +17,7 @@ import { VirtualizedList } from "metabase/common/components/VirtualizedList";import { useSetting } from "metabase/common/hooks";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { PLUGIN_LIBRARY } from "metabase/plugins";+import { useSelector } from "metabase/redux";import {Box,Ellipsified,@@ -28,7 +29,6 @@ import {Text,} from "metabase/ui";import { getIcon } from "metabase/utils/icon";-import { useSelector } from "metabase/utils/redux";import type {CollectionItem,SchemaName,diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.tsindex b3967f1c000..0d6a8cb02f0 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts@@ -3,8 +3,8 @@ import { useDeepCompareEffect } from "react-use";import { t } from "ttag";import { cardApi, collectionApi, databaseApi, tableApi } from "metabase/api";-import type { DispatchFn } from "metabase/utils/redux";-import { useDispatch } from "metabase/utils/redux";+import type { DispatchFn } from "metabase/redux";+import { useDispatch } from "metabase/redux";import type { SchemaName } from "metabase-types/api";import type { DataPickerValue } from "../DataPicker";diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.ts b/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.tsindex 70e5fd2fec9..5dd711310e2 100644--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.ts+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.ts@@ -1,11 +1,11 @@import { useAsyncFn } from "react-use";import type { AsyncFnReturn } from "react-use/lib/useAsyncFn";+import { useDispatch } from "metabase/redux";import {type DownloadQueryResultsOpts,downloadQueryResults,} from "metabase/redux/downloads";-import { useDispatch } from "metabase/utils/redux";export type UseDownloadDataParams = Pick<DownloadQueryResultsOpts,diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsxindex b55ea694a39..ade8d336ccc 100644--- a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx@@ -19,8 +19,8 @@ import {isInstanceAnalyticsCollection,} from "metabase/collections/utils";import { FormProvider } from "metabase/forms";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import type Question from "metabase-lib/v1/Question";import type { CollectionId, DashboardId } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/SavedQuestionLoader.tsx b/frontend/src/metabase/common/components/SavedQuestionLoader.tsxindex ae7d1eb23f2..12b69071adf 100644--- a/frontend/src/metabase/common/components/SavedQuestionLoader.tsx+++ b/frontend/src/metabase/common/components/SavedQuestionLoader.tsx@@ -3,8 +3,8 @@ import { useEffect, useMemo } from "react";import { skipToken, useGetCardQuery } from "metabase/api";import { loadMetadataForCard } from "metabase/questions/actions";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useDispatch, useSelector } from "metabase/utils/redux";import Question from "metabase-lib/v1/Question";import type { CardId } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsxindex 69265da3fec..cafc7f9d30d 100644--- a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx+++ b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx@@ -1,10 +1,10 @@import { useMemo } from "react";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import type { SelectProps } from "metabase/ui";import { Select } from "metabase/ui";import type { FontStyle } from "metabase/utils/measure-text";-import { useSelector } from "metabase/utils/redux";import { getLongestSelectLabel, measureTextWidthSafely } from "./utils";diff --git a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsxindex bbfac907c4b..7fbf9bc7c85 100644--- a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx+++ b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx@@ -10,9 +10,9 @@ import { createMockEntitiesState } from "__support__/store";import { Api } from "metabase/api";import { LocaleProvider } from "metabase/public/LocaleProvider";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 { MetabaseReduxProvider } from "metabase/utils/redux";import type { ScheduleSettings } from "metabase-types/api";import { Schedule } from "./Schedule";diff --git a/frontend/src/metabase/common/components/Schedule/components.tsx b/frontend/src/metabase/common/components/Schedule/components.tsxindex 10a66f6f53a..e808cc29d82 100644--- a/frontend/src/metabase/common/components/Schedule/components.tsx+++ b/frontend/src/metabase/common/components/Schedule/components.tsx@@ -1,10 +1,10 @@import { useMemo } from "react";import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Group, SegmentedControl, Tooltip } from "metabase/ui";import { capitalize } from "metabase/utils/formatting/strings";-import { useSelector } from "metabase/utils/redux";import { has24HourModeSetting } from "metabase/utils/time-dayjs";import type {ScheduleDayType,diff --git a/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsx b/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsxindex 093631f35af..5e968fd97c1 100644--- a/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsx+++ b/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsx@@ -1,9 +1,9 @@import { useMemo } from "react";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import type { SelectProps } from "metabase/ui";import { Select } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {getLongestSelectLabel,diff --git a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsxindex 87c207ea6df..910d343b872 100644--- a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx+++ b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx@@ -3,6 +3,7 @@ import { type CSSProperties, Component } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import {Box,@@ -18,7 +19,6 @@ import {getDayOfWeekOptions,} from "metabase/utils/date-time";import { capitalize } from "metabase/utils/formatting/strings";-import { useSelector } from "metabase/utils/redux";import type {ScheduleDayType,ScheduleFrameType,diff --git a/frontend/src/metabase/common/components/UndoListing.tsx b/frontend/src/metabase/common/components/UndoListing.tsxindex 4dbe112b0e6..6b39c889394 100644--- a/frontend/src/metabase/common/components/UndoListing.tsx+++ b/frontend/src/metabase/common/components/UndoListing.tsx@@ -15,6 +15,7 @@ import {import { t } from "ttag";import ZIndex from "metabase/css/core/z-index.module.css";+import { useDispatch, useSelector } from "metabase/redux";import type { Undo } from "metabase/redux/store/undo";import {dismissUndo,@@ -24,7 +25,6 @@ import {} from "metabase/redux/undo";import { Ellipsified, Portal, Progress } from "metabase/ui";import { capitalize, inflect } from "metabase/utils/formatting";-import { useDispatch, useSelector } from "metabase/utils/redux";import CS from "./UndoListing.module.css";import {diff --git a/frontend/src/metabase/common/components/Unsubscribe.tsx b/frontend/src/metabase/common/components/Unsubscribe.tsxindex abfdafc58db..abf21edf7ce 100644--- a/frontend/src/metabase/common/components/Unsubscribe.tsx+++ b/frontend/src/metabase/common/components/Unsubscribe.tsx@@ -9,13 +9,13 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { LogoIcon } from "metabase/common/components/LogoIcon";+import { useSelector } from "metabase/redux";import { getLoginPageIllustration } from "metabase/selectors/whitelabel";import {NotificationUnsubscribeApi,PulseUnsubscribeApi,} from "metabase/services";import { Center, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {CheckmarkIcon,diff --git a/frontend/src/metabase/common/components/errors/NoDataError.tsx b/frontend/src/metabase/common/components/errors/NoDataError.tsxindex eaf36f00ee5..b14ccc3d47d 100644--- a/frontend/src/metabase/common/components/errors/NoDataError.tsx+++ b/frontend/src/metabase/common/components/errors/NoDataError.tsx@@ -1,9 +1,9 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getNoDataIllustration } from "metabase/selectors/whitelabel";import type { ImageProps } from "metabase/ui";import { Image } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function NoDataError(props: ImageProps) {const noDataIllustration = useSelector(getNoDataIllustration);diff --git a/frontend/src/metabase/common/components/errors/NoObjectError.tsx b/frontend/src/metabase/common/components/errors/NoObjectError.tsxindex e0f4fd94ab6..e09e6102bf1 100644--- a/frontend/src/metabase/common/components/errors/NoObjectError.tsx+++ b/frontend/src/metabase/common/components/errors/NoObjectError.tsx@@ -1,9 +1,9 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getNoObjectIllustration } from "metabase/selectors/whitelabel";import type { ImageProps } from "metabase/ui";import { Image } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function NoObjectError(props: ImageProps) {const noObjectIllustration = useSelector(getNoObjectIllustration);diff --git a/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx b/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsxindex 23f2206753e..ff6d0252168 100644--- a/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx+++ b/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { Box, type BoxProps, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { UpsellCard, type UpsellCardProps } from "./UpsellCard";import { UPGRADE_URL } from "./constants";diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsxindex 97ea9b4bf68..c700c154e73 100644--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx@@ -1,8 +1,8 @@import { useCallback } from "react";import { useSetting } from "metabase/common/hooks";+import { useDispatch } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";-import { useDispatch } from "metabase/utils/redux";import { DATA_STUDIO_UPGRADE_URL, UPGRADE_URL } from "../../constants";import { useUpsellLink } from "../use-upsell-link";diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsxindex fc80473e83f..c7ae30c05f1 100644--- a/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx@@ -1,5 +1,5 @@+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";/*** we should wrap all upsell components in this HoC to ensure that they are only rendered for adminsdiff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.tsindex aad8eb51edb..10cf6ca5c07 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.ts@@ -1,8 +1,8 @@import type { Action } from "@reduxjs/toolkit";import { useDeepCompareEffect, usePrevious } from "react-use";+import { useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { useDispatch, useSelector } from "metabase/utils/redux";export interface EntityFetchOptions {reload?: boolean;diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsxindex 8dd9beb48de..50943455b7a 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx@@ -15,8 +15,8 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { Databases } from "metabase/entities/databases";import { Tables } from "metabase/entities/tables";+import { useDispatch } from "metabase/redux";import { delay } from "metabase/utils/promise";-import { useDispatch } from "metabase/utils/redux";import type Database from "metabase-lib/v1/metadata/Database";import type Table from "metabase-lib/v1/metadata/Table";import type { TableListQuery } from "metabase-types/api";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.tsindex dc4e00dbb07..47ea8f68243 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.ts@@ -1,8 +1,8 @@import type { Action } from "@reduxjs/toolkit";import { useDeepCompareEffect } from "react-use";+import { useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { useDispatch, useSelector } from "metabase/utils/redux";export interface EntityQuery<TId> {id: TId;diff --git a/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsx b/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsxindex b195b6f2ba2..0c2ab1b26ef 100644--- a/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsx+++ b/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsx@@ -1,7 +1,7 @@import { useMount } from "react-use";+import { useDispatch } from "metabase/redux";import { closeNavbar } from "metabase/redux/app";-import { useDispatch } from "metabase/utils/redux";export function useCloseNavbarOnMount() {const dispatch = useDispatch();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 ff4e356332a..0b8323b69ab 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@@ -4,7 +4,7 @@ import type { InjectedRouter, Route } from "react-router";import { goBack, push, replace } from "react-router-redux";import { match } from "ts-pattern";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { useBeforeUnload } from "./use-before-unload";diff --git a/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.ts b/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.tsindex 61b199e7018..55bcfee885c 100644--- a/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.ts+++ b/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.ts@@ -1,10 +1,10 @@+import { useSelector } from "metabase/redux";import {type UtmProps,getDocsUrl,getLearnUrl,} from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";type DocsUtmProps = Omit<UtmProps, "utm_medium"> & {utm_medium?: UtmProps["utm_medium"];diff --git a/frontend/src/metabase/common/hooks/use-get-personal-collection.ts b/frontend/src/metabase/common/hooks/use-get-personal-collection.tsindex 1b4f432765e..86d626a1bb4 100644--- a/frontend/src/metabase/common/hooks/use-get-personal-collection.ts+++ b/frontend/src/metabase/common/hooks/use-get-personal-collection.ts@@ -1,6 +1,6 @@import { skipToken, useGetCollectionQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getUserPersonalCollectionId } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";/*** gets the personal collection for the current userdiff --git a/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.ts b/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.tsindex d67399a9699..534f14bbf03 100644--- a/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.ts+++ b/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.ts@@ -1,6 +1,6 @@import { skipToken, useGetCollectionQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getUserPersonalCollectionId } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";/*** Hook that fetches the personal collection for the currently logged-in user.diff --git a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.tsindex f0366644c4b..804e8fa21a8 100644--- a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts+++ b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts@@ -1,5 +1,5 @@+import { useSelector } from "metabase/redux";import { getTokenFeature } from "metabase/setup/selectors";-import { useSelector } from "metabase/utils/redux";import type { TokenFeature } from "metabase-types/api";export const useHasTokenFeature = (settingName: TokenFeature) => {diff --git a/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx b/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsxindex 802854ca9bd..ca1e372e4f7 100644--- a/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx+++ b/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx@@ -1,7 +1,7 @@import { skipToken, useGetDashboardQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getCustomHomePageDashboardId } from "metabase/selectors/app";import { getSettingsLoading } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export const useHomepageDashboard = () => {const dashboardId = useSelector(getCustomHomePageDashboardId);diff --git a/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts b/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.tsindex ec9e7c09401..49957d88f2a 100644--- a/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts+++ b/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts@@ -1,5 +1,5 @@+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export const useInstanceLocale = () => {return useSelector((state) => getSetting(state, "site-locale"));diff --git a/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts b/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.tsindex 37dac915187..156d7773231 100644--- a/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts+++ b/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts@@ -1,7 +1,7 @@import { useLocation } from "react-use";+import { useSelector } from "metabase/redux";import { getCustomHomePageDashboardId } from "metabase/selectors/app";-import { useSelector } from "metabase/utils/redux";import { useSetting } from "./use-setting";diff --git a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts b/frontend/src/metabase/common/hooks/use-locale/use-locale.tsindex 8483c85bd6e..ed3a125a097 100644--- a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts+++ b/frontend/src/metabase/common/hooks/use-locale/use-locale.ts@@ -2,8 +2,8 @@ import { useContext } from "react";import { useInstanceLocale } from "metabase/common/hooks/use-instance-locale";import { FrontendLocaleContext } from "metabase/public/LocaleProvider";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";/** Get the user's locale or, if that has not been set, the instance locale*diff --git a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts b/frontend/src/metabase/common/hooks/use-setting/use-setting.tsindex e43f8f5ae23..250d34cc128 100644--- a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts+++ b/frontend/src/metabase/common/hooks/use-setting/use-setting.ts@@ -1,9 +1,9 @@import { useCallback, useMemo } from "react";import _ from "underscore";+import { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";import { getSetting } from "metabase/selectors/settings";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { EnterpriseSettingKey, UserSettings } from "metabase-types/api";export const useSetting = <SettingName extends EnterpriseSettingKey>(diff --git a/frontend/src/metabase/common/hooks/use-show-other-users-collections.ts b/frontend/src/metabase/common/hooks/use-show-other-users-collections.tsindex 7a1a6f69e78..018fdc62c7b 100644--- a/frontend/src/metabase/common/hooks/use-show-other-users-collections.ts+++ b/frontend/src/metabase/common/hooks/use-show-other-users-collections.ts@@ -1,5 +1,5 @@+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { useSetting } from "./use-setting";diff --git a/frontend/src/metabase/common/hooks/use-snapshot-selector.ts b/frontend/src/metabase/common/hooks/use-snapshot-selector.tsindex 2461eb4f92f..8d157eac912 100644--- a/frontend/src/metabase/common/hooks/use-snapshot-selector.ts+++ b/frontend/src/metabase/common/hooks/use-snapshot-selector.ts@@ -1,7 +1,7 @@import { type DependencyList, useEffect, useRef } from "react";+import { useStore } from "metabase/redux";import type { State } from "metabase/redux/store";-import { useStore } from "metabase/utils/redux";/*** This hook is similar to useSelector, but it doesn't trigger re-renders when the slice changes.diff --git a/frontend/src/metabase/common/hooks/use-store-url/use-store-url.ts b/frontend/src/metabase/common/hooks/use-store-url/use-store-url.tsindex 2765fd9fac9..42cd24adf56 100644--- a/frontend/src/metabase/common/hooks/use-store-url/use-store-url.ts+++ b/frontend/src/metabase/common/hooks/use-store-url/use-store-url.ts@@ -1,5 +1,5 @@+import { useSelector } from "metabase/redux";import { type StorePaths, getStoreUrl } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export function useStoreUrl(storePath: StorePaths = "") {return useSelector((state) => getStoreUrl(state, storePath));diff --git a/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.ts b/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.tsindex 17ed13e0a21..58459249568 100644--- a/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.ts+++ b/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.ts@@ -1,12 +1,12 @@import { useCallback } from "react";+import { useDispatch, useSelector } from "metabase/redux";import { setTempSetting } from "metabase/redux/app";import type {State,TempStorageKey,TempStorageValue,} from "metabase/redux/store";-import { useDispatch, useSelector } from "metabase/utils/redux";export const useTempStorage = <Key extends TempStorageKey>(key: Key,diff --git a/frontend/src/metabase/common/hooks/use-toast/use-toast.ts b/frontend/src/metabase/common/hooks/use-toast/use-toast.tsindex e2a0c8c7142..b74c5b9d195 100644--- a/frontend/src/metabase/common/hooks/use-toast/use-toast.ts+++ b/frontend/src/metabase/common/hooks/use-toast/use-toast.ts@@ -1,8 +1,8 @@import { useCallback } from "react";+import { useDispatch } from "metabase/redux";import type { Undo } from "metabase/redux/store/undo";import { addUndo, dismissUndo } from "metabase/redux/undo";-import { useDispatch } from "metabase/utils/redux";export type ToastArgs = Omit<Undo, "id" | "timeoutId">;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 3e70c77c9b1..087fdf0ec67 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@@ -4,7 +4,7 @@ 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/utils/redux";+import { useDispatch } from "metabase/redux";type BaseState = Record<string, unknown>;diff --git a/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.ts b/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.tsindex 25144f14f0c..3ba003cf683 100644--- a/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.ts+++ b/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.ts@@ -1,5 +1,5 @@+import { useSelector } from "metabase/redux";import { type UtmProps, getUrlWithUtm } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export function useUrlWithUtm(url: string, utm: UtmProps): string;export function useUrlWithUtm(url: undefined, utm: UtmProps): undefined;diff --git a/frontend/src/metabase/common/hooks/use-user-key-value.ts b/frontend/src/metabase/common/hooks/use-user-key-value.tsindex 9780b10cd70..53f1bdd08ac 100644--- a/frontend/src/metabase/common/hooks/use-user-key-value.ts+++ b/frontend/src/metabase/common/hooks/use-user-key-value.ts@@ -6,8 +6,8 @@ import {useGetUserKeyValueQuery,useUpdateKeyValueMutation,} from "metabase/api";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { UserKeyValue } from "metabase-types/api";export interface UseUserKeyValueParams<T extends UserKeyValue> {diff --git a/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx b/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsxindex 8077f99728c..32217479cd3 100644--- a/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx+++ b/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx@@ -8,9 +8,9 @@ import {} from "__support__/server-mocks/user-key-value";import { waitFor } from "__support__/ui";import { mainReducers as reducers } from "metabase/reducers-main";+import { MetabaseReduxProvider } from "metabase/redux";import { createMockState } from "metabase/redux/store/mocks";import { getStore } from "metabase/store";-import { MetabaseReduxProvider } from "metabase/utils/redux";import type { UserKeyValue } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/actions/cards-typed.ts b/frontend/src/metabase/dashboard/actions/cards-typed.tsindex 1668969e470..8471b898ae3 100644--- a/frontend/src/metabase/dashboard/actions/cards-typed.ts+++ b/frontend/src/metabase/dashboard/actions/cards-typed.ts@@ -4,6 +4,7 @@ import _ from "underscore";import { Questions } from "metabase/entities/questions";import { loadMetadataForCard } from "metabase/questions/actions";+import { createThunkAction } from "metabase/redux";import type { Dispatch, GetState } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import {@@ -15,7 +16,6 @@ import {GRID_WIDTH,getPositionForNewDashCard,} from "metabase/utils/dashboard_grid";-import { createThunkAction } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import { getDefaultSize } from "metabase/visualizations";import {diff --git a/frontend/src/metabase/dashboard/actions/data-fetching.ts b/frontend/src/metabase/dashboard/actions/data-fetching.tsindex c2af515d6c6..a43c038568a 100644--- a/frontend/src/metabase/dashboard/actions/data-fetching.ts+++ b/frontend/src/metabase/dashboard/actions/data-fetching.ts@@ -24,9 +24,11 @@ import {getAllDashboardCards,getCurrentTabDashboardCards,} from "metabase/dashboard/utils";+import { entityCompatibleQuery } from "metabase/entities";import { getSavedDashboardUiParameters } from "metabase/parameters/utils/dashboards";import { addFields } from "metabase/redux/metadata";import type { Dispatch, GetState } from "metabase/redux/store";+import { createAsyncThunk, createThunkAction } from "metabase/redux/utils";import { getMetadata } from "metabase/selectors/metadata";import {AutoApi,@@ -42,10 +44,8 @@ import {isQuestionDashCard,isVirtualDashCard,} from "metabase/utils/dashboard";-import { entityCompatibleQuery } from "metabase/utils/entities";import type { Deferred } from "metabase/utils/promise";import { defer } from "metabase/utils/promise";-import { createAsyncThunk, createThunkAction } from "metabase/utils/redux";import { uuid } from "metabase/utils/uuid";import { isVisualizerDashboardCard } from "metabase/visualizer/utils";import type { UiParameter } from "metabase-lib/v1/parameters/types";diff --git a/frontend/src/metabase/dashboard/actions/navigation.ts b/frontend/src/metabase/dashboard/actions/navigation.tsindex 09f8e1a6184..5dc8481b5ca 100644--- a/frontend/src/metabase/dashboard/actions/navigation.ts+++ b/frontend/src/metabase/dashboard/actions/navigation.ts@@ -1,9 +1,9 @@+import { createThunkAction } from "metabase/redux";import { openUrl } from "metabase/redux/app";import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";import type { Dispatch, GetState } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { isQuestionDashCard } from "metabase/utils/dashboard";-import { createThunkAction } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/dashboard/actions/parameters.tsx b/frontend/src/metabase/dashboard/actions/parameters.tsxindex ce46ce86164..31bc36bcb11 100644--- a/frontend/src/metabase/dashboard/actions/parameters.tsx+++ b/frontend/src/metabase/dashboard/actions/parameters.tsx@@ -20,13 +20,13 @@ import {setParameterName as setParamName,setParameterType as setParamType,} from "metabase/parameters/utils/dashboards";+import { createAction, createThunkAction } from "metabase/redux";import { selectTab, setParameterValues } from "metabase/redux/dashboard";import type { Dispatch, GetState } from "metabase/redux/store";import { addUndo, dismissUndo } from "metabase/redux/undo";import { getMetadata } from "metabase/selectors/metadata";import { Text } from "metabase/ui";import { isQuestionDashCard } from "metabase/utils/dashboard";-import { createAction, createThunkAction } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { getParameterValuesByIdFromQueryParams } from "metabase-lib/v1/parameters/utils/parameter-parsing";import {diff --git a/frontend/src/metabase/dashboard/actions/revisions.ts b/frontend/src/metabase/dashboard/actions/revisions.tsindex edd4ff5f24b..17066e5959e 100644--- a/frontend/src/metabase/dashboard/actions/revisions.ts+++ b/frontend/src/metabase/dashboard/actions/revisions.ts@@ -3,9 +3,9 @@ import {fetchDashboard,fetchDashboardCardData,} from "metabase/dashboard/actions";+import { entityCompatibleQuery } from "metabase/entities";+import { createThunkAction } from "metabase/redux";import { REVERT_TO_REVISION } from "metabase/redux/dashboard";-import { entityCompatibleQuery } from "metabase/utils/entities";-import { createThunkAction } from "metabase/utils/redux";import type { DashboardId, Revision } from "metabase-types/api";export const revertToRevision = createThunkAction(diff --git a/frontend/src/metabase/dashboard/actions/save.ts b/frontend/src/metabase/dashboard/actions/save.tsindex 30dce4a0c82..22a1d2549bf 100644--- a/frontend/src/metabase/dashboard/actions/save.ts+++ b/frontend/src/metabase/dashboard/actions/save.ts@@ -2,6 +2,7 @@ import { assocIn, dissocIn, getIn } from "icepick";import _ from "underscore";import { Dashboards } from "metabase/entities/dashboards";+import { createThunkAction } from "metabase/redux";import { UPDATE_DASHBOARD_AND_CARDS } from "metabase/redux/dashboard";import type {Dispatch,@@ -10,7 +11,6 @@ import type {StoreDashcard,} from "metabase/redux/store";import { CardApi } from "metabase/services";-import { createThunkAction } from "metabase/utils/redux";import { clickBehaviorIsValid } from "metabase-lib/v1/parameters/utils/click-behavior";import type { DashCardId, ParameterId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/actions/trash.ts b/frontend/src/metabase/dashboard/actions/trash.tsindex 7714f429642..06c6d582768 100644--- a/frontend/src/metabase/dashboard/actions/trash.ts+++ b/frontend/src/metabase/dashboard/actions/trash.ts@@ -6,8 +6,8 @@ import { canonicalCollectionId } from "metabase/collections/utils";import { fetchDashboard } from "metabase/dashboard/actions";import { Dashboards } from "metabase/entities/dashboards";import { Questions } from "metabase/entities/questions";+import { createThunkAction } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { createThunkAction } from "metabase/utils/redux";// just using the entity action doesn't cause the dashboard to live update// calling fetchDashboard ensures that the view updates with the last valuesdiff --git a/frontend/src/metabase/dashboard/actions/ui.ts b/frontend/src/metabase/dashboard/actions/ui.tsindex b73cb8952c6..712823cc621 100644--- a/frontend/src/metabase/dashboard/actions/ui.ts+++ b/frontend/src/metabase/dashboard/actions/ui.ts@@ -1,10 +1,10 @@import { SIDEBAR_NAME } from "metabase/dashboard/constants";+import { createAction, createThunkAction } from "metabase/redux";import type {DashboardSidebarName,Dispatch,GetState,} from "metabase/redux/store";-import { createAction, createThunkAction } from "metabase/utils/redux";import type { DashCardId } from "metabase-types/api";import { getSidebar } from "../selectors";diff --git a/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx b/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsxindex 4863f15f82b..044b7dfc966 100644--- a/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { Sidebar } from "metabase/common/components/Sidebar";import { AIAnalysisContentWrapper } from "metabase/metabot/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper";import { useDashCardAnalysis } from "metabase/metabot/hooks/useDashCardAnalysis";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { useDashboardContext } from "../../context";import { getIsDashCardsLoadingComplete } from "../../selectors";diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsxindex e8389ccb2f4..bb0378d8ed5 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx@@ -3,7 +3,7 @@ import { useMemo } from "react";import { getDashcardData } from "metabase/dashboard/selectors";import { isTableDisplay } from "metabase/dashboard/utils";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {ClickBehavior,diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsxindex 071b9c6eafc..efa33a72717 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx@@ -18,9 +18,9 @@ import { getDashboard } from "metabase/dashboard/selectors";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";import { Dashboards } from "metabase/entities/dashboards";import { Questions } from "metabase/entities/questions";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Button, Icon, Select } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import Question from "metabase-lib/v1/Question";import type {diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.ts b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.tsindex bb902024156..bc9fcb1ff57 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.ts+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.ts@@ -1,7 +1,7 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";import type { ClickBehaviorType, DashboardCard } from "metabase-types/api";import { hasActionsMenu } from "../../utils";diff --git a/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts b/frontend/src/metabase/dashboard/components/ClickMappings/hooks.tsindex d953f7abe6a..81f2f93e7ab 100644--- a/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts+++ b/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts@@ -2,10 +2,10 @@ import { useEffect, useMemo, useState } from "react";import { getDashcardData, getParameters } from "metabase/dashboard/selectors";import { loadMetadataForCard } from "metabase/questions/actions";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { GTAPApi } from "metabase/services";import { isQuestionDashCard } from "metabase/utils/dashboard";-import { useDispatch, useSelector } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import Question from "metabase-lib/v1/Question";import {diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsxindex 968c9da6c16..5759726f3a4 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx@@ -19,12 +19,12 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import type { NewParameterOpts } from "metabase/parameters/utils/dashboards";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";+import { useDispatch, useSelector, useStore } from "metabase/redux";import type { StoreDashcard } from "metabase/redux/store";import type { VisualizerVizDefinitionWithColumns } from "metabase/redux/store/visualizer";import { getMetadata } from "metabase/selectors/metadata";import { Box } from "metabase/ui";import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";-import { useDispatch, useSelector, useStore } from "metabase/utils/redux";import { getVisualizationRaw } from "metabase/visualizations";import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";import type { CardSlownessStatus } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsxindex d38aca2736a..0110dd1d225 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsx@@ -2,7 +2,7 @@ import { useEffect } from "react";import { t } from "ttag";import { setEditingDashcardId } from "metabase/dashboard/actions";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import type { ActionDashboardCard } from "metabase-types/api";import { DashCardActionButton } from "../DashCardActionButton/DashCardActionButton";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsxindex 5e0f6c4ff33..3ea52fef89b 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import { moveDashCardToTab } from "metabase/dashboard/actions";import { getSelectedTabId, getTabs } from "metabase/dashboard/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { Divider, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { DashCardId } from "metabase-types/api";import { DashCardActionButton } from "../DashCardActionButton/DashCardActionButton";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsxindex 67f6778a0eb..8b81fe33efe 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx@@ -13,8 +13,8 @@ import {} from "metabase/dashboard/context";import { getParameterValuesBySlugMap } from "metabase/dashboard/selectors";import { transformSdkQuestion } from "metabase/embedding-sdk/lib/transform-question";+import { useStore } from "metabase/redux";import { ActionIcon, Icon, Menu, type MenuProps } from "metabase/ui";-import { useStore } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsxindex 2efac4c2a9b..caf86d49c0b 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx@@ -7,8 +7,8 @@ import { editQuestion } from "metabase/dashboard/actions";import { useDashboardContext } from "metabase/dashboard/context";import { transformSdkQuestion } from "metabase/embedding-sdk/lib/transform-question";import type { DashboardCardCustomMenuItem } from "metabase/embedding-sdk/types/plugins";+import { useDispatch } from "metabase/redux";import { Icon, Menu } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import type { DashCardId, Dataset } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsxindex eadadc99e8b..5631c83361d 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx@@ -13,11 +13,11 @@ import {type ParameterMappingOption,getMappingOptionByTarget,} from "metabase/parameters/utils/mapping-options";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getIsRecentlyAutoConnectedDashcard } from "metabase/redux/undo";import { Box, Flex, Icon, Text, Transition } from "metabase/ui";import { isQuestionDashCard } from "metabase/utils/dashboard";-import { connect } from "metabase/utils/redux";import { getMobileHeight } from "metabase/visualizations/shared/utils/sizes";import type Question from "metabase-lib/v1/Question";import { isDateParameter } from "metabase-lib/v1/parameters/utils/parameter-type";diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsxindex c6b2ebbc269..eb9c2751be0 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsx@@ -10,6 +10,7 @@ import {showVirtualDashCardInfoText,} from "metabase/dashboard/utils";import type { ParameterMappingOption } from "metabase/parameters/utils/mapping-options";+import { useDispatch } from "metabase/redux";import {Box,Ellipsified,@@ -24,7 +25,6 @@ import {isQuestionDashCard,isVirtualDashCard,} from "metabase/utils/dashboard";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import { isTemporalUnitParameter } from "metabase-lib/v1/parameters/utils/parameter-type";import type {diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsxindex fc5f28ebaf0..4f405aed053 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsx@@ -1,8 +1,8 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getDocsUrl, getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import {isDateParameter,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex ecbac87f7ba..c3569966b50 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -19,6 +19,7 @@ import {import { getVirtualCardType } from "metabase/dashboard/utils";import { EmbeddingEntityContextProvider } from "metabase/embedding/context";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import {Box,@@ -37,7 +38,6 @@ import {import { isVirtualDashCard } from "metabase/utils/dashboard";import { duration } from "metabase/utils/formatting";import { measureTextWidth } from "metabase/utils/measure-text";-import { useDispatch, useSelector } from "metabase/utils/redux";import { getVisualizationRaw, isCartesianChart } from "metabase/visualizations";import Visualization from "metabase/visualizations/components/Visualization";import type { LoadingViewProps } from "metabase/visualizations/components/Visualization/LoadingView/LoadingView";diff --git a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsxindex ba17b057f62..30f11e452f7 100644--- a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx@@ -7,9 +7,9 @@ import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownlimport { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";import { useDashboardContext } from "metabase/dashboard/context";import { getParameterValuesBySlugMap } from "metabase/dashboard/selectors";+import { useSelector, useStore } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { ActionIcon, Icon, Menu } from "metabase/ui";-import { useSelector, useStore } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsxindex 42ea8f04fa8..0c2cd2640a1 100644--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx@@ -10,9 +10,9 @@ import { getIsHeaderVisible } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { FilterApplyToast } from "metabase/parameters/components/FilterApplyToast";import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";+import { useSelector } from "metabase/redux";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Box, Flex, Loader } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { DashboardCard } from "metabase-types/api";import { DASHBOARD_PDF_EXPORT_ROOT_ID } from "../../constants";diff --git a/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx b/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsxindex 943028beb57..9e68b12d9ac 100644--- a/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx+++ b/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx@@ -2,12 +2,12 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import { useDashboardContext } from "metabase/dashboard/context";+import { useSelector } from "metabase/redux";import {canUserCreateNativeQueries,canUserCreateQueries,} from "metabase/selectors/user";import { Loader } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { DashboardCard } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsx b/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsxindex fc217116b06..382779e3234 100644--- a/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsx+++ b/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsx@@ -1,5 +1,5 @@import { getDashboardHeaderValuePopulatedParameters } from "metabase/dashboard/selectors";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import {type DashboardParameterListProps,diff --git a/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.ts b/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.tsindex 4c93237c996..01f13bd1f33 100644--- a/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.ts+++ b/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.ts@@ -2,7 +2,7 @@ import { useCallback } from "react";import { setDashboardAttributes } from "metabase/dashboard/actions";import { getDashboardComplete } from "metabase/dashboard/selectors";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import type { Dashboard as IDashboard } from "metabase-types/api";export const useSetDashboardAttributeHandler = () => {diff --git a/frontend/src/metabase/dashboard/components/DashboardArchivedEntityBanner.tsx b/frontend/src/metabase/dashboard/components/DashboardArchivedEntityBanner.tsxindex 30398c5f3e0..d972c70d3c2 100644--- a/frontend/src/metabase/dashboard/components/DashboardArchivedEntityBanner.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardArchivedEntityBanner.tsx@@ -1,7 +1,7 @@import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner";import { Bookmarks } from "metabase/entities/bookmarks";import { Dashboards } from "metabase/entities/dashboards";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { useDashboardContext } from "../context";diff --git a/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx b/frontend/src/metabase/dashboard/components/DashboardBookmark.tsxindex bfdf4be9f03..42b735dfa2f 100644--- a/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx@@ -3,7 +3,7 @@ import { useBookmarkListQuery } from "metabase/common/hooks";import { useDashboardContext } from "metabase/dashboard/context/context";import { Bookmarks } from "metabase/entities/bookmarks";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { DashboardId, Bookmark as IBookmark } from "metabase-types/api";import { trackDashboardBookmarked } from "../analytics";diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsxindex bf56c8d2c4b..f0357e07dfc 100644--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx@@ -9,8 +9,8 @@ import type { CopyDashboardFormProperties } from "metabase/dashboard/containers/import { Collections } from "metabase/entities/collections";import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { Dashboards } from "metabase/entities/dashboards";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx b/frontend/src/metabase/dashboard/components/DashboardGrid.tsxindex d0479db6bd1..8105830a21b 100644--- a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardGrid.tsx@@ -19,6 +19,7 @@ import { ContentViewportContext } from "metabase/common/context/ContentViewportCimport DashboardS from "metabase/css/dashboard.module.css";import { getVisibleCardIds } from "metabase/dashboard/utils";import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import { Box, Flex, type FlexProps } from "metabase/ui";@@ -30,7 +31,6 @@ import {GRID_WIDTH,MIN_ROW_HEIGHT,} from "metabase/utils/dashboard_grid";-import { connect } from "metabase/utils/redux";import LegendS from "metabase/visualizations/components/Legend.module.css";import { VisualizerModal } from "metabase/visualizer/components/VisualizerModal";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsxindex 11abb92dc8c..4589b15abb0 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx@@ -17,10 +17,10 @@ import {} from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { fetchPulseFormInput } from "metabase/notifications/pulse/actions";+import { useDispatch, useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { Flex, Loader } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { Dashboard } from "metabase-types/api";import { SIDEBAR_NAME } from "../../constants";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsxindex e035e398090..8ea74589f68 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx@@ -15,12 +15,12 @@ import {getIsEditing,} from "metabase/dashboard/selectors";import { getPulseFormInput } from "metabase/notifications/pulse/selectors";+import { useDispatch, useSelector } from "metabase/redux";import {canManageSubscriptions as canManageSubscriptionsSelector,getUserIsAdmin,} from "metabase/selectors/user";import { Box } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";export const DashboardHeaderButtonRow = ({isPublic = false,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsxindex 5fed80741a6..ec74ba3a599 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx@@ -25,9 +25,9 @@ import {PLUGIN_COLLECTION_COMPONENTS,PLUGIN_MODERATION,} from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Box, Flex } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { Collection, Dashboard as IDashboard } from "metabase-types/api";import { Dashboard } from "../Dashboard";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsxindex c805b0e9b90..4e83d11165f 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { addActionToDashboard } from "metabase/dashboard/actions";import { useDashboardContext } from "metabase/dashboard/context/context";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";export const AddActionElementButton = () => {const { dashboard, selectedTabId } = useDashboardContext();diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsxindex 01a5764c84b..43727629cea 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsx@@ -6,8 +6,8 @@ import {addLinkDashCardToDashboard,} from "metabase/dashboard/actions";import { getDashboard, getSelectedTabId } from "metabase/dashboard/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { Group, Icon, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";export const AddLinkOrEmbedButton = () => {const dispatch = useDispatch();diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsxindex fd4dce365fc..ac0d3cf94d2 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx@@ -5,8 +5,8 @@ import { addSectionToDashboard } from "metabase/dashboard/actions";import { SectionLayoutPreview } from "metabase/dashboard/components/DashboardHeader/SectionLayoutPreview";import { useDashboardContext } from "metabase/dashboard/context/context";import { type SectionLayout, layoutOptions } from "metabase/dashboard/sections";+import { useDispatch } from "metabase/redux";import { Flex, Menu } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import AddSectionButtonS from "./AddSectionButton.module.css";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsxindex 218a24fc405..5808ceb1418 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx@@ -11,8 +11,8 @@ import { getIsSharing as getIsDashboardSubscriptionSidebarOpen } from "metabase/import { DashboardSubscriptionMenuItem } from "metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { PLUGIN_CACHING, PLUGIN_MODERATION } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { Icon, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";type DashboardActionMenuProps = {canResetFilters: boolean;diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsxindex 627f3c941f6..16acb84e495 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsx@@ -6,8 +6,8 @@ import { SIDEBAR_NAME } from "metabase/dashboard/constants";import { useDashboardContext } from "metabase/dashboard/context/context";import { getIsShowDashboardInfoSidebar } from "metabase/dashboard/selectors";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";+import { useSelector } from "metabase/redux";import type { ActionIconProps } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export const DashboardInfoButton = (props: ActionIconProps & ButtonHTMLAttributes<HTMLButtonElement>,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsxindex ba93f7a6aad..011702e7b76 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { useDashboardContext } from "metabase/dashboard/context";+import { useDispatch } from "metabase/redux";import { downloadDashboardToPdf } from "metabase/redux/downloads";import type { ActionIconProps } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";export const ExportAsPdfButton = (diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsxindex 83492e686bc..cf9dbc6686a 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx@@ -6,9 +6,9 @@ import ButtonsS from "metabase/css/components/buttons.module.css";import { useDashboardContext } from "metabase/dashboard/context/context";import { getMissingRequiredParameters } from "metabase/dashboard/selectors";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";+import { useDispatch, useSelector } from "metabase/redux";import { dismissAllUndo } from "metabase/redux/undo";import { Tooltip } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";export const SaveEditButton = () => {diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsxindex b87c76bd3b6..254d292315c 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx@@ -25,9 +25,9 @@ import {useDashboardContext,} from "metabase/dashboard/context";import { PLUGIN_MODERATION } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Stack, Tabs, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type {Dashboard,ModerationReview,diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsxindex dee2dd9cb4d..c6255841c35 100644--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx@@ -4,9 +4,9 @@ import { t } from "ttag";import { useConfirmRouteLeaveModal } from "metabase/common/hooks/use-confirm-route-leave-modal";import { updateDashboardAndCards } from "metabase/dashboard/actions/save";import { getIsDirty, getIsEditing } from "metabase/dashboard/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { dismissAllUndo } from "metabase/redux/undo";import { Box, Button, Flex, Modal, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { isNavigatingToCreateADashboardQuestion } from "./utils";diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsxindex a0890054380..d3262496044 100644--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx@@ -6,10 +6,10 @@ import { Link } from "metabase/common/components/Link";import { MoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModal";import { ROOT_COLLECTION } from "metabase/entities/collections";import { Dashboards } from "metabase/entities/dashboards";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Flex, Icon } from "metabase/ui";import { color } from "metabase/ui/utils/colors";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { CollectionId, Dashboard, DashboardId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsx b/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsxindex e75fcb38a20..5def83d2aaa 100644--- a/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsx@@ -10,7 +10,7 @@ import {import { DASHBOARD_PARAMETERS_PDF_EXPORT_NODE_CLASSNAME } from "metabase/dashboard/constants";import { useDashboardContext } from "metabase/dashboard/context";import { ParametersList } from "metabase/parameters/components/ParametersList";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsx b/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsxindex 1d7cb741a1e..9529a270053 100644--- a/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsx@@ -7,9 +7,9 @@ import { useIsParameterPanelSticky } from "metabase/dashboard/hooks/use-is-paramimport { getDashboardHeaderValuePopulatedParameters } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { getVisibleParameters } from "metabase/parameters/utils/ui";+import { useSelector } from "metabase/redux";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { isSmallScreen } from "metabase/utils/dom";-import { useSelector } from "metabase/utils/redux";import { Dashboard } from "../Dashboard";import DashboardS from "../Dashboard/Dashboard.module.css";diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsxindex 51e13315197..0d07934ece9 100644--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx@@ -9,8 +9,8 @@ import { toggleAutoApplyFilters } from "metabase/dashboard/actions/parameters";import { useDashboardContext } from "metabase/dashboard/context";import { isDashboardCacheable } from "metabase/dashboard/utils";import { PLUGIN_CACHING } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { Switch, useModalsStack } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { CacheableDashboard, Dashboard } from "metabase-types/api";export function DashboardSettingsSidebar() {diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsxindex 40d6307f628..e8c42ab3b41 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx@@ -17,10 +17,10 @@ import { EmailAttachmentPicker } from "metabase/notifications/EmailAttachmentPicimport { RecipientPicker } from "metabase/notifications/channels/RecipientPicker";import { PLUGIN_DASHBOARD_SUBSCRIPTION_PARAMETERS_SECTION_OVERRIDE } from "metabase/plugins";import { dashboardPulseIsValid } from "metabase/pulse";+import { useSelector } from "metabase/redux";import type { DraftDashboardSubscription } from "metabase/redux/store";import { canAccessSettings, getUser } from "metabase/selectors/user";import { Icon, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {Channel,diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSidebar.tsxindex 0531f27c862..aa751176565 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSidebar.tsx@@ -1,5 +1,5 @@+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import { getParameters, getTabHiddenParameterSlugs } from "../../../selectors";diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsxindex 5877edcd177..38fc8fdadb1 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx@@ -18,10 +18,10 @@ import {getPulseFormInput,} from "metabase/notifications/pulse/selectors";import { NEW_PULSE_TEMPLATE, cleanPulse, createChannel } from "metabase/pulse";+import { connect } from "metabase/redux";import type { DraftDashboardSubscription, State } from "metabase/redux/store";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { UserApi } from "metabase/services";-import { connect } from "metabase/utils/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {Channel,diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/NewPulseSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/NewPulseSidebar.tsxindex 974e827e1fd..e32998d10a4 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/NewPulseSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/NewPulseSidebar.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import { Sidebar } from "metabase/common/components/Sidebar";import { ChannelCard } from "metabase/notifications/pulse/components/ChannelCard";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Stack, Text, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";interface NewPulseSidebarProps {emailConfigured: boolean;diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsxindex aa0d16f1768..ec957faf1f3 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx@@ -8,6 +8,7 @@ import { Subhead } from "metabase/common/components/type/Subhead";import CS from "metabase/css/core/index.css";import { formatDateValue } from "metabase/parameters/utils/date-formatting";import { getActivePulseParameters } from "metabase/pulse";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Button, Icon, Tooltip } from "metabase/ui";import {@@ -15,7 +16,6 @@ import {formatDateTimeWithUnit,formatTimeWithUnit,} from "metabase/utils/formatting";-import { connect } from "metabase/utils/redux";import { formatFrame } from "metabase/utils/time-dayjs";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsxindex d81684d89f5..c147336ad96 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx@@ -16,8 +16,8 @@ import { getSelectedTabId } from "metabase/dashboard/selectors";import { createTabSlug } from "metabase/dashboard/utils";import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import { TEST_CARD } from "metabase/query_builder/containers/test-utils";+import { useSelector } from "metabase/redux";import type { DashboardState, State } from "metabase/redux/store";-import { useSelector } from "metabase/utils/redux";import type { DashboardTab } from "metabase-types/api";import { createMockDashboardCard } from "metabase-types/api/mocks/dashboard";diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.ts b/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.tsindex ab599687eef..eba8adbdeac 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.ts+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.ts@@ -3,9 +3,9 @@ import { t } from "ttag";import { trackTabDuplicated } from "metabase/dashboard/analytics";import { useDashboardContext } from "metabase/dashboard/context";+import { useDispatch } from "metabase/redux";import type { SelectedTabId } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";-import { useDispatch } from "metabase/utils/redux";let tabDeletionId = 1;diff --git a/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx b/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsxindex e728bea9a23..48d135d2c57 100644--- a/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx+++ b/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx@@ -4,8 +4,8 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { setDashboardAttributes } from "metabase/dashboard/actions";import { trackDashboardWidthChange } from "metabase/dashboard/analytics";import { getDashboard, getDashboardId } from "metabase/dashboard/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Popover, Stack, Switch } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045const EXTRA_BUTTONS_DESCRIPTION = t`Toggle width`;diff --git a/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx b/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsxindex 9bcf8347662..8e865c2d712 100644--- a/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx+++ b/frontend/src/metabase/dashboard/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx@@ -10,6 +10,7 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useDocsUrl, useLearnUrl } from "metabase/common/hooks";import { usableAsLinkedFilter } from "metabase/parameters/utils/linked-filters";+import { useDispatch } from "metabase/redux";import { showAddParameterPopover } from "metabase/redux/dashboard";import {Box,@@ -23,7 +24,6 @@ import {Switch,Text,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type { FieldId, ParameterId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx b/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsxindex af0a22d818a..6f0edca6e3a 100644--- a/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx+++ b/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx@@ -4,9 +4,9 @@ import { t } from "ttag";import _ from "underscore";import CS from "metabase/css/core/index.css";+import { useDispatch, useSelector } from "metabase/redux";import { Flex, Group, Icon, type IconName, Select, Text } from "metabase/ui";import { isQuestionDashCard } from "metabase/utils/dashboard";-import { useDispatch, useSelector } from "metabase/utils/redux";import visualizations from "metabase/visualizations";import type { BaseDashboardCard, ParameterId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx b/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsxindex bacfc0997aa..937d189ab8f 100644--- a/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx+++ b/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx@@ -13,6 +13,7 @@ import { TemporalUnitSettings } from "metabase/parameters/components/TemporalUniimport { ValuesSourceSettings } from "metabase/parameters/components/ValuesSourceSettings";import { isSingleOrMultiSelectable } from "metabase/parameters/utils/parameter-type";import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";+import { useDispatch } from "metabase/redux";import {Box,type BoxProps,@@ -24,7 +25,6 @@ import {TextInput,} from "metabase/ui";import { isQuestionDashCard } from "metabase/utils/dashboard";-import { useDispatch } from "metabase/utils/redux";import type { ParameterSectionId } from "metabase-lib/v1/parameters/utils/operators";import { canUseCustomSource } from "metabase-lib/v1/parameters/utils/parameter-source";import { isTemporalUnitParameter } from "metabase-lib/v1/parameters/utils/parameter-type";diff --git a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsxindex b567ed5268d..3021571f94e 100644--- a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx@@ -5,10 +5,10 @@ import { t } from "ttag";import { Sidebar } from "metabase/common/components/Sidebar";import { hasMapping } from "metabase/parameters/utils/dashboards";import { canUseLinkedFilters } from "metabase/parameters/utils/linked-filters";+import { useSelector } from "metabase/redux";import type { IconName } from "metabase/ui";import { Tabs } from "metabase/ui";import { slugify } from "metabase/utils/formatting";-import { useSelector } from "metabase/utils/redux";import { isFilterParameter } from "metabase-lib/v1/parameters/utils/parameter-type";import { parameterHasNoDisplayValue } from "metabase-lib/v1/parameters/utils/parameter-values";import type {diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsxindex d301a11b81f..a6fb09d8684 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx@@ -18,10 +18,10 @@ import { getSelectedTabId } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { Search } from "metabase/entities/search";import { PLUGIN_MODERATION } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { ActionIcon, Box, Flex, Icon, Tooltip } from "metabase/ui";import { DEFAULT_SEARCH_LIMIT } from "metabase/utils/constants";import { getIcon } from "metabase/utils/icon";-import { useDispatch, useSelector } from "metabase/utils/redux";import { VisualizerModal } from "metabase/visualizer/components/VisualizerModal";import type { CardId, CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsxindex 133008b1f58..5fd3897381c 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx@@ -14,6 +14,7 @@ import { getDashboard } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";import { PLUGIN_COLLECTIONS } from "metabase/plugins";+import { connect, useDispatch, useSelector } from "metabase/redux";import {canUserCreateNativeQueries,canUserCreateQueries,@@ -21,7 +22,6 @@ import {import { Button, Flex, Icon } from "metabase/ui";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import { getIcon } from "metabase/utils/icon";-import { connect, useDispatch, useSelector } from "metabase/utils/redux";import type { Collection, CollectionId } from "metabase-types/api";import { QuestionList } from "./QuestionList";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.tsindex 56e9476b02e..4471faee66f 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts@@ -1,7 +1,7 @@import { push } from "react-router-redux";import { getDashboard } from "metabase/dashboard/selectors";-import { createThunkAction } from "metabase/utils/redux";+import { createThunkAction } from "metabase/redux";import * as Urls from "metabase/utils/urls";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.tsindex cf519dc1e16..e1fb5317c43 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.ts+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.ts@@ -6,8 +6,8 @@ import { useSetting } from "metabase/common/hooks/use-setting";import { ROOT_COLLECTION } from "metabase/entities/collections";import getExpandedCollectionsById from "metabase/entities/collections/getExpandedCollectionsById";import { PLUGIN_TENANTS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUserPersonalCollectionId } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { Collection, CollectionId } from "metabase-types/api";// getExpandedCollectionsById produces path as CollectionId[] at runtime,diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsxindex 81d09dcc5ae..938e5ef7395 100644--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx@@ -7,7 +7,7 @@ import { ArchiveModal } from "metabase/common/components/ArchiveModal";import { setArchivedDashboard } from "metabase/dashboard/actions";import { Collections } from "metabase/entities/collections";import { Dashboards } from "metabase/entities/dashboards";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/urls";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsxindex 1c0dd012331..622c5c3503c 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx@@ -21,9 +21,9 @@ import { useDashboardUrlQuery } from "metabase/dashboard/hooks";import { ReturnToSetupGuideModal } from "metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";import { usePageTitle } from "metabase/hooks/use-page-title";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { Box, Flex, Group } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Dashboard as IDashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsxindex 37c7f226d1f..dd3d6adac16 100644--- a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx+++ b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx@@ -15,9 +15,9 @@ import {FormTextInput,FormTextarea,} from "metabase/forms";+import { useSelector } from "metabase/redux";import { Button, Stack } from "metabase/ui";import * as Errors from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import type { CollectionId, Dashboard } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx b/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsxindex 1b2d68485c2..3c52cc5f6cb 100644--- a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx+++ b/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import type { SdkCollectionId } from "embedding-sdk-bundle/types";import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";+import { useDispatch } from "metabase/redux";import { Modal, type ModalProps } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { CollectionId, 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 c1bbd43642e..b804376e3f6 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx@@ -32,9 +32,9 @@ import {usePageTitle,usePageTitleWithLoadingTime,} from "metabase/hooks/use-page-title";+import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { DashboardId, Dashboard as IDashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.ts b/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.tsindex 23b537d8e8a..42e2f5b5d42 100644--- a/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.ts+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.ts@@ -6,8 +6,8 @@ import { useUniqueId } from "metabase/common/hooks/use-unique-id";import { useWebNotification } from "metabase/common/hooks/use-web-notification";import { DASHBOARD_SLOW_TIMEOUT } from "metabase/dashboard/constants";import { useDashboardContext } from "metabase/dashboard/context";+import { useDispatch } from "metabase/redux";import { addUndo, dismissUndo } from "metabase/redux/undo";-import { useDispatch } from "metabase/utils/redux";export const useSlowCardNotification = () => {const { dashboard, isRunning, isLoadingComplete } = useDashboardContext();diff --git a/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx b/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsxindex 6cf97ee106a..168003b515d 100644--- a/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx+++ b/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx@@ -5,7 +5,7 @@ import {import { getParameters } from "metabase/dashboard/selectors";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";import { EmbedModal } from "metabase/public/components/EmbedModal";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import type { Dashboard } from "metabase-types/api";export type DashboardSharingEmbeddingModalProps = {diff --git a/frontend/src/metabase/dashboard/context/context.redux.ts b/frontend/src/metabase/dashboard/context/context.redux.tsindex 9a465fd87c2..dfdf0e173d8 100644--- a/frontend/src/metabase/dashboard/context/context.redux.ts+++ b/frontend/src/metabase/dashboard/context/context.redux.ts@@ -50,6 +50,7 @@ import {renameTab,undoDeleteTab,} from "metabase/dashboard/actions/tabs";+import { connect } from "metabase/redux";import {initialize,reset,@@ -62,7 +63,6 @@ import {canManageSubscriptions,getUserIsAdmin,} from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import {getClickBehaviorSidebarDashcard,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 19e63740025..64231767483 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@@ -2,8 +2,8 @@ import type { LocationDescriptorObject } from "history";import { useCallback, useMemo } from "react";import { replace } from "react-router-redux";+import { useDispatch } from "metabase/redux";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";-import { useDispatch } from "metabase/utils/redux";import type { DashCardId } from "metabase-types/api";export interface UseAutoScrollToDashcardResult {diff --git a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.tsindex a0bd5a73c01..0e53b932172 100644--- a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts+++ b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts@@ -13,9 +13,9 @@ import {} from "metabase/dashboard/selectors";import { Dashboards } from "metabase/entities/dashboards";import { Questions } from "metabase/entities/questions";+import { useStore } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUserAttributes } from "metabase/selectors/user";-import { useStore } from "metabase/utils/redux";import type { ClickObject } from "metabase/visualizations/types";import Question from "metabase-lib/v1/Question";import type {diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.tsindex 10c4a5c406e..81d0c7a6717 100644--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts@@ -7,8 +7,8 @@ import _ from "underscore";import { useSetting } from "metabase/common/hooks";import { isEmbedPreview } from "metabase/embedding/config";+import { useDispatch, useSelector } from "metabase/redux";import { selectTab } from "metabase/redux/dashboard";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/dashboard/hooks/use-location-sync.ts b/frontend/src/metabase/dashboard/hooks/use-location-sync.tsindex de3e9c477ed..fa200c15fbd 100644--- a/frontend/src/metabase/dashboard/hooks/use-location-sync.ts+++ b/frontend/src/metabase/dashboard/hooks/use-location-sync.ts@@ -4,8 +4,8 @@ import { replace } from "react-router-redux";import { usePrevious } from "react-use";import { omit } from "underscore";+import { useDispatch } from "metabase/redux";import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";-import { useDispatch } from "metabase/utils/redux";import { isNullOrUndefined } from "metabase/utils/types";type SYNCED_KEY = "refresh" | "fullscreen";diff --git a/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.ts b/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.tsindex 9ee3e0d4c76..552e2b073ce 100644--- a/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.ts+++ b/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.ts@@ -4,7 +4,7 @@ import {fetchDashboard,fetchDashboardCardData,} from "metabase/dashboard/actions";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { DashboardId, ParameterValuesMap } from "metabase-types/api";interface UseRefreshDashboardProps {diff --git a/frontend/src/metabase/dashboard/reducers-typed.ts b/frontend/src/metabase/dashboard/reducers-typed.tsindex a27e04a4395..935016d3900 100644--- a/frontend/src/metabase/dashboard/reducers-typed.ts+++ b/frontend/src/metabase/dashboard/reducers-typed.ts@@ -10,6 +10,7 @@ import {} from "metabase/api";import { Dashboards } from "metabase/entities/dashboards";import { Questions } from "metabase/entities/questions";+import { handleActions } from "metabase/redux";import {INITIALIZE,RESET,@@ -26,7 +27,6 @@ import type {DashboardSidebarName,StoreDashboard,} from "metabase/redux/store/dashboard";-import { handleActions } from "metabase/utils/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {Card,diff --git a/frontend/src/metabase/dashboard/reducers.ts b/frontend/src/metabase/dashboard/reducers.tsindex c5c86ed94a3..6a069790e50 100644--- a/frontend/src/metabase/dashboard/reducers.ts+++ b/frontend/src/metabase/dashboard/reducers.ts@@ -3,8 +3,8 @@ import { assoc, chain, merge, updateIn } from "icepick";import { Actions } from "metabase/entities/actions";import { Questions } from "metabase/entities/questions";+import { combineReducers } from "metabase/redux";import { SET_PARAMETER_VALUES, initialize } from "metabase/redux/dashboard";-import { combineReducers } from "metabase/utils/redux";import type { Card, WritebackAction } from "metabase-types/api";import {diff --git a/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsx b/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsxindex 9269db65714..c6511827157 100644--- a/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsx+++ b/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsx@@ -7,8 +7,8 @@ import {isInDbTree,} from "metabase/common/components/Pickers";import { replaceCard } from "metabase/dashboard/actions";+import { useDispatch } from "metabase/redux";import { Button, Flex } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type {VisualizationDefinition,VisualizationProps,diff --git a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsxindex 21d0102003b..d7fc8aec035 100644--- a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx+++ b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx@@ -14,10 +14,10 @@ import {getParameterValues,} from "metabase/dashboard/selectors";import { useTranslateContent } from "metabase/i18n/hooks";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Box, Ellipsified, Flex } from "metabase/ui";import { measureTextWidth } from "metabase/utils/measure-text";-import { useSelector } from "metabase/utils/redux";import { isEmpty } from "metabase/utils/validate";import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";import type {diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsxindex c0a4f48a174..8eb20346945 100644--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx@@ -6,9 +6,9 @@ import { Link } from "metabase/common/components/Link";import { useDocsUrl, useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { getParameterValues } from "metabase/dashboard/selectors";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Group, Icon, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";import type {Dashboard,diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsxindex 5bd7de11c72..7ed6d0379d4 100644--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx@@ -7,8 +7,8 @@ import { useToggle } from "metabase/common/hooks/use-toggle";import { getParameterValues } from "metabase/dashboard/selectors";import { Search } from "metabase/entities/search";import { SearchResults } from "metabase/nav/components/search/SearchResults";+import { useSelector } from "metabase/redux";import { getUrlTarget } from "metabase/utils/dom";-import { useSelector } from "metabase/utils/redux";import { modelToUrl } from "metabase/utils/urls";import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";import type {diff --git a/frontend/src/metabase/dashboard/visualizations/Text/Text.tsx b/frontend/src/metabase/dashboard/visualizations/Text/Text.tsxindex 6ee51fee501..f6aca7f456d 100644--- a/frontend/src/metabase/dashboard/visualizations/Text/Text.tsx+++ b/frontend/src/metabase/dashboard/visualizations/Text/Text.tsx@@ -13,7 +13,7 @@ import CS from "metabase/css/core/index.css";import { updateParameterMappingsForDashcardText } from "metabase/dashboard/actions";import { getParameterValues } from "metabase/dashboard/selectors";import { useTranslateContent } from "metabase/i18n/hooks";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { isEmpty } from "metabase/utils/validate";import { DATA_IMAGE_URI_PATTERN } from "metabase/visualizations/lib/utils";import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsxindex d1491c2be7e..c056ec93ce7 100644--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx@@ -9,12 +9,12 @@ import type {RowIdColumnOptions,} from "metabase/data-grid/types";import { publicReducers } from "metabase/reducers-public";+import { MetabaseReduxProvider } from "metabase/redux";import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";import { Checkbox, Flex } from "metabase/ui";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { DataGrid } from "./DataGrid";import classes from "./DataGrid.module.css";diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex cc459376094..9cb9807d4b3 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -12,6 +12,7 @@ import {PLUGIN_FEATURE_LEVEL_PERMISSIONS,PLUGIN_REMOTE_SYNC,} from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import {canAccessTransforms as canAccessTransformsSelector,@@ -31,7 +32,6 @@ import {Tooltip,} from "metabase/ui";import { isMac } from "metabase/utils/browser";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import S from "./DataStudioLayout.module.css";diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsxindex 80270cc1343..7ed41d2bf3b 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx@@ -4,9 +4,9 @@ import { t } from "ttag";import { useSetting } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { PLUGIN_TRANSFORMS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { EnableTransformsPage } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage";import { getShouldShowTransformsUpsell } from "metabase/transforms/selectors";-import { useSelector } from "metabase/utils/redux";import { SectionLayout } from "../../components/SectionLayout";diff --git a/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsxindex df8368d5fd1..9991064c275 100644--- a/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx+++ b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx@@ -5,8 +5,8 @@ import {PaneHeaderTabs,} from "metabase/data-studio/common/components/PaneHeader";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import { useSelector } from "metabase/utils/redux";export type EntityDetailTabUrls = {definition: string;diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsxindex f99eab06fda..a25d2ecdb06 100644--- a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx+++ b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx@@ -2,8 +2,8 @@ import { useMemo } from "react";import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";import { QueryVisualization } from "metabase/querying/components/QueryVisualization";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import Question from "metabase-lib/v1/Question";import type { Card, Dataset } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsxindex 46f4fd7277a..694349519cb 100644--- a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx+++ b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx@@ -6,6 +6,7 @@ import { EditableText } from "metabase/common/components/EditableText";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { MetabotDataStudioButton } from "metabase/metabot/components/MetabotDataStudioButton";import { AppSwitcher } from "metabase/nav/components/AppSwitcher";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import {Box,@@ -18,7 +19,6 @@ import {type StackProps,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import S from "./PaneHeader.module.css";import type { PaneHeaderTab } from "./types";diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.tsindex 1e569c4e184..6befc8ca822 100644--- a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts+++ b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts@@ -3,7 +3,7 @@ import { useMemo } from "react";import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";import type { TreeItem } from "metabase/data-studio/common/types";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { buildActiveSnippetTree, buildArchivedSnippetTree } from "./utils";diff --git a/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts b/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.tsindex 1305ad2b0b6..7154c58b5d9 100644--- a/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts+++ b/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts@@ -5,7 +5,7 @@ import {skipToken,useGetTableQueryMetadataQuery,} from "metabase/api";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { TableId } from "metabase-types/api";type UseLoadTableWithMetadataOptions = {diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsxindex dd33466d21b..ddb644955f5 100644--- a/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx@@ -1,6 +1,6 @@+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Flex } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { DatasetQuery, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsxindex a91f8cafce8..f48c39cc7d6 100644--- a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx@@ -3,10 +3,10 @@ import { t } from "ttag";import { useListRevisionsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSelector } from "metabase/redux";import { getUserId } from "metabase/selectors/user";import { Center, Stack, Text, Timeline } from "metabase/ui";import { assignUserColors } from "metabase/ui/colors/formatting-colors";-import { useSelector } from "metabase/utils/redux";import type { RevisionEntityType, TableId } from "metabase-types/api";import { RevisionItem } from "./RevisionItem";diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsxindex fa11e381f70..a303c89e99e 100644--- a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx@@ -3,9 +3,9 @@ import relativeTime from "dayjs/plugin/relativeTime";import { t } from "ttag";import { UserAvatar } from "metabase/common/components/UserAvatar";+import { useSelector } from "metabase/redux";import { getUserId } from "metabase/selectors/user";import { Box, Flex, Stack, Text, Timeline } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { FieldDiff, Revision, TableId } from "metabase-types/api";import { RevisionDiff } from "./RevisionDiff";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 fa00f841112..7d06cb4f2db 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/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/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 aa96003831f..84f67f5acf3 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@@ -24,6 +24,7 @@ import {PLUGIN_REMOTE_SYNC,PLUGIN_REPLACEMENT,} from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import {Box,Button,@@ -34,7 +35,6 @@ import {Tabs,Tooltip,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { DataStudioTableMetadataTab } from "metabase/utils/urls/data-studio";import { dependencyGraph } from "metabase/utils/urls/dependencies";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsxindex 1d77bc8e405..ac236e182b1 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx@@ -4,8 +4,8 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { ForwardRefLink } from "metabase/common/components/Link";import { trackMeasureCreateStarted } from "metabase/data-studio/analytics";import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";+import { useSelector } from "metabase/redux";import { Button, Group, Icon, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { ConcreteTableId, Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsxindex 8ec48f1f5e0..802cb313969 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx@@ -4,8 +4,8 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { ForwardRefLink } from "metabase/common/components/Link";import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";import { getUserCanWriteSegments } from "metabase/data-studio/selectors";+import { useSelector } from "metabase/redux";import { Button, Group, Icon, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsxindex 9bddec0eeed..9ecbcbca853 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx@@ -15,8 +15,8 @@ import {} from "metabase/metadata/components";import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { Box, Button, Group, Icon, Stack, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type {TableDataLayer,TableDataSource,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 9e4ce17c5fc..8ee7b91e00f 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@@ -8,7 +8,7 @@ import {useUpdateMeasureMutation,} from "metabase/api";import { useMetadataToasts } from "metabase/metadata/hooks";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/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 82f167b47cc..df8df360c63 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@@ -8,7 +8,7 @@ import {useUpdateMeasureMutation,} from "metabase/api";import { useToast } from "metabase/common/hooks/use-toast";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/urls";import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxindex 84911df9902..335bb36cb0f 100644--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -8,9 +8,9 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type { Measure } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsxindex 78fa443431a..7e3412f0909 100644--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx@@ -10,9 +10,9 @@ import { trackMeasureCreated } from "metabase/data-studio/analytics";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { DatasetQuery, Measure, Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsxindex 6a599704f93..a18cf41326d 100644--- a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx+++ b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx@@ -2,8 +2,8 @@ import { useCallback } from "react";import { t } from "ttag";import { ToolbarButton } from "metabase/common/components/ToolbarButton";+import { useDispatch } from "metabase/redux";import { openUrl } from "metabase/redux/app";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type Question from "metabase-lib/v1/Question";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 f09d281cbad..0afa3aa9fbc 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@@ -8,7 +8,7 @@ import {useUpdateSegmentMutation,} from "metabase/api";import { useMetadataToasts } from "metabase/metadata/hooks";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/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 11a644ef588..2bcb6a68ed4 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@@ -8,7 +8,7 @@ import {useUpdateSegmentMutation,} from "metabase/api";import { useToast } from "metabase/common/hooks/use-toast";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/urls";import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsxindex 705d88da51c..27d25844849 100644--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx@@ -10,9 +10,9 @@ import { trackSegmentCreated } from "metabase/data-studio/analytics";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";import { Button } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { DatasetQuery, Segment, Table } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsxindex 7bd9c7f2945..a2ee9051f77 100644--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx@@ -9,9 +9,9 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContaiimport { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";import { getUserCanWriteSegments } from "metabase/data-studio/selectors";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx b/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsxindex 8f132937f0c..92d8801ea53 100644--- a/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx+++ b/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx@@ -8,6 +8,7 @@ import {trackUpsellClicked,trackUpsellViewed,} from "metabase/common/components/upsells/components/analytics";+import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";import { getIsHosted } from "metabase/setup/selectors";import {@@ -23,7 +24,6 @@ import {Title,rem,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import S from "./UpsellCardContent.module.css";diff --git a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsxindex 276cd671aaa..ffd672a9193 100644--- a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx+++ b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx@@ -5,9 +5,9 @@ import { DATA_STUDIO_UPGRADE_URL } from "metabase/common/components/upsells/consimport { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { UpsellCardContent } from "metabase/data-studio/upsells/components/UpsellCardContent";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { DottedBackground } from "../components/DottedBackground";import { LineDecorator } from "../components/LineDecorator";diff --git a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsxindex 4ddd43a211e..57f4816cb18 100644--- a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx+++ b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx@@ -9,6 +9,7 @@ import {getEngineLogo,getEngineOptions,} from "metabase/databases/utils/engine";+import { useSelector } from "metabase/redux";import {Button,Center,@@ -21,7 +22,6 @@ import {Text,useCombobox,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import S from "./DatabaseEngineList.module.css";diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsxindex 6cafd5dbc96..3193b626705 100644--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx@@ -1,7 +1,7 @@import { useCallback, useEffect, useMemo, useState } from "react";import { Form, FormProvider } from "metabase/forms";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import type { DatabaseData, EngineKey } from "metabase-types/api";import { getEngines } from "../../selectors";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsxindex 5fc889f9d19..629acb018e2 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx@@ -2,11 +2,11 @@ import { Link } from "react-router";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Button, Divider, Icon } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { ContactSupportButtonSection } from "./ContactSupportButtonSection";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsxindex 995aacbdacc..7c993531000 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx@@ -2,9 +2,9 @@ import { Link } from "react-router";import { t } from "ttag";import { useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";import { Button, Flex } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { TroubleshootingTip } from "./TroubleshootingTip";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsxindex f26ac84f498..3d2a905d7db 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx@@ -3,12 +3,12 @@ import { useMemo } from "react";import { c, t } from "ttag";import { identity } from "underscore";+import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { getIsHosted } from "metabase/setup";import { Code } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { TipProps as _TipProps } from "./TroubleshootingTip";import { getDocsLinkConditionally, useCloudGatewayIPs } from "./utils";diff --git a/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx b/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsxindex 94bc6d0d1d6..78dcd1a7892 100644--- a/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx+++ b/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx@@ -2,8 +2,8 @@ import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { HelpCard } from "metabase/common/components/HelpCard";+import { useSelector } from "metabase/redux";import { getDocsUrl, getSetting } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export interface DatabaseHelpCardProps {className?: string;diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsxindex 9eccd13f6ea..4194dca4152 100644--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx@@ -6,9 +6,9 @@ import { useLatest } from "react-use";import { t } from "ttag";import { skipToken, useGetAdhocQueryQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Loader, Stack, Text, rem } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { ForeignKey } from "metabase-types/api";diff --git a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsxindex 917ab219708..0240e7bac8e 100644--- a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx+++ b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx@@ -12,10 +12,10 @@ import {getRowName,getTableQuery,} from "metabase/detail-view/utils";+import { useDispatch, useSelector } from "metabase/redux";import { closeNavbar, setDetailView } from "metabase/redux/app";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { extractRemappedColumns } from "metabase/visualizations";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsxindex cfb0313dab0..783f87910b3 100644--- a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx+++ b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx@@ -15,10 +15,10 @@ import {getRowName,getTableQuery,} from "metabase/detail-view/utils";+import { useDispatch, useSelector } from "metabase/redux";import { closeNavbar, setDetailView } from "metabase/redux/app";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";-import { useDispatch, useSelector } from "metabase/utils/redux";import { extractRemappedColumns } from "metabase/visualizations";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsxindex 57bc6b5e52c..70520a65102 100644--- a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx+++ b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx@@ -17,6 +17,7 @@ import Animation from "metabase/css/core/animation.module.css";import { useDocumentState } from "metabase/documents/hooks/use-document-state";import { getCurrentDocument } from "metabase/documents/selectors";import { getListCommentsQuery } from "metabase/documents/utils/api";+import { useDispatch, useSelector } from "metabase/redux";import {ActionIcon,Box,@@ -27,7 +28,6 @@ import {Text,Title,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { Comment, DocumentContent } from "metabase-types/api";import S from "./CommentsSidesheet.module.css";diff --git a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsxindex fd2504f5efa..e0671dca6e6 100644--- a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx+++ b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx@@ -4,7 +4,7 @@ import { deletePermanently } from "metabase/archive/actions";import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner";import { Bookmarks } from "metabase/entities/bookmarks";import { Documents } from "metabase/entities/documents";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { getCurrentDocument } from "../selectors";diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsxindex 2e5b1f952ff..53896847cd0 100644--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx@@ -9,6 +9,7 @@ import {} from "metabase/common/components/DateTime";import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import {ActionIcon,@@ -24,7 +25,6 @@ import {type TransitionProps,} from "metabase/ui";import { isWithinIframe } from "metabase/utils/iframe";-import { useSelector } from "metabase/utils/redux";import type { Document } from "metabase-types/api";import { DocumentPublicLinkPopover } from "../../embedding/components/PublicLinkPopover";diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsxindex d90232091f5..88ad66928f6 100644--- a/frontend/src/metabase/documents/components/DocumentPage.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx@@ -39,9 +39,9 @@ import { useToast } from "metabase/common/hooks";import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { usePageTitle } from "metabase/hooks/use-page-title";+import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { Box } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { extractEntityId } from "metabase/utils/urls";import * as Urls from "metabase/utils/urls";import type {diff --git a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsxindex 7125633766b..902137c8662 100644--- a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx+++ b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx@@ -12,8 +12,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { Document } from "metabase-types/api";interface DocumentRevisionHistorySidebarProps {diff --git a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsxindex 8a76ff65965..aeee6b13569 100644--- a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx+++ b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx@@ -8,9 +8,9 @@ import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { Api } from "metabase/api";import { commonReducers } from "metabase/reducers-common";+import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { registerVisualization } from "metabase/visualizations";import { LineChart } from "metabase/visualizations/visualizations/LineChart";import { PieChart } from "metabase/visualizations/visualizations/PieChart";diff --git a/frontend/src/metabase/documents/components/Editor/Editor.tsx b/frontend/src/metabase/documents/components/Editor/Editor.tsxindex cdda4431d5d..65d9633f948 100644--- a/frontend/src/metabase/documents/components/Editor/Editor.tsx+++ b/frontend/src/metabase/documents/components/Editor/Editor.tsx@@ -11,6 +11,7 @@ import { DND_IGNORE_CLASS_NAME } from "metabase/common/components/dnd";import { getMentionsCache } from "metabase/documents/selectors";import { isMetabotBlock } from "metabase/documents/utils/editorNodeUtils";import { getMentionsCacheKey } from "metabase/documents/utils/mentionsUtils";+import { useSelector, useStore } from "metabase/redux";import type { State } from "metabase/redux/store";import type { CardEmbedRef } from "metabase/redux/store/documents";import { EditorBubbleMenu } from "metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu";@@ -39,7 +40,6 @@ import { DROP_ZONE_COLOR } from "metabase/rich_text_editing/tiptap/extensions/shimport { createSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";import { getSetting } from "metabase/selectors/settings";import { Box, Loader } from "metabase/ui";-import { useSelector, useStore } from "metabase/utils/redux";import S from "./Editor.module.css";import { useCardEmbedsTracking, useQuestionSelection } from "./hooks";diff --git a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsxindex f7fe896cbc5..8ae769b9ac9 100644--- a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx+++ b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx@@ -2,6 +2,7 @@ import type { Editor } from "@tiptap/react";import { useCallback } from "react";import { t } from "ttag";+import { useDispatch, useSelector } from "metabase/redux";import {ActionIcon,Box,@@ -13,7 +14,6 @@ import {Stack,Text,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";import type {CardDisplayType,diff --git a/frontend/src/metabase/documents/hooks/use-block-menus.ts b/frontend/src/metabase/documents/hooks/use-block-menus.tsindex ea5f29201c0..c03876446c9 100644--- a/frontend/src/metabase/documents/hooks/use-block-menus.ts+++ b/frontend/src/metabase/documents/hooks/use-block-menus.ts@@ -9,8 +9,8 @@ import {getHoveredChildTargetId,} from "metabase/documents/selectors";import { isTopLevel } from "metabase/documents/utils/editorNodeUtils";+import { useSelector } from "metabase/redux";import { isWithinIframe } from "metabase/utils/iframe";-import { useSelector } from "metabase/utils/redux";import { documentWithAnchor } from "metabase/utils/urls";interface UseBlockMenusOptions {diff --git a/frontend/src/metabase/documents/hooks/use-card-data.ts b/frontend/src/metabase/documents/hooks/use-card-data.tsindex f1a4b45c085..7af763c3179 100644--- a/frontend/src/metabase/documents/hooks/use-card-data.ts+++ b/frontend/src/metabase/documents/hooks/use-card-data.ts@@ -5,8 +5,8 @@ import {useGetAdhocPivotQueryQuery,useGetAdhocQueryQuery,} from "metabase/api/dataset";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import Question from "metabase-lib/v1/Question";import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot";import type { Card, Dataset, RawSeries } from "metabase-types/api";diff --git a/frontend/src/metabase/documents/hooks/use-document-state.ts b/frontend/src/metabase/documents/hooks/use-document-state.tsindex 11cc11e8927..6b801e39f30 100644--- a/frontend/src/metabase/documents/hooks/use-document-state.ts+++ b/frontend/src/metabase/documents/hooks/use-document-state.ts@@ -1,8 +1,8 @@import type { JSONContent } from "@tiptap/react";import { useCallback, useEffect, useRef, useState } from "react";+import { useDispatch } from "metabase/redux";import type { CardEmbedRef } from "metabase/redux/store/documents";-import { useDispatch } from "metabase/utils/redux";import type { DocumentContent } from "metabase-types/api";import { setCardEmbeds, setIsCommentSidebarOpen } from "../documents.slice";diff --git a/frontend/src/metabase/documents/hooks/use-draft-card-operations.ts b/frontend/src/metabase/documents/hooks/use-draft-card-operations.tsindex 6f3b39339f1..dcf5e1e080f 100644--- a/frontend/src/metabase/documents/hooks/use-draft-card-operations.ts+++ b/frontend/src/metabase/documents/hooks/use-draft-card-operations.ts@@ -2,7 +2,7 @@ import type { Editor } from "@tiptap/react";import { useCallback } from "react";import { datasetApi } from "metabase/api/dataset";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { Card, Dataset } from "metabase-types/api";import { createDraftCard, generateDraftCardId } from "../documents.slice";diff --git a/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.ts b/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.tsindex 7501023f680..b82c04bdaf5 100644--- a/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.ts+++ b/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.ts@@ -3,7 +3,7 @@ import { getTargetChildCommentThreads } from "metabase/comments/utils";import { getUnresolvedComments } from "metabase/documents/components/Editor/CommentsMenu";import { getCurrentDocument } from "metabase/documents/selectors";import { getListCommentsQuery } from "metabase/documents/utils/api";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";export function useUnresolvedCommentsCount(targetId: string) {const document = useSelector(getCurrentDocument);diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsxindex 5bad6c8d42c..1fc2ed6481f 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx@@ -3,6 +3,7 @@ import { t } from "ttag";import { CopyButton } from "metabase/common/components/CopyButton";import { getPublicEmbedHTMLWithResizer } from "metabase/public/lib/code-templates";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import {Anchor,@@ -16,7 +17,6 @@ import {TextInput,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import S from "./DocumentPublicLinkPopoverContent.module.css";diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsxindex e158a0c7f99..a1f89ed6a80 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx@@ -2,9 +2,9 @@ import { useAsync } from "react-use";import { t } from "ttag";import type { ExportFormat } from "metabase/common/types/export";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Popover, Text, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { PublicLinkCopyPanel } from "./PublicLinkCopyPanel";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx b/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsxindex 61ff1e8fd77..4f511cb5a0a 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx@@ -1,8 +1,8 @@import { isInstanceAnalyticsCollection } from "metabase/collections/utils";import { getIsDashCardsRunning } from "metabase/dashboard/selectors";import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";+import { useSelector } from "metabase/redux";import { Flex, Menu } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Dashboard } from "metabase-types/api";import { useSharingModal } from "../../hooks/use-sharing-modal";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsxindex beca9d022c4..94508a4e353 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx@@ -1,8 +1,8 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Icon, Menu } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function EmbedMenuItem({ onClick }: { onClick: () => void }) {const isAdmin = useSelector(getUserIsAdmin);diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsxindex 1a6469e250b..1f18ac266c0 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsx@@ -1,6 +1,6 @@+import { useDispatch } from "metabase/redux";import { downloadDashboardToPdf } from "metabase/redux/downloads";import { Icon, Menu } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { getExportTabAsPdfButtonText } from "metabase/visualizations/lib/save-dashboard-pdf";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsxindex f8d455ba49e..f9934b8f2d0 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Button, Icon, Menu } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function PublicLinkMenuItem({hasPublicLink,diff --git a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsxindex 50dccf8d124..7f01c130bf7 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx@@ -4,13 +4,13 @@ import { isInstanceAnalyticsCollection } from "metabase/collections/utils";import { useSetting } from "metabase/common/hooks";import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";import { MODAL_TYPES } from "metabase/querying/constants";+import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import {canManageSubscriptions as canManageSubscriptionsSelector,getUserIsAdmin,} from "metabase/selectors/user";import { Flex } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import { useSharingModal } from "../../hooks/use-sharing-modal";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx b/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsxindex 9de5ff7deca..ada2f2c173a 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx@@ -12,12 +12,12 @@ import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";import { setupListNotificationEndpoints } from "__support__/server-mocks/notification";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";+import { useSelector } from "metabase/redux";import type { DashboardState } from "metabase/redux/store/dashboard";import {createMockDashboardState,createMockState,} from "metabase/redux/store/mocks";-import { useSelector } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import Question from "metabase-lib/v1/Question";import type { Card, Dashboard, Notification, User } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsxindex ec78c7c87ec..7207e89bdbf 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { CustomHomePageModal } from "metabase/home/components/CustomHomePageModal";import { dismissEmbeddingHomepage } from "metabase/home/components/EmbedHomepage/actions";import { MetabotGreeting } from "metabase/home/components/HomeGreeting";+import { useDispatch } from "metabase/redux";import { ActionIcon, Group, Icon, Menu, Stack, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { EmbeddingHub } from "./EmbeddingHub";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsxindex fcb67f4dce4..6940b2aef3a 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { DataPickerModal } from "metabase/common/components/Pickers/DataPicker";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { TableId } from "metabase-types/api";interface EmbeddingHubXrayPickerModalProps {diff --git a/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx b/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsxindex a878028310c..6c61ed9ce22 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx@@ -2,8 +2,8 @@ import { push } from "react-router-redux";import { t } from "ttag";import { EMBEDDING_SETUP_GUIDE_PATH } from "metabase/embedding/embedding-hub/constants";+import { useDispatch } from "metabase/redux";import { Button, Group, Modal, Stack, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";interface ReturnToSetupGuideModalProps {opened: boolean;diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.ts b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.tsindex 35287e98d77..bac3290525d 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.ts+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.ts@@ -4,8 +4,8 @@ import { Api, databaseApi, useListPermissionsGroupsQuery } from "metabase/api";import { tableApi } from "metabase/api/table";import { listTag } from "metabase/api/tags";import { PLUGIN_TENANTS } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { PermissionsApi } from "metabase/services";-import { useDispatch } from "metabase/utils/redux";import type { DatabaseId, TableId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.ts b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.tsindex cce1034a97f..6cee4e587c1 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.ts+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.ts@@ -2,7 +2,7 @@ import { useCallback, useState } from "react";import { t } from "ttag";import { tableApi, useListGroupTableAccessPoliciesQuery } from "metabase/api";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { TableColumnSelection } from "../RlsDataSelector";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.tsindex b5eddb768ac..083f40c9660 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts@@ -10,7 +10,7 @@ import {} from "metabase/api";import { listTag } from "metabase/api/tags";import { createDashCard, createVirtualCard } from "metabase/dashboard/utils";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type {CollectionId,CollectionItem,diff --git a/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.ts b/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.tsindex 8732d7c0fe6..74ee11d81b8 100644--- a/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.ts+++ b/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.ts@@ -5,8 +5,8 @@ import {PLUGIN_TENANTS,type SdkIframeEmbedSetupModalInitialState,} from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { setOpenModalWithProps } from "metabase/redux/ui";-import { useDispatch } from "metabase/utils/redux";import type { EmbeddingHubStep } from "../types";diff --git a/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts b/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.tsindex 0142b6a8450..7521f38b472 100644--- a/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts+++ b/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts@@ -1,6 +1,6 @@import { useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";export const useHelpUrl = () => {const isPaidPlan = useSelector(getIsPaidPlan);diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsxindex 94685e08172..a5d014f97b1 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx@@ -4,8 +4,8 @@ import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";import { UTM_LOCATION } from "metabase/embedding/embedding-iframe-sdk-setup/analytics";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUpgradeUrl } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";type Props = {campaign: string;diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsxindex 911055bb582..63d30982466 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx@@ -3,9 +3,9 @@ import { c, t } from "ttag";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { getResourceTypeFromExperience } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience";+import { useDispatch } from "metabase/redux";import { setOpenModalWithProps } from "metabase/redux/ui";import { Alert, Anchor, Box, Flex, Icon, Stack, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";export const LegacyStaticEmbeddingAlert = () => {const { isGuestEmbedsEnabled, settings, resource, experience, onClose } =diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsxindex e17e9e6dd7c..7182bc9be72 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx@@ -14,6 +14,7 @@ import { SdkIframeGuestEmbedStatusBar } from "metabase/embedding/embedding-iframimport { EMBED_STEPS } from "metabase/embedding/embedding-iframe-sdk-setup/constants";import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { closeModal } from "metabase/redux/ui";import {Box,@@ -26,7 +27,6 @@ import {Modal,Stack,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { SettingKey } from "metabase-types/api";import { useSdkIframeEmbedSetupContext } from "../context";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.tsindex 403c97b4e93..7f46e9e7959 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts@@ -3,9 +3,9 @@ import { useLatest, usePrevious } from "react-use";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";import { getSavedDashboardUiParameters } from "metabase/parameters/utils/dashboards";+import { useDispatch, useSelector } from "metabase/redux";import { addFields } from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";-import { useDispatch, useSelector } from "metabase/utils/redux";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";import type { Card, Dashboard, Parameter } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.tsindex c9501f2e50a..6d21e0ff07b 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts@@ -10,7 +10,7 @@ import {const mockDispatch = jest.fn();-jest.mock("metabase/utils/redux", () => ({+jest.mock("metabase/redux", () => ({useDispatch: () => mockDispatch,useSelector: jest.fn(),}));@@ -31,7 +31,7 @@ jest.mock("metabase/selectors/metadata", () => ({getMetadata: jest.fn(),}));-const mockUseSelector = jest.requireMock("metabase/utils/redux").useSelector;+const mockUseSelector = jest.requireMock("metabase/redux").useSelector;const mockGetSavedDashboardUiParameters = jest.requireMock("metabase/parameters/utils/dashboards",).getSavedDashboardUiParameters;diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.tsindex e756909ecbb..13febecea13 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts@@ -4,7 +4,7 @@ import { skipToken, useGetCardQuery } from "metabase/api";import { fetchDashboard } from "metabase/dashboard/actions";import { getDashboardComplete } from "metabase/dashboard/selectors";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import type { Card, Dashboard, DashboardId } from "metabase-types/api";const getResource = ({diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.tsindex 2491ce0cb68..b210c292456 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.ts@@ -2,8 +2,8 @@ import { useMemo } from "react";import _ from "underscore";import { useSearchQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getUserId } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { SearchResult } from "metabase-types/api";import type { SdkIframeEmbedSetupRecentItem } from "../types";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsxindex 301fda6baef..196f14d2a01 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx@@ -23,10 +23,10 @@ import { createSnowplowTracker } from "metabase/analytics";import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/EmbeddingFooter";import { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";import { PLUGIN_EMBEDDING_IFRAME_SDK } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { getUserId } from "metabase/selectors/user";import { Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useParamRerenderKey } from "../hooks/use-param-rerender-key";import { useSdkIframeEmbedEventBus } from "../hooks/use-sdk-iframe-embed-event-bus";diff --git a/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.ts b/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.tsindex 838ea8e9b49..46ca691258d 100644--- a/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.ts+++ b/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.ts@@ -1,8 +1,8 @@import { useCallback } from "react";import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { setOpenModalWithProps } from "metabase/redux/ui";-import { useDispatch } from "metabase/utils/redux";export const useOpenEmbedJsWizard = ({initialState,diff --git a/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts b/frontend/src/metabase/embedding/hooks/use-sharing-modal.tsindex 5596f273983..c09dee339f5 100644--- a/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts+++ b/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts@@ -10,8 +10,8 @@ import type {EmbedResource,EmbedResourceType,} from "metabase/public/lib/types";+import { useDispatch } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";-import { useDispatch } from "metabase/utils/redux";export const useSharingModal = <TModalType extends DashboardSharingModalType | QuestionSharingModalType,diff --git a/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsx b/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsxindex dadeee848d2..c7c8d948d15 100644--- a/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsx+++ b/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsx@@ -13,7 +13,7 @@ import { useSharingModal } from "./use-sharing-modal";const mockDispatch = jest.fn();const mockOpenEmbedJsWizard = jest.fn();-jest.mock("metabase/utils/redux", () => ({+jest.mock("metabase/redux", () => ({useDispatch: () => mockDispatch,}));diff --git a/frontend/src/metabase/entities/actions/actions.ts b/frontend/src/metabase/entities/actions/actions.tsindex 03a00594c1c..a1aae995540 100644--- a/frontend/src/metabase/entities/actions/actions.ts+++ b/frontend/src/metabase/entities/actions/actions.ts@@ -6,14 +6,9 @@ import {useGetActionQuery,useListActionsQuery,} from "metabase/api";+import { createThunkAction } from "metabase/redux";import type { Dispatch } from "metabase/redux/store";import { ActionSchema } from "metabase/schema";-import {- createEntity,- entityCompatibleQuery,- undo,-} from "metabase/utils/entities";-import { createThunkAction } from "metabase/utils/redux";import type {CreateActionRequest,GetActionRequest,@@ -25,6 +20,8 @@ import type {WritebackQueryAction,} from "metabase-types/api";+import { createEntity, entityCompatibleQuery, undo } from "../utils";+type BaseCreateActionParams = Pick<WritebackAction,"name" | "description" | "model_id" | "parameters" | "visualization_settings"@@ -119,12 +116,12 @@ export const Actions = createEntity({nameOne: "action",schema: ActionSchema,path: "/api/action",- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery: useGetActionQuery,}),useListQuery: useListActionsQuery,- },+ }),api: {list: (entityQuery: ListActionsRequest, dispatch: Dispatch) =>entityCompatibleQuery(diff --git a/frontend/src/metabase/entities/bookmarks.js b/frontend/src/metabase/entities/bookmarks.jsindex 8028da66895..ab4691e309e 100644--- a/frontend/src/metabase/entities/bookmarks.js+++ b/frontend/src/metabase/entities/bookmarks.js@@ -10,7 +10,8 @@ import { Documents } from "metabase/entities/documents";import { Questions } from "metabase/entities/questions";import { addUndo } from "metabase/redux/undo";import { BookmarkSchema } from "metabase/schema";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery } from "./utils";const REORDER_ACTION = `metabase/entities/bookmarks/REORDER_ACTION`;@@ -22,9 +23,9 @@ export const Bookmarks = createEntity({nameOne: "bookmark",path: "/api/bookmark",schema: BookmarkSchema,- rtk: {+ rtk: () => ({useListQuery: useListBookmarksQuery,- },+ }),api: {list: (_, dispatch) => {return entityCompatibleQuery(diff --git a/frontend/src/metabase/entities/collections/collections.ts b/frontend/src/metabase/entities/collections/collections.tsindex 4d143bbb34a..bd5873acc32 100644--- a/frontend/src/metabase/entities/collections/collections.ts+++ b/frontend/src/metabase/entities/collections/collections.ts@@ -16,11 +16,6 @@ import {import type { Dispatch, GetState, ReduxAction } from "metabase/redux/store";import { CollectionSchema } from "metabase/schema";import { getUserPersonalCollectionId } from "metabase/selectors/user";-import {- createEntity,- entityCompatibleQuery,- undo,-} from "metabase/utils/entities";import type {Collection,CreateCollectionRequest,@@ -30,6 +25,8 @@ import type {UpdateCollectionRequest,} from "metabase-types/api";+import { createEntity, entityCompatibleQuery, undo } from "../utils";+import getExpandedCollectionsById from "./getExpandedCollectionsById";import getInitialCollectionId from "./getInitialCollectionId";import { getCollectionType } from "./utils";@@ -71,12 +68,12 @@ export const Collections = createEntity({// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045displayNameMany: t`collections`,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery: useGetCollectionQuery,}),useListQuery,- },+ }),api: {list: async (params: ListParams, dispatch: Dispatch) => {diff --git a/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsx b/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsxindex e06223a26e6..32d22141758 100644--- a/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsx+++ b/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsx@@ -8,13 +8,13 @@ import {LoadingAndErrorWrapper as DefaultLoadingAndErrorWrapper,type LoadingAndErrorWrapperProps,} from "metabase/common/components/LoadingAndErrorWrapper";+import { useDispatch, useSelector } from "metabase/redux";import {setRequestError,setRequestLoaded,setRequestLoading,} from "metabase/redux/requests";import { capitalize } from "metabase/utils/formatting";-import { useDispatch, useSelector } from "metabase/utils/redux";import { isObject } from "metabase-types/guards";import type {diff --git a/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsx b/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsxindex 545f7abd727..e07989df8c9 100644--- a/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsx+++ b/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsx@@ -8,13 +8,13 @@ import {LoadingAndErrorWrapper as DefaultLoadingAndErrorWrapper,type LoadingAndErrorWrapperProps,} from "metabase/common/components/LoadingAndErrorWrapper";+import { useDispatch, useSelector } from "metabase/redux";import {setRequestError,setRequestLoaded,setRequestLoading,} from "metabase/redux/requests";import type { Dispatch } from "metabase/redux/store";-import { useDispatch, useSelector } from "metabase/utils/redux";import type {EntityDefinition,diff --git a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts b/frontend/src/metabase/entities/containers/rtk-query/types/entities.tsindex 0902a2c5024..47d70a8817a 100644--- a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts+++ b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts@@ -115,6 +115,7 @@ export interface EntityDefinition<Entity, EntityWrapper> {>>;};+selectors: {getError: Selector<unknown | null | undefined>;getFetched: Selector<boolean | undefined>;diff --git a/frontend/src/metabase/entities/dashboards.js b/frontend/src/metabase/entities/dashboards.jsindex e4237615ac4..de894bf2b54 100644--- a/frontend/src/metabase/entities/dashboards.js+++ b/frontend/src/metabase/entities/dashboards.js@@ -13,14 +13,16 @@ import {getCollectionType,normalizedCollection,} from "metabase/entities/collections/utils";+import { compose, withAction } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { color } from "metabase/ui/colors";+import {createEntity,entityCompatibleQuery,undo,-} from "metabase/utils/entities";-import { compose, withAction, withRequestState } from "metabase/utils/redux";+ withRequestState,+} from "./utils";const COPY_ACTION = `metabase/entities/dashboards/COPY`;@@ -37,12 +39,12 @@ export const Dashboards = createEntity({// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045displayNameMany: t`dashboards`,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery: useGetDashboardQuery,}),useListQuery: useListDashboardsQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/databases.js b/frontend/src/metabase/entities/databases.jsindex dbb62a9fa47..edcab053c29 100644--- a/frontend/src/metabase/entities/databases.js+++ b/frontend/src/metabase/entities/databases.js@@ -8,16 +8,17 @@ import {useGetDatabaseQuery,useListDatabasesQuery,} from "metabase/api";+import { createThunkAction } from "metabase/redux";import { DatabaseSchema } from "metabase/schema";import {getMetadata,getMetadataUnfiltered,} from "metabase/selectors/metadata";import { color } from "metabase/ui/colors";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";-import { createThunkAction, fetchData } from "metabase/utils/redux";import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";+import { createEntity, entityCompatibleQuery, fetchData } from "./utils";+// OBJECT ACTIONSexport const FETCH_DATABASE_METADATA ="metabase/entities/database/FETCH_DATABASE_METADATA";@@ -33,7 +34,7 @@ export const Databases = createEntity({nameOne: "database",nameMany: "databases",- rtk: {+ rtk: () => ({getUseGetQuery: (fetchType) => {if (fetchType === "fetchDatabaseMetadata") {return {@@ -46,7 +47,7 @@ export const Databases = createEntity({};},useListQuery: useListDatabasesQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/documents.ts b/frontend/src/metabase/entities/documents.tsindex dccf9d413a3..1122bad7e09 100644--- a/frontend/src/metabase/entities/documents.ts+++ b/frontend/src/metabase/entities/documents.ts@@ -8,11 +8,6 @@ import {import type { Dispatch } from "metabase/redux/store";import { DocumentSchema } from "metabase/schema";import { color } from "metabase/ui/utils/colors";-import {- createEntity,- entityCompatibleQuery,- undo,-} from "metabase/utils/entities";import type {Collection,CopyDocumentRequest,@@ -23,6 +18,7 @@ import type {UpdateDocumentRequest,} from "metabase-types/api";+import { createEntity, entityCompatibleQuery, undo } from "./utils";/*** @deprecated use "metabase/api" instead*/@@ -37,11 +33,11 @@ export const Documents = createEntity({// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045displayNameMany: t`documents`,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery: useGetDocumentQuery,}),- },+ }),api: {get: (diff --git a/frontend/src/metabase/entities/fields.js b/frontend/src/metabase/entities/fields.jsindex d3c52138e52..d275c94bb7b 100644--- a/frontend/src/metabase/entities/fields.js+++ b/frontend/src/metabase/entities/fields.js@@ -9,28 +9,29 @@ import {useGetFieldQuery,useGetFieldValuesQuery,} from "metabase/api";+import {+ compose,+ createAction,+ createThunkAction,+ handleActions,+ withAction,+} from "metabase/redux";import { FieldSchema } from "metabase/schema";import {getMetadata,getMetadataUnfiltered,} from "metabase/selectors/metadata";+import { getUniqueFieldId } from "metabase-lib/v1/metadata/utils/fields";+import { getFieldValues } from "metabase-lib/v1/queries/utils/field";+import {createEntity,entityCompatibleQuery,notify,-} from "metabase/utils/entities";-import {- compose,- createAction,- createThunkAction,- handleActions,updateData,- withAction,withCachedDataAndRequestState,withNormalize,-} from "metabase/utils/redux";-import { getUniqueFieldId } from "metabase-lib/v1/metadata/utils/fields";-import { getFieldValues } from "metabase-lib/v1/queries/utils/field";+} from "./utils";// ADDITIONAL OBJECT ACTIONS@@ -55,7 +56,7 @@ export const Fields = createEntity({path: "/api/field",schema: FieldSchema,- rtk: {+ rtk: () => ({getUseGetQuery: (fetchType) => {if (fetchType === "fetchFieldValues") {return {@@ -67,7 +68,7 @@ export const Fields = createEntity({useGetQuery: useGetFieldQuery,};},- },+ }),api: {get: (entityQuery, options, dispatch) =>diff --git a/frontend/src/metabase/entities/groups.js b/frontend/src/metabase/entities/groups.jsindex 537a666adbb..961d08408f9 100644--- a/frontend/src/metabase/entities/groups.js+++ b/frontend/src/metabase/entities/groups.js@@ -6,7 +6,8 @@ import {useGetPermissionsGroupQuery,useListPermissionsGroupsQuery,} from "metabase/api";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery } from "./utils";/*** @deprecated use "metabase/api" instead@@ -15,12 +16,12 @@ export const Groups = createEntity({name: "groups",path: "/api/permissions/group",- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery: useListPermissionsGroupsQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.tsindex bcb45038301..698d9657d50 100644--- a/frontend/src/metabase/entities/index.ts+++ b/frontend/src/metabase/entities/index.ts@@ -1,3 +1,73 @@+/*+ * # Entities abstract the interface between the back-end and the front-end.+ *+ * ## Endpoint requirements for entities:+ *+ * When fetching a list, each item of the list must include an `id` key/value pair.+ *+ * JSON must wrap response inside a `{ "data" : { …your data } }` structure.+ *+ * ## Required Properties:+ *+ * name:+ * a string in plural form+ * examples:+ * "questions", "dashboards"+ *+ * path:+ * a uri+ * starting with "/api/"+ * conventionally followed by the entity name in singular form+ * examples:+ * "/api/card", "/api/dashboard"+ *+ * ## Optional properties:+ *+ * api:+ *+ * here you can override the basic entity methods like `list`, `create`, `get`, `update`, `delete` (OR see `path` below)+ *+ * schema:+ * normalizr schema+ * default:+ * `new schema.Entity(entity.name)`+ *+ * ## How to create a bare-bones entity+ *+ * Say we want to create a "books" entity, to be able to fetch a list of "books".+ *+ * Add the following line to `frontend/src/metabase/entities.index.js`:+ *+ * export { default as books } from "./books"+ *+ * Create file `frontend/src/metabase/entities/books.js`+ *+ * Add the following to it:+ *+ * import { createEntity } from "./utils";++ * const Books = createEntity({+ * name: "books",+ * nameOne: "book",+ * path: "/api/book",+ * });+ *+ * export default Books;+ *+ * ## How to consume an entity:+ *+ * Near the top of a container file, import the entity:+ *+ * import Book from "metabase/entities/books";+ *+ * Near the bottom of the container file, add the entity to a `compose` statement:+ *+ * export default _.compose(+ * Book.loadList(),+ * connect(mapStateToProps),+ * )(BookContainer);+ */+export { Actions as actions } from "./actions/actions";export { Collections as collections } from "./collections";export { SnippetCollections as snippetCollections } from "./snippet-collections";@@ -25,3 +95,5 @@ export { Search as search } from "./search";export { PersistedModels as persistedModels } from "./persisted-models";export { Snippets as snippets } from "./snippets";export { Documents as documents } from "./documents";++export { entityCompatibleQuery, combineEntities } from "./utils";diff --git a/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts b/frontend/src/metabase/entities/indexed-entities/indexed-entities.tsindex 46de8a0c4a4..e2ef9be43ce 100644--- a/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts+++ b/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts@@ -5,7 +5,8 @@*/import { IndexedEntitySchema } from "metabase/schema";-import { createEntity } from "metabase/utils/entities";++import { createEntity } from "../utils";/*** @deprecated use "metabase/api" insteaddiff --git a/frontend/src/metabase/entities/measures.js b/frontend/src/metabase/entities/measures.jsindex 1225b052908..cb095043491 100644--- a/frontend/src/metabase/entities/measures.js+++ b/frontend/src/metabase/entities/measures.js@@ -6,7 +6,8 @@ import {import { MeasureSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";import { color } from "metabase/ui/colors";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery } from "./utils";/*** @deprecated use "metabase/api" instead@@ -17,12 +18,12 @@ export const Measures = createEntity({path: "/api/measure",schema: MeasureSchema,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery: useListMeasuresQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/metrics.js b/frontend/src/metabase/entities/metrics.jsindex 0d7f61f954d..07c469b4e50 100644--- a/frontend/src/metabase/entities/metrics.js+++ b/frontend/src/metabase/entities/metrics.js@@ -6,7 +6,8 @@ import {import { MetricSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";import { color } from "metabase/ui/colors";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery } from "./utils";/*** @deprecated use "metabase/api" instead@@ -17,12 +18,12 @@ export const Metrics = createEntity({path: "/api/metric",schema: MetricSchema,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery: useListMetricsQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/persisted-models.js b/frontend/src/metabase/entities/persisted-models.jsindex 28a42cdb290..d7e83d1b9ef 100644--- a/frontend/src/metabase/entities/persisted-models.js+++ b/frontend/src/metabase/entities/persisted-models.js@@ -9,7 +9,8 @@ import {useListPersistedInfoQuery,} from "metabase/api";import { PersistedModelSchema } from "metabase/schema";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery } from "./utils";const REFRESH_CACHE = "metabase/entities/persistedModels/REFRESH_CACHE";@@ -28,12 +29,12 @@ export const PersistedModels = createEntity({path: "/api/persist",schema: PersistedModelSchema,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery: useListPersistedInfoQuery,- },+ }),api: {get: ({ id, type }, options, dispatch) => {diff --git a/frontend/src/metabase/entities/pulses.js b/frontend/src/metabase/entities/pulses.jsindex 6fc39a84bbd..1f12054de8f 100644--- a/frontend/src/metabase/entities/pulses.js+++ b/frontend/src/metabase/entities/pulses.js@@ -7,11 +7,9 @@ import {} from "metabase/api";import { getCollectionType } from "metabase/entities/collections/utils";import { color } from "metabase/ui/colors";-import {- createEntity,- entityCompatibleQuery,- undo,-} from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery, undo } from "./utils";+/*** @deprecated use "metabase/api" instead*/@@ -20,12 +18,12 @@ export const Pulses = createEntity({nameOne: "pulse",path: "/api/pulse",- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery: useListSubscriptionsQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.jsindex ebae14c6094..fa9a9a2c0c7 100644--- a/frontend/src/metabase/entities/questions.js+++ b/frontend/src/metabase/entities/questions.js@@ -20,11 +20,8 @@ import {getMetadataUnfiltered,} from "metabase/selectors/metadata";import { color } from "metabase/ui/colors";-import {- createEntity,- entityCompatibleQuery,- undo,-} from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery, undo } from "./utils";export const INJECT_RTK_QUERY_QUESTION_VALUE ="metabase/entities/questions/FETCH_ADHOC_METADATA";@@ -37,12 +34,12 @@ export const Questions = createEntity({nameOne: "question",path: "/api/card",- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery: useGetCardQuery,}),useListQuery: useListCardsQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/schemas.js b/frontend/src/metabase/entities/schemas.jsindex d45561f933f..c6c6566310d 100644--- a/frontend/src/metabase/entities/schemas.js+++ b/frontend/src/metabase/entities/schemas.js@@ -11,7 +11,6 @@ import {import { Questions } from "metabase/entities/questions";import { SchemaSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";import {SAVED_QUESTIONS_VIRTUAL_DB_ID,getCollectionVirtualSchemaId,@@ -23,6 +22,8 @@ import {parseSchemaId,} from "metabase-lib/v1/metadata/utils/schema";+import { createEntity, entityCompatibleQuery } from "./utils";+// This is a weird entity because we don't have actual schema objects/**@@ -32,12 +33,12 @@ export const Schemas = createEntity({name: "schemas",schema: SchemaSchema,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery,- },+ }),api: {list: async ({ dbId, getAll = false, ...args }, dispatch) => {diff --git a/frontend/src/metabase/entities/search.js b/frontend/src/metabase/entities/search.jsindex c425e04770a..5c888b000ef 100644--- a/frontend/src/metabase/entities/search.js+++ b/frontend/src/metabase/entities/search.js@@ -9,9 +9,7 @@ import {useSearchQuery,} from "metabase/api";import { canonicalCollectionId } from "metabase/collections/utils";-import { entityForObject } from "metabase/entities/utils";import { ObjectUnionSchema } from "metabase/schema";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";import { Actions } from "./actions";import { Bookmarks } from "./bookmarks";@@ -22,6 +20,7 @@ import { Questions } from "./questions";import { Segments } from "./segments";import { SnippetCollections } from "./snippet-collections";import { Snippets } from "./snippets";+import { createEntity, entityCompatibleQuery, entityForObject } from "./utils";/*** @deprecated use "metabase/api" instead@@ -30,9 +29,9 @@ export const Search = createEntity({name: "search",path: "/api/search",- rtk: {+ rtk: () => ({useListQuery,- },+ }),api: {list: async (query = {}, dispatch) => {diff --git a/frontend/src/metabase/entities/segments.js b/frontend/src/metabase/entities/segments.jsindex 09a1ab2dc3a..1edeaf4a19a 100644--- a/frontend/src/metabase/entities/segments.js+++ b/frontend/src/metabase/entities/segments.js@@ -6,7 +6,8 @@ import {import { SegmentSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";import { color } from "metabase/ui/colors";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery } from "./utils";/*** @deprecated use "metabase/api" instead@@ -17,12 +18,12 @@ export const Segments = createEntity({path: "/api/segment",schema: SegmentSchema,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery: useListSegmentsQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/snippet-collections.js b/frontend/src/metabase/entities/snippet-collections.jsindex d0aef868be1..4661e833860 100644--- a/frontend/src/metabase/entities/snippet-collections.js+++ b/frontend/src/metabase/entities/snippet-collections.js@@ -10,7 +10,8 @@ import {useListQuery as useListCollectionsQuery,} from "metabase/entities/collections";import { SnippetCollectionSchema } from "metabase/schema";-import { createEntity, undo } from "metabase/utils/entities";++import { createEntity, undo } from "./utils";/*** @deprecated use "metabase/api" instead@@ -24,12 +25,12 @@ export const SnippetCollections = createEntity({// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045displayNameMany: t`snippet collections`,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery,- },+ }),api: _.mapObject(Collections.api,diff --git a/frontend/src/metabase/entities/snippets.js b/frontend/src/metabase/entities/snippets.jsindex 15439b48150..e0670dc98cc 100644--- a/frontend/src/metabase/entities/snippets.js+++ b/frontend/src/metabase/entities/snippets.js@@ -3,7 +3,8 @@ import {useGetSnippetQuery,useListSnippetsQuery,} from "metabase/api";-import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery } from "./utils";/*** @deprecated use "metabase/api" instead@@ -17,12 +18,12 @@ export const Snippets = createEntity({getFetched(state, props) || getObject(state, props),}),- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),useListQuery: useListSnippetsQuery,- },+ }),api: {list: (entityQuery, dispatch) =>diff --git a/frontend/src/metabase/entities/tables.js b/frontend/src/metabase/entities/tables.jsindex a2ff5b0cc92..4e853f7577f 100644--- a/frontend/src/metabase/entities/tables.js+++ b/frontend/src/metabase/entities/tables.js@@ -18,26 +18,19 @@ import {import { Fields } from "metabase/entities/fields";import { Questions } from "metabase/entities/questions";import { Segments } from "metabase/entities/segments";-import { TableSchema } from "metabase/schema";-import {- getMetadata,- getMetadataUnfiltered,-} from "metabase/selectors/metadata";-import { color } from "metabase/ui/colors";-import {- createEntity,- entityCompatibleQuery,- notify,-} from "metabase/utils/entities";import {compose,createThunkAction,useDispatch,useSelector,withAction,- withCachedDataAndRequestState,- withNormalize,-} from "metabase/utils/redux";+} from "metabase/redux";+import { TableSchema } from "metabase/schema";+import {+ getMetadata,+ getMetadataUnfiltered,+} from "metabase/selectors/metadata";+import { color } from "metabase/ui/colors";import {convertSavedQuestionToVirtualTable,getCollectionVirtualSchemaId,@@ -45,6 +38,14 @@ import {getQuestionVirtualTableId,} from "metabase-lib/v1/metadata/utils/saved-questions";+import {+ createEntity,+ entityCompatibleQuery,+ notify,+ withCachedDataAndRequestState,+ withNormalize,+} from "./utils";+// OBJECT ACTIONSexport const TABLES_BULK_UPDATE = "metabase/entities/TABLES_BULK_UPDATE";export const FETCH_METADATA = "metabase/entities/FETCH_METADATA";@@ -63,7 +64,7 @@ export const Tables = createEntity({path: "/api/table",schema: TableSchema,- rtk: {+ rtk: () => ({getUseGetQuery: (fetchType) => {if (fetchType === "fetchMetadata") {return {@@ -88,7 +89,7 @@ export const Tables = createEntity({};},useListQuery,- },+ }),api: {list: async ({ dbId, schemaName, ...params } = {}, dispatch) => {diff --git a/frontend/src/metabase/entities/timeline-events.js b/frontend/src/metabase/entities/timeline-events.jsindex dd3bc9c8506..a6e05aea6ef 100644--- a/frontend/src/metabase/entities/timeline-events.js+++ b/frontend/src/metabase/entities/timeline-events.js@@ -2,11 +2,8 @@ import { t } from "ttag";import { timelineEventApi, useGetTimelineEventQuery } from "metabase/api";import { TimelineEventSchema } from "metabase/schema";-import {- createEntity,- entityCompatibleQuery,- undo,-} from "metabase/utils/entities";++import { createEntity, entityCompatibleQuery, undo } from "./utils";/*** @deprecated use "metabase/api" instead@@ -17,11 +14,11 @@ export const TimelineEvents = createEntity({path: "/api/timeline-event",schema: TimelineEventSchema,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery,}),- },+ }),api: {list: () => {diff --git a/frontend/src/metabase/entities/timelines.js b/frontend/src/metabase/entities/timelines.jsindex 05a813e4b70..a0eb2aea91a 100644--- a/frontend/src/metabase/entities/timelines.js+++ b/frontend/src/metabase/entities/timelines.js@@ -16,13 +16,9 @@ import {getTimelineName,} from "metabase/common/utils/timelines";import { TimelineSchema } from "metabase/schema";-import {- createEntity,- entityCompatibleQuery,- undo,-} from "metabase/utils/entities";import { TimelineEvents } from "./timeline-events";+import { createEntity, entityCompatibleQuery, undo } from "./utils";/*** @deprecated use "metabase/api" instead@@ -33,12 +29,12 @@ export const Timelines = createEntity({path: "/api/timeline",schema: TimelineSchema,- rtk: {+ rtk: () => ({getUseGetQuery: () => ({useGetQuery: useGetTimelineQuery,}),useListQuery,- },+ }),api: {list: ({ collectionId, ...params } = {}, dispatch) =>diff --git a/frontend/src/metabase/entities/transforms.ts b/frontend/src/metabase/entities/transforms.tsindex 8fa6a1d0da6..5da86ae64ff 100644--- a/frontend/src/metabase/entities/transforms.ts+++ b/frontend/src/metabase/entities/transforms.ts@@ -1,8 +1,9 @@import { TransformSchema } from "metabase/schema";import { color } from "metabase/ui/utils/colors";-import { createEntity } from "metabase/utils/entities";import type { Transform } from "metabase-types/api";+import { createEntity } from "./utils";+/*** @deprecated use "metabase/api" instead* used for search only that relies on .wrapEntitydiff --git a/frontend/src/metabase/entities/utils.ts b/frontend/src/metabase/entities/utils.tsindex 40ebe3a1994..254570fb6cf 100644--- a/frontend/src/metabase/entities/utils.ts+++ b/frontend/src/metabase/entities/utils.ts@@ -1,4 +1,27 @@+import type { Reducer } from "@reduxjs/toolkit";+import { createSelector } from "@reduxjs/toolkit";+import { getIn, merge } from "icepick";+import inflection from "inflection"; // NOTE: need to use inflection directly here due to circular dependency+import { type Schema, denormalize, normalize, schema } from "normalizr";+import createCachedSelector from "re-reselect";+import type React from "react";+import _ from "underscore";+import { PLUGIN_ENTITIES } from "metabase/plugins";+import { combineReducers, compose, withAction } from "metabase/redux";+import {+ type RequestsStateTree,+ requestsReducer,+ setRequestError,+ setRequestLoaded,+ setRequestLoading,+ setRequestPromise,+ setRequestUnloaded,+} from "metabase/redux/requests";+import type { Dispatch, EntitiesState, State } from "metabase/redux/store";+import { addUndo } from "metabase/redux/undo";+import { DELETE, GET, POST, PUT } from "metabase/utils/api";+import { delay } from "metabase/utils/promise";// backend returns model = "card" instead of "question"export const entityTypeForModel = (model: string): string => {@@ -27,3 +50,1262 @@ export const entityForObject = (object?: { model: string } | null) => {}return { ...entities, ...enterpriseEntities }[entityType];};++const EMPTY_ENTITY_QUERY = {};++export type EntityId = string | number;++/**+ * The minimum shape required of an entity object: anything with an `id`.+ * Concrete entity types (Collection, Card, Dashboard, …) extend this implicitly+ * by having an `id` field. We avoid an `[key: string]: unknown` index signature+ * because it would prevent narrower types from being assignable to `EntityObject`.+ */+export type EntityObject = {+ id: EntityId;+ name?: string;+ collection?: unknown;+};++type NormalizedPayload = {+ entities?: Record<string, Record<EntityId, EntityObject>>;+ result?: EntityId | EntityId[];+};++type EntityAction = {+ payload?: NormalizedPayload;+};++// The entity framework is a runtime abstraction — consumers define selectors,+// action creators, and object methods with per-entity concrete types that can't be+// statically expressed here. These aliases document the intent of each `any`:++/** Redux dispatch accepted by entity actions. */++type AnyDispatch = (action: any) => any;+/** Redux getState accepted by entity thunks. */++type AnyGetState = () => any;+/** Action creator produced by `entity.actions` / `entity.objectActions`. Each entity+ * defines its own specific signatures, so we use a broad callable type here. */++type EntityActionCreator = (...args: any[]) => any;+/** Entity selector signature. Each entity defines its own specific selector signatures. */++type EntitySelector = (state: any, ...args: any[]) => any;+/** Entity query passed to list/fetch endpoints. Concrete shape depends on the entity. */++type EntityQuery = any;++/** Named selectors that every entity must expose. */+export type EntitySelectors = {+ getObject: EntitySelector;+ getList: EntitySelector;+ getEntityIds: EntitySelector;+ getLoading: EntitySelector;+ getLoaded: EntitySelector;+ getFetched: EntitySelector;+ getError: EntitySelector;+ getListMetadata: EntitySelector;+ getInitialCollectionId: EntitySelector;+ getExpandedCollectionsById: EntitySelector;+};++/** Shape returned by createEntity */+export type Entity = {+ // Names+ name: string;+ nameOne: string;+ nameMany: string;+ displayNameOne: string;+ displayNameMany: string;++ // Schema+ schema: schema.Entity;+ path?: string;++ // API — each method may accept any arguments (raw data + options objects)++ api: {+ list?: (...args: any[]) => Promise<+ | EntityObject[]+ | {+ data: EntityObject[];+ [key: string]: unknown;+ }+ >;+ create: (...args: any[]) => Promise<any>;+ get: (...args: any[]) => Promise<any>;+ update: (...args: any[]) => Promise<any>;+ delete: (...args: any[]) => Promise<any>;+ };++ // Action type constants. The values are strings at runtime, but consumers use them+ // with `builder.addCase(actionType, reducer)` and rely on the second arg being typed+ // as a `PayloadAction<any>` (matching the JS framework's behaviour). Typing them as+ // `any` here preserves that ergonomic.+ actionTypes: {+ CREATE: any;++ FETCH: any;++ UPDATE: any;++ DELETE: any;++ FETCH_LIST: any;++ INVALIDATE_LISTS_ACTION: any;++ [key: string]: any;+ };++ actionDecorators: Record<+ string,+ (action: EntityActionCreator) => EntityActionCreator+ >;++ // Path helpers+ getQueryKey: (entityQuery: EntityQuery) => string;+ getObjectStatePath: (entityId: EntityId) => (string | EntityId)[];+ getListStatePath: (entityQuery: EntityQuery) => string[];++ // Normalize helpers+ normalize: (+ object: EntityObject,+ entitySchema?: schema.Entity,+ ) => NormalizedPayload & { object: EntityObject };+ normalizeList: (+ list: EntityObject[],+ entitySchema?: schema.Entity,+ ) => NormalizedPayload & { list: EntityObject[] };++ // Actions (thunk action creators) — each entity defines its own signatures+ objectActions: Record<string, EntityActionCreator> & {+ fetch: EntityActionCreator;+ create: EntityActionCreator;+ update: EntityActionCreator;+ delete: EntityActionCreator;+ };++ actions: Record<string, EntityActionCreator> & {+ fetchList: EntityActionCreator;+ invalidateLists: EntityActionCreator;+ fetch: EntityActionCreator;+ create: EntityActionCreator;+ update: EntityActionCreator;+ delete: EntityActionCreator;+ };++ // Extract entity from dispatched action result. The return type depends on the+ // action's normalized payload and is best handled dynamically by consumers.++ HACK_getObjectFromAction: (action: any) => any;++ // Selectors+ selectors: EntitySelectors;++ // Per-entity object accessors. Each entity defines these with its own object type.+ objectSelectors: Record<string, (object: any, ...args: any[]) => any>;++ // Reducers+ reducer?: EntitiesReducer;+ reducers: Record<string, EntitiesReducer | Reducer<Record<string, unknown>>>;+ requestsReducer: (+ state: RequestsStateTree,+ action: { type: string },+ ) => RequestsStateTree;+ actionShouldInvalidateLists: (action: { type: string }) => boolean;++ // Writable properties (subset of entity fields sent to the API)+ writableProperties?: string[];++ // Wrap entity object with bound selectors/actions. The wrapper preserves the+ // input's properties and adds the entity's bound objectSelectors/objectActions+ // (e.g. `getName()`, `getIcon()`). Each entity defines its own object methods,+ // so we return `any` to allow consumers to use any wrapper-provided method.+ wrapEntity: (object: any, dispatch?: AnyDispatch | null) => any;++ // HOC factories and JSX components added by addEntityContainers at construction time.+ // These are always present on the returned entity, so consumers can rely on them.+ /** @deprecated HOCs are deprecated */++ load: (opts?: Record<string, unknown>) => any;+ /** @deprecated HOCs are deprecated */++ loadList: (opts?: Record<string, unknown>) => any;++ ListLoader: React.ComponentType<any>;+ // Accept nullable/undefined IDs: consumers commonly pass optional dashboard/card ids+ Name: React.ComponentType<+ { id: EntityId | null | undefined } & Record<string, any>+ >;++ rtk: EntityRtkBridge;+};++/**+ * Optional RTK Query bridge that a few entities use to expose RTK Query hooks+ * through the entity abstraction. Structure is deliberately loose — each entity+ * attaches a different set of helpers.+ */++type EntityRtkBridge = Record<string, any>;+type EntitiesReducer = Reducer<+ Partial<EntitiesState> | undefined,+ { type: string; payload: EntitiesState }+>;++type EntityDef = {+ name: string;+ nameOne?: string;+ nameMany?: string;+ displayNameOne?: string;+ displayNameMany?: string;+ path?: string;+ schema?: schema.Entity;+ api?: Partial<Entity["api"]>;+ writableProperties?: string[];+ actionTypes?: Record<string, string>;+ actionDecorators?: Record<+ string,+ (action: EntityActionCreator) => EntityActionCreator+ >;+ objectActions?: Record<string, EntityActionCreator>;+ actions?: Record<string, EntityActionCreator>;+ selectors?: Partial<EntitySelectors>;+ createSelectors?: (+ defaultSelectors: Partial<EntitySelectors>,+ ) => Partial<EntitySelectors>;+ objectSelectors?: Partial<Entity["objectSelectors"]>;+ // Reducers in entity defs typically destructure `{ type, payload }` from the action+ // and accept any payload shape, so we type the action loosely here.++ reducer?: EntitiesReducer;+ wrapEntity?: Entity["wrapEntity"];+ requestsReducer?: Entity["requestsReducer"];+ actionShouldInvalidateLists?: Entity["actionShouldInvalidateLists"];+ rtk?: EntityRtkBridge | (() => EntityRtkBridge);+ // Per-entity custom fields (e.g. `getAnalyticsMetadata`, `form`, `forms`).+ // These are attached to the entity object and used by entity-aware machinery.++ [key: string]: any;+};++// helper for working with normalizr+// merge each entity from newEntities with existing entity, if any+// this ensures partial entities don't overwrite existing entities with more properties+export function mergeEntities<T = EntitiesState>(+ entities: T,+ newEntities: Partial<T>,+): T {+ const result = { ...entities };+ // Casting is necessary here because Object.keys always returns string[]+ const ids = Object.keys(newEntities) as Array<keyof T>;++ for (const id of ids) {+ const entry = newEntities[id];+ if (entry == null) {+ delete result[id];+ } else {+ result[id] = { ...(result[id] ?? {}), ...entry };+ }+ }+ return result;+}++// helper for working with normalizr+// reducer that merges payload.entities+export function handleEntities(+ actionPattern: RegExp,+ entityType: string,+ reducer?: EntitiesReducer,+): EntitiesReducer {+ return (state, action) => {+ const entities = getIn(action, ["payload", "entities", entityType]);+ if (state && actionPattern.test(action.type) && entities) {+ state = mergeEntities(state, entities);+ }+ return reducer?.(state, action) ?? state ?? {};+ };+}++/**+ * @deprecated use "metabase/api" instead+ */+export function createEntity(def: EntityDef): Entity {+ // We use a mutable object internally during construction+ // then return it typed as Entity at the end.+ const entity = { ...def } as Entity;++ if (!entity.nameOne) {+ entity.nameOne = inflection.singularize(entity.name);+ }+ if (!entity.nameMany) {+ entity.nameMany = entity.name;+ }++ if (!entity.displayNameOne) {+ entity.displayNameOne = entity.nameOne;+ }+ if (!entity.displayNameMany) {+ entity.displayNameMany = entity.nameMany;+ }++ // defaults+ if (!entity.schema) {+ entity.schema = new schema.Entity(entity.name);+ }++ if (entity.path) {+ const path = entity.path;+ const defaultApi: Entity["api"] = {+ list: GET(`${path}`),+ create: POST(`${path}`),+ get: GET(`${path}/:id`),+ update: PUT(`${path}/:id`),+ delete: DELETE(`${path}/:id`),+ };+ // merge: user-provided overrides win over path-derived defaults+ entity.api = { ...defaultApi, ...entity.api };+ }++ const getQueryKey = (entityQuery: EntityQuery): string =>+ JSON.stringify(entityQuery || null);+ const getObjectStatePath = (entityId: EntityId): (string | EntityId)[] => [+ "entities",+ entity.name,+ entityId,+ ];+ const getListStatePath = (entityQuery: EntityQuery): string[] =>+ ["entities", entity.name + "_list"].concat(getQueryKey(entityQuery));++ entity.getQueryKey = getQueryKey;+ entity.getObjectStatePath = getObjectStatePath;+ entity.getListStatePath = getListStatePath;++ const getWritableProperties = (object: EntityObject): Partial<EntityObject> =>+ entity.writableProperties != null+ ? _.pick(object, "id", ...entity.writableProperties)+ : object;++ // ACTION TYPES+ const CREATE_ACTION = `metabase/entities/${entity.name}/CREATE`;+ const FETCH_ACTION = `metabase/entities/${entity.name}/FETCH`;+ const UPDATE_ACTION = `metabase/entities/${entity.name}/UPDATE`;+ const DELETE_ACTION = `metabase/entities/${entity.name}/DELETE`;+ const FETCH_LIST_ACTION = `metabase/entities/${entity.name}/FETCH_LIST`;+ const INVALIDATE_LISTS_ACTION = `metabase/entities/${entity.name}/INVALIDATE_LISTS`;++ entity.actionTypes = {+ CREATE: CREATE_ACTION,+ FETCH: FETCH_ACTION,+ UPDATE: UPDATE_ACTION,+ DELETE: DELETE_ACTION,+ FETCH_LIST: FETCH_LIST_ACTION,+ INVALIDATE_LISTS_ACTION: INVALIDATE_LISTS_ACTION,+ ...(def.actionTypes || {}),+ };++ entity.actionDecorators = {+ ...(def.actionDecorators || {}),+ };++ // normalize helpers+ entity.normalize = (+ object: EntityObject,+ entitySchema: schema.Entity = entity.schema,+ ) => ({+ object,+ [entity.nameOne]: object,+ ...normalize(object, entitySchema),+ });++ entity.normalizeList = (+ list: EntityObject[],+ entitySchema: schema.Entity = entity.schema,+ ) => ({+ list,+ [entity.nameMany]: list,+ ...normalize(list, [entitySchema]),+ });++ // thunk decorators:++ // same as withRequestState, but with automatic prefix++ function withEntityRequestState(+ getSubStatePath: (...args: any[]) => (string | EntityId)[],+ ) {+ return withRequestState((...args: any[]) => [+ "entities",+ entity.name,+ ...getSubStatePath(...args).map(String),+ ]);+ }++ function withEntityActionDecorators(+ action: string,+ ): (fn: EntityActionCreator) => EntityActionCreator {+ return entity.actionDecorators[action] || ((fn: EntityActionCreator) => fn);+ }++ // `objectActions` are for actions that accept an entity as their first argument,+ // and they are bound to instances when `wrapped: true` is passed to `EntityListLoader`+ // compose(decorator, decorator)(fn) loses types through multiple levels; makeAction recovers them+ entity.objectActions = {+ fetch: compose<EntityActionCreator>(+ withAction(FETCH_ACTION),+ withCachedDataAndRequestState(+ ({ id }: { id: EntityId }) => [...getObjectStatePath(id).map(String)],+ ({ id }: { id: EntityId }) => [+ ...getObjectStatePath(id).map(String),+ "fetch",+ ],+ (entityQuery: EntityQuery) => getQueryKey(entityQuery),+ ),+ withEntityActionDecorators("fetch"),+ )(+ (entityQuery: EntityQuery, options: Record<string, unknown> = {}) =>+ async (dispatch: AnyDispatch, getState: AnyGetState) =>+ entity.normalize(+ await entity.api.get?.(entityQuery, options, dispatch, getState),+ ),+ ),++ create: compose<EntityActionCreator>(+ withAction(CREATE_ACTION),+ withEntityRequestState(() => ["create"]),+ withEntityActionDecorators("create"),+ )(+ (entityObject: EntityObject) =>+ async (dispatch: AnyDispatch, getState: AnyGetState) => {+ return entity.normalize(+ await entity.api.create?.(+ getWritableProperties(entityObject),+ dispatch,+ getState,+ ),+ );+ },+ ),++ update: compose<EntityActionCreator>(+ withAction(UPDATE_ACTION),+ withEntityRequestState((object: EntityObject) => [+ String(object.id),+ "update",+ ]),+ withEntityActionDecorators("update"),+ )(+ (+ entityObject: EntityObject,+ updatedObject: Partial<EntityObject> | null = null,+ {+ notify,+ }: {+ notify?: { undo?: boolean; subject?: string; verb?: string } | false;+ } = {},+ ) =>+ async (dispatch: AnyDispatch, getState: AnyGetState) => {+ // save the original object for undo+ const originalObject = getObject(getState(), {+ entityId: entityObject.id,+ });+ // If a second object is provided just take the id from the first and+ // update it with all the properties in the second+ if (updatedObject) {+ entityObject = { id: entityObject.id, ...updatedObject };+ }++ const result = entity.normalize(+ await entity.api.update?.(+ getWritableProperties(entityObject),+ dispatch,+ getState,+ ),+ );++ if (notify) {+ if (notify.undo) {+ // pick only the attributes that were updated+ const undoObject = _.pick(+ originalObject,+ ...Object.keys(updatedObject || {}),+ );+ dispatch(+ addUndo({+ actions: [+ entity.objectActions.update(+ entityObject,+ undoObject,+ // don't show an undo for the undo+ { notify: false },+ ),+ ],+ ...notify,+ }),+ );+ } else {+ dispatch(addUndo(notify));+ }+ }+ return result;+ },+ ),++ delete: compose<EntityActionCreator>(+ withAction(DELETE_ACTION),+ withEntityRequestState((object: EntityObject) => [+ String(object.id),+ "delete",+ ]),+ withEntityActionDecorators("delete"),+ )(+ (entityObject: EntityObject) =>+ async (dispatch: AnyDispatch, getState: AnyGetState) => {+ await entity.api.delete?.(entityObject, dispatch, getState);+ return {+ entities: { [entity.name]: { [entityObject.id]: null } },+ result: entityObject.id,+ };+ },+ ),++ // user defined object actions should override defaults+ ...(def.objectActions || {}),+ };++ // ACTION CREATORS+ entity.actions = {+ fetchList: compose<EntityActionCreator>(+ withAction(FETCH_LIST_ACTION),+ withCachedDataAndRequestState(+ (entityQuery: EntityQuery) => [...getListStatePath(entityQuery)],+ (entityQuery: EntityQuery) => [+ ...getListStatePath(entityQuery),+ "fetch",+ ],+ (entityQuery: EntityQuery) => entity.getQueryKey(entityQuery),+ ),+ )(+ (entityQuery: EntityQuery = null) =>+ async (dispatch: AnyDispatch, getState: AnyGetState) => {+ const fetched = await entity.api.list?.(+ entityQuery || EMPTY_ENTITY_QUERY,+ dispatch,+ getState,+ );++ let results: EntityObject[] | undefined;+ let metadata: Record<string, unknown> = {};++ if (!fetched || _.isArray(fetched)) {+ results = fetched;+ } else {+ const { data, ...rest } = fetched;+ results = data;+ metadata = rest;+ }++ if (!Array.isArray(results)) {+ throw `Invalid response listing ${entity.name}`;+ }+ return {+ ...entity.normalizeList(results),+ metadata,+ entityQuery,+ };+ },+ ),++ invalidateLists: compose<EntityActionCreator>(+ withAction(INVALIDATE_LISTS_ACTION),+ withEntityActionDecorators("invalidateLists"),+ )(() => null),++ // user defined actions should override defaults+ ...entity.objectActions,+ ...(def.actions || {}),+ };++ entity.HACK_getObjectFromAction = (+ rawAction: EntityAction | undefined,+ ): EntityObject | EntityObject[] | NormalizedPayload | undefined => {+ const { payload } = rawAction ?? {};+ if (payload && "entities" in payload && "result" in payload) {+ if (Array.isArray(payload.result)) {+ return payload.result.map((id) => payload.entities![entity.name][id]);+ } else {+ return payload.entities![entity.name][payload.result!];+ }+ } else {+ return payload;+ }+ };++ // SELECTORS++ const getEntities = (state: State) => state.entities;+ const getSettings = (state: State) => state.settings;++ // OBJECT SELECTORS++ const getEntityId = (+ state: State,+ props: { params?: { entityId?: EntityId }; entityId?: EntityId },+ ): EntityId | undefined =>+ (props.params && props.params.entityId) || props.entityId;++ const getObject = createCachedSelector(+ [getEntities, getEntityId],+ (entities: EntitiesState, entityId: EntityId | undefined) =>+ denormalize(entityId, entity.schema, entities),+ )((state: State, { entityId }: { entityId?: EntityId } = {}) =>+ typeof entityId === "object"+ ? JSON.stringify(entityId)+ : entityId+ ? String(entityId)+ : "",+ );++ // LIST SELECTORS++ const getEntityQueryId = (+ state: any,+ props: { entityQuery?: EntityQuery } | null | undefined,+ ): string => getQueryKey(props?.entityQuery);++ const getEntityLists = createSelector([getEntities], (entities) => {+ return entities[`${entity.name}_list`] as+ | Record<string, { list?: EntityId[]; metadata?: unknown }>+ | undefined;+ });++ const getEntityList = createSelector(+ [getEntityQueryId, getEntityLists],+ (+ entityQueryId: string,+ lists:+ | Record<string, { list?: EntityId[]; metadata?: unknown }>+ | undefined,+ ) => lists?.[entityQueryId],+ );++ const getEntityIds = createSelector(+ [getEntityList],+ (entityList: { list?: EntityId[]; metadata?: unknown } | undefined) =>+ entityList?.list,+ );++ const getListMetadata = createSelector(+ [getEntityList],+ (entityList: { list?: EntityId[]; metadata?: unknown } | undefined) =>+ entityList?.metadata,+ );++ const getList = createCachedSelector(+ [getEntities, getEntityIds, getSettings],+ (+ entities: EntitiesState,+ entityIds: EntityId[] | undefined,+ settings: unknown,+ ) =>+ entityIds &&+ entityIds+ .map((entityId) =>+ entity.selectors.getObject({ entities, settings }, { entityId }),+ )+ .filter((e): e is EntityObject => e != null),+ )((state: any, props: { entityQuery?: EntityQuery } | null | undefined) =>+ props?.entityQuery ? JSON.stringify(props.entityQuery) : "",+ );++ // REQUEST STATE SELECTORS++ type RequestStateEntry = {+ loading?: boolean;+ loaded?: boolean;+ fetched?: boolean;+ error?: unknown;+ queryKey?: string;+ queryPromise?: Promise<unknown>;+ };++ const getStatePath = ({+ entityId,+ entityQuery,+ }: { entityId?: EntityId; entityQuery?: EntityQuery } = {}): (+ | string+ | EntityId+ )[] =>+ entityId != null+ ? getObjectStatePath(entityId)+ : getListStatePath(entityQuery);++ const getRequestStatePath = ({+ entityId,+ entityQuery,+ requestType = "fetch",+ }: {+ entityId?: EntityId;+ entityQuery?: EntityQuery;+ requestType?: string;+ } = {}): string[] => [+ "requests",+ ...getStatePath({ entityId, entityQuery }).map(String),+ requestType,+ ];++ const defaultRequestState: RequestStateEntry = {};+ const getRequestState = (+ state: EntitiesState,+ props?: {+ entityId?: EntityId;+ entityQuery?: EntityQuery;+ requestType?: string;+ },+ ): RequestStateEntry =>+ getIn(state, getRequestStatePath(props)) || defaultRequestState;++ const getLoading = createSelector(+ [getRequestState],+ (requestState: RequestStateEntry) => requestState.loading,+ );+ const getLoaded = createSelector(+ [getRequestState],+ (requestState: RequestStateEntry) => requestState.loaded,+ );+ const getFetched = createSelector(+ [getRequestState],+ (requestState: RequestStateEntry) => requestState.fetched,+ );+ const getError = createSelector(+ [getRequestState],+ (requestState: RequestStateEntry) => requestState.error,+ );++ // createSelector/createCachedSelector attach cache methods; cast to the clean selector types+ const defaultSelectors: Partial<EntitySelectors> = {+ getEntityIds,+ getList,+ getObject,+ getFetched,+ getLoading,+ getLoaded,+ getError,+ getListMetadata,+ };+ entity.selectors = {+ ...defaultSelectors,+ ...(def.selectors || {}),+ ...(def.createSelectors ? def.createSelectors(defaultSelectors) : {}),+ } as EntitySelectors;++ entity.objectSelectors = {+ getName(object: EntityObject) {+ return object.name;+ },+ getIcon(_object: EntityObject) {+ return { name: "unknown" };+ },+ getColor(_object: EntityObject): string | undefined {+ return undefined;+ },+ getCollection(object: EntityObject) {+ return object.collection;+ },+ ...(def.objectSelectors || {}),+ };++ // REDUCERS++ entity.reducers = {};++ entity.reducers[entity.name] = handleEntities(+ /^metabase\/entities\//,+ entity.name,+ def.reducer,+ );++ const listReducer: Reducer<Record<string, unknown>> = (+ state: Record<string, unknown> = {},+ action: {+ type: string;+ error?: boolean;+ payload?: Record<string, unknown>;+ },+ ) => {+ if (action.error) {+ return state;+ }+ if (action.type === FETCH_LIST_ACTION) {+ if (action.payload && action.payload.result) {+ const { entityQuery, metadata, result: list } = action.payload;+ return {+ ...state,+ [getQueryKey(entityQuery)]: {+ list,+ metadata,+ },+ };+ }+ // NOTE: only add/remove from the "default" list (no entityQuery)+ // TODO: just remove this entirely?+ } else if (action.type === CREATE_ACTION && state[""]) {+ return {+ ...state,+ "": (state[""] as EntityId[]).concat([+ action.payload!.result as EntityId,+ ]),+ };+ } else if (action.type === DELETE_ACTION && state[""]) {+ return {+ ...state,+ "": (state[""] as EntityId[]).filter(+ (id) => id !== action.payload!.result,+ ),+ };+ }+ return state;+ };+ entity.reducers[`${entity.name}_list`] = listReducer;++ // REQUEST STATE REDUCER++ if (!entity.actionShouldInvalidateLists) {+ entity.actionShouldInvalidateLists = (action: { type: string }) =>+ action.type === CREATE_ACTION ||+ action.type === DELETE_ACTION ||+ action.type === UPDATE_ACTION ||+ action.type === INVALIDATE_LISTS_ACTION;+ }++ entity.requestsReducer = (+ state: RequestsStateTree = {},+ action: { type: string },+ ) => {+ if (entity.actionShouldInvalidateLists(action)) {+ return requestsReducer(+ state,+ setRequestUnloaded(["entities", entity.name + "_list"]),+ );+ }+ return state ?? {};+ };++ // OBJECT WRAPPER++ if (!entity.wrapEntity) {+ class EntityWrapper {+ [key: string]: unknown;+ _dispatch: AnyDispatch | null;++ constructor(+ object: { id: EntityId },+ dispatch: AnyDispatch | null = null,+ ) {+ Object.assign(this, object);+ this._dispatch = dispatch;+ }+ }+ // object selectors+ for (const [methodName, method] of Object.entries(entity.objectSelectors)) {+ if (method) {+ EntityWrapper.prototype[methodName] = function (+ this: EntityWrapper,+ ...args: unknown[]+ ) {+ return method(this, ...args);+ };+ }+ }+ // object actions+ for (const [methodName, method] of Object.entries(entity.objectActions)) {+ if (method) {+ EntityWrapper.prototype[methodName] = function (+ this: EntityWrapper,+ ...args: unknown[]+ ) {+ if (this._dispatch) {+ return this._dispatch(method(this, ...args));+ } else {+ return method(this, ...args);+ }+ };+ }+ }++ entity.wrapEntity = (+ object: any,+ dispatch: AnyDispatch | null = null,+ ): any => new EntityWrapper(object, dispatch);+ }++ // add container components and HOCs+ // eslint-disable-next-line @typescript-eslint/no-require-imports -- dynamic require to avoid circular dependency+ require("metabase/entities/containers").addEntityContainers(entity);++ // rtk can be defined as a function or a direct value+ // make it a getter to callers don't need to worry about this detail+ // and can still use definition.rtk+ const rtk = entity.rtk;+ Object.defineProperty(entity, "rtk", {+ get() {+ if (typeof rtk === "function") {+ return rtk();+ }+ return rtk;+ },+ });++ return entity;+}++type CombinedEntities = {+ entities: Record<string, Entity>;+ reducers: Record<string, Reducer<Record<string, unknown>>>;+ reducer: Reducer<Record<string, Record<string, unknown>>>;+ requestsReducer: (+ state: RequestsStateTree | undefined,+ action: { type: string },+ ) => RequestsStateTree;+};++export function combineEntities(entities: Entity[]): CombinedEntities {+ const entitiesMap: Record<string, Entity> = {};+ const reducersMap: Record<string, Reducer<Record<string, unknown>>> = {};++ for (const entity of entities) {+ if (entity.name in entitiesMap) {+ console.warn(`Entity with name ${entity.name} already exists!`);+ } else {+ entitiesMap[entity.name] = entity;+ Object.assign(reducersMap, entity.reducers);+ }+ }++ const combinedRequestsReducer = (+ state: RequestsStateTree = {},+ action: { type: string },+ ): RequestsStateTree => {+ let current = state;+ for (const entity of entities) {+ if (entity.requestsReducer) {+ current = entity.requestsReducer(current, action);+ }+ }+ return current;+ };++ return {+ entities: entitiesMap,+ reducers: reducersMap,+ reducer: combineReducers(reducersMap),+ requestsReducer: combinedRequestsReducer,+ };+}++// OBJECT ACTION DECORATORS++export const notify = (+ opts: Record<string, unknown> = {},+ subject: string,+ verb: string,+) => merge({ notify: { subject, verb, undo: false } }, opts || {});++export const undo = (+ opts: Record<string, unknown> = {},+ subject: string,+ verb: string,+) => merge({ notify: { subject, verb, undo: true } }, opts || {});++/**+ * Structural minimum of an RTK Query endpoint descriptor. Concrete endpoints from+ * RTK Query carry many extra properties (hooks, selectors, etc.) and concrete+ * argument/result types — we only rely on `initiate` here.+ */++type RTKEndpoint = { initiate: (request: any, options: any) => any };++export async function entityCompatibleQuery(+ entityQuery: EntityQuery,+ dispatch: AnyDispatch,+ endpoint: RTKEndpoint,++ { forceRefetch = true } = {},+): Promise<any> {+ const request = entityQuery === EMPTY_ENTITY_QUERY ? undefined : entityQuery;+ const action = dispatch(endpoint.initiate(request, { forceRefetch }));++ try {+ return await action.unwrap();+ } finally {+ action.unsubscribe?.();+ }+}++type Thunk<R = unknown> = (+ dispatch: Dispatch,+ getState: () => State,+) => Promise<R> | R;++type ThunkCreator<TArgs extends unknown[], R = unknown> = (+ ...args: TArgs+) => Thunk<R>;++export function withNormalize<TArgs extends unknown[]>(schema: Schema) {+ return (thunkCreator: ThunkCreator<TArgs>) =>+ (...args: TArgs) =>+ async (dispatch: Dispatch, getState: () => State) =>+ normalize(await thunkCreator(...args)(dispatch, getState), schema);+}++/**+ * Decorator that tracks the state of a request action+ */+export function withRequestState<TArgs extends unknown[]>(+ getRequestStatePath: (...args: TArgs) => string[],+ getQueryKey?: (...args: TArgs) => string | undefined,+) {+ // thunk decorator:+ return (thunkCreator: ThunkCreator<TArgs>) =>+ // thunk creator:+ (...args: TArgs) =>+ // thunk:+ async (dispatch: Dispatch, getState: () => State) => {+ const statePath = getRequestStatePath(...args);+ const queryKey = getQueryKey && getQueryKey(...args);+ try {+ dispatch(setRequestLoading(statePath, queryKey));++ const queryPromise = thunkCreator(...args)(dispatch, getState);+ dispatch(+ setRequestPromise(+ statePath,+ queryKey,+ queryPromise as Promise<unknown>,+ ),+ );++ const result = await queryPromise;++ // Dispatch `setRequestLoaded` after clearing the call stack because+ // we want to the actual data to be updated before we notify+ // components that fetching the data is completed+ setTimeout(() => dispatch(setRequestLoaded(statePath, queryKey)));++ return result;+ } catch (error) {+ console.error(`Request ${statePath.join(",")} failed:`, error);+ dispatch(setRequestError(statePath, queryKey, error));+ throw error;+ }+ };+}++/**+ * Decorator that returns cached data if appropriate, otherwise calls the composed thunk.+ * Also tracks request state using withRequestState+ */+export function withCachedDataAndRequestState<TArgs extends unknown[]>(+ getExistingStatePath: (...args: TArgs) => string[],+ getRequestStatePath: (...args: TArgs) => string[],+ getQueryKey?: (...args: TArgs) => string | undefined,+) {+ return compose(+ withCachedData(getExistingStatePath, getRequestStatePath, getQueryKey),+ withRequestState(getRequestStatePath, getQueryKey),+ );+}++type CachedRequestState = {+ loading?: boolean;+ loaded?: boolean;+ queryKey?: string;+ error?: { status?: number };+ queryPromise?: Promise<unknown>;+};++type CachedOptions = {+ useCachedForbiddenError?: boolean;+ reload?: boolean | (() => void);+ properties?: string[];+};++// NOTE: this should be used together with withRequestState, probably via withCachedDataAndRequestState+function withCachedData<TArgs extends unknown[]>(+ getExistingStatePath: (...args: TArgs) => string[],+ getRequestStatePath: (...args: TArgs) => string[],+ getQueryKey?: (...args: TArgs) => string | undefined,+) {+ // thunk decorator:+ return (thunkCreator: ThunkCreator<TArgs>) =>+ // thunk creator:+ (...args: TArgs) =>+ // thunk:+ async function thunk(+ dispatch: Dispatch,+ getState: () => State,+ ): Promise<unknown> {+ const options = (args[args.length - 1] as CachedOptions) || {};+ const { useCachedForbiddenError, reload, properties } = options;++ const existingStatePath = getExistingStatePath(...args);+ const requestStatePath = ["requests", ...getRequestStatePath(...args)];+ const newQueryKey = getQueryKey && getQueryKey(...args);+ const existingData = getIn(getState(), existingStatePath);+ const { loading, loaded, queryKey, error } =+ (getIn(getState(), requestStatePath) as CachedRequestState) || {};++ // Avoid requesting data with permanently forbidden access+ if (useCachedForbiddenError && error?.status === 403) {+ throw error;+ }++ const hasRequestedProperties =+ properties &&+ existingData &&+ _.all(properties, (p: string) => existingData[p] !== undefined);++ // return existing data if+ if (+ // we don't want to reload+ // the check is a workaround for EntityListLoader passing reload function to children+ reload !== true &&+ // reload if the query used to load an entity has changed even if it's already loaded+ newQueryKey === queryKey+ ) {+ // and we have a non-error request state or have a list of properties that all exist on the object+ if (loaded || hasRequestedProperties) {+ return existingData;+ } else if (loading) {+ const requestState = getIn(getState(), requestStatePath) as+ | CachedRequestState+ | undefined;+ const queryPromise = requestState?.queryPromise;++ if (queryPromise) {+ // wait for current loading request to be resolved+ await queryPromise;++ // need to wait for next tick to allow loaded request data to be processed and avoid loops+ await delay(0);++ // retry this function after waited request gets resolved+ return thunk(dispatch, getState);+ }++ return existingData;+ }+ }++ return thunkCreator(...args)(dispatch, getState);+ };+}++export type FetchDataArgs = {+ dispatch: Dispatch;+ getState: () => State;+ requestStatePath: string[];+ existingStatePath: string[];+ queryKey?: string;+ getData: () => Promise<unknown>;+ reload?: boolean;+ properties?: string[] | null;+};++// DEPRECATED+export const fetchData = async ({+ dispatch,+ getState,+ requestStatePath,+ existingStatePath,+ queryKey,+ getData,+ reload = false,+ properties = null,+}: FetchDataArgs): Promise<unknown> => {+ const existingData = getIn(getState(), existingStatePath);++ // short circuit if we have loaded data, and we're given a list of required properties, and they all exist in the loaded data+ if (+ !reload &&+ existingData &&+ properties &&+ _.all(properties, (p: string) => existingData[p] !== undefined)+ ) {+ return existingData;+ }++ const statePath = requestStatePath.concat(["fetch"]);+ try {+ const requestState = getIn(getState(), ["requests", ...statePath]);+ if (!requestState || requestState?.error || reload) {+ dispatch(setRequestLoading(statePath, queryKey));++ const queryPromise = getData();+ dispatch(setRequestPromise(statePath, queryKey, queryPromise));++ const data = await queryPromise;++ // NOTE Atte Keinänen 8/23/17:+ // Dispatch `setRequestLoaded` after clearing the call stack because we want to the actual data to be updated+ // before we notify components via `state.requests.fetches` that fetching the data is completed+ setTimeout(() => dispatch(setRequestLoaded(statePath, queryKey)));++ return data;+ }++ return existingData;+ } catch (error) {+ dispatch(setRequestError(statePath, queryKey, error));+ console.error("fetchData error", error);+ return existingData;+ }+};++type UpdateDataArgs = {+ dispatch: Dispatch;+ getState: () => State;+ requestStatePath: string[];+ existingStatePath?: string[];+ queryKey?: string;+ dependentRequestStatePaths?: string[][];+ putData: () => Promise<unknown>;+};++// DEPRECATED+export const updateData = async ({+ dispatch,+ getState,+ requestStatePath,+ existingStatePath,+ queryKey,+ dependentRequestStatePaths,+ putData,+}: UpdateDataArgs): Promise<unknown> => {+ const existingData = existingStatePath+ ? getIn(getState(), existingStatePath)+ : null;+ const statePath = requestStatePath.concat(["update"]);+ try {+ dispatch(setRequestLoading(statePath, queryKey));++ const queryPromise = putData();+ dispatch(setRequestPromise(statePath, queryKey, queryPromise));++ const data = await queryPromise;+ dispatch(setRequestLoaded(statePath, queryKey));++ (dependentRequestStatePaths || []).forEach((path) =>+ dispatch(setRequestUnloaded(path)),+ );++ return data;+ } catch (error) {+ dispatch(setRequestError(statePath, queryKey, error));+ console.error(error);+ return existingData;+ }+};diff --git a/frontend/src/metabase/entities/utils.unit.spec.ts b/frontend/src/metabase/entities/utils.unit.spec.tsindex 03c1aaf3bb1..8f585d35ef3 100644--- a/frontend/src/metabase/entities/utils.unit.spec.ts+++ b/frontend/src/metabase/entities/utils.unit.spec.ts@@ -1,7 +1,24 @@+import { combineReducers, configureStore } from "@reduxjs/toolkit";++import { delay } from "__support__/utils";+import {+ type RequestState,+ type RequestsStateTree,+ requestsReducer,+} from "metabase/redux/requests";+import type { Dispatch, State } from "metabase/redux/store";+import { createMockState } from "metabase/redux/store/mocks";+import { createMockRequestsState } from "metabase/redux/store/mocks/requests";+import {+ combineEntities,+ createEntity,entityTypeForModel,entityTypeForObject,-} from "metabase/entities/utils";+ fetchData,+ mergeEntities,+ updateData,+} from "./utils";describe("schemas", () => {const MODEL_ENTITY_TYPE = [@@ -40,3 +57,375 @@ describe("schemas", () => {});});});++function getObject(id: number) {+ return { id: id, name: `object${id}` };+}++function setup() {+ const widgets = createEntity({+ name: "widgets",+ api: {+ get: jest+ .fn()+ .mockImplementation(({ id }: { id: number }) => getObject(id)),+ list: jest.fn().mockImplementation(() => [getObject(1), getObject(2)]),+ },+ });++ const entities = combineEntities([widgets]);++ const reducer = combineReducers({+ entities: entities.reducer,+ requests: (+ state: RequestsStateTree | undefined,+ action: { type: string; payload: Record<string, unknown> | undefined },+ ) => requestsReducer(entities.requestsReducer(state, action), action),+ });++ const initialState = {+ entities: {+ widgets: {+ 1: { name: "foo " },+ 2: { name: "bar" },+ },+ },+ };++ const store = configureStore({+ reducer,+ preloadedState: initialState,+ middleware: (getDefaultMiddleware) =>+ getDefaultMiddleware({+ immutableCheck: false,+ serializableCheck: false,+ }),+ });++ return { widgets, store, initialState };+}++describe("entities", () => {+ describe("getObject", () => {+ it("should return an object", () => {+ const { widgets, initialState } = setup();+ expect(+ widgets.selectors.getObject(initialState, { entityId: 1 }),+ ).toEqual({ name: "foo " });+ });++ it("should cache the object", () => {+ const { widgets, initialState } = setup();+ const a1 = widgets.selectors.getObject(initialState, { entityId: 1 });+ const a2 = widgets.selectors.getObject(initialState, { entityId: 1 });+ expect(a1).toBe(a2);+ });++ it("should cache multiple objects", () => {+ const { widgets, initialState } = setup();+ const a1 = widgets.selectors.getObject(initialState, { entityId: 1 });+ const b1 = widgets.selectors.getObject(initialState, { entityId: 2 });+ const a2 = widgets.selectors.getObject(initialState, { entityId: 1 });+ const b2 = widgets.selectors.getObject(initialState, { entityId: 2 });+ expect(a1).toBe(a2);+ expect(b1).toBe(b2);+ });+ });++ describe("fetch", () => {+ it("should fetch an entity", async () => {+ const { widgets, store } = setup();+ await store.dispatch(widgets.actions.fetch({ id: 3 }));+ const object = widgets.selectors.getObject(store.getState(), {+ entityId: 3,+ });+ expect(object).toEqual(getObject(3));+ });+ });++ describe("fetchList", () => {+ it("should fetch a list of entities", async () => {+ const { widgets, store } = setup();+ await store.dispatch(widgets.actions.fetchList());+ const objects = widgets.selectors.getList(store.getState());+ expect(objects).toEqual([getObject(1), getObject(2)]);+ });++ it("should not call the API when the results are cached", async () => {+ const { widgets, store } = setup();+ await store.dispatch(widgets.actions.fetchList());+ expect(widgets.api.list).toHaveBeenCalledTimes(1);++ await store.dispatch(widgets.actions.fetchList());+ expect(widgets.api.list).toHaveBeenCalledTimes(1);++ await store.dispatch(widgets.actions.fetchList({ query: "abc" }));+ expect(widgets.api.list).toHaveBeenCalledTimes(2);++ await store.dispatch(widgets.actions.fetchList({ query: "abc" }));+ expect(widgets.api.list).toHaveBeenCalledTimes(2);++ await store.dispatch(widgets.actions.fetchList());+ expect(widgets.api.list).toHaveBeenCalledTimes(2);+ });+ });++ describe("mergeEntities", () => {+ it("add an entity", () => {+ expect(+ mergeEntities<Record<string, { id: number; name: string }>>(+ { actions: { id: 1, name: "foo" } },+ { questions: { id: 2, name: "bar" } },+ ),+ ).toEqual({+ actions: { id: 1, name: "foo" },+ questions: { id: 2, name: "bar" },+ });+ });++ it("merge entity keys", () => {+ expect(+ mergeEntities<Record<string, Record<string, string | number>>>(+ { actions: { id: 1, name: "foo", prop1: 123 } },+ { actions: { id: 1, name: "bar", prop2: 456 } },+ ),+ ).toEqual({ actions: { id: 1, name: "bar", prop1: 123, prop2: 456 } });+ });++ it("delete an entity", () => {+ expect(+ mergeEntities(+ { databases: { id: 1 }, questions: { id: 2 } },+ { questions: undefined },+ ),+ ).toEqual({ databases: { id: 1 } });+ });+ });+});++describe("Metadata", () => {+ const getDefaultArgs = (+ overrides: {+ existingData?: string;+ newData?: string;+ requestState?: RequestState;+ requestStateLoading?: RequestState;+ requestStateLoaded?: RequestState;+ requestStateError?: RequestState;+ statePath?: string[];+ statePathFetch?: string[];+ statePathUpdate?: string[];+ requestStatePath?: string[];+ existingStatePath?: string[];+ getState?: () => State;+ dispatch?: Dispatch;+ getData?: () => Promise<unknown>;+ putData?: () => Promise<unknown>;+ } = {},+ ) => {+ const existingData = overrides.existingData ?? "data";+ const newData = overrides.newData ?? "new data";+ const requestState = overrides.requestState;+ const requestStateLoading = overrides.requestStateLoading ?? {+ loading: true,+ loaded: false,+ fetched: false,+ error: null,+ _isRequestState: true as const,+ };+ const requestStateLoaded = overrides.requestStateLoaded ?? {+ loading: false,+ loaded: true,+ fetched: true,+ error: null,+ _isRequestState: true as const,+ };+ const requestStateError = overrides.requestStateError ?? {+ loading: false,+ loaded: false,+ fetched: false,+ error: new Error("error"),+ _isRequestState: true as const,+ };+ const statePath = overrides.statePath ?? ["test", "path"];+ const statePathFetch =+ overrides.statePathFetch ?? statePath.concat("fetch");+ const statePathUpdate =+ overrides.statePathUpdate ?? statePath.concat("update");+ const requestStatePath = overrides.requestStatePath ?? [+ "entities",+ ...statePath,+ ];+ const existingStatePath = overrides.existingStatePath ?? statePath;+ const getState =+ overrides.getState ??+ (() => ({+ ...createMockState(),+ requests: createMockRequestsState({+ entities: {+ test: {+ path: requestState+ ? { fetch: requestState, update: requestState }+ : {},+ },+ },+ }),+ test: { path: existingData },+ }));+ const dispatch = overrides.dispatch ?? jest.fn();+ const getData = overrides.getData ?? (() => Promise.resolve(newData));+ const putData = overrides.putData ?? (() => Promise.resolve(newData));++ return {+ dispatch,+ getState,+ requestStatePath,+ existingStatePath,+ getData,+ putData,+ // passthrough args constants+ existingData,+ newData,+ requestState,+ requestStateLoading,+ requestStateLoaded,+ requestStateError,+ statePath,+ statePathFetch,+ statePathUpdate,+ };+ };++ const args = getDefaultArgs({});++ describe("fetchData()", () => {+ it("should return new data if request hasn't been made", async () => {+ const argsDefault = getDefaultArgs({});+ const data = await fetchData(argsDefault);+ await delay(10);++ expect(argsDefault.dispatch).toHaveBeenCalledTimes(3);++ expect(argsDefault.dispatch).toHaveBeenCalledWith(+ expect.objectContaining({+ type: "metabase/requests/SET_REQUEST_LOADING",+ }),+ );+ expect(argsDefault.dispatch).toHaveBeenCalledWith(+ expect.objectContaining({+ type: "metabase/requests/SET_REQUEST_PROMISE",+ }),+ );+ expect(argsDefault.dispatch).toHaveBeenCalledWith(+ expect.objectContaining({+ type: "metabase/requests/SET_REQUEST_LOADED",+ }),+ );++ expect(data).toEqual(args.newData);+ });++ it("should return existing data if request has been made", async () => {+ const argsLoading = getDefaultArgs({+ requestState: args.requestStateLoading,+ });+ const dataLoading = await fetchData(argsLoading);+ expect(argsLoading.dispatch).toHaveBeenCalledTimes(0);+ expect(dataLoading).toEqual(args.existingData);++ const argsLoaded = getDefaultArgs({+ requestState: args.requestStateLoaded,+ });+ const dataLoaded = await fetchData(argsLoaded);+ expect(argsLoaded.dispatch).toHaveBeenCalledTimes(0);+ expect(dataLoaded).toEqual(args.existingData);+ });++ it("should return new data if previous request ended in error", async () => {+ const argsError = getDefaultArgs({+ requestState: args.requestStateError,+ });+ const dataError = await fetchData(argsError);+ await delay(10);++ expect(argsError.dispatch).toHaveBeenCalledTimes(3);++ expect(argsError.dispatch).toHaveBeenCalledWith(+ expect.objectContaining({+ type: "metabase/requests/SET_REQUEST_LOADING",+ }),+ );+ expect(argsError.dispatch).toHaveBeenCalledWith(+ expect.objectContaining({+ type: "metabase/requests/SET_REQUEST_PROMISE",+ }),+ );+ expect(argsError.dispatch).toHaveBeenCalledWith(+ expect.objectContaining({+ type: "metabase/requests/SET_REQUEST_LOADED",+ }),+ );++ expect(dataError).toEqual(args.newData);+ });++ // FIXME: this seems to make jasmine ignore the rest of the tests+ // is an exception bubbling up from fetchData? why?+ // how else to test return value in the catch case?+ it("should return existing data if request fails", async () => {+ const argsFail = getDefaultArgs({+ getData: () => Promise.reject("error"),+ });++ try {+ const dataFail = await fetchData(argsFail);+ expect(argsFail.dispatch).toHaveBeenCalledTimes(2);+ expect(dataFail).toEqual(args.existingData);+ } catch (error) {+ return;+ }+ });+ });++ describe("updateData()", () => {+ it("should return new data regardless of previous request state", async () => {+ const argsDefault = getDefaultArgs({});+ const data = await updateData(argsDefault);+ expect(argsDefault.dispatch).toHaveBeenCalledTimes(3);+ expect(data).toEqual(args.newData);++ const argsLoading = getDefaultArgs({+ requestState: args.requestStateLoading,+ });+ const dataLoading = await updateData(argsLoading);+ expect(argsLoading.dispatch).toHaveBeenCalledTimes(3);+ expect(dataLoading).toEqual(args.newData);++ const argsLoaded = getDefaultArgs({+ requestState: args.requestStateLoaded,+ });+ const dataLoaded = await updateData(argsLoaded);+ expect(argsLoaded.dispatch).toHaveBeenCalledTimes(3);+ expect(dataLoaded).toEqual(args.newData);++ const argsError = getDefaultArgs({+ requestState: args.requestStateError,+ });+ const dataError = await updateData(argsError);+ expect(argsError.dispatch).toHaveBeenCalledTimes(3);+ expect(dataError).toEqual(args.newData);+ });++ it("should return existing data if request fails", async () => {+ const argsFail = getDefaultArgs({+ putData: () => {+ throw new Error("test");+ },+ });+ const data = await updateData(argsFail);+ await delay(10);+ expect(argsFail.dispatch).toHaveBeenCalledTimes(2);+ expect(data).toEqual(args.existingData);+ });+ });+});diff --git a/frontend/src/metabase/hoc/ModalRoute.tsx b/frontend/src/metabase/hoc/ModalRoute.tsxindex 3e2953b8065..a848c5a485a 100644--- a/frontend/src/metabase/hoc/ModalRoute.tsx+++ b/frontend/src/metabase/hoc/ModalRoute.tsx@@ -4,7 +4,7 @@ import { Route } from "react-router";import { push } from "react-router-redux";import { Modal } from "metabase/common/components/Modal";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import MetabaseSettings from "metabase/utils/settings";type RouteParams = Record<string, string | undefined>;diff --git a/frontend/src/metabase/hoc/Remapped.jsx b/frontend/src/metabase/hoc/Remapped.jsxindex c24ca3ceb77..539d2afa626 100644--- a/frontend/src/metabase/hoc/Remapped.jsx+++ b/frontend/src/metabase/hoc/Remapped.jsx@@ -1,9 +1,9 @@/* eslint-disable react/prop-types */import { Component } from "react";+import { connect } from "metabase/redux";import { fetchRemapping } from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";const mapStateToProps = (state, props) => ({metadata: getMetadata(state, props),diff --git a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsxindex 4e9d830f737..d8617f1a944 100644--- a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx+++ b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx@@ -6,10 +6,10 @@ import { updateSettings } from "metabase/admin/settings/settings";import { DashboardSelector } from "metabase/common/components/DashboardSelector/DashboardSelector";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import { useDispatch } from "metabase/redux";import { addUndo, dismissUndo } from "metabase/redux/undo";import { refreshCurrentUser } from "metabase/redux/user";import { Box, Button, Flex, Modal, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { DashboardId } from "metabase-types/api";const CUSTOM_HOMEPAGE_SETTING_KEY = "custom-homepage";diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsxindex ae41d3cbb29..3b4137bf8a5 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx@@ -5,9 +5,9 @@ import { useSendProductFeedbackMutation } from "metabase/api/product-feedback";import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import { getPlan } from "metabase/common/utils/plan";import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { getDocsUrl, getSetting } from "metabase/selectors/settings";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";import { EmbedHomepageView } from "./EmbedHomepageView";diff --git a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts b/frontend/src/metabase/home/components/EmbedHomepage/actions.tsindex 57ec368e76d..2e06122ba54 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts+++ b/frontend/src/metabase/home/components/EmbedHomepage/actions.ts@@ -1,5 +1,5 @@import { updateSetting } from "metabase/redux/settings";-import { createAsyncThunk } from "metabase/utils/redux";+import { createAsyncThunk } from "metabase/redux/utils";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";import { trackEmbeddingHomepageDismissed } from "./analytics";diff --git a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsxindex 48892bab20a..80f0843299c 100644--- a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx+++ b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx@@ -3,8 +3,8 @@ import { useMemo } from "react";import { useListPopularItemsQuery, useListRecentsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useDatabaseListQuery, useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { isSyncCompleted } from "metabase/utils/syncing";import type Database from "metabase-lib/v1/metadata/Database";import type { PopularItem, RecentItem, User } from "metabase-types/api";diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsxindex 43fccd4dd50..cc402e98408 100644--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx@@ -5,9 +5,9 @@ import _ from "underscore";import { MetabotLogo } from "metabase/common/components/MetabotLogo";import animationStyles from "metabase/css/core/animation.module.css";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Flex, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getHasMetabotLogo } from "../../selectors";diff --git a/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsx b/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsxindex 1ba0cf095b8..40aac8e12f5 100644--- a/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsx+++ b/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsx@@ -4,13 +4,13 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useUniqueId } from "metabase/common/hooks/use-unique-id";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getLearnUrl } from "metabase/selectors/settings";import {getApplicationName,getShowMetabaseLinks,} from "metabase/selectors/whitelabel";import { Card, Flex, Icon, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export const HomeHelpCard = (): JSX.Element | null => {const cardTitleId = useUniqueId();diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsxindex 62bd5d1efa3..b4e3f2fd9c1 100644--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx@@ -5,10 +5,10 @@ import { t } from "ttag";import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import { EmbeddingHubHomePage } from "metabase/embedding/embedding-hub";+import { useSelector } from "metabase/redux";import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { getLandingPageIllustration } from "metabase/selectors/whitelabel";import { Box, Button, Icon, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { CustomHomePageModal } from "../CustomHomePageModal";import { HomeGreeting } from "../HomeGreeting";diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.tsxindex d77267263cd..0c68952aa88 100644--- a/frontend/src/metabase/home/components/HomePage/HomePage.tsx+++ b/frontend/src/metabase/home/components/HomePage/HomePage.tsx@@ -4,10 +4,10 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useHomepageDashboard } from "metabase/common/hooks/use-homepage-dashboard";+import { useDispatch, useSelector } from "metabase/redux";import { updateUserSetting } from "metabase/redux/settings";import { addUndo } from "metabase/redux/undo";import { getHasDismissedCustomHomePageToast } from "metabase/selectors/app";-import { useDispatch, useSelector } from "metabase/utils/redux";import { HomeContent } from "../HomeContent";import { HomeLayout } from "../HomeLayout";diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsxindex f1310363c3f..b9b8bcf21c1 100644--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx@@ -2,10 +2,10 @@ import { t } from "ttag";import { useListRecentsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { getIcon } from "metabase/utils/icon";import { getName } from "metabase/utils/name";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { RecentItem } from "metabase-types/api";diff --git a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsxindex 4697d09e508..061915508c5 100644--- a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx+++ b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx@@ -10,8 +10,8 @@ import {} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { Select } from "metabase/common/components/Select";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";import { isSyncCompleted } from "metabase/utils/syncing";import { isNotNull } from "metabase/utils/types";import * as Urls from "metabase/utils/urls";diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsxindex 092fe6e881a..3da79cfa542 100644--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx@@ -16,6 +16,7 @@ import { useSetting, useTempStorage } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { getIsXrayEnabled } from "metabase/home/selectors";import { useHelpLink } from "metabase/nav/components/AppSwitcher/useHelpLink";+import { useSelector } from "metabase/redux";import {getDocsUrl,getIsPaidPlan,@@ -38,7 +39,6 @@ import {Title,rem,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import S from "./Onboarding.module.css";diff --git a/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx b/frontend/src/metabase/list-view/components/ListViz/ListViz.tsxindex 2cf5f046ba7..cdbc041d09d 100644--- a/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx+++ b/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx@@ -7,11 +7,11 @@ import {getIsListViewConfigurationShown,getQuestion,} from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { Box, type IconName } from "metabase/ui";import { color } from "metabase/ui/utils/colors";import { displayNameForColumn } from "metabase/utils/formatting";import type { OptionsType } from "metabase/utils/formatting/types";-import { useDispatch, useSelector } from "metabase/utils/redux";import ChartSettingLinkUrlInput from "metabase/visualizations/components/settings/ChartSettingLinkUrlInput";import { columnSettings } from "metabase/visualizations/lib/settings/column";import {diff --git a/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsxindex f576f89b432..ca758e3beed 100644--- a/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx@@ -6,8 +6,8 @@ import { useAnalyzeChartMutation } from "metabase/api";import { CopyButton } from "metabase/common/components/CopyButton";import { SidebarContent } from "metabase/common/components/SidebarContent";import { getIsLoadingComplete } from "metabase/query_builder/selectors";+import { useSelector } from "metabase/redux";import { Box } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {getChartImagePngDataUri,getChartSelector,diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsxindex 7c70439c75d..6c851034a93 100644--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx@@ -10,8 +10,8 @@ import {useUserMetabotPermissions,} from "metabase/metabot/hooks";import { setIsNativeEditorOpen } from "metabase/query_builder/actions";+import { useDispatch } from "metabase/redux";import { Button } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { trackQueryFixClicked } from "../../analytics";diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsxindex a3894a81539..92ac41b06d5 100644--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx@@ -8,7 +8,7 @@ import {useUserMetabotPermissions,} from "metabase/metabot/hooks";import { setIsNativeEditorOpen } from "metabase/query_builder/actions";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { trackQueryFixClicked } from "../../analytics";@@ -23,8 +23,8 @@ jest.mock("../../analytics", () => ({trackQueryFixClicked: jest.fn(),}));-jest.mock("metabase/utils/redux", () => ({- ...jest.requireActual("metabase/utils/redux"),+jest.mock("metabase/redux", () => ({+ ...jest.requireActual("metabase/redux"),useDispatch: jest.fn(),}));diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsxindex 9d984f75800..0ff52b3eea5 100644--- a/frontend/src/metabase/metabot/components/Metabot.tsx+++ b/frontend/src/metabase/metabot/components/Metabot.tsx@@ -9,10 +9,10 @@ import {useUserMetabotPermissions,} from "metabase/metabot/hooks";import { Sidebar } from "metabase/nav/containers/MainNavbar/MainNavbar.styled";+import { useSelector } from "metabase/redux";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";import { getUser } from "metabase/selectors/user";import { Box, Button, Flex, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { trackMetabotChatOpened } from "../analytics";import type { MetabotAgentId } from "../state";diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts b/frontend/src/metabase/metabot/components/MetabotAdmin/utils.tsindex 0803c3d4cc5..0dcab1fb90d 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts@@ -3,8 +3,8 @@ import type { FormikErrors } from "formik";import { P, isMatching } from "ts-pattern";import { useAdminSetting } from "metabase/api/utils";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import { useSelector } from "metabase/utils/redux";import type { MetabotProvider } from "metabase-types/api";type ApiKeylessProviders = "metabase";diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex dace4ebb4fd..f07c9c42fc4 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -19,6 +19,7 @@ import {} from "metabase/metabot/state";import { useMetadataToasts } from "metabase/metadata/hooks";import EditorS from "metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.module.css";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import {Button,@@ -30,7 +31,6 @@ import {Paper,Text,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsxindex b2a647094c3..762ae67cf44 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx@@ -6,6 +6,7 @@ import EmptyDashboardBot from "assets/img/dashboard-empty.svg?component";import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";import { useSetting } from "metabase/common/hooks";import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotChat/MetabotResetLongChatButton";+import { useSelector } from "metabase/redux";import { getIsHosted } from "metabase/setup/selectors";import {ActionIcon,@@ -18,7 +19,6 @@ import {Text,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { useMetabotAgent, useMetabotName } from "../../hooks";import type { MetabotConfig } from "../Metabot";diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsxindex 214309eeaca..b4477f839a3 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx@@ -8,11 +8,11 @@ import { FormSelect } from "metabase/forms/components/FormSelect";import { FormTextarea } from "metabase/forms/components/FormTextarea";import { useMetabotName } from "metabase/metabot/hooks";import { getMetabotId, getMetabotState } from "metabase/metabot/state";+import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { Button, Group, Modal, Stack, Text } from "metabase/ui";import * as Errors from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import type { MetabotFeedback } from "metabase-types/api";// Issue types that require free text feedbackdiff --git a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsxindex dc58fdbb915..ea57d0d185c 100644--- a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx@@ -5,10 +5,10 @@ import {useMetabotName,useUserMetabotPermissions,} from "metabase/metabot/hooks";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";import { ActionIcon, Tooltip } from "metabase/ui";import { METAKEY } from "metabase/utils/browser";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { trackMetabotChatOpened } from "../analytics";diff --git a/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsxindex 941b375dd50..051bb83bdde 100644--- a/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { Metabot } from "./Metabot";diff --git a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsxindex 8c84e58d2d3..10b60217fd7 100644--- a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx+++ b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useStoreUrl } from "metabase/common/hooks";+import { useDispatch } from "metabase/redux";import { dismissUndo } from "metabase/redux/undo";import {Button,@@ -13,7 +14,6 @@ import {Modal,Text,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { MetabotSetupInner } from "./MetabotAdmin/MetabotSetup";diff --git a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsxindex f4f4552e9cc..2b696f08b0c 100644--- a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx+++ b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx@@ -11,6 +11,7 @@ import { forwardRef, useEffect, useImperativeHandle, useRef } from "react";import { t } from "ttag";import type { MetabotPromptInputRef } from "metabase/metabot";+import { useSelector } from "metabase/redux";import {MetabotMentionExtension,MetabotMentionPluginKey,@@ -21,7 +22,6 @@ import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensioimport { createBareSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";import { getSetting } from "metabase/selectors/settings";import { getCspNonce } from "metabase/utils/csp";-import { useSelector } from "metabase/utils/redux";import type { DatabaseId } from "metabase-types/api";import S from "./MetabotPromptInput.module.css";diff --git a/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsxindex f5008d0c66f..ef2f05ff1fc 100644--- a/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx@@ -10,6 +10,7 @@ import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";import { MetabotLogo } from "metabase/common/components/MetabotLogo";import { MetabotPromptInput } from "metabase/metabot/components/MetabotPromptInput";import { QueryBuilder } from "metabase/query_builder/containers/QueryBuilder";+import { useDispatch } from "metabase/redux";import { useRouter } from "metabase/router";import {Box,@@ -20,7 +21,6 @@ import {Text,UnstyledButton,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { useMetabotAgent, useUserMetabotPermissions } from "../../hooks";diff --git a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsxindex b47d588977c..c7cb77ded5f 100644--- a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx@@ -6,8 +6,8 @@ import {useMetabotAgent,useUserMetabotPermissions,} from "metabase/metabot/hooks";+import { useDispatch } from "metabase/redux";import { Loader } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";export const getMetabotQuickLinks = () => {return (diff --git a/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx b/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsxindex 0025b29eb45..a69d2582f2f 100644--- a/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx+++ b/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx@@ -2,8 +2,8 @@ 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 { useDispatch } from "metabase/utils/redux";export const SlackConnectSuccess = () => {const dispatch = useDispatch();diff --git a/frontend/src/metabase/metabot/context.tsx b/frontend/src/metabase/metabot/context.tsxindex 788d2625782..ac5bbf1fe88 100644--- a/frontend/src/metabase/metabot/context.tsx+++ b/frontend/src/metabase/metabot/context.tsx@@ -12,13 +12,13 @@ import {} from "react";import _ from "underscore";+import { useStore } from "metabase/redux";import type { State } from "metabase/redux/store";import {canUserCreateNativeQueries,canUserCreateQueries,getUserIsAdmin,} from "metabase/selectors/user";-import { useStore } from "metabase/utils/redux";import type {MetabotChatContext,MetabotSuggestedTransform,diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts b/frontend/src/metabase/metabot/hooks/use-metabot-agent.tsindex 173846e3ae5..f3533560d61 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts@@ -2,7 +2,7 @@ import { isFulfilled } from "@reduxjs/toolkit";import { useCallback } from "react";import { useMetabotContext } from "metabase/metabot";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { trackMetabotRequestSent } from "../analytics";import {diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts b/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.tsindex 098bdccc5af..71f767d7302 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts@@ -2,7 +2,7 @@ import { useCallback } from "react";import { useMount } from "react-use";import _ from "underscore";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import {type MetabotAgentId,diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts b/frontend/src/metabase/metabot/hooks/use-metabot-reactions.tsindex 35e784d9847..0af03e63810 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts@@ -4,7 +4,7 @@ import {getNavigateToPath,setNavigateToPath as setNavigateToPathAction,} from "metabase/metabot/state";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";export const useMetabotReactions = () => {const dispatch = useDispatch();diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsxindex 5fc96563513..1b33f8cc7cf 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx+++ b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx@@ -12,8 +12,8 @@ import {removeSuggestedCodeEdit,resetConversation,} from "metabase/metabot/state";+import { useDispatch, useSelector } from "metabase/redux";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { DatabaseId } from "metabase-types/api";import { useMetabotAgent } from "./use-metabot-agent";diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tsindex 16833cfa879..60ac2c248be 100644--- a/frontend/src/metabase/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -12,9 +12,9 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { setIsNativeEditorOpen } from "metabase/query_builder/actions";import type { Dispatch, State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";+import { createAsyncThunk } from "metabase/redux/utils";import { getSetting } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";-import { createAsyncThunk } from "metabase/utils/redux";import type {JSONValue,MetabotAgentRequest,diff --git a/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsx b/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsxindex d5892e6e9a2..0740e44724f 100644--- a/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsx+++ b/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsx@@ -1,8 +1,8 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Modal, Stack, Text, rem } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { FieldId } from "metabase-types/api";import { DiscardFieldValuesButton } from "../DiscardFieldValuesButton";diff --git a/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx b/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsxindex 8c440bb51e1..ac0b4f67620 100644--- a/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx+++ b/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx@@ -6,9 +6,9 @@ import { getErrorMessage } from "metabase/api/utils";import { EmptyState } from "metabase/common/components/EmptyState";import { DetailsGroup, Header } from "metabase/detail-view/components";import { getEntityIcon, getHeaderColumns } from "metabase/detail-view/utils";+import { useSelector } from "metabase/redux";import { getMetadataUnfiltered } from "metabase/selectors/metadata";import { Box, Repeat, Skeleton, Stack, rem } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { extractRemappedColumns } from "metabase/visualizations";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx b/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsxindex fefff278104..8968b2eb712 100644--- a/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx+++ b/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx@@ -5,9 +5,9 @@ import _ from "underscore";import { skipToken, useGetAdhocQueryQuery } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { EmptyState } from "metabase/common/components/EmptyState";+import { useSelector } from "metabase/redux";import { getMetadataUnfiltered } from "metabase/selectors/metadata";import { Repeat, Skeleton, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import Visualization from "metabase/visualizations/components/Visualization";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsxindex 4aa56fce91b..6a965f5808d 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx@@ -1,8 +1,8 @@import { useCallback, useEffect, useState } from "react";import { push, replace } from "react-router-redux";+import { useDispatch, useSelector } from "metabase/redux";import { getLocation } from "metabase/selectors/routing";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { TablePicker } from "./components";diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts b/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.tsindex 64a4d92b80b..a42bbdcc0e4 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts@@ -3,8 +3,8 @@ import { t } from "ttag";import { metricApi } from "metabase/api";import { getErrorMessage } from "metabase/api/utils/errors";+import { useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { MetricDefinition } from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";import { isMetric } from "metabase-lib/v1/types/utils/isa";diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.tsindex 19903c099ab..ddae4ff17b1 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts@@ -1,9 +1,9 @@import { useCallback, useEffect, useRef, useState } from "react";import { measureApi, metricApi } from "metabase/api";+import { useDispatch, useStore } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getObjectEntries, objectFromEntries } from "metabase/utils/objects";-import { useDispatch, useStore } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import type {DimensionMetadata,diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.tsindex 2f22d85fe11..c4f5004e548 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts@@ -4,7 +4,7 @@ import { push, replace } from "react-router-redux";import { t } from "ttag";import { useToast } from "metabase/common/hooks";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/urls";import type { MeasureId } from "metabase-types/api";import type { MetricId } from "metabase-types/api/metric";diff --git a/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.tsindex 539c0371bb5..bbe6d32f5d0 100644--- a/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts+++ b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts@@ -1,8 +1,8 @@import { useMemo } from "react";import { useGetMetricQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import type { MetricDefinition } from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";import type { MetricId } from "metabase-types/api/metric";diff --git a/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsxindex 6dc7a23bd7e..ca6340c3a39 100644--- a/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx+++ b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx@@ -5,8 +5,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";import { PLUGIN_MODERATION } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { Card } from "metabase-types/api";interface MetricActivityTimelineProps {diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsxindex 31789231d48..699b9ea4c3b 100644--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx@@ -6,6 +6,7 @@ import _ from "underscore";import { trackMetricPageShowMoreClicked } from "metabase/browse/metrics/analytics";import { useMetricDimensionQuery } from "metabase/metrics/common/hooks";import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";+import { useDispatch } from "metabase/redux";import {Button,Flex,@@ -15,7 +16,6 @@ import {Stack,Text,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import Visualization from "metabase/visualizations/components/Visualization";import ChartSkeleton from "metabase/visualizations/components/skeletons/ChartSkeleton";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsxindex 60d7c50d2da..1de834b25a9 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx@@ -8,8 +8,8 @@ import {} from "metabase/data-studio/common/components/PaneHeader";import { isNumericMetric } from "metabase/metrics/utils/validation";import { PLUGIN_CACHING, PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex 522adc22b0a..df5f2e5cfee 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -19,11 +19,11 @@ import { AddToDashSelectDashModal } from "metabase/query_builder/components/AddTimport { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";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 { getMetadata } from "metabase/selectors/metadata";import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { Button, Group, Icon, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsxindex ce247d57f2b..27eb32ee908 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx@@ -3,8 +3,8 @@ import { push } from "react-router-redux";import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";import { useMetricDefinition } from "metabase/metrics/common/hooks";+import { useDispatch } from "metabase/redux";import { Box, Flex, Stack } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as LibMetric from "metabase-lib/metric";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsxindex 2c44d5f772d..2b8acf8afb3 100644--- a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx@@ -5,8 +5,8 @@ import { useGetMetricQuery } from "metabase/api/metric";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";+import { useDispatch } from "metabase/redux";import { Center } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { MetricDimensionGrid } from "../../components/MetricDimensionGrid";diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsxindex 9d932ce347e..070cbe1f326 100644--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx@@ -13,9 +13,9 @@ import { getResultMetadata } from "metabase/data-studio/common/utils";import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Card, Center } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsxindex 52bb4266ca9..a9af5918842 100644--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -18,9 +18,9 @@ import { getResultMetadata } from "metabase/data-studio/common/utils";import { MetricQueryEditor } from "metabase/metrics/components/MetricQueryEditor";import { NAME_MAX_LENGTH } from "metabase/metrics/constants";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Breadcrumbs, Card, Icon } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type { Card as CardApiType } from "metabase-types/api";diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsxindex 26275c637a9..e8975bb957c 100644--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx@@ -7,8 +7,8 @@ import { Link } from "metabase/common/components/Link";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { Actions } from "metabase/entities/actions";import { Databases } from "metabase/entities/databases";+import { connect } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import { parseTimestamp } from "metabase/utils/time-dayjs";import * as Urls from "metabase/utils/urls";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsxindex a3f01190a28..ffd1b0034ac 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx@@ -12,8 +12,8 @@ import { Tables } from "metabase/entities/tables";import { usePageTitle } from "metabase/hooks/use-page-title";import ModelActionsView from "metabase/models/components/ModelActions";import { loadMetadataForCard } from "metabase/questions/actions";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsxindex 0ca62ab1748..485cd68443b 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import CS from "metabase/css/core/index.css";import NewModelOption from "metabase/models/components/NewModelOption";+import { useSelector } from "metabase/redux";import { NoDatabasesEmptyState } from "metabase/reference/databases/NoDatabasesEmptyState";import { getLearnUrl, getSetting } from "metabase/selectors/settings";import {@@ -12,7 +13,6 @@ import {} from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Group } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { EducationalButton, OptionsRoot } from "./NewModelOptions.styled";diff --git a/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx b/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsxindex 58214561d4a..ee4d8bde3e2 100644--- a/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx+++ b/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx@@ -3,6 +3,7 @@ import _ from "underscore";import { LogoIcon } from "metabase/common/components/LogoIcon";import { useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import {getApplicationName,getIsWhiteLabeling,@@ -18,7 +19,6 @@ import {Title,} from "metabase/ui";import { capitalize } from "metabase/utils/formatting";-import { useSelector } from "metabase/utils/redux";import type { MetabaseInfo } from "metabase-types/api";export const AboutModal = ({diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsxindex 4320e19915f..def9c1581b9 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx@@ -6,11 +6,11 @@ import { t } from "ttag";import { LogoIcon } from "metabase/common/components/LogoIcon";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 { getIsPaidPlan } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { Button, Icon } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { AppSwitcher } from "../AppSwitcher";import StoreLink from "../StoreLink";diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsxindex 47fb6f299ca..ab0e3a92bc8 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx@@ -14,6 +14,7 @@ import {getCanAccessOnboardingPage,getIsNewInstance,} from "metabase/home/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { openDiagnostics } from "metabase/redux/app";import { setOpenModal } from "metabase/redux/ui";import { getUser } from "metabase/selectors/user";@@ -31,7 +32,6 @@ import {Text,} from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { AboutModal } from "../AboutModal/AboutModal";diff --git a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.tsindex b2797c4159c..d7cc436f24d 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts+++ b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts@@ -2,9 +2,9 @@ import { useEffect, useState } from "react";import { useSetting } from "metabase/common/hooks";import { getHelpUrl } from "metabase/common/utils/help-url";+import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";import { UtilApi } from "metabase/services";-import { useSelector } from "metabase/utils/redux";import { getUser } from "../../../selectors/user";diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsxindex 0554b7e31cf..12b2d18da93 100644--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx@@ -4,12 +4,12 @@ import { t } from "ttag";import { useGetVersionInfoQuery } from "metabase/api";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";import { useSetting } from "metabase/common/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { updateSetting } from "metabase/redux/settings";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { getIsWhiteLabeling } from "metabase/selectors/whitelabel";import { Anchor, Flex, Icon, Paper, Stack, Text } from "metabase/ui";import { color } from "metabase/ui/utils/colors";-import { useDispatch, useSelector } from "metabase/utils/redux";import S from "./WhatsNewNotification.module.css";import Sparkles from "./sparkles.svg?component";diff --git a/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx b/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsxindex 3632c69dd6c..729cf7cfa73 100644--- a/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx+++ b/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx@@ -2,9 +2,9 @@ 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 { Paper } from "metabase/ui";import { getName } from "metabase/utils/name";-import { useDispatch } from "metabase/utils/redux";import type {RecentContexts,RecentItem,diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsxindex 16ad8d50610..abdb870b1fc 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx@@ -17,6 +17,7 @@ import { useToggle } from "metabase/common/hooks/use-toggle";import { RecentsList } from "metabase/nav/components/search/RecentsList";import { SearchResultsDropdown } from "metabase/nav/components/search/SearchResultsDropdown";import { zoomInRow } from "metabase/query_builder/actions";+import { useDispatch, useSelector } from "metabase/redux";import type { SearchAwareLocation, WrappedResult } from "metabase/search/types";import {getFiltersFromLocation,@@ -27,7 +28,6 @@ import { getSetting } from "metabase/selectors/settings";import { Icon } from "metabase/ui";import { isSmallScreen } from "metabase/utils/dom";import { isWithinIframe } from "metabase/utils/iframe";-import { useDispatch, useSelector } from "metabase/utils/redux";import { modelToUrl } from "metabase/utils/urls";import { CommandPaletteTrigger } from "./CommandPaletteTrigger";diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsxindex 9812746554b..3b73bea78c9 100644--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx@@ -13,6 +13,7 @@ import {ResultsFooter,SearchResultsList,} from "metabase/nav/components/search/SearchResults/SearchResults.styled";+import { useDispatch } from "metabase/redux";import { SearchResult } from "metabase/search/components/SearchResult/SearchResult";import { SearchContextTypes } from "metabase/search/constants";import type { SearchFilters } from "metabase/search/types";@@ -21,7 +22,6 @@ import {DEFAULT_SEARCH_LIMIT,SEARCH_DEBOUNCE_DURATION,} from "metabase/utils/constants";-import { useDispatch } from "metabase/utils/redux";import { modelToUrl } from "metabase/utils/urls";import type {CollectionItem,diff --git a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsxindex 42f6f59ddbd..eef425f7fc7 100644--- a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx+++ b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx@@ -7,6 +7,7 @@ import {} from "metabase/documents/selectors";import { Collections } from "metabase/entities/collections";import { getMetabotVisible } from "metabase/metabot/state";+import { connect } from "metabase/redux";import { closeNavbar, toggleNavbar } from "metabase/redux/app";import type { State } from "metabase/redux/store";import type { RouterProps } from "metabase/selectors/app";@@ -24,7 +25,6 @@ import {} from "metabase/selectors/app";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import AppBar from "../../components/AppBar";diff --git a/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsxindex 7c7e04f0956..7d934afe27e 100644--- a/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx+++ b/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx@@ -2,8 +2,8 @@ import { useLocation } from "react-use";import { useGetCollectionQuery } from "metabase/api";import { getQuestion } from "metabase/query_builder/selectors";+import { useSelector } from "metabase/redux";import { getCollectionId } from "metabase/selectors/app";-import { useSelector } from "metabase/utils/redux";import type { CollectionId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsxindex 747c5920b2f..804634d7fe5 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx@@ -9,9 +9,9 @@ import {useGetCollectionQuery,} from "metabase/api";import { getDashboard } from "metabase/dashboard/selectors";+import { connect } from "metabase/redux";import { closeNavbar, openNavbar } from "metabase/redux/app";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import Question from "metabase-lib/v1/Question";import type { CollectionId, Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsxindex d52a4eb910b..7c3a6f5b9ae 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx@@ -3,6 +3,7 @@ import { Link } from "react-router";import { match } from "ts-pattern";import { c, t } from "ttag";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import {Alert,@@ -15,7 +16,6 @@ import {Title,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getSubpathSafeUrl } from "metabase/utils/urls";import IconCSV from "./illustrations/csv.svg?component";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsxindex 89de339532e..1e6695e3244 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx@@ -19,6 +19,7 @@ import {type OmniPickerItem,} from "metabase/common/components/Pickers";import { UploadInput } from "metabase/common/components/upload";+import { useDispatch } from "metabase/redux";import { UploadMode } from "metabase/redux/store/upload";import {MAX_UPLOAD_SIZE,@@ -26,7 +27,6 @@ import {uploadFile,} from "metabase/redux/uploads";import { Box, Button, Center, Group, Icon, Stack, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import S from "../AddDataModal.module.css";import { trackCSVFileInputSelect } from "../analytics";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 ef14e6de473..951531fc3b7 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@@ -2,7 +2,7 @@ import { push } from "react-router-redux";import { DatabaseEngineList } from "metabase/databases/components/DatabaseEngineList";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import { trackDatabaseSelect } from "../analytics";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.tsindex d4663d69eee..2ab62cc8c40 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.ts@@ -1,7 +1,7 @@import { useListDatabasesQuery } from "metabase/api";import { useSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { canAccessSettings, getUserIsAdmin } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";export function useAddDataPermissions() {const { data: databasesResponse } = useListDatabasesQuery();diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsxindex 0b883cb9ee7..eb8c0cbcc7d 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx@@ -16,9 +16,9 @@ import { Sortable } from "metabase/common/components/Sortable";import GrabberS from "metabase/css/components/grabber.module.css";import { Bookmarks } from "metabase/entities/bookmarks";import { PLUGIN_COLLECTIONS } from "metabase/plugins";+import { connect } from "metabase/redux";import { Icon, Tooltip } from "metabase/ui";import { getIcon } from "metabase/utils/icon";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Bookmark } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsxindex df0ddfd52fa..5264d43e77a 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx@@ -2,10 +2,10 @@ import { c, t } from "ttag";import { CollapseSection } from "metabase/common/components/CollapseSection";import { useUserSetting } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import { getEntityTypes } from "metabase/redux/embedding-data-picker";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { ActionIcon, Icon, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { PaddedSidebarLink, SidebarHeading } from "../MainNavbar.styled";import { trackAddDataModalOpened } from "../analytics";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsxindex cadd9d4c825..d6275df8501 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx@@ -23,13 +23,13 @@ import {} from "metabase/entities/collections";import { Databases } from "metabase/entities/databases";import { PLUGIN_TENANTS } from "metabase/plugins";+import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import {getIsTenantUser,getUser,getUserCanWriteToCollections,} from "metabase/selectors/user";-import { connect, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, User } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsxindex 33cd4768e2e..67c82f45ef4 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx@@ -23,6 +23,7 @@ import {} from "metabase/home/selectors";import { WhatsNewNotification } from "metabase/nav/components/WhatsNewNotification";import { PLUGIN_REMOTE_SYNC, PLUGIN_TENANTS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import {getIsTenantUser,getUser,@@ -30,7 +31,6 @@ import {} from "metabase/selectors/user";import { ActionIcon, Icon, Tooltip } from "metabase/ui";import { isSmallScreen } from "metabase/utils/dom";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Bookmark, Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsxindex 51c93731a32..b78530cd618 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx@@ -10,8 +10,8 @@ import type {} from "metabase/common/components/tree/types";import { getCollectionIcon } from "metabase/entities/collections/utils";import { PLUGIN_COLLECTIONS } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getIsTenantUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/Navbar.tsx b/frontend/src/metabase/nav/containers/Navbar.tsxindex fd5279bcf9a..ea878028356 100644--- a/frontend/src/metabase/nav/containers/Navbar.tsx+++ b/frontend/src/metabase/nav/containers/Navbar.tsx@@ -5,10 +5,10 @@ import _ from "underscore";import { getAdminPaths } from "metabase/admin/app/selectors";import { Databases } from "metabase/entities/databases";+import { connect } from "metabase/redux";import type { AdminPath, State } from "metabase/redux/store";import { getIsNavbarOpen } from "metabase/selectors/app";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import type { User } from "metabase-types/api";import { AdminNavbar } from "../components/AdminNavbar";diff --git a/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsx b/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsxindex 05e00743e21..45c066e3b62 100644--- a/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsx+++ b/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsx@@ -2,8 +2,8 @@ import {getOriginalQuestion,getQuestion,} from "metabase/query_builder/selectors";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import QuestionLineage from "../../components/QuestionLineage";diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex 2e2ff9b3f51..69094c4289c 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -19,9 +19,9 @@ import { Collections } from "metabase/entities/collections/collections";import { PaletteShortcutsModal } from "metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { closeModal, setOpenModal } from "metabase/redux/ui";import { getCurrentOpenModalState } from "metabase/selectors/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { WritebackAction } from "metabase-types/api";diff --git a/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsx b/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsxindex be3795768f8..c5a7a41e53a 100644--- a/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsx+++ b/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsx@@ -1,12 +1,12 @@import { t } from "ttag";import { useHasEmailSetup, useHasSlackSetup } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";import {canManageSubscriptions as canManageSubscriptionsSelector,getUserIsAdmin,} from "metabase/selectors/user";import { Icon, Menu, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Dashboard } from "metabase-types/api";export function DashboardSubscriptionMenuItem({diff --git a/frontend/src/metabase/notifications/channels/SlackChannelField.tsx b/frontend/src/metabase/notifications/channels/SlackChannelField.tsxindex d25470ca847..5d67213480d 100644--- a/frontend/src/metabase/notifications/channels/SlackChannelField.tsx+++ b/frontend/src/metabase/notifications/channels/SlackChannelField.tsx@@ -7,9 +7,9 @@ import {findChannelId,getDisplayNames,} from "metabase/notifications/channels/utils";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Autocomplete } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Channel, ChannelSpec } from "metabase-types/api";const CHANNEL_FIELD_NAME = "channel";diff --git a/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsx b/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsxindex 54d6a435042..7cfa6ad359a 100644--- a/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsx+++ b/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsx@@ -6,9 +6,9 @@ import {findChannelId,getDisplayNames,} from "metabase/notifications/channels/utils";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Autocomplete } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { ChannelSpec, NotificationHandlerSlack } from "metabase-types/api";const CHANNEL_FIELD_NAME = "channel";diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsxindex 3e6f5d1057e..a9eea563de7 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx@@ -26,6 +26,7 @@ import {getQuestion,getVisualizationSettings,} from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { canAccessSettings, getUser } from "metabase/selectors/user";import {@@ -40,7 +41,6 @@ import {rem,} from "metabase/ui";import { getResponseErrorMessage } from "metabase/utils/errors";-import { useDispatch, useSelector } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import type {CreateAlertNotificationRequest,diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsxindex 259075bd843..3d523b087c8 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx@@ -12,11 +12,11 @@ import {DEFAULT_ALERT_SCHEDULE,formatNotificationScheduleDescription,} from "metabase/notifications/utils";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, type BoxProps, Flex, Text } from "metabase/ui";import { getScheduleExplanation } from "metabase/utils/cron";-import { useSelector } from "metabase/utils/redux";import type {NotificationCronSubscription,ScheduleSettings,diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsxindex 2907936205d..f7c92cbcdf0 100644--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx@@ -8,9 +8,9 @@ import {formatNotificationSchedule,getNotificationHandlersGroupedByTypes,} from "metabase/notifications/utils";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Box, FixedSizeIcon, Group, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { isNotFalsy } from "metabase/utils/types";import type {Notification,diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsxindex 25302ca1a93..497c62d2515 100644--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx@@ -2,12 +2,12 @@ import { t } from "ttag";import _ from "underscore";import { useListChannelsQuery, useListUserRecipientsQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import {canManageSubscriptions as canManageSubscriptionsSelector,getUser,} from "metabase/selectors/user";import { Button, Modal, Stack, rem } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Notification } from "metabase-types/api";import { AlertListItem } from "./AlertListItem";diff --git a/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx b/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsxindex 9c3b5cace9a..102b56ea290 100644--- a/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx+++ b/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx@@ -9,9 +9,9 @@ import {NotificationChannelsAddMenu,} from "metabase/notifications/modals/components/NotificationChannelsAddMenu";import { getNotificationHandlersGroupedByTypes } from "metabase/notifications/utils";+import { useSelector } from "metabase/redux";import { canAccessSettings, getUser } from "metabase/selectors/user";import { Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type {ChannelApiResponse,NotificationHandler,diff --git a/frontend/src/metabase/notifications/pulse/actions.ts b/frontend/src/metabase/notifications/pulse/actions.tsindex 0389ac31a3f..29b2c27df63 100644--- a/frontend/src/metabase/notifications/pulse/actions.ts+++ b/frontend/src/metabase/notifications/pulse/actions.ts@@ -3,9 +3,9 @@ import { t } from "ttag";import { getActionErrorMessage } from "metabase/actions/utils";import { Pulses } from "metabase/entities/pulses";+import { createThunkAction } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { PulseApi } from "metabase/services";-import { createThunkAction } from "metabase/utils/redux";import type {ChannelApiResponse,DashboardSubscription,diff --git a/frontend/src/metabase/palette/components/Palette.stories.tsx b/frontend/src/metabase/palette/components/Palette.stories.tsxindex fdabc254c29..377bcbcc55f 100644--- a/frontend/src/metabase/palette/components/Palette.stories.tsx+++ b/frontend/src/metabase/palette/components/Palette.stories.tsx@@ -12,10 +12,10 @@ import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { Api } from "metabase/api";import { commonReducers } from "metabase/reducers-common";+import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import { Box, Center } from "metabase/ui";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { registerVisualization } from "metabase/visualizations";import { ComboChart } from "metabase/visualizations/visualizations/ComboChart";import { LineChart } from "metabase/visualizations/visualizations/LineChart";diff --git a/frontend/src/metabase/palette/components/Palette.tsx b/frontend/src/metabase/palette/components/Palette.tsxindex 782bd1fb322..b650a9078d2 100644--- a/frontend/src/metabase/palette/components/Palette.tsx+++ b/frontend/src/metabase/palette/components/Palette.tsx@@ -5,10 +5,10 @@ import { type PlainRoute, withRouter } from "react-router";import { t } from "ttag";import { useOnClickOutside } from "metabase/common/hooks/use-on-click-outside";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";import { Box, Card, Center, Icon, Overlay, Stack, rem } from "metabase/ui";import { isWithinIframe } from "metabase/utils/iframe";-import { useSelector } from "metabase/utils/redux";import { useCommandPalette } from "../hooks/useCommandPalette";import { useCommandPaletteBasicActions } from "../hooks/useCommandPaletteBasicActions";diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex 765dfa71c88..cb9cfd4b82c 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -11,6 +11,7 @@ import { useSetting } from "metabase/common/hooks";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";import { Search } from "metabase/entities/search";import { PLUGIN_CACHING } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { trackSearchClick } from "metabase/search/analytics";import {getDocsSearchUrl,@@ -23,7 +24,6 @@ import { Icon, Text } from "metabase/ui";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import { getIcon } from "metabase/utils/icon";import { getName } from "metabase/utils/name";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { modelToUrl } from "metabase/utils/urls";import {diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex bdadccd5efb..10663771a77 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -12,6 +12,7 @@ import {import { trackMetricCreateStarted } from "metabase/data-studio/analytics";import { canAccessDataStudio } from "metabase/data-studio/selectors";import { Collections } from "metabase/entities/collections/collections";+import { useDispatch, useSelector } from "metabase/redux";import { openDiagnostics } from "metabase/redux/app";import type { ModalName } from "metabase/redux/store/modal";import {@@ -27,7 +28,6 @@ import {getUserPersonalCollectionId,} from "metabase/selectors/user";import { useColorScheme } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import {diff --git a/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx b/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsxindex 25db03f9025..62b4921c760 100644--- a/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx+++ b/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx@@ -10,8 +10,8 @@ import {getIsAutoApplyFilters,getParameterValues,} from "metabase/dashboard/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { setParameterValues } from "metabase/redux/dashboard";-import { useDispatch, useSelector } from "metabase/utils/redux";import { getFilterChangeDescription } from "./utils";diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsxindex 7d2be4c3672..ed237604d16 100644--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx@@ -14,11 +14,11 @@ import { Option, Select } from "metabase/common/components/Select";import { SelectButton } from "metabase/common/components/SelectButton";import { Questions } from "metabase/entities/questions";import { Tables } from "metabase/entities/tables";+import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Flex, Icon } from "metabase/ui";-import { connect, useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsxindex 207c228e300..2620fa020e5 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx@@ -35,6 +35,7 @@ import {fetchDashboardParameterValues,fetchParameterValues,} from "metabase/parameters/actions";+import { connect, useDispatch } from "metabase/redux";import { addRemappings } from "metabase/redux/metadata";import type { State } from "metabase/redux/store";import {@@ -44,7 +45,6 @@ import {MultiAutocompleteValue,} from "metabase/ui";import { parseNumber } from "metabase/utils/number";-import { connect, useDispatch } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import Field from "metabase-lib/v1/metadata/Field";import { getSourceType } from "metabase-lib/v1/parameters/utils/parameter-source";diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsxindex 06874915387..763eba3a4c7 100644--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx@@ -21,12 +21,12 @@ import { ParametersList } from "metabase/parameters/components/ParametersList";import { getVisibleParameters } from "metabase/parameters/utils/ui";import { SyncedParametersList } from "metabase/query_builder/components/SyncedParametersList";import { useSyncUrlParameters } from "metabase/query_builder/hooks/use-sync-url-parameters";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Box } from "metabase/ui";import { getDashboardType } from "metabase/utils/dashboard";import { initializeIframeResizer, isSmallScreen } from "metabase/utils/dom";-import { useSelector } from "metabase/utils/redux";import { SAVING_DOM_IMAGE_DISPLAY_NONE_CLASS } from "metabase/visualizations/lib/image-exports";import type Question from "metabase-lib/v1/Question";import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsxindex 1a96d9b90d7..8f708bad953 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx@@ -9,6 +9,7 @@ import type {EmbedResourceType,EmbeddingDisplayOptions,} from "metabase/public/lib/types";+import { useSelector } from "metabase/redux";import { getSetting, getUpgradeUrl } from "metabase/selectors/settings";import { getCanWhitelabel } from "metabase/selectors/whitelabel";import {@@ -19,7 +20,6 @@ import {Switch,Text,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import {DashboardDownloadSettings,diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsxindex 7bc3be2cbce..cfd9f5ddb81 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx@@ -9,8 +9,8 @@ import type {EmbeddingParametersValues,ServerCodeSampleConfig,} from "metabase/public/lib/types";+import { useSelector } from "metabase/redux";import { getCanWhitelabel } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";import { CodeSample } from "./CodeSample";import { getDefaultDisplayOptions } from "./config";diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsxindex 29f05008996..52eff89864f 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx@@ -19,9 +19,9 @@ import type {EmbeddingParametersValues,GuestEmbedResourceType,} from "metabase/public/lib/types";+import { useSelector } from "metabase/redux";import { getCanWhitelabel } from "metabase/selectors/whitelabel";import { Paper, Stack, Tabs } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import { EmbedModalContentStatusBar } from "./EmbedModalContentStatusBar";diff --git a/frontend/src/metabase/public/components/PublicError.tsx b/frontend/src/metabase/public/components/PublicError.tsxindex 20251213f6f..b4a245b876b 100644--- a/frontend/src/metabase/public/components/PublicError.tsx+++ b/frontend/src/metabase/public/components/PublicError.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { NoDataError } from "metabase/common/components/errors/NoDataError";import CS from "metabase/css/core/index.css";import { SyncedEmbedFrame } from "metabase/public/components/EmbedFrame";+import { useSelector } from "metabase/redux";import { getErrorMessage } from "metabase/selectors/app";-import { useSelector } from "metabase/utils/redux";export const PublicError = () => {const message = useSelector(getErrorMessage) ?? t`An error occurred`;diff --git a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsxindex 01ec3b2e139..f0928e0ae9a 100644--- a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx+++ b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx@@ -2,9 +2,9 @@ import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { LegaleseStepDetailsContainer } from "metabase/public/components/widgets/LegaleseStep/LegaleseStep.styled";+import { useDispatch } from "metabase/redux";import { updateSetting } from "metabase/redux/settings";import { Button, Center, Stack, Text, Title } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";export const LegaleseStep = ({goToNextStep,diff --git a/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsx b/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsxindex c5d8d6f6dc4..daccaecb900 100644--- a/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsx+++ b/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsx@@ -2,9 +2,9 @@ import { useCallback, useEffect } from "react";import { useAsyncFn, useMount } from "react-use";import { SyncedEmbedFrame } from "metabase/public/components/EmbedFrame";+import { connect } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { PublicApi } from "metabase/services";-import { connect } from "metabase/utils/redux";import PublicAction from "./PublicAction";import {diff --git a/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx b/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsxindex 05eb56e45d3..8b32a26d7a0 100644--- a/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx+++ b/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx@@ -3,12 +3,12 @@ import { useLayoutEffect } from "react";import { usePageTitle } from "metabase/hooks/use-page-title";import { PublicError } from "metabase/public/components/PublicError";import { PublicNotFound } from "metabase/public/components/PublicNotFound";+import { connect, useSelector } from "metabase/redux";import type { AppErrorDescriptor, State } from "metabase/redux/store";import { getErrorPage } from "metabase/selectors/app";import { getApplicationName } from "metabase/selectors/whitelabel";import { PublicStatusListing } from "metabase/status/components/PublicStatusListing";import { isWithinIframe } from "metabase/utils/iframe";-import { connect, useSelector } from "metabase/utils/redux";interface OwnProps {children: JSX.Element;diff --git a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsxindex 9903313c986..29022935098 100644--- a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx+++ b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx@@ -11,6 +11,7 @@ import CS from "metabase/css/core/index.css";import { EmbedFrame } from "metabase/public/components/EmbedFrame";import { PublicDocumentProvider } from "metabase/public/contexts/PublicDocumentContext";import { useEmbedFrameOptions } from "metabase/public/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { CardEmbed } from "metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode";import { CustomStarterKit } from "metabase/rich_text_editing/tiptap/extensions/CustomStarterKit/CustomStarterKit";@@ -24,7 +25,6 @@ import { getSetting } from "metabase/selectors/settings";import { PublicApi } from "metabase/services";import { Box } from "metabase/ui";import { initializeIframeResizer } from "metabase/utils/dom";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { Document } from "metabase-types/api";import S from "./PublicDocument.module.css";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsxindex b49337a5172..ee789c807ac 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx@@ -8,10 +8,10 @@ import { useDashboardUrlQuery } from "metabase/dashboard/hooks/use-dashboard-urlimport { EmbeddingEntityContextProvider } from "metabase/embedding/context";import { LocaleProvider } from "metabase/public/LocaleProvider";import { useEmbedFrameOptions, useSetEmbedFont } from "metabase/public/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { getCanWhitelabel } from "metabase/selectors/whitelabel";import { isActionDashCard, isQuestionCard } from "metabase/utils/dashboard";-import { useDispatch, useSelector } from "metabase/utils/redux";import { Mode } from "metabase/visualizations/click-actions/Mode";import { PublicMode } from "metabase/visualizations/click-actions/modes/PublicMode";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsxindex af4b77af76b..d856f26ee76 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx@@ -13,12 +13,12 @@ import {type MockDashboardContextProps,} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import { publicReducers } from "metabase/reducers-public";+import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import { MetabaseReduxProvider } from "metabase/utils/redux/custom-context";import { registerVisualization } from "metabase/visualizations";import { BarChart } from "metabase/visualizations/visualizations/BarChart";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsxindex 8f63d4bb1a0..fa08a8c7c2d 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx@@ -15,13 +15,13 @@ import {type MockDashboardContextProps,} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import { publicReducers } from "metabase/reducers-public";+import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";import { stableStringify } from "metabase/utils/objects";-import { MetabaseReduxProvider } from "metabase/utils/redux/custom-context";import { registerVisualization } from "metabase/visualizations";import { BarChart } from "metabase/visualizations/visualizations/BarChart";import { Table } from "metabase/visualizations/visualizations/Table/Table";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsxindex b21b628fd48..d5bd0633d25 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx@@ -16,13 +16,13 @@ import {type MockDashboardContextProps,} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import { publicReducers } from "metabase/reducers-public";+import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";import { Box, Card, Popover, Text, Tooltip } from "metabase/ui";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { registerVisualization } from "metabase/visualizations";import { BarChart } from "metabase/visualizations/visualizations/BarChart";import { ObjectDetail } from "metabase/visualizations/visualizations/ObjectDetail";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsxindex 76788aa624d..e3b0a2214c7 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx@@ -10,7 +10,7 @@ import {mapDispatchToProps,mapStateToProps,} from "metabase/dashboard/context/context.redux";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";export type MockDashboardContextProps = Partial<Omit<PropsWithChildren<DashboardContextReturned>, "dashboardActions"> & {diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsxindex 2790456fa23..42da506277f 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx@@ -9,12 +9,12 @@ import { LocaleProvider } from "metabase/public/LocaleProvider";import { useEmbedFrameOptions } from "metabase/public/hooks";import { usePublicEndpoints } from "metabase/public/hooks/use-public-endpoints";import { useSetEmbedFont } from "metabase/public/hooks/use-set-embed-font";+import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";import { addFields } from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";import { getCanWhitelabel } from "metabase/selectors/whitelabel";import { EmbedApi, PublicApi, maybeUsePivotEndpoint } from "metabase/services";-import { useDispatch, useSelector } from "metabase/utils/redux";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";import { getParameterValuesByIdFromQueryParams } from "metabase-lib/v1/parameters/utils/parameter-parsing";import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsxindex ae27e327482..0298972959a 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx@@ -16,12 +16,12 @@ import {} from "__support__/visualizations";import { Api } from "metabase/api";import { publicReducers } from "metabase/reducers-public";+import { MetabaseReduxProvider } from "metabase/redux";import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";import { Box } from "metabase/ui";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { registerVisualization } from "metabase/visualizations";import { BarChart } from "metabase/visualizations/visualizations/BarChart";import { PivotTable } from "metabase/visualizations/visualizations/PivotTable";diff --git a/frontend/src/metabase/public/hooks/use-public-document-card-data.ts b/frontend/src/metabase/public/hooks/use-public-document-card-data.tsindex 5534ce35854..cc99772a646 100644--- a/frontend/src/metabase/public/hooks/use-public-document-card-data.ts+++ b/frontend/src/metabase/public/hooks/use-public-document-card-data.ts@@ -2,9 +2,9 @@ import { useMemo } from "react";import { useAsync } from "react-use";import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { PublicApi } from "metabase/services";-import { useSelector } from "metabase/utils/redux";import Question from "metabase-lib/v1/Question";import type { Card, Dataset, RawSeries } from "metabase-types/api";diff --git a/frontend/src/metabase/public/hooks/use-set-embed-font.ts b/frontend/src/metabase/public/hooks/use-set-embed-font.tsindex dddfe2a9776..0cc925e3242 100644--- a/frontend/src/metabase/public/hooks/use-set-embed-font.ts+++ b/frontend/src/metabase/public/hooks/use-set-embed-font.ts@@ -2,9 +2,9 @@ import type { Location } from "history";import { useEffect } from "react";import type { EmbeddingHashOptions } from "metabase/public/lib/types";+import { useDispatch } from "metabase/redux";import { setOptions } from "metabase/redux/embed";import { parseHashOptions } from "metabase/utils/browser";-import { useDispatch } from "metabase/utils/redux";export const useSetEmbedFont = ({ location }: { location: Location }) => {const dispatch = useDispatch();diff --git a/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx b/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsxindex 724365f8472..06ec04d374e 100644--- a/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx+++ b/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx@@ -3,10 +3,10 @@ import type { Location } from "history";import type { PropsWithChildren } from "react";import { mainReducers } from "metabase/reducers-main";+import { MetabaseReduxProvider } from "metabase/redux";import type { EmbedState } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import { getStore } from "metabase/store";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { useSetEmbedFont } from "./use-set-embed-font";diff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.tsindex 463c1616ac1..a5f3b49283b 100644--- a/frontend/src/metabase/query_builder/actions/core/core.ts+++ b/frontend/src/metabase/query_builder/actions/core/core.ts@@ -5,10 +5,12 @@ import {cardIsEquivalent,cardQueryIsEquivalent,} from "metabase/common/utils/card";+import { entityCompatibleQuery } from "metabase/entities";import { Databases } from "metabase/entities/databases";import { updateModelIndexes } from "metabase/entities/model-indexes/actions";import { Questions } from "metabase/entities/questions";import { loadMetadataForCard } from "metabase/questions/actions";+import { createThunkAction } from "metabase/redux";import { openUrl } from "metabase/redux/app";import {API_UPDATE_QUESTION,@@ -23,8 +25,6 @@ import type { Dispatch, GetState } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { clone } from "metabase/utils/clone";import { shouldOpenInBlankWindow } from "metabase/utils/dom";-import { entityCompatibleQuery } from "metabase/utils/entities";-import { createThunkAction } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import * as Urls from "metabase/utils/urls";import { getCardAfterVisualizationClick } from "metabase/visualizations/lib/utils";diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.tsindex 187a1fe54e4..48088e1a0ab 100644--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts@@ -1,6 +1,7 @@import _ from "underscore";import { loadMetadataForCard } from "metabase/questions/actions";+import { createThunkAction } from "metabase/redux";import {onCloseQuestionInfo,setUIControls,@@ -10,7 +11,6 @@ import type {GetState,QueryBuilderMode,} from "metabase/redux/store";-import { createThunkAction } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";diff --git a/frontend/src/metabase/query_builder/actions/modal.ts b/frontend/src/metabase/query_builder/actions/modal.tsindex 95f231199b6..848b029f8f8 100644--- a/frontend/src/metabase/query_builder/actions/modal.ts+++ b/frontend/src/metabase/query_builder/actions/modal.ts@@ -1,5 +1,5 @@+import { createThunkAction } from "metabase/redux";import { UserApi } from "metabase/services";-import { createThunkAction } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";export const CLOSE_QB_NEWB_MODAL = "metabase/qb/CLOSE_QB_NEWB_MODAL";diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.tsindex 0c33c52bfb9..22e0f9ac530 100644--- a/frontend/src/metabase/query_builder/actions/native.ts+++ b/frontend/src/metabase/query_builder/actions/native.ts@@ -1,10 +1,10 @@import { createAction } from "redux-actions";import { Questions } from "metabase/entities/questions";+import { createThunkAction } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { updateUserSetting } from "metabase/redux/settings";import type { Dispatch, GetState } from "metabase/redux/store";-import { createThunkAction } from "metabase/utils/redux";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";import type {CardId,diff --git a/frontend/src/metabase/query_builder/actions/navigation.ts b/frontend/src/metabase/query_builder/actions/navigation.tsindex 1b425607813..5cdbcf453f2 100644--- a/frontend/src/metabase/query_builder/actions/navigation.ts+++ b/frontend/src/metabase/query_builder/actions/navigation.ts@@ -1,10 +1,10 @@import type { Location } from "history";import _ from "underscore";+import { createThunkAction } from "metabase/redux";import { resetUIControls } from "metabase/redux/query-builder";import type { Dispatch } from "metabase/redux/store";import { getLocation } from "metabase/selectors/routing";-import { createThunkAction } from "metabase/utils/redux";import {getCard,diff --git a/frontend/src/metabase/query_builder/actions/object-detail.ts b/frontend/src/metabase/query_builder/actions/object-detail.tsindex 51f2b0abf43..e0a158852e5 100644--- a/frontend/src/metabase/query_builder/actions/object-detail.ts+++ b/frontend/src/metabase/query_builder/actions/object-detail.ts@@ -1,10 +1,10 @@import _ from "underscore";+import { createThunkAction } from "metabase/redux";import { RESET_ROW_ZOOM } from "metabase/redux/query-builder";import type { Dispatch, GetState } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { MetabaseApi } from "metabase/services";-import { createThunkAction } from "metabase/utils/redux";import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/actions/querying.ts b/frontend/src/metabase/query_builder/actions/querying.tsindex 414ef31f64e..97ca81b30fc 100644--- a/frontend/src/metabase/query_builder/actions/querying.ts+++ b/frontend/src/metabase/query_builder/actions/querying.ts@@ -2,6 +2,7 @@ import { createAction } from "redux-actions";import { t } from "ttag";import { syncVizSettingsWithSeries } from "metabase/querying/viz-settings/utils/sync-viz-settings";+import { createThunkAction } from "metabase/redux";import {CANCEL_QUERY,QUERY_COMPLETED as QUERY_COMPLETED_TYPE,@@ -15,7 +16,6 @@ import type { Dispatch, GetState } from "metabase/redux/store";import { getWhiteLabeledLoadingMessageFactory } from "metabase/selectors/whitelabel";import { runQuestionQuery as apiRunQuestionQuery } from "metabase/services";import { defer } from "metabase/utils/promise";-import { createThunkAction } from "metabase/utils/redux";import { getSensibleDisplays } from "metabase/visualizations";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/actions/url.ts b/frontend/src/metabase/query_builder/actions/url.tsindex 8f4ef93a085..26c33e02210 100644--- a/frontend/src/metabase/query_builder/actions/url.ts+++ b/frontend/src/metabase/query_builder/actions/url.ts@@ -4,7 +4,7 @@ import type { LocationDescriptor } from "history";import { push, replace } from "react-router-redux";import { isEqualCard } from "metabase/common/utils/card";-import { createThunkAction } from "metabase/utils/redux";+import { createThunkAction } from "metabase/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import { isAdHocModelOrMetricQuestion } from "metabase-lib/v1/metadata/utils/models";diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsxindex 87dac20fad7..9839706dd59 100644--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx+++ b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx@@ -9,8 +9,8 @@ import { DashboardPickerModal } from "metabase/common/components/Pickers/Dashboaimport { getCollectionType } from "metabase/common/components/Pickers/EntityPicker/utils";import { canPlaceEntityInCollectionOrDescendants } from "metabase/data-studio/utils";import { ROOT_COLLECTION } from "metabase/entities/collections";+import { useSelector } from "metabase/redux";import { getUserPersonalCollectionId } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Card, Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsxindex 75fa0531c72..0e8939932b5 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx@@ -48,11 +48,11 @@ import type { DataReferenceItem } from "metabase/querying/components/DataReferenimport { QueryVisualization } from "metabase/querying/components/QueryVisualization";import { SnippetSidebar } from "metabase/querying/components/SnippetSidebar";import { MODAL_TYPES } from "metabase/querying/constants";+import { connect, useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { Box, Flex, Icon, Tooltip } from "metabase/ui";-import { connect, useDispatch } from "metabase/utils/redux";import {extractRemappings,getVisualizationTransformed,diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsxindex 49d21473195..ac4945c3ac5 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx@@ -4,9 +4,9 @@ import {getIsListViewConfigurationShown,getTransformedSeries,} from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { Button, Group, SegmentedControl, Stack, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import type { CardDisplayType } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsx b/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsxindex 13283d35c7f..df60c742eb5 100644--- a/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsx+++ b/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsx@@ -5,9 +5,9 @@ import { Button } from "metabase/common/components/Button";import { ExternalLink } from "metabase/common/components/ExternalLink";import { ModalContent } from "metabase/common/components/ModalContent";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";type Props = {onClose: () => void;diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsxindex 9213a15e450..1494abe2af0 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx@@ -26,8 +26,8 @@ import type {SelectionRange,SidebarFeatures,} from "metabase/querying/editor/types";+import { useSelector } from "metabase/redux";import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsxindex b8326663737..2746e026097 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx@@ -3,8 +3,8 @@ import { type PropsWithChildren, forwardRef } from "react";import { updateQuestion } from "metabase/query_builder/actions/core";import type { QueryModalType } from "metabase/querying/constants";import type { SidebarFeatures } from "metabase/querying/editor/types";+import { useDispatch } from "metabase/redux";import { Flex } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import type Database from "metabase-lib/v1/metadata/Database";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";diff --git a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsxindex 5040a4126f2..35a3a44f4a6 100644--- a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx+++ b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { ModalContent } from "metabase/common/components/ModalContent";import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";import { turnQuestionIntoModel } from "metabase/query_builder/actions";+import { useDispatch } from "metabase/redux";import { Box, Button, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import NewDatasetModalS from "./NewDatasetModal.module.css";diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex fe360a124c8..be2813b7fb9 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -19,12 +19,12 @@ import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";import { MoveCardModal } from "metabase/questions/components/MoveCardModal";+import { useDispatch, useSelector } from "metabase/redux";import type { QueryBuilderMode } from "metabase/redux/store";import EditEventModal from "metabase/timelines/questions/containers/EditEventModal";import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";import NewEventModal from "metabase/timelines/questions/containers/NewEventModal";import { Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import Question from "metabase-lib/v1/Question";import type { Card, DashboardTabId } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsxindex a1bb459a490..713d88b556f 100644--- a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx@@ -6,8 +6,8 @@ import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistimport { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";import { PLUGIN_MODERATION } from "metabase/plugins";import { revertToRevision } from "metabase/query_builder/actions";+import { useDispatch, useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useDispatch, useSelector } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";const { getModerationTimelineEvents } = PLUGIN_MODERATION;diff --git a/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx b/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsxindex f078ef6c7ae..39ee8e71ef0 100644--- a/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx@@ -4,8 +4,8 @@ import {} from "metabase/api";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";import { EmbedModal } from "metabase/public/components/EmbedModal";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx b/frontend/src/metabase/query_builder/components/SyncedParametersList.tsxindex eb50e13b425..466cdfd175d 100644--- a/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx+++ b/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx@@ -4,7 +4,7 @@ import {ParametersList,type ParametersListProps,} from "metabase/parameters/components/ParametersList";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import type { ParameterId } from "metabase-types/api";import { setParameterValueToDefault } from "../actions";diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsxindex 788821b133e..b9a58873da6 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import { Snippets } from "metabase/entities/snippets";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { Flex, Modal } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type {CreateSnippetRequest,NativeQuerySnippet,diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsxindex 90668e9d0c3..8f34d2ef779 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx@@ -8,11 +8,11 @@ import { isSingleOrMultiSelectable } from "metabase/parameters/utils/parameter-timport type { EmbeddingParameterVisibility } from "metabase/public/lib/types";import { setTemplateTagConfig } from "metabase/query_builder/actions";import { getOriginalQuestion } from "metabase/query_builder/selectors";+import { type DispatchFn, connect } from "metabase/redux";import { fetchField } from "metabase/redux/metadata";import type { State } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";import { Box } from "metabase/ui";-import { type DispatchFn, connect } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx b/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsxindex 9b93ff83e51..8d6aad8466e 100644--- a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx+++ b/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx@@ -2,8 +2,8 @@ import cx from "classnames";import { t } from "ttag";import { toggleDataReference } from "metabase/query_builder/actions";+import { useDispatch } from "metabase/redux";import { Box, Icon, Tooltip } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import DataReferenceButtonS from "./DataReferenceButton.module.css";diff --git a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx b/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsxindex dcd5056cd80..cc008721426 100644--- a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx+++ b/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx@@ -2,8 +2,8 @@ import cx from "classnames";import { t } from "ttag";import { toggleTemplateTagsEditor } from "metabase/query_builder/actions";+import { useDispatch } from "metabase/redux";import { Box, Icon, Tooltip } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import NativeVariablesButtonS from "./NativeVariablesButton.module.css";diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsx b/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsxindex fe46893db65..67f95f1d112 100644--- a/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsx+++ b/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsx@@ -5,8 +5,8 @@ import {getQuestion,} from "metabase/query_builder/selectors";import { NativeQueryPreview } from "metabase/querying/notebook/components/NativeQueryPreview";+import { useSelector } from "metabase/redux";import { Modal } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import type { UiParameter } from "metabase-lib/v1/parameters/types";diff --git a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsxindex e1499704289..50f41605622 100644--- a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx+++ b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx@@ -19,9 +19,9 @@ import {getIsResultDirty,getQuestion,} from "metabase/query_builder/selectors";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Box, Popover, UnstyledButton } from "metabase/ui";-import { connect } from "metabase/utils/redux";import type { Limit } from "metabase-lib";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsxindex 6a92e357ed7..e9452c265be 100644--- a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx+++ b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx@@ -2,11 +2,11 @@ import { t } from "ttag";import { ViewFooterButton } from "metabase/common/components/ViewFooterButton";import { getUiControls } from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import {onCloseTimelines,onOpenTimelines,} from "metabase/redux/query-builder";-import { useDispatch, useSelector } from "metabase/utils/redux";export interface QuestionTimelineWidgetProps {className?: string;diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsxindex b224a4713c4..1dc005aa4fa 100644--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx@@ -11,9 +11,9 @@ import {Notebook,type NotebookProps,} from "metabase/querying/notebook/components/Notebook";+import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { Box, Flex, rem } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { canShowNativePreview } from "../../ViewHeader/utils";diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsxindex 9db7086e5db..9c493c55feb 100644--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx@@ -3,8 +3,8 @@ import { useCallback } from "react";import { updateQuestion } from "metabase/query_builder/actions";import { getQuestion } from "metabase/query_builder/selectors";import { NotebookNativePreview as ControlledNotebookNativePreview } from "metabase/querying/notebook/components/NotebookNativePreview";+import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";-import { useDispatch, useSelector } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx b/frontend/src/metabase/query_builder/components/view/View/View/View.jsxindex 770fa1fa8fa..d76e86a8423 100644--- a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx+++ b/frontend/src/metabase/query_builder/components/view/View/View/View.jsx@@ -21,8 +21,8 @@ import {} from "metabase/query_builder/actions";import { SIDEBAR_SIZES } from "metabase/query_builder/constants";import { MetricEditor } from "metabase/querying/metrics/components/MetricEditor";+import { connect } from "metabase/redux";import { Flex } from "metabase/ui";-import { connect } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { DatasetEditor } from "../../../DatasetEditor";diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsxindex 5deab1437b2..96e37bdf7d2 100644--- a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx@@ -8,8 +8,8 @@ import type {SelectionRange,SidebarFeatures,} from "metabase/querying/editor/types";+import { useSelector } from "metabase/redux";import { Box } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsxindex 6e2aacf7569..af33f4b2eb8 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx@@ -1,7 +1,7 @@import CS from "metabase/css/core/index.css";import { getUiControls } from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";-import { useDispatch, useSelector } from "metabase/utils/redux";import { QuestionDisplayToggle } from "../QuestionDisplayToggle/QuestionDisplayToggle";diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsxindex f66d116cbd2..1d947e260fe 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx@@ -6,6 +6,7 @@ import { ViewButton } from "metabase/common/components/ViewButton";import CS from "metabase/css/core/index.css";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { getQuestion, getUiControls } from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import {onCloseChartSettings,onCloseChartType,@@ -14,7 +15,6 @@ import {} from "metabase/redux/query-builder";import type { QueryBuilderUIControls } from "metabase/redux/store";import { Group } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import S from "./LeftViewFooterButtonGroup.module.css";diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsxindex 561a556f87a..de1119d53d7 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx@@ -7,8 +7,8 @@ import {getIsTimeseries,} from "metabase/query_builder/selectors";import { getIsObjectDetail } from "metabase/query_builder/selectors/mode";+import { useSelector } from "metabase/redux";import { Group } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { ExecutionTime } from "../ExecutionTime";import { QuestionLastUpdated } from "../QuestionLastUpdated/QuestionLastUpdated";diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsxindex 4da8ed09949..e0729b77fa7 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsx@@ -6,8 +6,8 @@ import {getIsVisualized,getQuestion,} from "metabase/query_builder/selectors";+import { useSelector } from "metabase/redux";import { Box, Group } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { ViewSection } from "../ViewSection";diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsxindex f3c465d017c..c07df6b3f1d 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx@@ -7,7 +7,7 @@ import {getQuestion,getVisualizationSettings,} from "metabase/query_builder/selectors";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";export const ViewFooterDownloadWidget = () => {const question = useSelector(getQuestion);diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsxindex 1ddd044237e..9ded10d864d 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx@@ -8,9 +8,9 @@ import { updateQuestion } from "metabase/query_builder/actions";import { getFilterItems } from "metabase/querying/filters/components/FilterPanel/utils";import { MultiStageFilterPicker } from "metabase/querying/filters/components/FilterPicker/MultiStageFilterPicker";import type { FilterChangeOpts } from "metabase/querying/filters/components/FilterPicker/types";+import { useDispatch } from "metabase/redux";import type { QueryBuilderMode } from "metabase/redux/store";import { Button, Icon, Popover, Tooltip } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsxindex 934c0ac9943..742993a40ee 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx@@ -4,9 +4,9 @@ import { t } from "ttag";import { useTranslateContent } from "metabase/i18n/hooks";import { getParentEntity } from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { navigateBackToDashboard } from "metabase/redux/query-builder";import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { CollectionItemModel, DashboardId } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsxindex f22850ddb42..346e815c400 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx@@ -9,11 +9,11 @@ import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut"import { runQuestionQuery } from "metabase/query_builder/actions";import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";import type { QueryModalType } from "metabase/querying/constants";+import { useDispatch } from "metabase/redux";import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";import { UploadMode } from "metabase/redux/store/upload";import { uploadFile } from "metabase/redux/uploads";import { Box, Divider, Icon, Menu } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import ViewTitleHeaderS from "../../ViewTitleHeader.module.css";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsxindex c126248dea0..6fffd21b49e 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx@@ -17,11 +17,11 @@ import { DatasetMetadataStrengthIndicator } from "metabase/query_builder/componeimport { shouldShowQuestionSettingsSidebar } from "metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar";import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";+import { useDispatch, useSelector } from "metabase/redux";import { onOpenQuestionSettings } from "metabase/redux/query-builder";import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { Icon, Menu } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import { checkCanBeModel } from "metabase-lib/v1/metadata/utils/models";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsxindex 94e462ce86e..776accd15fe 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx@@ -1,8 +1,8 @@import { type ReactElement, useMemo } from "react";import { skipToken, useGetCardQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.tsindex bfc12c8227d..86a863c9319 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts@@ -1,5 +1,5 @@+import { useSelector } from "metabase/redux";import { getMetadataUnfiltered } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsxindex a53d60a33da..d07d095a9bd 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { getEngineNativeType } from "metabase/databases/utils/engine";import { trackNotebookNativePreviewShown } from "metabase/query_builder/analytics";import { getUiControls } from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { ActionIcon, Icon, Tooltip } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import { canShowNativePreview } from "../../utils";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsxindex 33f9bbd4f76..ce37ecba4f4 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx@@ -10,11 +10,11 @@ import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut"import { canExploreResults } from "metabase/query_builder/components/view/ViewHeader/utils";import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";+import { useSelector } from "metabase/redux";import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";import { getUserCanWriteToCollections } from "metabase/selectors/user";import { Box, Button, Flex, Tooltip } from "metabase/ui";import { SERVER_ERROR_TYPES } from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsxindex a029e7ae9ed..c2cb579b3ae 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx@@ -9,11 +9,11 @@ import {getUiControls,getVisualizationSettings,} from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import {onCloseChartSettings,onOpenChartType,} from "metabase/redux/query-builder";-import { useDispatch, useSelector } from "metabase/utils/redux";import visualizations from "metabase/visualizations";import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsxindex 75de821c33f..15cc5be09aa 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx@@ -12,12 +12,12 @@ import {getSensibleVisualizations,useQuestionVisualizationState,} from "metabase/query_builder/components/chart-type-selector";+import { useDispatch } from "metabase/redux";import {onCloseChartType,onOpenChartSettings,setUIControls,} from "metabase/redux/query-builder";-import { useDispatch } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { CardDisplayType } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsxindex 96efd9813c9..cae51a1a3dc 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx@@ -18,9 +18,9 @@ import SidesheetStyles from "metabase/common/components/Sidesheet/sidesheet.moduimport { InsightsUpsellTab } from "metabase/common/components/upsells/InsightsUpsellTab";import { PLUGIN_MODERATION } from "metabase/plugins";import { QuestionActivityTimeline } from "metabase/query_builder/components/QuestionActivityTimeline";+import { useDispatch } from "metabase/redux";import { onCloseQuestionInfo } from "metabase/redux/query-builder";import { Flex, Icon, Stack, Tabs } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsxindex d2e97d0ca0c..ea349945ae8 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx@@ -4,9 +4,9 @@ import { c } from "ttag";import { Link } from "metabase/common/components/Link";import { SidesheetCardSection } from "metabase/common/components/Sidesheet";import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";+import { useSelector } from "metabase/redux";import { Flex, FixedSizeIcon as Icon } from "metabase/ui";import { getIcon } from "metabase/utils/icon";-import { useSelector } from "metabase/utils/redux";import { getDataSourceParts } from "../../../ViewHeader/components/QuestionDataSource/utils";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsxindex 214440619ca..ae86762f670 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";+import { useSelector } from "metabase/redux";import { Flex, Icon, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { ToggleFullList } from "./ToggleFullList";import { useExpandableList } from "./hooks";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsxindex a124ec97fca..c90f794f9ff 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx@@ -5,9 +5,9 @@ import { t } from "ttag";import { isInstanceAnalyticsCollection } from "metabase/collections/utils";import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";import { PLUGIN_CACHING, PLUGIN_MODEL_PERSISTENCE } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { onCloseQuestionSettings } from "metabase/redux/query-builder";import { Stack, useModalsStack } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import { ModelCacheManagementSection } from "../ModelCacheManagementSection";diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex 82d3c6bd3ef..d970033a941 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -23,6 +23,7 @@ import {getDatabasesList,getSampleDatabaseId,} from "metabase/querying/selectors";+import { connect, useSelector } from "metabase/redux";import { closeNavbar } from "metabase/redux/app";import {closeQB,@@ -55,7 +56,6 @@ import {getUser,getUserIsAdmin,} from "metabase/selectors/user";-import { connect, useSelector } from "metabase/utils/redux";import type {BookmarkId,Bookmark as BookmarkType,diff --git a/frontend/src/metabase/query_builder/containers/use-create-question.ts b/frontend/src/metabase/query_builder/containers/use-create-question.tsindex 64e9e4e8f58..37d4d308033 100644--- a/frontend/src/metabase/query_builder/containers/use-create-question.ts+++ b/frontend/src/metabase/query_builder/containers/use-create-question.ts@@ -2,8 +2,8 @@ import { useCallback } from "react";import type { ScheduleCallback } from "metabase/common/hooks/use-callback-effect";import { apiCreateQuestion } from "metabase/query_builder/actions";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import type { DashboardTabId } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/containers/use-save-question.ts b/frontend/src/metabase/query_builder/containers/use-save-question.tsindex c4b860321cf..91963736649 100644--- a/frontend/src/metabase/query_builder/containers/use-save-question.ts+++ b/frontend/src/metabase/query_builder/containers/use-save-question.ts@@ -1,8 +1,8 @@import { useCallback } from "react";import type { ScheduleCallback } from "metabase/common/hooks/use-callback-effect";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import { apiUpdateQuestion } from "../actions/core/core";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsxindex c9088ec23a7..a78316a224f 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx@@ -13,11 +13,11 @@ import { Questions } from "metabase/entities/questions";import { Schemas } from "metabase/entities/schemas";import { Search } from "metabase/entities/search";import { Tables } from "metabase/entities/tables";+import { connect } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { canUserCreateQueries } from "metabase/selectors/user";import { Box, Popover } from "metabase/ui";-import { connect } from "metabase/utils/redux";import {SAVED_QUESTIONS_VIRTUAL_DB_ID,getQuestionIdFromVirtualTableId,diff --git a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsxindex ed88fac1903..65d683aba1e 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx@@ -15,8 +15,8 @@ import {PERSONAL_COLLECTIONS,buildCollectionTree,} from "metabase/entities/collections";+import { connect } from "metabase/redux";import { Box, Icon } from "metabase/ui";-import { connect } from "metabase/utils/redux";import { SavedEntityList } from "./SavedEntityList";import SavedEntityPickerS from "./SavedEntityPicker.module.css";diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsxindex efe76e7387a..021e26c02db 100644--- a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx@@ -9,10 +9,10 @@ import { getStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";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 { Box, Popover } from "metabase/ui";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { DatePicker } from "./DatePicker";diff --git a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsxindex 3b054aca139..5f739d57bf2 100644--- a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx@@ -14,9 +14,9 @@ import {EmptyDescription,} from "metabase/common/components/MetadataInfo/MetadataInfo";import { SidebarContent } from "metabase/common/components/SidebarContent";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Box, Flex, Icon, type IconName } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import * as ML_Urls from "metabase-lib/v1/urls";diff --git a/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsx b/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsxindex b937b396fef..05ddbd381f5 100644--- a/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsx+++ b/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsx@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";import { useAsyncFn } from "react-use";import { Tables } from "metabase/entities/tables";-import { connect } from "metabase/utils/redux";+import { connect } from "metabase/redux";import type Table from "metabase-lib/v1/metadata/Table";type OwnProps = {diff --git a/frontend/src/metabase/querying/components/DataReference/TablePane.tsx b/frontend/src/metabase/querying/components/DataReference/TablePane.tsxindex 6ecbcf033b3..179df3a54a5 100644--- a/frontend/src/metabase/querying/components/DataReference/TablePane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/TablePane.tsx@@ -8,8 +8,8 @@ import {} from "metabase/common/components/MetadataInfo/MetadataInfo";import { SidebarContent } from "metabase/common/components/SidebarContent";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import { isConcreteTableId } from "metabase-types/api";import { ConnectedTableList } from "./ConnectedTableList";diff --git a/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsxindex 5fb41424294..c0c2d19f6f7 100644--- a/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx+++ b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx@@ -9,11 +9,11 @@ import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";import { Warnings } from "metabase/common/components/Warnings";import CS from "metabase/css/core/index.css";import QueryBuilderS from "metabase/css/query_builder.module.css";+import { useSelector } from "metabase/redux";import { getWhiteLabeledLoadingMessageFactory } from "metabase/selectors/whitelabel";import { Box, Flex, Stack, Text, Title } from "metabase/ui";import { isMac } from "metabase/utils/browser";import { SERVER_ERROR_TYPES } from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsxindex 2ed404d2520..ff98648a36d 100644--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx@@ -10,10 +10,10 @@ import CS from "metabase/css/core/index.css";import QueryBuilderS from "metabase/css/query_builder.module.css";import { getEngineNativeType } from "metabase/databases/utils/engine";import { FixSqlQueryButton } from "metabase/metabot/components/FixSqlQueryButton";+import { useSelector } from "metabase/redux";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Center, Flex, Icon } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { DatasetError, DatasetErrorType } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsxindex dd86cc9a558..685bcb96332 100644--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx@@ -15,7 +15,7 @@ import {getIsShowingRawTable,getUiControls,} from "metabase/query_builder/selectors";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import Visualization from "metabase/visualizations/components/Visualization";import * as Lib from "metabase-lib";import { datasetContainsNoResults } from "metabase-lib/v1/queries/utils/dataset";diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsxindex 1486a6c5fd0..c622763fafb 100644--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx@@ -18,8 +18,8 @@ import {PLUGIN_SNIPPET_SIDEBAR_PLUS_MENU_OPTIONS,PLUGIN_SNIPPET_SIDEBAR_ROW_RENDERERS,} from "metabase/plugins";+import { connect } from "metabase/redux";import { Box, Button, Flex, Icon, Menu } from "metabase/ui";-import { connect } from "metabase/utils/redux";import { SnippetRow } from "./SnippetRow";import S from "./SnippetSidebar.module.css";diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsxindex fda8112aee6..014fe296788 100644--- a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx+++ b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx@@ -20,9 +20,9 @@ import {} from "metabase/querying/expressions";import { tokenAtPos } from "metabase/querying/expressions";import { COMMA, GROUP } from "metabase/querying/expressions/pratt";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Button, Tooltip as ButtonTooltip, Flex, Icon } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsx b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsxindex d9b43d79d3b..4b2bd2a2237 100644--- a/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsx+++ b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsx@@ -12,9 +12,9 @@ import { t } from "ttag";import { EmptyState } from "metabase/common/components/EmptyState";import { Markdown } from "metabase/common/components/Markdown";import type { HelpText } from "metabase/querying/expressions";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Box, Flex, Icon, Input, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type * as Lib from "metabase-lib";import { HighlightExpressionSource } from "../HighlightExpression";diff --git a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsxindex adf4f019ae7..401de62f32a 100644--- a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx+++ b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx@@ -1,7 +1,7 @@import { c } from "ttag";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";-import { useDispatch } from "metabase/utils/redux";import { ClickActionsView } from "metabase/visualizations/components/ClickActions";import type {ClickActionPopoverProps,diff --git a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsxindex 1edd935c667..af2502a7967 100644--- a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx+++ b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx@@ -1,8 +1,8 @@import { t } from "ttag";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { Box, Title } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type {ClickActionPopoverProps,Drill,diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsxindex fec6791dc81..0fa5337bccf 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx@@ -3,8 +3,8 @@ import { useMount } from "react-use";import { match } from "ts-pattern";import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";+import { useSelector } from "metabase/redux";import { Box } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { NativeQuerySnippet, RowValue } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.tsindex 2c83ab6ae18..f386cc13794 100644--- a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts+++ b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts@@ -1,7 +1,7 @@import { useMemo, useState } from "react";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type { VisualizationSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsxindex fba4946b552..a9a5cd2495c 100644--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsx+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsx@@ -1,10 +1,10 @@import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Button, Icon } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";export function MetricEditorSidebar() {const showMetabaseLinks = useSelector(getShowMetabaseLinks);diff --git a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsxindex 29f230be059..0a86ce8dfe2 100644--- a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx+++ b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx@@ -6,10 +6,10 @@ import { CodeEditor } from "metabase/common/components/CodeEditor";import { CopyButton } from "metabase/common/components/CopyButton";import { ExternalLink } from "metabase/common/components/ExternalLink";import { formatNativeQuery } from "metabase/databases/utils/engine";+import { useSelector } from "metabase/redux";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Flex, Icon, Loader, Stack } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type { NativeDatasetResponse } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsxindex 19f34604e69..8096f9ff518 100644--- a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx+++ b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx@@ -1,7 +1,7 @@import type { DataPickerValue } from "metabase/common/components/Pickers/DataPicker";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { Box } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type Question from "metabase-lib/v1/Question";import type { NotebookDataPickerOptions } from "../../types";diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsxindex 9a3b54b488b..a94a7393610 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx@@ -3,6 +3,7 @@ import { useContext } from "react";import { skipToken, useGetCardQuery, useSearchQuery } from "metabase/api";import { PLUGIN_EMBEDDING } from "metabase/plugins";import { EmbeddingDataPickerContext } from "metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/context";+import { useSelector } from "metabase/redux";import {DEFAULT_EMBEDDING_ENTITY_TYPES,getDataPicker,@@ -10,7 +11,6 @@ import {} from "metabase/redux/embedding-data-picker";import type { EmbeddingEntityType } from "metabase/redux/store/embedding-data-picker";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import type { CardType, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsxindex 36951ab0a15..79cfdbddb0a 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx@@ -15,10 +15,10 @@ import type {} from "metabase/common/components/Pickers/MiniPicker/types";import { isEmbedding } from "metabase/embedding/config";import { loadMetadataForTable } from "metabase/questions/actions";+import { useDispatch, useSelector, useStore } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getIsTenantUser } from "metabase/selectors/user";import { Icon, TextInput } from "metabase/ui";-import { useDispatch, useSelector, useStore } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";diff --git a/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx b/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsxindex bcf21da39d6..bbefcfd7a64 100644--- a/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx+++ b/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx@@ -1,8 +1,8 @@import { FilterPill } from "metabase/querying/filters/components/FilterPanel/FilterPill";import { getSegmentQuery } from "metabase/querying/segments/utils";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Flex } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { DatasetQuery, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsxindex 700b1d99af9..04a106795cf 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx@@ -7,9 +7,9 @@ import {} from "metabase/common/components/Pickers/DataPicker";import { Tables } from "metabase/entities/tables";import { TableBreadcrumbs } from "metabase/metadata/components";+import { useDispatch, useStore } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Box, Button, Flex, Icon, Text } from "metabase/ui";-import { useDispatch, useStore } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";import type { TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/questions/actions.ts b/frontend/src/metabase/questions/actions.tsindex 0340808d237..17fdc2806be 100644--- a/frontend/src/metabase/questions/actions.ts+++ b/frontend/src/metabase/questions/actions.ts@@ -1,7 +1,7 @@import { cardApi, datasetApi } from "metabase/api";+import { entityCompatibleQuery } from "metabase/entities";import { Tables } from "metabase/entities/tables";import type { Dispatch } from "metabase/redux/store";-import { entityCompatibleQuery } from "metabase/utils/entities";import type { Card, TableId, UnsavedCard } from "metabase-types/api";import type { EntityToken } from "metabase-types/api/entity";import { isSavedCard } from "metabase-types/guards";diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsxindex 98e50c5dfcf..ae53069af54 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx@@ -16,10 +16,10 @@ import type { OmniPickerCollectionItem } from "metabase/common/components/Pickerimport { MoveModal } from "metabase/common/components/Pickers";import { Dashboards } from "metabase/entities/dashboards";import { INJECT_RTK_QUERY_QUESTION_VALUE } from "metabase/entities/questions";+import { useDispatch } from "metabase/redux";import { API_UPDATE_QUESTION } from "metabase/redux/query-builder";import { addUndo } from "metabase/redux/undo";import { Box, Icon, Radio, Title } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/redux/app.ts b/frontend/src/metabase/redux/app.tsindex d290814c016..08cad945e7b 100644--- a/frontend/src/metabase/redux/app.ts+++ b/frontend/src/metabase/redux/app.ts@@ -5,6 +5,7 @@ import {} from "@reduxjs/toolkit";import { LOCATION_CHANGE, push } from "react-router-redux";+import { combineReducers, handleActions } from "metabase/redux";import type {DetailViewState,Dispatch,@@ -17,7 +18,6 @@ import {openInBlankWindow,shouldOpenInBlankWindow,} from "metabase/utils/dom";-import { combineReducers, handleActions } from "metabase/utils/redux";interface LocationChangeAction {type: string; // "@@router/LOCATION_CHANGE"diff --git a/frontend/src/metabase/redux/context.tsx b/frontend/src/metabase/redux/context.tsxnew file mode 100644index 00000000000..cd257a840d5--- /dev/null+++ b/frontend/src/metabase/redux/context.tsx@@ -0,0 +1,34 @@+import type { Store } from "@reduxjs/toolkit";+import { type PropsWithChildren, createContext } from "react";+import {+ Provider,+ type ReactReduxContextValue,+ // eslint-disable-next-line no-restricted-imports+ connect as _connect,+} from "react-redux";++export const metabaseReduxContext =+ createContext<ReactReduxContextValue | null>(null);++export const MetabaseReduxProvider = ({+ children,+ store,+}: PropsWithChildren<{ store: Store }>) => {+ return (+ <Provider store={store} context={metabaseReduxContext}>+ {children}+ </Provider>+ );+};++export const connect: typeof _connect = (+ mapStateToProps?: any,+ mapDispatchToProps?: any,+ mergeProps?: any,+ options?: any,+) => {+ return _connect(mapStateToProps, mapDispatchToProps, mergeProps, {+ context: metabaseReduxContext,+ ...options,+ });+};diff --git a/frontend/src/metabase/redux/dashboard.ts b/frontend/src/metabase/redux/dashboard.tsindex be84abed78a..fcaf9b4d0c5 100644--- a/frontend/src/metabase/redux/dashboard.ts+++ b/frontend/src/metabase/redux/dashboard.ts@@ -1,6 +1,6 @@import { createAction } from "@reduxjs/toolkit";-import { createAction as createLegacyAction } from "metabase/utils/redux";+import { createAction as createLegacyAction } from "metabase/redux";import type { DashboardTabId } from "metabase-types/api";export const INITIALIZE = "metabase/dashboard/INITIALIZE";diff --git a/frontend/src/metabase/redux/downloads.ts b/frontend/src/metabase/redux/downloads.tsindex de90aa3a80f..0ec369e44dc 100644--- a/frontend/src/metabase/redux/downloads.ts+++ b/frontend/src/metabase/redux/downloads.ts@@ -14,12 +14,12 @@ import { trackExportDashboardToPDF } from "metabase/dashboard/analytics";import { DASHBOARD_PDF_EXPORT_ROOT_ID } from "metabase/dashboard/constants";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import type { DownloadsState, State } from "metabase/redux/store";+import { createAsyncThunk } from "metabase/redux/utils";import { getTokenFeature } from "metabase/setup/selectors";import api, { GET, POST } from "metabase/utils/api";import { openSaveDialog } from "metabase/utils/dom";import { isWithinIframe } from "metabase/utils/iframe";import { isJWT } from "metabase/utils/jwt";-import { createAsyncThunk } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import * as Urls from "metabase/utils/urls";import { isUuid } from "metabase/utils/uuid";diff --git a/frontend/src/metabase/redux/entities.js b/frontend/src/metabase/redux/entities.jsindex 25a287b2caf..8b5ad07bf82 100644--- a/frontend/src/metabase/redux/entities.js+++ b/frontend/src/metabase/redux/entities.js@@ -1,6 +1,6 @@import * as entitiesMap from "metabase/entities";+import { combineEntities } from "metabase/entities";import { PLUGIN_ENTITIES } from "metabase/plugins";-import { combineEntities } from "metabase/utils/entities";const entitiesArray = Object.values({...entitiesMap,diff --git a/frontend/src/metabase/utils/redux/hooks.ts b/frontend/src/metabase/redux/hooks.tssimilarity index 73%rename from frontend/src/metabase/utils/redux/hooks.tsrename to frontend/src/metabase/redux/hooks.tsindex 7318476428f..0143d79e096 100644--- a/frontend/src/metabase/utils/redux/hooks.ts+++ b/frontend/src/metabase/redux/hooks.ts@@ -8,13 +8,13 @@ import {import type { State } from "metabase/redux/store";-import { MetabaseReduxContext } from "./custom-context";+import { metabaseReduxContext } from "./context";export const useStore: () => Store<State, AnyAction> =- createStoreHook(MetabaseReduxContext);+ createStoreHook(metabaseReduxContext);export const useDispatch: () => ThunkDispatch<State, void, AnyAction> =- createDispatchHook(MetabaseReduxContext);+ createDispatchHook(metabaseReduxContext);export const useSelector: TypedUseSelectorHook<State> =- createSelectorHook(MetabaseReduxContext);+ createSelectorHook(metabaseReduxContext);export type DispatchFn = ReturnType<typeof useDispatch>;diff --git a/frontend/src/metabase/utils/redux/hooks.unit.spec.tsx b/frontend/src/metabase/redux/hooks.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/utils/redux/hooks.unit.spec.tsxrename to frontend/src/metabase/redux/hooks.unit.spec.tsxdiff --git a/frontend/src/metabase/redux/index.ts b/frontend/src/metabase/redux/index.tsnew file mode 100644index 00000000000..8bc845140e9--- /dev/null+++ b/frontend/src/metabase/redux/index.ts@@ -0,0 +1,3 @@+export * from "./context";+export * from "./hooks";+export * from "./utils";diff --git a/frontend/src/metabase/utils/redux/metadata.ts b/frontend/src/metabase/redux/metadata-typed.tssimilarity index 86%rename from frontend/src/metabase/utils/redux/metadata.tsrename to frontend/src/metabase/redux/metadata-typed.tsindex dd4adeadcfe..a36416f511a 100644--- a/frontend/src/metabase/utils/redux/metadata.ts+++ b/frontend/src/metabase/redux/metadata-typed.ts@@ -1,7 +1,7 @@import { type Schema, normalize } from "normalizr";// this action is handled by entity reducers in `handleEntities` in-// `frontend/src/metabase/utils/redux/utils.js`+// `frontend/src/metabase/entities/utils.js`const UPDATE = "metabase/entities/UPDATE";export function updateMetadata(data: unknown, schema: Schema) {diff --git a/frontend/src/metabase/redux/metadata.js b/frontend/src/metabase/redux/metadata.jsindex 69a087846a3..863036f65af 100644--- a/frontend/src/metabase/redux/metadata.js+++ b/frontend/src/metabase/redux/metadata.js@@ -6,12 +6,14 @@ import { Databases } from "metabase/entities/databases";import { Fields } from "metabase/entities/fields";import { Segments } from "metabase/entities/segments";import { Tables } from "metabase/entities/tables";+import { entityCompatibleQuery } from "metabase/entities/utils";import { isProduction } from "metabase/env";+import { createThunkAction } from "metabase/redux";import { RevisionsApi } from "metabase/services";-import { entityCompatibleQuery } from "metabase/utils/entities";-import { createThunkAction, fetchData } from "metabase/utils/redux";import { normalizeParameter } from "metabase-lib/v1/parameters/utils/parameter-values";+export * from "metabase/redux/metadata-typed";+// NOTE: All of these actions are deprecated. Use metadata entities directly.const deprecated = (message) => {@@ -112,34 +114,15 @@ export const updateFieldDimension = (fieldId, dimension) => {};export const FETCH_REVISIONS = "metabase/metadata/FETCH_REVISIONS";-export const fetchRevisions = createThunkAction(- FETCH_REVISIONS,- (type, id, reload = false) => {- return async (dispatch, getState) => {- const requestStatePath = ["revisions", type, id];- const existingStatePath = ["revisions"];- const getData = async () => {- return {- type,- id,- revisions: await RevisionsApi.get({- id,- entity: type === "metric" ? "legacy-metric" : type,- }),- };- };-- return await fetchData({- dispatch,- getState,- requestStatePath,- existingStatePath,- getData,- reload,- });- };- },-);+export const fetchRevisions = createThunkAction(FETCH_REVISIONS, (type, id) => {+ return async () => {+ const revisions = await RevisionsApi.get({+ id,+ entity: type === "metric" ? "legacy-metric" : type,+ });+ return { type, id, revisions };+ };+});export const FETCH_SEGMENT_FIELDS = "metabase/metadata/FETCH_SEGMENT_FIELDS";export const fetchSegmentFields = createThunkAction(diff --git a/frontend/src/metabase/redux/query-builder.ts b/frontend/src/metabase/redux/query-builder.tsindex a385eacb314..e291d25df4e 100644--- a/frontend/src/metabase/redux/query-builder.ts+++ b/frontend/src/metabase/redux/query-builder.ts@@ -1,7 +1,7 @@import { createAction } from "redux-actions";+import { createThunkAction } from "metabase/redux";import { UserApi } from "metabase/services";-import { createThunkAction } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import type { ParameterId, ParameterValueOrArray } from "metabase-types/api";diff --git a/frontend/src/metabase/redux/settings.ts b/frontend/src/metabase/redux/settings.tsindex 9e82bc33141..e2ae26c9091 100644--- a/frontend/src/metabase/redux/settings.ts+++ b/frontend/src/metabase/redux/settings.ts@@ -1,8 +1,8 @@import { createAction, createReducer } from "@reduxjs/toolkit";import { sessionApi } from "metabase/api";+import { createAsyncThunk, createThunkAction } from "metabase/redux/utils";import { SettingsApi } from "metabase/services";-import { createAsyncThunk, createThunkAction } from "metabase/utils/redux";import type { Settings, UserSettings } from "metabase-types/api";export const REFRESH_SITE_SETTINGS = "metabase/settings/REFRESH_SITE_SETTINGS";diff --git a/frontend/src/metabase/redux/settings.unit.spec.tsx b/frontend/src/metabase/redux/settings.unit.spec.tsxindex 57cc5a7fafe..7431fb5bf64 100644--- a/frontend/src/metabase/redux/settings.unit.spec.tsx+++ b/frontend/src/metabase/redux/settings.unit.spec.tsx@@ -9,10 +9,10 @@ import {useGetSettingsQuery,} from "metabase/api";import { useSetting } from "metabase/common/hooks";+import { useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockSettingsState } from "metabase/redux/store/mocks";import { getSetting } from "metabase/selectors/settings";-import { useDispatch, useSelector } from "metabase/utils/redux";import { createMockSettings } from "metabase-types/api/mocks";import { refreshSiteSettings } from "./settings";diff --git a/frontend/src/metabase/redux/undo.ts b/frontend/src/metabase/redux/undo.tsindex 9e7b88ea2c2..ce6d6b0d3de 100644--- a/frontend/src/metabase/redux/undo.ts+++ b/frontend/src/metabase/redux/undo.ts@@ -3,9 +3,9 @@ import { createRef } from "react";import type { Action } from "redux-actions";import _ from "underscore";+import { createAction, createThunkAction } from "metabase/redux";import type { State } from "metabase/redux/store";import type { Undo } from "metabase/redux/store/undo";-import { createAction, createThunkAction } from "metabase/utils/redux";const ADD_UNDO = "metabase/questions/ADD_UNDO";const DISMISS_UNDO = "metabase/questions/DISMISS_UNDO";diff --git a/frontend/src/metabase/redux/uploads.ts b/frontend/src/metabase/redux/uploads.tsindex 4bcad2ee0c4..1574e4df9b4 100644--- a/frontend/src/metabase/redux/uploads.ts+++ b/frontend/src/metabase/redux/uploads.ts@@ -3,16 +3,16 @@ import { t } from "ttag";import { cardApi } from "metabase/api";import { Collections } from "metabase/entities/collections";+import { entityCompatibleQuery } from "metabase/entities/utils";import type { Dispatch, State } from "metabase/redux/store";import type { FileUploadState } from "metabase/redux/store/upload";import { UploadMode } from "metabase/redux/store/upload";-import { MetabaseApi } from "metabase/services";-import { entityCompatibleQuery } from "metabase/utils/entities";import {createAction,createThunkAction,handleActions,-} from "metabase/utils/redux";+} from "metabase/redux/utils";+import { MetabaseApi } from "metabase/services";import type { CardId, CollectionId, TableId } from "metabase-types/api";export const UPLOAD_DATA_FILE_TYPES = [".csv", ".tsv"];diff --git a/frontend/src/metabase/redux/user.ts b/frontend/src/metabase/redux/user.tsindex aaebcc07a2c..032e4456848 100644--- a/frontend/src/metabase/redux/user.ts+++ b/frontend/src/metabase/redux/user.ts@@ -2,8 +2,8 @@ import { createAction, createReducer } from "@reduxjs/toolkit";import { Dashboards } from "metabase/entities/dashboards";import { CLOSE_QB_NEWB_MODAL } from "metabase/redux/query-builder";+import { createAsyncThunk } from "metabase/redux/utils";import { UserApi } from "metabase/services";-import { createAsyncThunk } from "metabase/utils/redux";import type { User } from "metabase-types/api";export const refreshCurrentUser = createAsyncThunk(diff --git a/frontend/src/metabase/redux/utils.ts b/frontend/src/metabase/redux/utils.tsnew file mode 100644index 00000000000..0b739b4a370--- /dev/null+++ b/frontend/src/metabase/redux/utils.ts@@ -0,0 +1,78 @@+import {+ type ThunkDispatch,+ createAsyncThunk as createAsyncThunkOriginal,+} from "@reduxjs/toolkit";++import type { Dispatch, GetState, State } from "metabase/redux/store";++export { combineReducers, compose } from "@reduxjs/toolkit";+export { handleActions, createAction } from "redux-actions";++interface ThunkConfig {+ state: State;+}++export const createAsyncThunk =+ createAsyncThunkOriginal.withTypes<ThunkConfig>();++// similar to createAction but accepts a (redux-thunk style) thunk and dispatches based on whether+// the promise returned from the thunk resolves or rejects, similar to redux-promise+export function createThunkAction<+ TArgs extends any[],+ TResult,+ TActionType extends string,+>(+ actionType: TActionType,+ thunkCreator: (+ ...args: TArgs+ ) => (dispatch: ThunkDispatch<any, any, any>, getState: GetState) => TResult,+): (+ ...args: TArgs+) => (+ dispatch: ThunkDispatch<any, any, any>,+ getState: GetState,+) => Promise<{ type: TActionType; payload: Awaited<TResult> }> {+ // @ts-expect-error - withAction is too hard to type correctly as it can accept both the payload or a thunk creator+ // this function only uses it with a thunk creator+ return withAction<TActionType, TArgs>(actionType)(thunkCreator);+}++type Thunk<R = unknown> = (+ dispatch: Dispatch,+ getState: () => State,+) => Promise<R> | R;++type PayloadOrThunkCreator<TArgs extends unknown[], R = unknown> = (+ ...args: TArgs+) => R | Thunk<R>;++/**+ * Decorator for turning a payload creator or thunk (including one returning a promise) into a flux standard action+ */+export function withAction<TArgs extends unknown[]>(actionType: string) {+ return (payloadOrThunkCreator: PayloadOrThunkCreator<TArgs>) => {+ function newCreator(...args: TArgs): unknown {+ const payloadOrThunk = payloadOrThunkCreator(...args);+ if (typeof payloadOrThunk === "function") {+ // thunk, return a new thunk+ return async (dispatch: Dispatch, getState: () => State) => {+ try {+ const payload = await (payloadOrThunk as Thunk)(dispatch, getState);+ const dispatchValue = { type: actionType, payload: payload };+ dispatch(dispatchValue);++ return dispatchValue;+ } catch (error) {+ dispatch({ type: actionType, payload: error, error: true });+ throw error;+ }+ };+ } else {+ // payload, return an action+ return { type: actionType, payload: payloadOrThunk };+ }+ }+ newCreator.toString = () => actionType;+ return newCreator;+ };+}diff --git a/frontend/src/metabase/reference/databases/DatabaseDetail.jsx b/frontend/src/metabase/reference/databases/DatabaseDetail.jsxindex 86de4bdb5b5..ae5083084ae 100644--- a/frontend/src/metabase/reference/databases/DatabaseDetail.jsx+++ b/frontend/src/metabase/reference/databases/DatabaseDetail.jsx@@ -7,13 +7,13 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import Detail from "metabase/reference/components/Detail";import { EditHeader } from "metabase/reference/components/EditHeader";import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";import * as actions from "metabase/reference/reference";import { getShallowFields as getFields } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import {getDatabase,diff --git a/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsx b/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsxindex 90f0c9f69a5..f9229049c42 100644--- a/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsx+++ b/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import DatabaseDetail from "metabase/reference/databases/DatabaseDetail";import * as actions from "metabase/reference/reference";-import { connect } from "metabase/utils/redux";import { getDatabase, getDatabaseId, getIsEditing } from "../selectors";diff --git a/frontend/src/metabase/reference/databases/DatabaseList.jsx b/frontend/src/metabase/reference/databases/DatabaseList.jsxindex 98df4b90464..f317194ccbc 100644--- a/frontend/src/metabase/reference/databases/DatabaseList.jsx+++ b/frontend/src/metabase/reference/databases/DatabaseList.jsx@@ -9,10 +9,10 @@ import S from "metabase/common/components/List/List.module.css";import { ListItem } from "metabase/common/components/ListItem";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import { NoDatabasesEmptyState } from "metabase/reference/databases/NoDatabasesEmptyState";import { getShallowDatabases as getDatabases } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import ReferenceHeader from "../components/ReferenceHeader";import { getError, getLoading } from "../selectors";diff --git a/frontend/src/metabase/reference/databases/DatabaseListContainer.jsx b/frontend/src/metabase/reference/databases/DatabaseListContainer.jsxindex 9a28fd57cfc..f64870099e0 100644--- a/frontend/src/metabase/reference/databases/DatabaseListContainer.jsx+++ b/frontend/src/metabase/reference/databases/DatabaseListContainer.jsx@@ -5,11 +5,11 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import DatabaseList from "metabase/reference/databases/DatabaseList";import BaseSidebar from "metabase/reference/guide/BaseSidebar";import * as actions from "metabase/reference/reference";-import { connect } from "metabase/utils/redux";import { getDatabaseId, getIsEditing } from "../selectors";diff --git a/frontend/src/metabase/reference/databases/FieldDetail.jsx b/frontend/src/metabase/reference/databases/FieldDetail.jsxindex 6b0daa08911..538ef6b45f4 100644--- a/frontend/src/metabase/reference/databases/FieldDetail.jsx+++ b/frontend/src/metabase/reference/databases/FieldDetail.jsx@@ -7,6 +7,7 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import S from "metabase/reference/Reference.module.css";import Detail from "metabase/reference/components/Detail";@@ -15,7 +16,6 @@ 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 { connect } from "metabase/utils/redux";import {getDatabase,diff --git a/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx b/frontend/src/metabase/reference/databases/FieldDetailContainer.jsxindex 1371aa9e579..82332c0fa16 100644--- a/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx+++ b/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx@@ -5,11 +5,11 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import FieldDetail from "metabase/reference/databases/FieldDetail";import * as actions from "metabase/reference/reference";import { getMetadata } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import {getDatabase,diff --git a/frontend/src/metabase/reference/databases/FieldList.jsx b/frontend/src/metabase/reference/databases/FieldList.jsxindex f435e782f09..7806f366da5 100644--- a/frontend/src/metabase/reference/databases/FieldList.jsx+++ b/frontend/src/metabase/reference/databases/FieldList.jsx@@ -9,6 +9,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";import S from "metabase/common/components/List/List.module.css";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import R from "metabase/reference/Reference.module.css";import { EditHeader } from "metabase/reference/components/EditHeader";@@ -16,7 +17,6 @@ import EditableReferenceHeader from "metabase/reference/components/EditableReferimport Field from "metabase/reference/components/Field";import F from "metabase/reference/components/Field.module.css";import * as actions from "metabase/reference/reference";-import { connect } from "metabase/utils/redux";import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";import {diff --git a/frontend/src/metabase/reference/databases/FieldListContainer.jsx b/frontend/src/metabase/reference/databases/FieldListContainer.jsxindex 4f447fd4b75..ab4ed366851 100644--- a/frontend/src/metabase/reference/databases/FieldListContainer.jsx+++ b/frontend/src/metabase/reference/databases/FieldListContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import FieldList from "metabase/reference/databases/FieldList";import * as actions from "metabase/reference/reference";-import { connect } from "metabase/utils/redux";import {getDatabase,diff --git a/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsx b/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsxindex ebb9fa42cf0..ffe35a51fd0 100644--- a/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsx+++ b/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { AdminAwareEmptyState } from "metabase/common/components/AdminAwareEmptyState";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";-import { useSelector } from "metabase/utils/redux";export const NoDatabasesEmptyState = () => {const applicationName = useSelector(getApplicationName);diff --git a/frontend/src/metabase/reference/databases/TableDetail.jsx b/frontend/src/metabase/reference/databases/TableDetail.jsxindex 773c9ecdd41..4e25924c3b5 100644--- a/frontend/src/metabase/reference/databases/TableDetail.jsx+++ b/frontend/src/metabase/reference/databases/TableDetail.jsx@@ -7,6 +7,7 @@ import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import S from "metabase/reference/Reference.module.css";import Detail from "metabase/reference/components/Detail";@@ -18,7 +19,6 @@ import {getShallowFields as getFields,getMetadata,} from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import {getError,diff --git a/frontend/src/metabase/reference/databases/TableDetailContainer.jsx b/frontend/src/metabase/reference/databases/TableDetailContainer.jsxindex 64f5533f6e4..ae0f0dacae0 100644--- a/frontend/src/metabase/reference/databases/TableDetailContainer.jsx+++ b/frontend/src/metabase/reference/databases/TableDetailContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import TableDetail from "metabase/reference/databases/TableDetail";import * as actions from "metabase/reference/reference";-import { connect } from "metabase/utils/redux";import {getDatabase,diff --git a/frontend/src/metabase/reference/databases/TableList.jsx b/frontend/src/metabase/reference/databases/TableList.jsxindex 10a185698e6..e1dffcb46a0 100644--- a/frontend/src/metabase/reference/databases/TableList.jsx+++ b/frontend/src/metabase/reference/databases/TableList.jsx@@ -11,9 +11,9 @@ import S from "metabase/common/components/List/List.module.css";import { ListItem } from "metabase/common/components/ListItem";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import R from "metabase/reference/Reference.module.css";-import { connect } from "metabase/utils/redux";import ReferenceHeader from "../components/ReferenceHeader";import {diff --git a/frontend/src/metabase/reference/databases/TableListContainer.jsx b/frontend/src/metabase/reference/databases/TableListContainer.jsxindex 5a1fc9c22e0..709d01dcfd1 100644--- a/frontend/src/metabase/reference/databases/TableListContainer.jsx+++ b/frontend/src/metabase/reference/databases/TableListContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import TableList from "metabase/reference/databases/TableList";import * as actions from "metabase/reference/reference";-import { connect } from "metabase/utils/redux";import { getDatabase, getDatabaseId, getIsEditing } from "../selectors";diff --git a/frontend/src/metabase/reference/databases/TableQuestions.jsx b/frontend/src/metabase/reference/databases/TableQuestions.jsxindex 3cd8ef82b74..e85cd5e40fe 100644--- a/frontend/src/metabase/reference/databases/TableQuestions.jsx+++ b/frontend/src/metabase/reference/databases/TableQuestions.jsx@@ -11,9 +11,9 @@ import S from "metabase/common/components/List/List.module.css";import { ListItem } from "metabase/common/components/ListItem";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import visualizations from "metabase/visualizations";diff --git a/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx b/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsxindex 8f33c99e853..1232afcc581 100644--- a/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx+++ b/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx@@ -6,10 +6,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";import { Questions } from "metabase/entities/questions";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import TableQuestions from "metabase/reference/databases/TableQuestions";import * as actions from "metabase/reference/reference";-import { connect } from "metabase/utils/redux";import {getDatabase,diff --git a/frontend/src/metabase/reference/reference.js b/frontend/src/metabase/reference/reference.jsindex 588ddc20c18..b7f5491c160 100644--- a/frontend/src/metabase/reference/reference.js+++ b/frontend/src/metabase/reference/reference.js@@ -1,6 +1,6 @@import { assoc } from "icepick";-import { createAction, handleActions } from "metabase/utils/redux";+import { createAction, handleActions } from "metabase/redux";import { filterUntouchedFields, isEmptyObject } from "./utils.js";diff --git a/frontend/src/metabase/reference/segments/SegmentDetail.jsx b/frontend/src/metabase/reference/segments/SegmentDetail.jsxindex 3b08acdad72..086cee55dfe 100644--- a/frontend/src/metabase/reference/segments/SegmentDetail.jsx+++ b/frontend/src/metabase/reference/segments/SegmentDetail.jsx@@ -8,6 +8,7 @@ import { Link } from "metabase/common/components/Link";import { List } from "metabase/common/components/List";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import Detail from "metabase/reference/components/Detail";import { EditHeader } from "metabase/reference/components/EditHeader";@@ -20,7 +21,6 @@ import {getMetadata,} from "metabase/selectors/metadata";import { modelIconMap } from "metabase/utils/icon";-import { connect } from "metabase/utils/redux";import S from "../components/Detail.module.css";import {diff --git a/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsx b/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsxindex 20879912817..fba824a62ca 100644--- a/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsx+++ b/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import * as actions from "metabase/reference/reference";import SegmentDetail from "metabase/reference/segments/SegmentDetail";-import { connect } from "metabase/utils/redux";import {getDatabaseId,diff --git a/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsx b/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsxindex d3ee260787e..4878e77d8a7 100644--- a/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsx+++ b/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsx@@ -7,6 +7,7 @@ import { t } from "ttag";import { List } from "metabase/common/components/List";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import S from "metabase/reference/Reference.module.css";import Detail from "metabase/reference/components/Detail";@@ -16,7 +17,6 @@ import FieldTypeDetail from "metabase/reference/components/FieldTypeDetail";import UsefulQuestions from "metabase/reference/components/UsefulQuestions";import * as actions from "metabase/reference/reference";import { getMetadata } from "metabase/selectors/metadata";-import { connect } from "metabase/utils/redux";import {getError,diff --git a/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsx b/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsxindex d3ef20b5f86..975ce61d824 100644--- a/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsx+++ b/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import * as actions from "metabase/reference/reference";import SegmentFieldDetail from "metabase/reference/segments/SegmentFieldDetail";-import { connect } from "metabase/utils/redux";import { getField, getIsEditing, getSegment, getSegmentId } from "../selectors";diff --git a/frontend/src/metabase/reference/segments/SegmentFieldList.jsx b/frontend/src/metabase/reference/segments/SegmentFieldList.jsxindex 32f99ddc66b..9405fbe7c8c 100644--- a/frontend/src/metabase/reference/segments/SegmentFieldList.jsx+++ b/frontend/src/metabase/reference/segments/SegmentFieldList.jsx@@ -9,6 +9,7 @@ import { List } from "metabase/common/components/List";import S from "metabase/common/components/List/List.module.css";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import R from "metabase/reference/Reference.module.css";import { EditHeader } from "metabase/reference/components/EditHeader";@@ -17,7 +18,6 @@ import Field from "metabase/reference/components/Field";import F from "metabase/reference/components/Field.module.css";import * as actions from "metabase/reference/reference";import { modelIconMap } from "metabase/utils/icon";-import { connect } from "metabase/utils/redux";import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";import {diff --git a/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsx b/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsxindex 3fce2b5ff91..d2785cc0078 100644--- a/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsx+++ b/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import * as actions from "metabase/reference/reference";import SegmentFieldList from "metabase/reference/segments/SegmentFieldList";-import { connect } from "metabase/utils/redux";import {getIsEditing,diff --git a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsxindex 3b3e526c38a..3697e15d6f5 100644--- a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx+++ b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx@@ -8,11 +8,11 @@ import S from "metabase/common/components/List/List.module.css";import { ListItem } from "metabase/common/components/ListItem";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { useSelector } from "metabase/redux";import { getShallowSegments } from "metabase/selectors/metadata";import { getDocsUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { modelIconMap } from "metabase/utils/icon";-import { useSelector } from "metabase/utils/redux";import ReferenceHeader from "../../components/ReferenceHeader";import { getError, getLoading } from "../../selectors";diff --git a/frontend/src/metabase/reference/segments/SegmentListContainer.jsx b/frontend/src/metabase/reference/segments/SegmentListContainer.jsxindex b7929a3b410..f0a56a92003 100644--- a/frontend/src/metabase/reference/segments/SegmentListContainer.jsx+++ b/frontend/src/metabase/reference/segments/SegmentListContainer.jsx@@ -5,11 +5,11 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import BaseSidebar from "metabase/reference/guide/BaseSidebar";import * as actions from "metabase/reference/reference";import { SegmentList } from "metabase/reference/segments/SegmentList";-import { connect } from "metabase/utils/redux";import { getDatabaseId, getIsEditing } from "../selectors";diff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx b/frontend/src/metabase/reference/segments/SegmentQuestions.jsxindex ef545c7c1c3..52c51fed3db 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.jsx@@ -10,10 +10,10 @@ import { ListItem } from "metabase/common/components/ListItem";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useQuestionListQuery } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";import { modelIconMap } from "metabase/utils/icon";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import visualizations from "metabase/visualizations";diff --git a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsxindex e873c09ed03..450ad56fc5c 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx@@ -6,10 +6,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";import { Questions } from "metabase/entities/questions";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import * as actions from "metabase/reference/reference";import { SegmentQuestions } from "metabase/reference/segments/SegmentQuestions";-import { connect } from "metabase/utils/redux";import {getDatabaseId,diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx b/frontend/src/metabase/reference/segments/SegmentRevisions.jsxindex a1699415b6a..860685a136d 100644--- a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.jsx@@ -9,11 +9,11 @@ import S from "metabase/common/components/List/List.module.css";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";import { Revision } from "metabase/querying/segments/components/revisions/Revision";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import { getShallowTables as getTables } from "metabase/selectors/metadata";import { assignUserColors } from "metabase/ui/colors/formatting-colors";import { modelIconMap } from "metabase/utils/icon";-import { connect } from "metabase/utils/redux";import ReferenceHeader from "../components/ReferenceHeader";import {diff --git a/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsx b/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsxindex 11efed84e90..6ab93c1f0f3 100644--- a/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsx+++ b/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsx@@ -5,10 +5,10 @@ import { Component } from "react";import { SidebarLayout } from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";+import { connect } from "metabase/redux";import * as metadataActions from "metabase/redux/metadata";import * as actions from "metabase/reference/reference";import SegmentRevisions from "metabase/reference/segments/SegmentRevisions";-import { connect } from "metabase/utils/redux";import {getDatabaseId,diff --git a/frontend/src/metabase/reference/selectors.js b/frontend/src/metabase/reference/selectors.jsindex 98bf4892bb5..2f48e92e270 100644--- a/frontend/src/metabase/reference/selectors.js+++ b/frontend/src/metabase/reference/selectors.js@@ -1,5 +1,6 @@import { createSelector } from "@reduxjs/toolkit";import { getIn } from "icepick";+import _ from "underscore";import { Dashboards } from "metabase/entities/dashboards";import {@@ -8,7 +9,6 @@ import {getShallowSegments as getSegments,getShallowTables as getTables,} from "metabase/selectors/metadata";-import { resourceListToMap } from "metabase/utils/redux";import { idsToObjectMap } from "./utils";@@ -114,5 +114,5 @@ export const getIsFormulaExpanded = (state, props) =>export const getDashboards = (state, props) => {const list = Dashboards.selectors.getList(state);- return list && resourceListToMap(list);+ return list && _.indexBy(list, "id");};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 6fcfbedabf7..54265d7ba48 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@@ -38,6 +38,7 @@ import {} from "metabase/documents/selectors";import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";import { usePublicDocumentCardData } from "metabase/public/hooks/use-public-document-card-data";+import { useDispatch, useSelector } from "metabase/redux";import { DropZone } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/DropZone";import { getMetadata } from "metabase/selectors/metadata";import {@@ -50,7 +51,6 @@ import {Text,TextInput,} from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { DocumentMode } from "metabase/visualizations/click-actions/modes/DocumentMode";import Visualization from "metabase/visualizations/components/Visualization";import { ErrorView } from "metabase/visualizations/components/Visualization/ErrorView/ErrorView";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsxindex ff35f4f4bfd..6730b30a390 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx@@ -6,9 +6,9 @@ import { t } from "ttag";import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";import { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { ActionIcon, Icon, Menu } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { checkNotNull } from "metabase/utils/types";import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsxindex a453103554c..52895d2bbde 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx@@ -8,10 +8,10 @@ import {loadMetadataForDocumentCard,} from "metabase/documents/documents.slice";import { Notebook } from "metabase/querying/notebook/components/Notebook";+import { useDispatch, useSelector, useStore } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { Box, Button, Flex, Modal, Text } from "metabase/ui";-import { useDispatch, useSelector, useStore } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.tsindex c26da08349f..be66bc67a70 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts@@ -5,8 +5,8 @@ import { navigateToCardFromDocument } from "metabase/documents/actions";import { updateVizSettings } from "metabase/documents/documents.slice";import type { UseCardDataResult } from "metabase/documents/hooks/use-card-data";import { useDraftCardOperations } from "metabase/documents/hooks/use-draft-card-operations";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useDispatch, useSelector } from "metabase/utils/redux";import Question from "metabase-lib/v1/Question";import { getUrl } from "metabase-lib/v1/urls";import type { Card, Document, VisualizationSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsxindex 703ed6b7c8d..b8ef450fb32 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx@@ -25,6 +25,7 @@ import {useMetabotName,useUserMetabotPermissions,} from "metabase/metabot/hooks";+import { useSelector } from "metabase/redux";import { getBrowseAllItemIndex } from "metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils";import type { SuggestionPickerViewMode } from "metabase/rich_text_editing/tiptap/extensions/shared/types";import {@@ -36,7 +37,6 @@ import {Text,UnstyledButton,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { SearchResult } from "metabase-types/api";import { EntitySearchSection } from "../shared/EntitySearchSection";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsxindex 670c81e6156..f2e0321642d 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx@@ -8,10 +8,10 @@ import {loadMetadataForDocumentCard,} from "metabase/documents/documents.slice";import { Notebook } from "metabase/querying/notebook/components/Notebook";+import { useDispatch, useSelector, useStore } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { Box, Button, Flex, Modal } from "metabase/ui";-import { useDispatch, useSelector, useStore } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.tsindex e34ce162964..259a74aee13 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts@@ -2,12 +2,12 @@ import { useMemo } from "react";import { t } from "ttag";import { useListDatabasesQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getHasDatabaseWithJsonEngine } from "metabase/selectors/data";import {canUserCreateNativeQueries,canUserCreateQueries,} from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { NewQuestionMenuItem } from "./types";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsxindex f9ec70a0ad2..e7d23cd101a 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsx@@ -7,7 +7,7 @@ import {SuggestionPaper,} from "metabase/documents/components/Editor/shared/SuggestionPaper";import { getCurrentDocument } from "metabase/documents/selectors";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import type { SearchResult } from "metabase-types/api";import { EntitySearchSection } from "../shared/EntitySearchSection";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsxindex 2d9e9fe578f..44b84360bb2 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx@@ -26,8 +26,8 @@ import {useMetabotName,useUserMetabotPermissions,} from "metabase/metabot/hooks";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Button, Flex, Icon, Text, Tooltip } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { Card, MetabotGenerateContentRequest } from "metabase-types/api";import { wrapCardEmbed } from "../shared/layout";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsxindex 80250bb5b5d..42fc9e53970 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx@@ -27,13 +27,13 @@ import {parseMetabaseProtocolMarkdownLink,} from "metabase/metabot/utils/links";import { PLUGIN_TRANSFORMS } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { Icon } from "metabase/ui";import {type IconModel,type ObjectWithModel,getIcon,} from "metabase/utils/icon";-import { useDispatch } from "metabase/utils/redux";import { modelToUrl } from "metabase/utils/urls/modelToUrl";import { extractEntityId } from "metabase/utils/urls/utils";import type {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 be769cfba90..02db4fbe4c8 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@@ -19,11 +19,11 @@ import {getChildTargetId,getCurrentDocument,} from "metabase/documents/selectors";+import { useDispatch, useSelector } from "metabase/redux/hooks";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 { Box } from "metabase/ui";import { isWithinIframe } from "metabase/utils/iframe";-import { useDispatch, useSelector } from "metabase/utils/redux/hooks";import { CommentsButton } from "../../components/CommentsButton";import { cleanupFlexContainerNodes } from "../HandleEditorDrop/utils";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsxindex 6b785da4180..e4bf0f207c7 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx@@ -14,10 +14,10 @@ import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryimport { createRawSeries } from "metabase/query_builder/utils";import { DataReference } from "metabase/querying/components/DataReference/DataReference";import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { Box, Button, Flex, Loader, Modal, Stack, Text } from "metabase/ui";import { isMac } from "metabase/utils/browser";-import { useDispatch, useSelector } from "metabase/utils/redux";import Visualization from "metabase/visualizations/components/Visualization";import NoResultsView from "metabase/visualizations/components/Visualization/NoResultsView/NoResultsView";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsxindex 3ed12f5c9fb..91663d57ad7 100644--- a/frontend/src/metabase/route-guards.tsx+++ b/frontend/src/metabase/route-guards.tsx@@ -4,10 +4,10 @@ import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";import { getAdminPaths } from "metabase/admin/app/selectors";import { canAccessDataStudio } from "metabase/data-studio/selectors";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";+import { metabaseReduxContext } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";-import { MetabaseReduxContext } from "metabase/utils/redux";import { getCanAccessOnboardingPage } from "./home/selectors";import { getIsEmbeddingIframe } from "./selectors/embed";@@ -37,7 +37,7 @@ const MetabaseIsSetup = connectedReduxRedirect<Props, State>({allowRedirectBack: false,authenticatedSelector: (state) => getSetting(state, "has-user-setup"),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const AvailableInEmbedding = connectedReduxRedirect<Props, State>({@@ -46,7 +46,7 @@ const AvailableInEmbedding = connectedReduxRedirect<Props, State>({allowRedirectBack: false,authenticatedSelector: (state) => !getIsEmbeddingIframe(state),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserIsAuthenticated = connectedReduxRedirect<Props, State>({@@ -54,7 +54,7 @@ const UserIsAuthenticated = connectedReduxRedirect<Props, State>({redirectPath: "/auth/login",authenticatedSelector: (state) => !!state.currentUser,redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserIsAdmin = connectedReduxRedirect<Props, State>({@@ -64,7 +64,7 @@ const UserIsAdmin = connectedReduxRedirect<Props, State>({authenticatedSelector: (state) =>Boolean(state.currentUser && state.currentUser.is_superuser),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserIsNotAuthenticated = connectedReduxRedirect<Props, State>({@@ -87,7 +87,7 @@ const UserIsNotAuthenticated = connectedReduxRedirect<Props, State>({}return routerActions.replace(location);},- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserCanAccessSettings = connectedReduxRedirect<Props, State>({@@ -96,7 +96,7 @@ const UserCanAccessSettings = connectedReduxRedirect<Props, State>({allowRedirectBack: false,authenticatedSelector: (state) => (getAdminPaths(state)?.length ?? 0) > 0,redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserCanAccessOnboarding = connectedReduxRedirect<Props, State>({@@ -105,7 +105,7 @@ const UserCanAccessOnboarding = connectedReduxRedirect<Props, State>({allowRedirectBack: false,authenticatedSelector: (state) => getCanAccessOnboardingPage(state),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserCanAccessDataModel = connectedReduxRedirect<Props, State>({@@ -115,7 +115,7 @@ const UserCanAccessDataModel = connectedReduxRedirect<Props, State>({authenticatedSelector: (state) =>PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel(state),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserCanAccessDataStudio = connectedReduxRedirect<Props, State>({@@ -124,7 +124,7 @@ const UserCanAccessDataStudio = connectedReduxRedirect<Props, State>({allowRedirectBack: false,authenticatedSelector: (state) => canAccessDataStudio(state),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});const UserCanAccessTransforms = connectedReduxRedirect<Props, State>({@@ -133,7 +133,7 @@ const UserCanAccessTransforms = connectedReduxRedirect<Props, State>({allowRedirectBack: false,authenticatedSelector: (state) => canAccessTransforms(state),redirectAction: routerActions.replace,- context: MetabaseReduxContext,+ context: metabaseReduxContext,});export const IsAuthenticated = MetabaseIsSetup(diff --git a/frontend/src/metabase/route-guards.unit.spec.tsx b/frontend/src/metabase/route-guards.unit.spec.tsxindex 2e5fa4e8eb7..126b1a6fadb 100644--- a/frontend/src/metabase/route-guards.unit.spec.tsx+++ b/frontend/src/metabase/route-guards.unit.spec.tsx@@ -3,10 +3,10 @@ import { routerActions } from "react-router-redux";import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";import { renderWithProviders, screen } from "__support__/ui";+import { metabaseReduxContext } from "metabase/redux/context";import { createMockState } from "metabase/redux/store/mocks";import { isBackendOnlyPath } from "./route-guards";-import { MetabaseReduxContext } from "./utils/redux";describe("route-guards", () => {describe("patched redux-auth-wrapper", () => {@@ -20,7 +20,7 @@ describe("route-guards", () => {let selectorState: any;const RouteGuard = setupRouteGuard({// leverage the same context used by the main application- context: MetabaseReduxContext,+ context: metabaseReduxContext,authenticatedSelector: (state) => {selectorState = state;return !!state.auth.VAL_ONLY_IN_THIS_CTX;diff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsxindex c6fe0105364..7d1d6f648c2 100644--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx@@ -4,6 +4,7 @@ import { isEmpty } from "underscore";import { useCaptureEvent } from "metabase/common/hooks";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";+import { useSelector } from "metabase/redux";import type {FilterTypeKeys,SearchFilterComponentProps,@@ -13,7 +14,6 @@ import type {import { getIsNavbarOpen } from "metabase/selectors/app";import type { IconName } from "metabase/ui";import { Box, Button, Center, Icon, Popover, Stack, Text } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import {diff --git a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/search/components/SearchResult/SearchResult.tsxindex ae3f4ce24a7..96bd874f678 100644--- a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx+++ b/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx@@ -4,10 +4,10 @@ import { useCallback } from "react";import { push } from "react-router-redux";import { PLUGIN_MODERATION } from "metabase/plugins";+import { useDispatch } from "metabase/redux";import { trackSearchClick } from "metabase/search/analytics";import type { WrappedResult } from "metabase/search/types";import { Group, Icon, Loader } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import { isSyncCompleted } from "metabase/utils/syncing";import { modelToUrl } from "metabase/utils/urls";import type { SearchContext } from "metabase-types/api";diff --git a/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx b/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsxindex 3d660db7cf1..49fd540444a 100644--- a/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx+++ b/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { canUserCreateNativeQueries } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";export const NativeQueryLabel = () => {const hasNativeWrite = useSelector(canUserCreateNativeQueries);diff --git a/frontend/src/metabase/search/containers/SearchApp.jsx b/frontend/src/metabase/search/containers/SearchApp.jsxindex b30c59cca8a..7b82b41c646 100644--- a/frontend/src/metabase/search/containers/SearchApp.jsx+++ b/frontend/src/metabase/search/containers/SearchApp.jsx@@ -11,6 +11,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { NoObjectError } from "metabase/common/components/errors/NoObjectError";import { Search } from "metabase/entities/search";import { usePageTitle } from "metabase/hooks/use-page-title";+import { useDispatch } from "metabase/redux";import { SearchSidebar } from "metabase/search/components/SearchSidebar";import {SearchContextTypes,@@ -29,7 +30,6 @@ import {getSearchTextFromLocation,} from "metabase/search/utils";import { Box, Group, Paper, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";const getPageFromLocation = (location) => {const maybePage = location.query?.pagediff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.tsindex 930c11c779b..792c477465f 100644--- a/frontend/src/metabase/setup/actions.ts+++ b/frontend/src/metabase/setup/actions.ts@@ -9,10 +9,10 @@ import {import { userApi } from "metabase/api";import { updateSetting } from "metabase/redux/settings";import type { InviteInfo, Locale, State, UserInfo } from "metabase/redux/store";+import { createAsyncThunk } from "metabase/redux/utils";import { getSetting } from "metabase/selectors/settings";import { SetupApi } from "metabase/services";import { loadLocalization } from "metabase/utils/i18n";-import { createAsyncThunk } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import type { DatabaseData, Settings, UsageReason } from "metabase-types/api";diff --git a/frontend/src/metabase/setup/actions.unit.spec.ts b/frontend/src/metabase/setup/actions.unit.spec.tsindex 3ed80be0828..cbc52ddf01b 100644--- a/frontend/src/metabase/setup/actions.unit.spec.ts+++ b/frontend/src/metabase/setup/actions.unit.spec.ts@@ -1,6 +1,6 @@import { userApi } from "metabase/api";+import type { DispatchFn } from "metabase/redux";import type { InviteInfo, State } from "metabase/redux/store";-import type { DispatchFn } from "metabase/utils/redux";import { submitUserInvite } from "./actions";diff --git a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsxindex ba550aa2851..4e472855415 100644--- a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx+++ b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx@@ -1,7 +1,7 @@import type { ReactNode } from "react";+import { useSelector } from "metabase/redux";import { getShouldShowStepNumber } from "metabase/setup";-import { useSelector } from "metabase/utils/redux";import {StepLabel,diff --git a/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx b/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsxindex 33163bc613c..f02f28c4d7a 100644--- a/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx+++ b/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { HelpCard } from "metabase/common/components/HelpCard";+import { useSelector } from "metabase/redux";import { migrateToCloudGuideUrl } from "metabase/selectors/settings";-import { useSelector } from "metabase/utils/redux";import { getIsHosted } from "../../selectors";import { useStep } from "../../useStep";diff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsxindex 153dcd4ecaf..b3e120085cc 100644--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx+++ b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx@@ -3,9 +3,9 @@ import { type ChangeEvent, useState } from "react";import { t } from "ttag";import ButtonsS from "metabase/css/components/buttons.module.css";+import { useSelector } from "metabase/redux";import { subscribeToNewsletter } from "metabase/setup/utils";import { Switch, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { getIsStepActive, getUserEmail } from "../../selectors";diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsxindex 11c17f2e192..55e980c3be5 100644--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx@@ -5,7 +5,7 @@ import { jt, t } from "ttag";import { ActionButton } from "metabase/common/components/ActionButton";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { goToNextStep, updateTracking } from "../../actions";import { getIsTrackingAllowed } from "../../selectors";diff --git a/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsx b/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsxindex ce2139b23cc..6c1bd43db11 100644--- a/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsx+++ b/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsx@@ -1,5 +1,5 @@import { DatabaseHelpCard } from "metabase/databases/components/DatabaseHelpCard";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { getDatabaseEngine, getIsStepActive } from "../../selectors";import { SetupCardContainer } from "../SetupCardContainer";diff --git a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsxindex bd0b46ab5db..f238310f2eb 100644--- a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx+++ b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx@@ -3,6 +3,7 @@ import { c, t } from "ttag";import { useToast } from "metabase/common/hooks";import { DatabaseForm } from "metabase/databases/components/DatabaseForm";+import { useDispatch, useSelector } from "metabase/redux";import type { InviteInfo } from "metabase/redux/store";import {getDatabase,@@ -12,7 +13,6 @@ import {getUser,} from "metabase/setup";import { Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { DatabaseData } from "metabase-types/api";import {diff --git a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsxindex dc6ea9b3b53..7b9830e6051 100644--- a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx+++ b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx@@ -3,13 +3,13 @@ import { t } from "ttag";import { findWhere } from "underscore";import { useUpdateSettingMutation } from "metabase/api";+import { useDispatch, useSelector } from "metabase/redux";import {getAvailableLocales,getIsStepCompleted,getLocale,} from "metabase/setup/selectors";import { Select } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { updateLocale } from "../../actions";import { getLocales } from "../../utils";diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsxindex 9dfe7e3d6e8..f59ba69ad1a 100644--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx@@ -4,9 +4,9 @@ import _ from "underscore";import { Button } from "metabase/common/components/Button";import { CommunityLocalizationNotice } from "metabase/common/components/CommunityLocalizationNotice";+import { useDispatch, useSelector } from "metabase/redux";import type { Locale } from "metabase/redux/store";import { Stack } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { useStep } from "../..//useStep";import { goToNextStep, updateLocale } from "../../actions";diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsxindex 1cfc14e92d9..cea26785708 100644--- a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { useToast } from "metabase/common/hooks/use-toast";+import { useDispatch, useSelector } from "metabase/redux";import { useStep } from "metabase/setup/useStep";import { Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { submitLicenseToken } from "../../actions";import { ActiveStep } from "../ActiveStep";diff --git a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsxindex f08df37e957..2e8102df39e 100644--- a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx+++ b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx@@ -1,9 +1,9 @@import { getLocalizationNoticeText } from "metabase/common/components/CommunityLocalizationNotice";import { LogoIcon } from "metabase/common/components/LogoIcon";+import { useSelector } from "metabase/redux";import { getSteps } from "metabase/setup/selectors";import type { SetupStep } from "metabase/setup/types";import { Box, Flex, Icon, Text, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { CloudMigrationHelp } from "../CloudMigrationHelp";import { CompletedStep } from "../CompletedStep";diff --git a/frontend/src/metabase/setup/components/Setup/Setup.tsx b/frontend/src/metabase/setup/components/Setup/Setup.tsxindex dee85dcc0c5..89e3f8f7ef4 100644--- a/frontend/src/metabase/setup/components/Setup/Setup.tsx+++ b/frontend/src/metabase/setup/components/Setup/Setup.tsx@@ -1,7 +1,7 @@import { useEffect } from "react";import { useUpdate } from "react-use";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { trackStepSeen } from "../../analytics";import { getIsLocaleLoaded, getStep, getSteps } from "../../selectors";diff --git a/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx b/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsxindex 979f2bb6bcf..a711382e966 100644--- a/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx+++ b/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx@@ -2,8 +2,8 @@ import { useState } from "react";import { t } from "ttag";import { Button } from "metabase/common/components/Button";+import { useDispatch } from "metabase/redux";import { Divider, Radio, Stack, Text } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { UsageReason } from "metabase-types/api";import { submitUsageReason } from "../../actions";diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.tsxindex 512ed0a5164..b1862721986 100644--- a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import { useDispatch, useSelector } from "metabase/redux";import type { UserInfo } from "metabase/redux/store";-import { useDispatch, useSelector } from "metabase/utils/redux";import { submitUser } from "../../actions";import { getIsHosted, getUser } from "../../selectors";diff --git a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsx b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsxindex 68ade3b4f2a..3cf3b416962 100644--- a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsx+++ b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsx@@ -3,7 +3,7 @@ import { useTimeout } from "react-use";import { t } from "ttag";import { DefaultLogoIcon } from "metabase/common/components/LogoIcon";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { goToNextStep, loadDefaults } from "../../actions";import { LOCALE_TIMEOUT } from "../../constants";diff --git a/frontend/src/metabase/setup/useStep.ts b/frontend/src/metabase/setup/useStep.tsindex a7b0de86d11..e850e0c913a 100644--- a/frontend/src/metabase/setup/useStep.ts+++ b/frontend/src/metabase/setup/useStep.ts@@ -1,4 +1,4 @@-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { selectStep } from "./actions";import {diff --git a/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsx b/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsxindex 37f70fad924..098c03eda55 100644--- a/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsx+++ b/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsx@@ -1,11 +1,11 @@import { t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";+import { useDispatch, useSelector } from "metabase/redux";import {clearExport,getAnalyticsExport,} from "metabase/redux/analytics-export";-import { useDispatch, useSelector } from "metabase/utils/redux";import useStatusVisibility from "../../hooks/use-status-visibility";import StatusLarge from "../StatusLarge";diff --git a/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx b/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsxindex f3b166b7346..cf86a768743 100644--- a/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx+++ b/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx@@ -1,8 +1,8 @@import { useEffect, useState } from "react";import { useListDatabasesQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import { isSyncInProgress } from "metabase/utils/syncing";import type { Database, User } from "metabase-types/api";diff --git a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsx b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsxindex b9e76e1a675..d4b9b3f9f6b 100644--- a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsx+++ b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsx@@ -1,8 +1,8 @@import { useCallback, useEffect, useState } from "react";+import { useDispatch, useSelector } from "metabase/redux";import { clearAll, getDownloads } from "metabase/redux/downloads";import useStatusVisibility from "metabase/status/hooks/use-status-visibility";-import { useDispatch, useSelector } from "metabase/utils/redux";import { DownloadsStatusLarge } from "../DownloadsStatusLarge";import { DownloadsStatusSmall } from "../DownloadsStatusSmall";diff --git a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsxindex 185c9e46a24..13577597646 100644--- a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx+++ b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx@@ -2,9 +2,9 @@ import _ from "underscore";import ErrorBoundary from "metabase/ErrorBoundary";import { useCollectionQuery, useTableQuery } from "metabase/common/hooks";+import { useDispatch, useSelector } from "metabase/redux";import type { FileUpload } from "metabase/redux/store/upload";import { clearAllUploads, getAllUploads } from "metabase/redux/uploads";-import { useDispatch, useSelector } from "metabase/utils/redux";import { isEmpty } from "metabase/utils/validate";import type { CollectionId, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx b/frontend/src/metabase/status/components/StatusListing/StatusListing.tsxindex 26067710567..e0e5f936c37 100644--- a/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx+++ b/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx@@ -6,10 +6,10 @@ import {PLUGIN_REPLACEMENT,PLUGIN_UPLOAD_MANAGEMENT,} from "metabase/plugins";+import { useSelector } from "metabase/redux";import { hasActiveUploads } from "metabase/redux/uploads";import { getUserIsAdmin } from "metabase/selectors/user";import { useCheckActiveDownloadsBeforeUnload } from "metabase/status/hooks/use-check-active-downloads-before-unload";-import { useSelector } from "metabase/utils/redux";import { AnalyticsExportStatus } from "../AnalyticsExportStatus";import { DatabaseStatus } from "../DatabaseStatus";diff --git a/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.ts b/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.tsindex 4b6c4c44591..57786ce9c6c 100644--- a/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.ts+++ b/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.ts@@ -1,8 +1,8 @@import { useBeforeUnload } from "react-use";import { t } from "ttag";+import { useSelector } from "metabase/redux";import { hasActiveDownloads } from "metabase/redux/downloads";-import { useSelector } from "metabase/utils/redux";export const useCheckActiveDownloadsBeforeUnload = () => {const downloadInProgress = useSelector(hasActiveDownloads);diff --git a/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx b/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsxindex ca6cf8cf698..11afcf7e347 100644--- a/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx+++ b/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx@@ -9,10 +9,10 @@ import {isPublicEmbedding,isStaticEmbedding,} from "metabase/embedding/config";+import { useSelector } from "metabase/redux";import { getMetabaseCssVariables } from "metabase/styled-components/theme/css-variables";import { useMantineTheme } from "metabase/ui";import { getSitePath } from "metabase/utils/dom";-import { useSelector } from "metabase/utils/redux";import { saveDomImageStyles } from "metabase/visualizations/lib/image-exports";import { getFont, getFontFiles } from "../../selectors";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsxindex 1387caeca90..e28efaecd8a 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx@@ -2,9 +2,9 @@ import { c, t } from "ttag";import EmptyEvent from "assets/img/empty-states/event.svg";import { Link } from "metabase/common/components/Link";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Button, Stack, Text, Title, Tooltip } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Collection, Timeline } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsxindex cb2f02ad4bc..9e18b38e3e2 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx@@ -3,9 +3,9 @@ import _ from "underscore";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import DeleteEventModal from "metabase/timelines/common/components/DeleteEventModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/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 6d20356077e..5e8e7a7421e 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -2,9 +2,9 @@ import { push } from "react-router-redux";import _ from "underscore";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import DeleteTimelineModal from "metabase/timelines/common/components/DeleteTimelineModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/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 c4724c3ca12..2d1c765620d 100644--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx@@ -3,9 +3,9 @@ import _ from "underscore";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import EditEventModal from "metabase/timelines/common/components/EditEventModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/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 7bd157bdc21..cc42ad01f80 100644--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx@@ -2,9 +2,9 @@ import { push } from "react-router-redux";import _ from "underscore";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import EditTimelineModal from "metabase/timelines/common/components/EditTimelineModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/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 a98c054489d..13fddaf3b49 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -4,9 +4,9 @@ import _ from "underscore";import { Collections } from "metabase/entities/collections";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import MoveEventModal from "metabase/timelines/common/components/MoveEventModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsxindex 4adccc678f4..351a8c30063 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx@@ -1,9 +1,9 @@import _ from "underscore";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import MoveTimelineModal from "metabase/timelines/common/components/MoveTimelineModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { 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 ac6355876fd..1fc7494ab4d 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx@@ -3,9 +3,9 @@ import _ from "underscore";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import NewEventModal from "metabase/timelines/common/components/NewEventModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsxindex 80b137921ae..2db51297248 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx@@ -3,9 +3,9 @@ import _ from "underscore";import { Collections } from "metabase/entities/collections";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import NewEventModal from "metabase/timelines/common/components/NewEventModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Collection, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsxindex 53a3f10950f..3f088676c96 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx@@ -3,9 +3,9 @@ import _ from "underscore";import { Collections } from "metabase/entities/collections";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { 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 dbf19caf61d..017bef1d294 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx@@ -3,8 +3,8 @@ import _ from "underscore";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/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 3091fe8f60f..14fd234a324 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -3,8 +3,8 @@ import _ from "underscore";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/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 521c3031a7a..d302e2bb710 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx@@ -3,8 +3,8 @@ import _ from "underscore";import { Collections } from "metabase/entities/collections";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Collection, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsxindex d2ac1a75fc7..dbd1ddc2e7a 100644--- a/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx+++ b/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx@@ -1,6 +1,6 @@+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";-import { connect } from "metabase/utils/redux";import type {EventFormOwnProps,diff --git a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsxindex 37e8ab82e4a..6a12ac67a35 100644--- a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx+++ b/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import EmptyEvent from "assets/img/empty-states/event.svg";+import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";import { Box, Button, Stack, Text, Title } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import type { Collection, Timeline } from "metabase-types/api";export interface TimelineEmptyStateProps {diff --git a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsxindex 127c2764cb4..d193df9c44e 100644--- a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx@@ -2,10 +2,10 @@ import { t } from "ttag";import _ from "underscore";import { TimelineEvents } from "metabase/entities/timeline-events";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import EditEventModal from "metabase/timelines/common/components/EditEventModal";-import { connect } from "metabase/utils/redux";import type { TimelineEvent } from "metabase-types/api";interface EditEventModalProps {diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsxindex 00c6f8c8dd8..2f1f97557fa 100644--- a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx@@ -3,9 +3,9 @@ import _ from "underscore";import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import MoveEventModal from "metabase/timelines/common/components/MoveEventModal";-import { connect } from "metabase/utils/redux";import type { Timeline, TimelineEvent } from "metabase-types/api";interface MoveEventModalProps {diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsxindex f3f99c99526..53e95f41cd6 100644--- a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx@@ -4,10 +4,10 @@ import _ from "underscore";import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";import { TimelineEvents } from "metabase/entities/timeline-events";import { Timelines } from "metabase/entities/timelines";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import NewEventModal from "metabase/timelines/common/components/NewEventModal";-import { connect } from "metabase/utils/redux";import type { Collection, TimelineEvent } from "metabase-types/api";interface NewEventModalProps {diff --git a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsxindex d914397c80c..3a2b62b35ba 100644--- a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx+++ b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx@@ -2,8 +2,8 @@ import _ from "underscore";import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";import { TimelineEvents } from "metabase/entities/timeline-events";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { connect } from "metabase/utils/redux";import type { TimelineEvent } from "metabase-types/api";import TimelinePanel from "../../components/TimelinePanel";diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsxindex 11f8fcb7f18..47ba8a7a8d5 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import { useDocsUrl } from "metabase/common/hooks";import { FormSelect } from "metabase/forms";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { TitleSection } from "metabase/transforms/components/TitleSection";import {@@ -21,7 +22,6 @@ import {Text,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { TransformSource } from "metabase-types/api";import type { TransformType } from "metabase-types/api/transform";diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsxindex e3057aa8f27..f16cc8cce9e 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx@@ -2,9 +2,9 @@ import { skipToken } from "@reduxjs/toolkit/query";import { useMemo } from "react";import { useGetTableQueryMetadataQuery } from "metabase/api";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import type { DataAttributes, InputDescriptionProps } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { PythonTransformTableAliases } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.tsindex 059675659d8..fe764044313 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts@@ -5,9 +5,9 @@ import {useGetAdhocQueryMetadataQuery,useGetTableQueryMetadataQuery,} from "metabase/api";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getLibQuery, isMbqlQuery } from "metabase/transforms/utils";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { TransformSource } from "metabase-types/api";import { isConcreteTableId } from "metabase-types/api/table";diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.tsindex e8ea968a8b8..ade88e1237f 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts@@ -1,8 +1,8 @@import { useMemo } from "react";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import type { SelectOption } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { isConcreteTableId } from "metabase-types/api/table";diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.tsindex c75afcfeabf..f6df3898ff1 100644--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.ts+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.ts@@ -1,7 +1,7 @@import { useEffect, useMemo } from "react";import { tableApi } from "metabase/api";-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import type { Table } from "metabase-types/api";const selectTableQueryMetadata =diff --git a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsxindex 1d8f3693a4b..4dd87b20ac6 100644--- a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx@@ -7,8 +7,8 @@ import { useListTransformJobTransformsQuery } from "metabase/api";import { ListEmptyState } from "metabase/common/components/ListEmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { useDispatch } from "metabase/redux";import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Transform, TransformJobId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsxindex 6f411399a02..e79f649400c 100644--- a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx+++ b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx@@ -6,8 +6,8 @@ import {type QueryEditorUiOptions,type QueryEditorUiState,} from "metabase/querying/editor/components/QueryEditor";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type {Database,diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsxindex bb8d69990d9..617f608f1d7 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx@@ -6,8 +6,8 @@ import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/Daimport { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import type { StackProps } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Transform } 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 bc3cab1a739..978c2ac7230 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx@@ -3,8 +3,8 @@ import { push } from "react-router-redux";import { t } from "ttag";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useDispatch } from "metabase/redux";import { ActionIcon, Icon, Menu } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Transform } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsxindex 81eb6a271fd..4164f5e8d78 100644--- a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx+++ b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx@@ -12,8 +12,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";+import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";-import { useSelector } from "metabase/utils/redux";import type { Transform } from "metabase-types/api";interface TransformRevisionHistorySidebarProps {diff --git a/frontend/src/metabase/transforms/hooks/use-source-state.ts b/frontend/src/metabase/transforms/hooks/use-source-state.tsindex 0ad993fe2df..ef67ab22e85 100644--- a/frontend/src/metabase/transforms/hooks/use-source-state.ts+++ b/frontend/src/metabase/transforms/hooks/use-source-state.ts@@ -4,8 +4,8 @@ import {deactivateSuggestedTransform,getMetabotSuggestedTransform,} from "metabase/metabot/state";+import { useDispatch, useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsxindex 87fb007d7f3..09775881049 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx@@ -5,6 +5,7 @@ import { getPlan } from "metabase/common/utils/plan";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import {@@ -19,7 +20,7 @@ import {Text,Title,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";+export const EnableTransformsPage = () => {const isAdmin = useSelector(getUserIsAdmin);const plan = useSelector((state) =>diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsxindex 6be1a9d115f..3763cab2f1c 100644--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx@@ -10,6 +10,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";+import { useDispatch } from "metabase/redux";import type { TreeTableColumnDef } from "metabase/ui";import {Button,@@ -23,7 +24,6 @@ import {TreeTableSkeleton,useTreeTableInstance,} from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { TransformJob } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsxindex 5987ac9af97..a8202532dfb 100644--- a/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx+++ b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx@@ -3,8 +3,8 @@ import { push } from "react-router-redux";import { t } from "ttag";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useDispatch } from "metabase/redux";import { ActionIcon, Icon, Menu } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { TransformJob } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsxindex 277f2310128..fbc1e437b43 100644--- a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx@@ -11,7 +11,7 @@ import {import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";import { useMetadataToasts } from "metabase/metadata/hooks";-import { useDispatch } from "metabase/utils/redux";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/utils/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 b632e8f4242..4ee63ee40bb 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -17,10 +17,10 @@ import {} from "metabase/data-studio/common/components/PaneHeader";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 { getMetadata } from "metabase/selectors/metadata";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type {diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsxindex 75afbf07a03..5e702566119 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx@@ -14,9 +14,9 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { usePageTitle } from "metabase/hooks/use-page-title";+import { useDispatch } from "metabase/redux";import { POLLING_INTERVAL } from "metabase/transforms/constants";import { Center, Flex, Stack } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { TransformRun, TransformRunId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsxindex d31e90baef6..4b5c39a6101 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx@@ -3,10 +3,10 @@ import { msgid, ngettext, t } from "ttag";import { useUpdateCollectionMutation } from "metabase/api";import { useConfirmation } from "metabase/common/hooks/use-confirmation";+import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { EditTransformCollectionModal } from "metabase/transforms/components/EditTransformCollectionModal";import { ActionIcon, Box, Icon, Menu } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";type CollectionRowMenuProps = {collectionId: number;diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsxindex 89b7196eae9..7bff2f6c754 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx@@ -7,9 +7,9 @@ import { QuestionPickerModal } from "metabase/common/components/Pickers";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useHasTokenFeature } from "metabase/common/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useDispatch, useSelector } from "metabase/redux";import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { trackTransformCreate } from "../../../analytics";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsxindex e4b9c3fbd3b..38d2c4416e4 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx@@ -26,6 +26,7 @@ import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/Daimport { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";import { PLUGIN_REPLACEMENT, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";@@ -44,7 +45,6 @@ import {useTreeTableInstance,} from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import { type NamedUser, getUserName } from "metabase/utils/user";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsxindex 642a9d8132a..3a475c79bab 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx@@ -2,10 +2,10 @@ import { useMemo } from "react";import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";import { getValidationResult } from "metabase/transforms/utils";-import { useSelector } from "metabase/utils/redux";import * as Lib from "metabase-lib";import type { DraftTransformSource, Transform } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex fc7964fcc4a..4fdeb150390 100644--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -21,9 +21,9 @@ import {PLUGIN_TRANSFORMS_PYTHON,} from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";+import { useDispatch, useSelector } from "metabase/redux";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { Box, Center, Group, Icon } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type {Database,diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsxindex 5f32c63549b..7d643a57aeb 100644--- a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx@@ -11,9 +11,9 @@ import {import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { Anchor, Box, Card, Divider, Group, Stack } from "metabase/ui";import { isResourceNotFoundError } from "metabase/utils/errors";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Transform, TransformTagId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsxindex fbef3fd9a0b..c6bd61c8ae0 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx@@ -12,6 +12,7 @@ import CS from "metabase/css/core/index.css";import { UserInput } from "metabase/metadata/components";import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSelector } from "metabase/redux";import { TransformOwnerAvatar } from "metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar";import {Button,@@ -23,7 +24,6 @@ import {Stack,Text,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import * as Urls from "metabase/utils/urls";import type { Transform, UserId } from "metabase-types/api";diff --git a/frontend/src/metabase/utils/entities.ts b/frontend/src/metabase/utils/entities.tsdeleted file mode 100644index ce26178eb69..00000000000--- a/frontend/src/metabase/utils/entities.ts+++ /dev/null@@ -1,1074 +0,0 @@-/*- * # Entities abstract the interface between the back-end and the front-end.- *- * ## Endpoint requirements for entities:- *- * When fetching a list, each item of the list must include an `id` key/value pair.- *- * JSON must wrap response inside a `{ "data" : { …your data } }` structure.- *- * ## Required Properties:- *- * name:- * a string in plural form- * examples:- * "questions", "dashboards"- *- * path:- * a uri- * starting with "/api/"- * conventionally followed by the entity name in singular form- * examples:- * "/api/card", "/api/dashboard"- *- * ## Optional properties:- *- * api:- *- * here you can override the basic entity methods like `list`, `create`, `get`, `update`, `delete` (OR see `path` below)- *- * schema:- * normalizr schema- * default:- * `new schema.Entity(entity.name)`- *- * ## How to create a bare-bones entity- *- * Say we want to create a "books" entity, to be able to fetch a list of "books".- *- * Add the following line to `frontend/src/metabase/entities.index.js`:- *- * export { default as books } from "./books"- *- * Create file `frontend/src/metabase/entities/books.js`- *- * Add the following to it:- *- * import { createEntity } from "metabase/lib/entities";-- * const Books = createEntity({- * name: "books",- * nameOne: "book",- * path: "/api/book",- * });- *- * export default Books;- *- * ## How to consume an entity:- *- * Near the top of a container file, import the entity:- *- * import Book from "metabase/entities/books";- *- * Near the bottom of the container file, add the entity to a `compose` statement:- *- * export default _.compose(- * Book.loadList(),- * connect(mapStateToProps),- * )(BookContainer);- */--import type { Reducer } from "@reduxjs/toolkit";-import { createSelector } from "@reduxjs/toolkit";-import { getIn, merge } from "icepick";-import inflection from "inflection"; // NOTE: need to use inflection directly here due to circular dependency-import { denormalize, normalize, schema } from "normalizr";-import createCachedSelector from "re-reselect";-import type React from "react";-import _ from "underscore";--import {- type RequestsStateTree,- requestsReducer,- setRequestUnloaded,-} from "metabase/redux/requests";-import type { EntitiesState, State } from "metabase/redux/store";-import { addUndo } from "metabase/redux/undo";--import { DELETE, GET, POST, PUT } from "./api";-import {- combineReducers,- compose,- withAction,- withCachedDataAndRequestState,- withRequestState,-} from "./redux";--const EMPTY_ENTITY_QUERY = {};--export type EntityId = string | number;--/**- * The minimum shape required of an entity object: anything with an `id`.- * Concrete entity types (Collection, Card, Dashboard, …) extend this implicitly- * by having an `id` field. We avoid an `[key: string]: unknown` index signature- * because it would prevent narrower types from being assignable to `EntityObject`.- */-export type EntityObject = {- id: EntityId;- name?: string;- collection?: unknown;-};--type NormalizedPayload = {- entities?: Record<string, Record<EntityId, EntityObject>>;- result?: EntityId | EntityId[];-};--type EntityAction = {- payload?: NormalizedPayload;-};--// The entity framework is a runtime abstraction — consumers define selectors,-// action creators, and object methods with per-entity concrete types that can't be-// statically expressed here. These aliases document the intent of each `any`:--/** Redux dispatch accepted by entity actions. */--type AnyDispatch = (action: any) => any;-/** Redux getState accepted by entity thunks. */--type AnyGetState = () => any;-/** Action creator produced by `entity.actions` / `entity.objectActions`. Each entity- * defines its own specific signatures, so we use a broad callable type here. */--type EntityActionCreator = (...args: any[]) => any;-/** Entity selector signature. Each entity defines its own specific selector signatures. */--type EntitySelector = (state: any, ...args: any[]) => any;-/** Entity query passed to list/fetch endpoints. Concrete shape depends on the entity. */--type EntityQuery = any;--/** Named selectors that every entity must expose. */-export type EntitySelectors = {- getObject: EntitySelector;- getList: EntitySelector;- getEntityIds: EntitySelector;- getLoading: EntitySelector;- getLoaded: EntitySelector;- getFetched: EntitySelector;- getError: EntitySelector;- getListMetadata: EntitySelector;- getInitialCollectionId: EntitySelector;- getExpandedCollectionsById: EntitySelector;-};--/** Shape returned by createEntity */-export type Entity = {- // Names- name: string;- nameOne: string;- nameMany: string;- displayNameOne: string;- displayNameMany: string;-- // Schema- schema: schema.Entity;- path?: string;-- // API — each method may accept any arguments (raw data + options objects)-- api: {- list?: (...args: any[]) => Promise<- | EntityObject[]- | {- data: EntityObject[];- [key: string]: unknown;- }- >;- create: (...args: any[]) => Promise<any>;- get: (...args: any[]) => Promise<any>;- update: (...args: any[]) => Promise<any>;- delete: (...args: any[]) => Promise<any>;- };-- // Action type constants. The values are strings at runtime, but consumers use them- // with `builder.addCase(actionType, reducer)` and rely on the second arg being typed- // as a `PayloadAction<any>` (matching the JS framework's behaviour). Typing them as- // `any` here preserves that ergonomic.- actionTypes: {- CREATE: any;-- FETCH: any;-- UPDATE: any;-- DELETE: any;-- FETCH_LIST: any;-- INVALIDATE_LISTS_ACTION: any;-- [key: string]: any;- };-- actionDecorators: Record<- string,- (action: EntityActionCreator) => EntityActionCreator- >;-- // Path helpers- getQueryKey: (entityQuery: EntityQuery) => string;- getObjectStatePath: (entityId: EntityId) => (string | EntityId)[];- getListStatePath: (entityQuery: EntityQuery) => string[];-- // Normalize helpers- normalize: (- object: EntityObject,- entitySchema?: schema.Entity,- ) => NormalizedPayload & { object: EntityObject };- normalizeList: (- list: EntityObject[],- entitySchema?: schema.Entity,- ) => NormalizedPayload & { list: EntityObject[] };-- // Actions (thunk action creators) — each entity defines its own signatures- objectActions: Record<string, EntityActionCreator> & {- fetch: EntityActionCreator;- create: EntityActionCreator;- update: EntityActionCreator;- delete: EntityActionCreator;- };-- actions: Record<string, EntityActionCreator> & {- fetchList: EntityActionCreator;- invalidateLists: EntityActionCreator;- fetch: EntityActionCreator;- create: EntityActionCreator;- update: EntityActionCreator;- delete: EntityActionCreator;- };-- // Extract entity from dispatched action result. The return type depends on the- // action's normalized payload and is best handled dynamically by consumers.-- HACK_getObjectFromAction: (action: any) => any;-- // Selectors- selectors: EntitySelectors;-- // Per-entity object accessors. Each entity defines these with its own object type.- objectSelectors: Record<string, (object: any, ...args: any[]) => any>;-- // Reducers- reducer?: EntitiesReducer;- reducers: Record<string, EntitiesReducer | Reducer<Record<string, unknown>>>;- requestsReducer: (- state: RequestsStateTree,- action: { type: string },- ) => RequestsStateTree;- actionShouldInvalidateLists: (action: { type: string }) => boolean;-- // Writable properties (subset of entity fields sent to the API)- writableProperties?: string[];-- // Wrap entity object with bound selectors/actions. The wrapper preserves the- // input's properties and adds the entity's bound objectSelectors/objectActions- // (e.g. `getName()`, `getIcon()`). Each entity defines its own object methods,- // so we return `any` to allow consumers to use any wrapper-provided method.- wrapEntity: (object: any, dispatch?: AnyDispatch | null) => any;-- // HOC factories and JSX components added by addEntityContainers at construction time.- // These are always present on the returned entity, so consumers can rely on them.- /** @deprecated HOCs are deprecated */-- load: (opts?: Record<string, unknown>) => any;- /** @deprecated HOCs are deprecated */-- loadList: (opts?: Record<string, unknown>) => any;-- ListLoader: React.ComponentType<any>;- // Accept nullable/undefined IDs: consumers commonly pass optional dashboard/card ids- Name: React.ComponentType<- { id: EntityId | null | undefined } & Record<string, any>- >;-};--/**- * Optional RTK Query bridge that a few entities use to expose RTK Query hooks- * through the entity abstraction. Structure is deliberately loose — each entity- * attaches a different set of helpers.- */--type EntityRtkBridge = Record<string, any>;-type EntitiesReducer = Reducer<- Partial<EntitiesState> | undefined,- { type: string; payload: EntitiesState }->;--type EntityDef = {- name: string;- nameOne?: string;- nameMany?: string;- displayNameOne?: string;- displayNameMany?: string;- path?: string;- schema?: schema.Entity;- api?: Partial<Entity["api"]>;- writableProperties?: string[];- actionTypes?: Record<string, string>;- actionDecorators?: Record<- string,- (action: EntityActionCreator) => EntityActionCreator- >;- objectActions?: Record<string, EntityActionCreator>;- actions?: Record<string, EntityActionCreator>;- selectors?: Partial<EntitySelectors>;- createSelectors?: (- defaultSelectors: Partial<EntitySelectors>,- ) => Partial<EntitySelectors>;- objectSelectors?: Partial<Entity["objectSelectors"]>;- // Reducers in entity defs typically destructure `{ type, payload }` from the action- // and accept any payload shape, so we type the action loosely here.-- reducer?: EntitiesReducer;- wrapEntity?: Entity["wrapEntity"];- requestsReducer?: Entity["requestsReducer"];- actionShouldInvalidateLists?: Entity["actionShouldInvalidateLists"];- rtk?: EntityRtkBridge;- // Per-entity custom fields (e.g. `getAnalyticsMetadata`, `form`, `forms`).- // These are attached to the entity object and used by entity-aware machinery.-- [key: string]: any;-};--// helper for working with normalizr-// merge each entity from newEntities with existing entity, if any-// this ensures partial entities don't overwrite existing entities with more properties-export function mergeEntities<T = EntitiesState>(- entities: T,- newEntities: Partial<T>,-): T {- const result = { ...entities };- // Casting is necessary here because Object.keys always returns string[]- const ids = Object.keys(newEntities) as Array<keyof T>;-- for (const id of ids) {- const entry = newEntities[id];- if (entry == null) {- delete result[id];- } else {- result[id] = { ...(result[id] ?? {}), ...entry };- }- }- return result;-}--// helper for working with normalizr-// reducer that merges payload.entities-export function handleEntities(- actionPattern: RegExp,- entityType: string,- reducer?: EntitiesReducer,-): EntitiesReducer {- return (state, action) => {- const entities = getIn(action, ["payload", "entities", entityType]);- if (state && actionPattern.test(action.type) && entities) {- state = mergeEntities(state, entities);- }- return reducer?.(state, action) ?? state ?? {};- };-}--/**- * @deprecated use "metabase/api" instead- */-export function createEntity(def: EntityDef): Entity {- // We use a mutable object internally during construction- // then return it typed as Entity at the end.- const entity = { ...def } as Entity;-- if (!entity.nameOne) {- entity.nameOne = inflection.singularize(entity.name);- }- if (!entity.nameMany) {- entity.nameMany = entity.name;- }-- if (!entity.displayNameOne) {- entity.displayNameOne = entity.nameOne;- }- if (!entity.displayNameMany) {- entity.displayNameMany = entity.nameMany;- }-- // defaults- if (!entity.schema) {- entity.schema = new schema.Entity(entity.name);- }-- if (entity.path) {- const path = entity.path;- const defaultApi: Entity["api"] = {- list: GET(`${path}`),- create: POST(`${path}`),- get: GET(`${path}/:id`),- update: PUT(`${path}/:id`),- delete: DELETE(`${path}/:id`),- };- // merge: user-provided overrides win over path-derived defaults- entity.api = { ...defaultApi, ...entity.api };- }-- const getQueryKey = (entityQuery: EntityQuery): string =>- JSON.stringify(entityQuery || null);- const getObjectStatePath = (entityId: EntityId): (string | EntityId)[] => [- "entities",- entity.name,- entityId,- ];- const getListStatePath = (entityQuery: EntityQuery): string[] =>- ["entities", entity.name + "_list"].concat(getQueryKey(entityQuery));-- entity.getQueryKey = getQueryKey;- entity.getObjectStatePath = getObjectStatePath;- entity.getListStatePath = getListStatePath;-- const getWritableProperties = (object: EntityObject): Partial<EntityObject> =>- entity.writableProperties != null- ? _.pick(object, "id", ...entity.writableProperties)- : object;-- // ACTION TYPES- const CREATE_ACTION = `metabase/entities/${entity.name}/CREATE`;- const FETCH_ACTION = `metabase/entities/${entity.name}/FETCH`;- const UPDATE_ACTION = `metabase/entities/${entity.name}/UPDATE`;- const DELETE_ACTION = `metabase/entities/${entity.name}/DELETE`;- const FETCH_LIST_ACTION = `metabase/entities/${entity.name}/FETCH_LIST`;- const INVALIDATE_LISTS_ACTION = `metabase/entities/${entity.name}/INVALIDATE_LISTS`;-- entity.actionTypes = {- CREATE: CREATE_ACTION,- FETCH: FETCH_ACTION,- UPDATE: UPDATE_ACTION,- DELETE: DELETE_ACTION,- FETCH_LIST: FETCH_LIST_ACTION,- INVALIDATE_LISTS_ACTION: INVALIDATE_LISTS_ACTION,- ...(def.actionTypes || {}),- };-- entity.actionDecorators = {- ...(def.actionDecorators || {}),- };-- // normalize helpers- entity.normalize = (- object: EntityObject,- entitySchema: schema.Entity = entity.schema,- ) => ({- object,- [entity.nameOne]: object,- ...normalize(object, entitySchema),- });-- entity.normalizeList = (- list: EntityObject[],- entitySchema: schema.Entity = entity.schema,- ) => ({- list,- [entity.nameMany]: list,- ...normalize(list, [entitySchema]),- });-- // thunk decorators:-- // same as withRequestState, but with automatic prefix-- function withEntityRequestState(- getSubStatePath: (...args: any[]) => (string | EntityId)[],- ) {- return withRequestState((...args: any[]) => [- "entities",- entity.name,- ...getSubStatePath(...args).map(String),- ]);- }-- function withEntityActionDecorators(- action: string,- ): (fn: EntityActionCreator) => EntityActionCreator {- return entity.actionDecorators[action] || ((fn: EntityActionCreator) => fn);- }-- // `objectActions` are for actions that accept an entity as their first argument,- // and they are bound to instances when `wrapped: true` is passed to `EntityListLoader`- // compose(decorator, decorator)(fn) loses types through multiple levels; makeAction recovers them- entity.objectActions = {- fetch: compose<EntityActionCreator>(- withAction(FETCH_ACTION),- withCachedDataAndRequestState(- ({ id }: { id: EntityId }) => [...getObjectStatePath(id).map(String)],- ({ id }: { id: EntityId }) => [- ...getObjectStatePath(id).map(String),- "fetch",- ],- (entityQuery: EntityQuery) => getQueryKey(entityQuery),- ),- withEntityActionDecorators("fetch"),- )(- (entityQuery: EntityQuery, options: Record<string, unknown> = {}) =>- async (dispatch: AnyDispatch, getState: AnyGetState) =>- entity.normalize(- await entity.api.get?.(entityQuery, options, dispatch, getState),- ),- ),-- create: compose<EntityActionCreator>(- withAction(CREATE_ACTION),- withEntityRequestState(() => ["create"]),- withEntityActionDecorators("create"),- )(- (entityObject: EntityObject) =>- async (dispatch: AnyDispatch, getState: AnyGetState) => {- return entity.normalize(- await entity.api.create?.(- getWritableProperties(entityObject),- dispatch,- getState,- ),- );- },- ),-- update: compose<EntityActionCreator>(- withAction(UPDATE_ACTION),- withEntityRequestState((object: EntityObject) => [- String(object.id),- "update",- ]),- withEntityActionDecorators("update"),- )(- (- entityObject: EntityObject,- updatedObject: Partial<EntityObject> | null = null,- {- notify,- }: {- notify?: { undo?: boolean; subject?: string; verb?: string } | false;- } = {},- ) =>- async (dispatch: AnyDispatch, getState: AnyGetState) => {- // save the original object for undo- const originalObject = getObject(getState(), {- entityId: entityObject.id,- });- // If a second object is provided just take the id from the first and- // update it with all the properties in the second- if (updatedObject) {- entityObject = { id: entityObject.id, ...updatedObject };- }-- const result = entity.normalize(- await entity.api.update?.(- getWritableProperties(entityObject),- dispatch,- getState,- ),- );-- if (notify) {- if (notify.undo) {- // pick only the attributes that were updated- const undoObject = _.pick(- originalObject,- ...Object.keys(updatedObject || {}),- );- dispatch(- addUndo({- actions: [- entity.objectActions.update(- entityObject,- undoObject,- // don't show an undo for the undo- { notify: false },- ),- ],- ...notify,- }),- );- } else {- dispatch(addUndo(notify));- }- }- return result;- },- ),-- delete: compose<EntityActionCreator>(- withAction(DELETE_ACTION),- withEntityRequestState((object: EntityObject) => [- String(object.id),- "delete",- ]),- withEntityActionDecorators("delete"),- )(- (entityObject: EntityObject) =>- async (dispatch: AnyDispatch, getState: AnyGetState) => {- await entity.api.delete?.(entityObject, dispatch, getState);- return {- entities: { [entity.name]: { [entityObject.id]: null } },- result: entityObject.id,- };- },- ),-- // user defined object actions should override defaults- ...(def.objectActions || {}),- };-- // ACTION CREATORS- entity.actions = {- fetchList: compose<EntityActionCreator>(- withAction(FETCH_LIST_ACTION),- withCachedDataAndRequestState(- (entityQuery: EntityQuery) => [...getListStatePath(entityQuery)],- (entityQuery: EntityQuery) => [- ...getListStatePath(entityQuery),- "fetch",- ],- (entityQuery: EntityQuery) => entity.getQueryKey(entityQuery),- ),- )(- (entityQuery: EntityQuery = null) =>- async (dispatch: AnyDispatch, getState: AnyGetState) => {- const fetched = await entity.api.list?.(- entityQuery || EMPTY_ENTITY_QUERY,- dispatch,- getState,- );-- let results: EntityObject[] | undefined;- let metadata: Record<string, unknown> = {};-- if (!fetched || _.isArray(fetched)) {- results = fetched;- } else {- const { data, ...rest } = fetched;- results = data;- metadata = rest;- }-- if (!Array.isArray(results)) {- throw `Invalid response listing ${entity.name}`;- }- return {- ...entity.normalizeList(results),- metadata,- entityQuery,- };- },- ),-- invalidateLists: compose<EntityActionCreator>(- withAction(INVALIDATE_LISTS_ACTION),- withEntityActionDecorators("invalidateLists"),- )(() => null),-- // user defined actions should override defaults- ...entity.objectActions,- ...(def.actions || {}),- };-- entity.HACK_getObjectFromAction = (- rawAction: EntityAction | undefined,- ): EntityObject | EntityObject[] | NormalizedPayload | undefined => {- const { payload } = rawAction ?? {};- if (payload && "entities" in payload && "result" in payload) {- if (Array.isArray(payload.result)) {- return payload.result.map((id) => payload.entities![entity.name][id]);- } else {- return payload.entities![entity.name][payload.result!];- }- } else {- return payload;- }- };-- // SELECTORS-- const getEntities = (state: State) => state.entities;- const getSettings = (state: State) => state.settings;-- // OBJECT SELECTORS-- const getEntityId = (- state: State,- props: { params?: { entityId?: EntityId }; entityId?: EntityId },- ): EntityId | undefined =>- (props.params && props.params.entityId) || props.entityId;-- const getObject = createCachedSelector(- [getEntities, getEntityId],- (entities: EntitiesState, entityId: EntityId | undefined) =>- denormalize(entityId, entity.schema, entities),- )((state: State, { entityId }: { entityId?: EntityId } = {}) =>- typeof entityId === "object"- ? JSON.stringify(entityId)- : entityId- ? String(entityId)- : "",- );-- // LIST SELECTORS-- const getEntityQueryId = (- state: any,- props: { entityQuery?: EntityQuery } | null | undefined,- ): string => getQueryKey(props?.entityQuery);-- const getEntityLists = createSelector([getEntities], (entities) => {- return entities[`${entity.name}_list`] as- | Record<string, { list?: EntityId[]; metadata?: unknown }>- | undefined;- });-- const getEntityList = createSelector(- [getEntityQueryId, getEntityLists],- (- entityQueryId: string,- lists:- | Record<string, { list?: EntityId[]; metadata?: unknown }>- | undefined,- ) => lists?.[entityQueryId],- );-- const getEntityIds = createSelector(- [getEntityList],- (entityList: { list?: EntityId[]; metadata?: unknown } | undefined) =>- entityList?.list,- );-- const getListMetadata = createSelector(- [getEntityList],- (entityList: { list?: EntityId[]; metadata?: unknown } | undefined) =>- entityList?.metadata,- );-- const getList = createCachedSelector(- [getEntities, getEntityIds, getSettings],- (- entities: EntitiesState,- entityIds: EntityId[] | undefined,- settings: unknown,- ) =>- entityIds &&- entityIds- .map((entityId) =>- entity.selectors.getObject({ entities, settings }, { entityId }),- )- .filter((e): e is EntityObject => e != null),- )((state: any, props: { entityQuery?: EntityQuery } | null | undefined) =>- props?.entityQuery ? JSON.stringify(props.entityQuery) : "",- );-- // REQUEST STATE SELECTORS-- type RequestStateEntry = {- loading?: boolean;- loaded?: boolean;- fetched?: boolean;- error?: unknown;- queryKey?: string;- queryPromise?: Promise<unknown>;- };-- const getStatePath = ({- entityId,- entityQuery,- }: { entityId?: EntityId; entityQuery?: EntityQuery } = {}): (- | string- | EntityId- )[] =>- entityId != null- ? getObjectStatePath(entityId)- : getListStatePath(entityQuery);-- const getRequestStatePath = ({- entityId,- entityQuery,- requestType = "fetch",- }: {- entityId?: EntityId;- entityQuery?: EntityQuery;- requestType?: string;- } = {}): string[] => [- "requests",- ...getStatePath({ entityId, entityQuery }).map(String),- requestType,- ];-- const defaultRequestState: RequestStateEntry = {};- const getRequestState = (- state: EntitiesState,- props?: {- entityId?: EntityId;- entityQuery?: EntityQuery;- requestType?: string;- },- ): RequestStateEntry =>- getIn(state, getRequestStatePath(props)) || defaultRequestState;-- const getLoading = createSelector(- [getRequestState],- (requestState: RequestStateEntry) => requestState.loading,- );- const getLoaded = createSelector(- [getRequestState],- (requestState: RequestStateEntry) => requestState.loaded,- );- const getFetched = createSelector(- [getRequestState],- (requestState: RequestStateEntry) => requestState.fetched,- );- const getError = createSelector(- [getRequestState],- (requestState: RequestStateEntry) => requestState.error,- );-- // createSelector/createCachedSelector attach cache methods; cast to the clean selector types- const defaultSelectors: Partial<EntitySelectors> = {- getEntityIds,- getList,- getObject,- getFetched,- getLoading,- getLoaded,- getError,- getListMetadata,- };- entity.selectors = {- ...defaultSelectors,- ...(def.selectors || {}),- ...(def.createSelectors ? def.createSelectors(defaultSelectors) : {}),- } as EntitySelectors;-- entity.objectSelectors = {- getName(object: EntityObject) {- return object.name;- },- getIcon(_object: EntityObject) {- return { name: "unknown" };- },- getColor(_object: EntityObject): string | undefined {- return undefined;- },- getCollection(object: EntityObject) {- return object.collection;- },- ...(def.objectSelectors || {}),- };-- // REDUCERS-- entity.reducers = {};-- entity.reducers[entity.name] = handleEntities(- /^metabase\/entities\//,- entity.name,- def.reducer,- );-- const listReducer: Reducer<Record<string, unknown>> = (- state: Record<string, unknown> = {},- action: {- type: string;- error?: boolean;- payload?: Record<string, unknown>;- },- ) => {- if (action.error) {- return state;- }- if (action.type === FETCH_LIST_ACTION) {- if (action.payload && action.payload.result) {- const { entityQuery, metadata, result: list } = action.payload;- return {- ...state,- [getQueryKey(entityQuery)]: {- list,- metadata,- },- };- }- // NOTE: only add/remove from the "default" list (no entityQuery)- // TODO: just remove this entirely?- } else if (action.type === CREATE_ACTION && state[""]) {- return {- ...state,- "": (state[""] as EntityId[]).concat([- action.payload!.result as EntityId,- ]),- };- } else if (action.type === DELETE_ACTION && state[""]) {- return {- ...state,- "": (state[""] as EntityId[]).filter(- (id) => id !== action.payload!.result,- ),- };- }- return state;- };- entity.reducers[`${entity.name}_list`] = listReducer;-- // REQUEST STATE REDUCER-- if (!entity.actionShouldInvalidateLists) {- entity.actionShouldInvalidateLists = (action: { type: string }) =>- action.type === CREATE_ACTION ||- action.type === DELETE_ACTION ||- action.type === UPDATE_ACTION ||- action.type === INVALIDATE_LISTS_ACTION;- }-- entity.requestsReducer = (- state: RequestsStateTree = {},- action: { type: string },- ) => {- if (entity.actionShouldInvalidateLists(action)) {- return requestsReducer(- state,- setRequestUnloaded(["entities", entity.name + "_list"]),- );- }- return state ?? {};- };-- // OBJECT WRAPPER-- if (!entity.wrapEntity) {- class EntityWrapper {- [key: string]: unknown;- _dispatch: AnyDispatch | null;-- constructor(- object: { id: EntityId },- dispatch: AnyDispatch | null = null,- ) {- Object.assign(this, object);- this._dispatch = dispatch;- }- }- // object selectors- for (const [methodName, method] of Object.entries(entity.objectSelectors)) {- if (method) {- EntityWrapper.prototype[methodName] = function (- this: EntityWrapper,- ...args: unknown[]- ) {- return method(this, ...args);- };- }- }- // object actions- for (const [methodName, method] of Object.entries(entity.objectActions)) {- if (method) {- EntityWrapper.prototype[methodName] = function (- this: EntityWrapper,- ...args: unknown[]- ) {- if (this._dispatch) {- return this._dispatch(method(this, ...args));- } else {- return method(this, ...args);- }- };- }- }-- entity.wrapEntity = (- object: any,- dispatch: AnyDispatch | null = null,- ): any => new EntityWrapper(object, dispatch);- }-- // add container components and HOCs- // eslint-disable-next-line @typescript-eslint/no-require-imports -- dynamic require to avoid circular dependency- require("metabase/entities/containers").addEntityContainers(entity);-- return entity;-}--type CombinedEntities = {- entities: Record<string, Entity>;- reducers: Record<string, Reducer<Record<string, unknown>>>;- reducer: Reducer<Record<string, Record<string, unknown>>>;- requestsReducer: (- state: RequestsStateTree | undefined,- action: { type: string },- ) => RequestsStateTree;-};--export function combineEntities(entities: Entity[]): CombinedEntities {- const entitiesMap: Record<string, Entity> = {};- const reducersMap: Record<string, Reducer<Record<string, unknown>>> = {};-- for (const entity of entities) {- if (entity.name in entitiesMap) {- console.warn(`Entity with name ${entity.name} already exists!`);- } else {- entitiesMap[entity.name] = entity;- Object.assign(reducersMap, entity.reducers);- }- }-- const combinedRequestsReducer = (- state: RequestsStateTree = {},- action: { type: string },- ): RequestsStateTree => {- let current = state;- for (const entity of entities) {- if (entity.requestsReducer) {- current = entity.requestsReducer(current, action);- }- }- return current;- };-- return {- entities: entitiesMap,- reducers: reducersMap,- reducer: combineReducers(reducersMap),- requestsReducer: combinedRequestsReducer,- };-}--// OBJECT ACTION DECORATORS--export const notify = (- opts: Record<string, unknown> = {},- subject: string,- verb: string,-) => merge({ notify: { subject, verb, undo: false } }, opts || {});--export const undo = (- opts: Record<string, unknown> = {},- subject: string,- verb: string,-) => merge({ notify: { subject, verb, undo: true } }, opts || {});--/**- * Structural minimum of an RTK Query endpoint descriptor. Concrete endpoints from- * RTK Query carry many extra properties (hooks, selectors, etc.) and concrete- * argument/result types — we only rely on `initiate` here.- */--type RTKEndpoint = { initiate: (request: any, options: any) => any };--export async function entityCompatibleQuery(- entityQuery: EntityQuery,- dispatch: AnyDispatch,- endpoint: RTKEndpoint,-- { forceRefetch = true } = {},-): Promise<any> {- const request = entityQuery === EMPTY_ENTITY_QUERY ? undefined : entityQuery;- const action = dispatch(endpoint.initiate(request, { forceRefetch }));-- try {- return await action.unwrap();- } finally {- action.unsubscribe?.();- }-}diff --git a/frontend/src/metabase/utils/entities.unit.spec.ts b/frontend/src/metabase/utils/entities.unit.spec.tsdeleted file mode 100644index dcbfd44de67..00000000000--- a/frontend/src/metabase/utils/entities.unit.spec.ts+++ /dev/null@@ -1,153 +0,0 @@-import { combineReducers, configureStore } from "@reduxjs/toolkit";--import {- type RequestsStateTree,- requestsReducer,-} from "metabase/redux/requests";--import { combineEntities, createEntity, mergeEntities } from "./entities";--function getObject(id: number) {- return { id: id, name: `object${id}` };-}--function setup() {- const widgets = createEntity({- name: "widgets",- api: {- get: jest- .fn()- .mockImplementation(({ id }: { id: number }) => getObject(id)),- list: jest.fn().mockImplementation(() => [getObject(1), getObject(2)]),- },- });-- const entities = combineEntities([widgets]);-- const reducer = combineReducers({- entities: entities.reducer,- requests: (- state: RequestsStateTree | undefined,- action: { type: string; payload: Record<string, unknown> | undefined },- ) => requestsReducer(entities.requestsReducer(state, action), action),- });-- const initialState = {- entities: {- widgets: {- 1: { name: "foo " },- 2: { name: "bar" },- },- },- };-- const store = configureStore({- reducer,- preloadedState: initialState,- middleware: (getDefaultMiddleware) =>- getDefaultMiddleware({- immutableCheck: false,- serializableCheck: false,- }),- });-- return { widgets, store, initialState };-}--describe("entities", () => {- describe("getObject", () => {- it("should return an object", () => {- const { widgets, initialState } = setup();- expect(- widgets.selectors.getObject(initialState, { entityId: 1 }),- ).toEqual({ name: "foo " });- });-- it("should cache the object", () => {- const { widgets, initialState } = setup();- const a1 = widgets.selectors.getObject(initialState, { entityId: 1 });- const a2 = widgets.selectors.getObject(initialState, { entityId: 1 });- expect(a1).toBe(a2);- });-- it("should cache multiple objects", () => {- const { widgets, initialState } = setup();- const a1 = widgets.selectors.getObject(initialState, { entityId: 1 });- const b1 = widgets.selectors.getObject(initialState, { entityId: 2 });- const a2 = widgets.selectors.getObject(initialState, { entityId: 1 });- const b2 = widgets.selectors.getObject(initialState, { entityId: 2 });- expect(a1).toBe(a2);- expect(b1).toBe(b2);- });- });-- describe("fetch", () => {- it("should fetch an entity", async () => {- const { widgets, store } = setup();- await store.dispatch(widgets.actions.fetch({ id: 3 }));- const object = widgets.selectors.getObject(store.getState(), {- entityId: 3,- });- expect(object).toEqual(getObject(3));- });- });-- describe("fetchList", () => {- it("should fetch a list of entities", async () => {- const { widgets, store } = setup();- await store.dispatch(widgets.actions.fetchList());- const objects = widgets.selectors.getList(store.getState());- expect(objects).toEqual([getObject(1), getObject(2)]);- });-- it("should not call the API when the results are cached", async () => {- const { widgets, store } = setup();- await store.dispatch(widgets.actions.fetchList());- expect(widgets.api.list).toHaveBeenCalledTimes(1);-- await store.dispatch(widgets.actions.fetchList());- expect(widgets.api.list).toHaveBeenCalledTimes(1);-- await store.dispatch(widgets.actions.fetchList({ query: "abc" }));- expect(widgets.api.list).toHaveBeenCalledTimes(2);-- await store.dispatch(widgets.actions.fetchList({ query: "abc" }));- expect(widgets.api.list).toHaveBeenCalledTimes(2);-- await store.dispatch(widgets.actions.fetchList());- expect(widgets.api.list).toHaveBeenCalledTimes(2);- });- });-- describe("mergeEntities", () => {- it("add an entity", () => {- expect(- mergeEntities<Record<string, { id: number; name: string }>>(- { actions: { id: 1, name: "foo" } },- { questions: { id: 2, name: "bar" } },- ),- ).toEqual({- actions: { id: 1, name: "foo" },- questions: { id: 2, name: "bar" },- });- });-- it("merge entity keys", () => {- expect(- mergeEntities<Record<string, Record<string, string | number>>>(- { actions: { id: 1, name: "foo", prop1: 123 } },- { actions: { id: 1, name: "bar", prop2: 456 } },- ),- ).toEqual({ actions: { id: 1, name: "bar", prop1: 123, prop2: 456 } });- });-- it("delete an entity", () => {- expect(- mergeEntities(- { databases: { id: 1 }, questions: { id: 2 } },- { questions: undefined },- ),- ).toEqual({ databases: { id: 1 } });- });- });-});diff --git a/frontend/src/metabase/utils/redux/custom-context.tsx b/frontend/src/metabase/utils/redux/custom-context.tsxdeleted file mode 100644index 136986b2c6c..00000000000--- a/frontend/src/metabase/utils/redux/custom-context.tsx+++ /dev/null@@ -1,30 +0,0 @@-import type { Store } from "@reduxjs/toolkit";-import { createContext } from "react";-import { Provider } from "react-redux";-// eslint-disable-next-line no-restricted-imports-import * as ReactRedux from "react-redux";--export const MetabaseReduxContext = createContext<any>(null);--export const MetabaseReduxProvider = ({- children,- store,-}: React.PropsWithChildren & { store: Store }) => {- return (- <Provider store={store} context={MetabaseReduxContext}>- {children}- </Provider>- );-};--export const connect: typeof ReactRedux.connect = (- mapStateToProps?: any,- mapDispatchToProps?: any,- mergeProps?: any,- options?: any,-) => {- return ReactRedux.connect(mapStateToProps, mapDispatchToProps, mergeProps, {- context: MetabaseReduxContext,- ...options,- });-};diff --git a/frontend/src/metabase/utils/redux/index.ts b/frontend/src/metabase/utils/redux/index.tsdeleted file mode 100644index 260997d43d1..00000000000--- a/frontend/src/metabase/utils/redux/index.ts+++ /dev/null@@ -1,4 +0,0 @@-export * from "./utils";-export * from "./typed-utils";-export * from "./hooks";-export * from "./custom-context";diff --git a/frontend/src/metabase/utils/redux/typed-utils.ts b/frontend/src/metabase/utils/redux/typed-utils.tsdeleted file mode 100644index 83fe6cebe7a..00000000000--- a/frontend/src/metabase/utils/redux/typed-utils.ts+++ /dev/null@@ -1,35 +0,0 @@-import type { ThunkDispatch } from "@reduxjs/toolkit";-import { createAsyncThunk as createAsyncThunkOriginal } from "@reduxjs/toolkit";--import type { GetState, State } from "metabase/redux/store";--import { withAction } from "./utils";--interface ThunkConfig {- state: State;-}--export const createAsyncThunk =- createAsyncThunkOriginal.withTypes<ThunkConfig>();--// similar to createAction but accepts a (redux-thunk style) thunk and dispatches based on whether-// the promise returned from the thunk resolves or rejects, similar to redux-promise-export function createThunkAction<- TArgs extends any[],- TResult,- TActionType extends string,->(- actionType: TActionType,- thunkCreator: (- ...args: TArgs- ) => (dispatch: ThunkDispatch<any, any, any>, getState: GetState) => TResult,-): (- ...args: TArgs-) => (- dispatch: ThunkDispatch<any, any, any>,- getState: GetState,-) => Promise<{ type: TActionType; payload: Awaited<TResult> }> {- // @ts-expect-error - withAction is too hard to type correctly as it can accept both the payload or a thunk creator- // this function only uses it with a thunk creator- return withAction(actionType)(thunkCreator);-}diff --git a/frontend/src/metabase/utils/redux/utils.ts b/frontend/src/metabase/utils/redux/utils.tsdeleted file mode 100644index 3e9e392b4e0..00000000000--- a/frontend/src/metabase/utils/redux/utils.ts+++ /dev/null@@ -1,329 +0,0 @@-import { compose } from "@reduxjs/toolkit";-import { getIn } from "icepick";-import { type Schema, normalize } from "normalizr";-import _ from "underscore";--import {- setRequestError,- setRequestLoaded,- setRequestLoading,- setRequestPromise,- setRequestUnloaded,-} from "metabase/redux/requests";-import type { Dispatch, State } from "metabase/redux/store";-import { delay } from "metabase/utils/promise";--// convenience-export { combineReducers, compose } from "@reduxjs/toolkit";-export { handleActions, createAction } from "redux-actions";--// turns into id indexed map-export const resourceListToMap = <T extends { id: string | number }>(- resources: T[],-): Record<string | number, T> =>- resources.reduce(- (map, resource) => ({ ...map, [resource.id]: resource }),- {} as Record<string | number, T>,- );--export type FetchDataArgs = {- dispatch: Dispatch;- getState: () => State;- requestStatePath: string[];- existingStatePath: string[];- queryKey?: string;- getData: () => Promise<unknown>;- reload?: boolean;- properties?: string[] | null;-};--// DEPRECATED-export const fetchData = async ({- dispatch,- getState,- requestStatePath,- existingStatePath,- queryKey,- getData,- reload = false,- properties = null,-}: FetchDataArgs): Promise<unknown> => {- const existingData = getIn(getState(), existingStatePath);-- // short circuit if we have loaded data, and we're given a list of required properties, and they all exist in the loaded data- if (- !reload &&- existingData &&- properties &&- _.all(properties, (p: string) => existingData[p] !== undefined)- ) {- return existingData;- }-- const statePath = requestStatePath.concat(["fetch"]);- try {- const requestState = getIn(getState(), ["requests", ...statePath]);- if (!requestState || requestState?.error || reload) {- dispatch(setRequestLoading(statePath, queryKey));-- const queryPromise = getData();- dispatch(setRequestPromise(statePath, queryKey, queryPromise));-- const data = await queryPromise;-- // NOTE Atte Keinänen 8/23/17:- // Dispatch `setRequestLoaded` after clearing the call stack because we want to the actual data to be updated- // before we notify components via `state.requests.fetches` that fetching the data is completed- setTimeout(() => dispatch(setRequestLoaded(statePath, queryKey)));-- return data;- }-- return existingData;- } catch (error) {- dispatch(setRequestError(statePath, queryKey, error));- console.error("fetchData error", error);- return existingData;- }-};--type UpdateDataArgs = {- dispatch: Dispatch;- getState: () => State;- requestStatePath: string[];- existingStatePath?: string[];- queryKey?: string;- dependentRequestStatePaths?: string[][];- putData: () => Promise<unknown>;-};--// DEPRECATED-export const updateData = async ({- dispatch,- getState,- requestStatePath,- existingStatePath,- queryKey,- dependentRequestStatePaths,- putData,-}: UpdateDataArgs): Promise<unknown> => {- const existingData = existingStatePath- ? getIn(getState(), existingStatePath)- : null;- const statePath = requestStatePath.concat(["update"]);- try {- dispatch(setRequestLoading(statePath, queryKey));-- const queryPromise = putData();- dispatch(setRequestPromise(statePath, queryKey, queryPromise));-- const data = await queryPromise;- dispatch(setRequestLoaded(statePath, queryKey));-- (dependentRequestStatePaths || []).forEach((path) =>- dispatch(setRequestUnloaded(path)),- );-- return data;- } catch (error) {- dispatch(setRequestError(statePath, queryKey, error));- console.error(error);- return existingData;- }-};--// THUNK DECORATORS--type Thunk<R = unknown> = (- dispatch: Dispatch,- getState: () => State,-) => Promise<R> | R;--type ThunkCreator<TArgs extends unknown[], R = unknown> = (- ...args: TArgs-) => Thunk<R>;--type PayloadOrThunkCreator<TArgs extends unknown[], R = unknown> = (- ...args: TArgs-) => R | Thunk<R>;--/**- * Decorator for turning a payload creator or thunk (including one returning a promise) into a flux standard action- */-export function withAction<TArgs extends unknown[]>(actionType: string) {- return (payloadOrThunkCreator: PayloadOrThunkCreator<TArgs>) => {- function newCreator(...args: TArgs): unknown {- const payloadOrThunk = payloadOrThunkCreator(...args);- if (typeof payloadOrThunk === "function") {- // thunk, return a new thunk- return async (dispatch: Dispatch, getState: () => State) => {- try {- const payload = await (payloadOrThunk as Thunk)(dispatch, getState);- const dispatchValue = { type: actionType, payload: payload };- dispatch(dispatchValue);-- return dispatchValue;- } catch (error) {- dispatch({ type: actionType, payload: error, error: true });- throw error;- }- };- } else {- // payload, return an action- return { type: actionType, payload: payloadOrThunk };- }- }- newCreator.toString = () => actionType;- return newCreator;- };-}--/**- * Decorator that tracks the state of a request action- */-export function withRequestState<TArgs extends unknown[]>(- getRequestStatePath: (...args: TArgs) => string[],- getQueryKey?: (...args: TArgs) => string | undefined,-) {- // thunk decorator:- return (thunkCreator: ThunkCreator<TArgs>) =>- // thunk creator:- (...args: TArgs) =>- // thunk:- async (dispatch: Dispatch, getState: () => State) => {- const statePath = getRequestStatePath(...args);- const queryKey = getQueryKey && getQueryKey(...args);- try {- dispatch(setRequestLoading(statePath, queryKey));-- const queryPromise = thunkCreator(...args)(dispatch, getState);- dispatch(- setRequestPromise(- statePath,- queryKey,- queryPromise as Promise<unknown>,- ),- );-- const result = await queryPromise;-- // Dispatch `setRequestLoaded` after clearing the call stack because- // we want to the actual data to be updated before we notify- // components that fetching the data is completed- setTimeout(() => dispatch(setRequestLoaded(statePath, queryKey)));-- return result;- } catch (error) {- console.error(`Request ${statePath.join(",")} failed:`, error);- dispatch(setRequestError(statePath, queryKey, error));- throw error;- }- };-}--/**- * Decorator that returns cached data if appropriate, otherwise calls the composed thunk.- * Also tracks request state using withRequestState- */-export function withCachedDataAndRequestState<TArgs extends unknown[]>(- getExistingStatePath: (...args: TArgs) => string[],- getRequestStatePath: (...args: TArgs) => string[],- getQueryKey?: (...args: TArgs) => string | undefined,-) {- return compose(- withCachedData(getExistingStatePath, getRequestStatePath, getQueryKey),- withRequestState(getRequestStatePath, getQueryKey),- );-}--type CachedRequestState = {- loading?: boolean;- loaded?: boolean;- queryKey?: string;- error?: { status?: number };- queryPromise?: Promise<unknown>;-};--type CachedOptions = {- useCachedForbiddenError?: boolean;- reload?: boolean | (() => void);- properties?: string[];-};--// NOTE: this should be used together with withRequestState, probably via withCachedDataAndRequestState-function withCachedData<TArgs extends unknown[]>(- getExistingStatePath: (...args: TArgs) => string[],- getRequestStatePath: (...args: TArgs) => string[],- getQueryKey?: (...args: TArgs) => string | undefined,-) {- // thunk decorator:- return (thunkCreator: ThunkCreator<TArgs>) =>- // thunk creator:- (...args: TArgs) =>- // thunk:- async function thunk(- dispatch: Dispatch,- getState: () => State,- ): Promise<unknown> {- const options = (args[args.length - 1] as CachedOptions) || {};- const { useCachedForbiddenError, reload, properties } = options;-- const existingStatePath = getExistingStatePath(...args);- const requestStatePath = ["requests", ...getRequestStatePath(...args)];- const newQueryKey = getQueryKey && getQueryKey(...args);- const existingData = getIn(getState(), existingStatePath);- const { loading, loaded, queryKey, error } =- (getIn(getState(), requestStatePath) as CachedRequestState) || {};-- // Avoid requesting data with permanently forbidden access- if (useCachedForbiddenError && error?.status === 403) {- throw error;- }-- const hasRequestedProperties =- properties &&- existingData &&- _.all(properties, (p: string) => existingData[p] !== undefined);-- // return existing data if- if (- // we don't want to reload- // the check is a workaround for EntityListLoader passing reload function to children- reload !== true &&- // reload if the query used to load an entity has changed even if it's already loaded- newQueryKey === queryKey- ) {- // and we have a non-error request state or have a list of properties that all exist on the object- if (loaded || hasRequestedProperties) {- return existingData;- } else if (loading) {- const requestState = getIn(getState(), requestStatePath) as- | CachedRequestState- | undefined;- const queryPromise = requestState?.queryPromise;-- if (queryPromise) {- // wait for current loading request to be resolved- await queryPromise;-- // need to wait for next tick to allow loaded request data to be processed and avoid loops- await delay(0);-- // retry this function after waited request gets resolved- return thunk(dispatch, getState);- }-- return existingData;- }- }-- return thunkCreator(...args)(dispatch, getState);- };-}--export function withNormalize<TArgs extends unknown[]>(schema: Schema) {- return (thunkCreator: ThunkCreator<TArgs>) =>- (...args: TArgs) =>- async (dispatch: Dispatch, getState: () => State) =>- normalize(await thunkCreator(...args)(dispatch, getState), schema);-}diff --git a/frontend/src/metabase/utils/redux/utils.unit.spec.ts b/frontend/src/metabase/utils/redux/utils.unit.spec.tsdeleted file mode 100644index 50ccce4c560..00000000000--- a/frontend/src/metabase/utils/redux/utils.unit.spec.ts+++ /dev/null@@ -1,233 +0,0 @@-import { delay } from "__support__/utils";-import type { Dispatch, RequestState, State } from "metabase/redux/store";-import { createMockState } from "metabase/redux/store/mocks";-import { createMockRequestsState } from "metabase/redux/store/mocks/requests";--import { fetchData, updateData } from "./utils";--describe("Metadata", () => {- const getDefaultArgs = (- overrides: {- existingData?: string;- newData?: string;- requestState?: RequestState;- requestStateLoading?: RequestState;- requestStateLoaded?: RequestState;- requestStateError?: RequestState;- statePath?: string[];- statePathFetch?: string[];- statePathUpdate?: string[];- requestStatePath?: string[];- existingStatePath?: string[];- getState?: () => State;- dispatch?: Dispatch;- getData?: () => Promise<unknown>;- putData?: () => Promise<unknown>;- } = {},- ) => {- const existingData = overrides.existingData ?? "data";- const newData = overrides.newData ?? "new data";- const requestState = overrides.requestState;- const requestStateLoading = overrides.requestStateLoading ?? {- loading: true,- loaded: false,- fetched: false,- error: null,- _isRequestState: true as const,- };- const requestStateLoaded = overrides.requestStateLoaded ?? {- loading: false,- loaded: true,- fetched: true,- error: null,- _isRequestState: true as const,- };- const requestStateError = overrides.requestStateError ?? {- loading: false,- loaded: false,- fetched: false,- error: new Error("error"),- _isRequestState: true as const,- };- const statePath = overrides.statePath ?? ["test", "path"];- const statePathFetch =- overrides.statePathFetch ?? statePath.concat("fetch");- const statePathUpdate =- overrides.statePathUpdate ?? statePath.concat("update");- const requestStatePath = overrides.requestStatePath ?? [- "entities",- ...statePath,- ];- const existingStatePath = overrides.existingStatePath ?? statePath;- const getState =- overrides.getState ??- (() => ({- ...createMockState(),- requests: createMockRequestsState({- entities: {- test: {- path: requestState- ? { fetch: requestState, update: requestState }- : {},- },- },- }),- test: { path: existingData },- }));- const dispatch = overrides.dispatch ?? jest.fn();- const getData = overrides.getData ?? (() => Promise.resolve(newData));- const putData = overrides.putData ?? (() => Promise.resolve(newData));-- return {- dispatch,- getState,- requestStatePath,- existingStatePath,- getData,- putData,- // passthrough args constants- existingData,- newData,- requestState,- requestStateLoading,- requestStateLoaded,- requestStateError,- statePath,- statePathFetch,- statePathUpdate,- };- };-- const args = getDefaultArgs({});-- describe("fetchData()", () => {- it("should return new data if request hasn't been made", async () => {- const argsDefault = getDefaultArgs({});- const data = await fetchData(argsDefault);- await delay(10);-- expect(argsDefault.dispatch).toHaveBeenCalledTimes(3);-- expect(argsDefault.dispatch).toHaveBeenCalledWith(- expect.objectContaining({- type: "metabase/requests/SET_REQUEST_LOADING",- }),- );- expect(argsDefault.dispatch).toHaveBeenCalledWith(- expect.objectContaining({- type: "metabase/requests/SET_REQUEST_PROMISE",- }),- );- expect(argsDefault.dispatch).toHaveBeenCalledWith(- expect.objectContaining({- type: "metabase/requests/SET_REQUEST_LOADED",- }),- );-- expect(data).toEqual(args.newData);- });-- it("should return existing data if request has been made", async () => {- const argsLoading = getDefaultArgs({- requestState: args.requestStateLoading,- });- const dataLoading = await fetchData(argsLoading);- expect(argsLoading.dispatch).toHaveBeenCalledTimes(0);- expect(dataLoading).toEqual(args.existingData);-- const argsLoaded = getDefaultArgs({- requestState: args.requestStateLoaded,- });- const dataLoaded = await fetchData(argsLoaded);- expect(argsLoaded.dispatch).toHaveBeenCalledTimes(0);- expect(dataLoaded).toEqual(args.existingData);- });-- it("should return new data if previous request ended in error", async () => {- const argsError = getDefaultArgs({- requestState: args.requestStateError,- });- const dataError = await fetchData(argsError);- await delay(10);-- expect(argsError.dispatch).toHaveBeenCalledTimes(3);-- expect(argsError.dispatch).toHaveBeenCalledWith(- expect.objectContaining({- type: "metabase/requests/SET_REQUEST_LOADING",- }),- );- expect(argsError.dispatch).toHaveBeenCalledWith(- expect.objectContaining({- type: "metabase/requests/SET_REQUEST_PROMISE",- }),- );- expect(argsError.dispatch).toHaveBeenCalledWith(- expect.objectContaining({- type: "metabase/requests/SET_REQUEST_LOADED",- }),- );-- expect(dataError).toEqual(args.newData);- });-- // FIXME: this seems to make jasmine ignore the rest of the tests- // is an exception bubbling up from fetchData? why?- // how else to test return value in the catch case?- it("should return existing data if request fails", async () => {- const argsFail = getDefaultArgs({- getData: () => Promise.reject("error"),- });-- try {- const dataFail = await fetchData(argsFail);- expect(argsFail.dispatch).toHaveBeenCalledTimes(2);- expect(dataFail).toEqual(args.existingData);- } catch (error) {- return;- }- });- });-- describe("updateData()", () => {- it("should return new data regardless of previous request state", async () => {- const argsDefault = getDefaultArgs({});- const data = await updateData(argsDefault);- expect(argsDefault.dispatch).toHaveBeenCalledTimes(3);- expect(data).toEqual(args.newData);-- const argsLoading = getDefaultArgs({- requestState: args.requestStateLoading,- });- const dataLoading = await updateData(argsLoading);- expect(argsLoading.dispatch).toHaveBeenCalledTimes(3);- expect(dataLoading).toEqual(args.newData);-- const argsLoaded = getDefaultArgs({- requestState: args.requestStateLoaded,- });- const dataLoaded = await updateData(argsLoaded);- expect(argsLoaded.dispatch).toHaveBeenCalledTimes(3);- expect(dataLoaded).toEqual(args.newData);-- const argsError = getDefaultArgs({- requestState: args.requestStateError,- });- const dataError = await updateData(argsError);- expect(argsError.dispatch).toHaveBeenCalledTimes(3);- expect(dataError).toEqual(args.newData);- });-- it("should return existing data if request fails", async () => {- const argsFail = getDefaultArgs({- putData: () => {- throw new Error("test");- },- });- const data = await updateData(argsFail);- await delay(10);- expect(argsFail.dispatch).toHaveBeenCalledTimes(2);- expect(data).toEqual(args.existingData);- });- });-});diff --git a/frontend/src/metabase/utils/urls/utils.ts b/frontend/src/metabase/utils/urls/utils.tsindex e502af5597c..8debf14e514 100644--- a/frontend/src/metabase/utils/urls/utils.ts+++ b/frontend/src/metabase/utils/urls/utils.ts@@ -52,6 +52,13 @@ export function parseStringParam(value: unknown): string | undefined {return typeof value === "string" ? value : undefined;}+export function parseIntParam(value: unknown): number | undefined {+ if (typeof value === "string") {+ const number = parseInt(value);+ return Number.isFinite(number) ? number : undefined;+ }+}+export function parseNumberParam(value: unknown): number | undefined {if (typeof value === "string") {const number = parseFloat(value);diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsxindex 38621f80b0d..29e3102324f 100644--- a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx+++ b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx@@ -5,8 +5,8 @@ import {CombineColumns,hasCombinations,} from "metabase/querying/components/expressions";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";-import { useDispatch } from "metabase/utils/redux";import type { LegacyDrill } from "metabase/visualizations/types";import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsxindex cce1de0c251..38a48ef9e7a 100644--- a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx+++ b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx@@ -5,9 +5,9 @@ import {ExtractColumn,hasExtractions,} from "metabase/querying/components/expressions";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { Box, rem } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import type { LegacyDrill } from "metabase/visualizations/types";import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsxindex 83768863171..225ea2e4a93 100644--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx@@ -12,10 +12,10 @@ import { Link } from "metabase/common/components/Link";import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";import CS from "metabase/css/core/index.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { connect, useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import { Flex, Text } from "metabase/ui";import { formatValue } from "metabase/utils/formatting";-import { connect, useSelector } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import { MinColumnsError } from "metabase/visualizations/lib/errors";import {diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsxindex 1a7ddf6f469..1078fb7c7d9 100644--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx@@ -1,5 +1,5 @@+import { useDispatch } from "metabase/redux";import { Box, Button, Icon, Tooltip } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import {type ClickAction,isCustomClickAction,diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsxindex b85b7449e18..46b4149bc94 100644--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx@@ -2,10 +2,10 @@ import type { LocationDescriptorObject } from "history";import { Component } from "react";import type * as tippy from "tippy.js";+import { connect } from "metabase/redux";import type { Dispatch } from "metabase/redux/store";import { PopoverWithRef } from "metabase/ui/components/overlays/Popover/PopoverWithRef";import { getEventTarget } from "metabase/utils/dom";-import { connect } from "metabase/utils/redux";import { performAction } from "metabase/visualizations/lib/action";import type {ClickObject,diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsxindex e2a4cc623a9..742da224142 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx@@ -17,9 +17,9 @@ import {getZoomRow,getZoomedObjectId,} from "metabase/query_builder/selectors";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUser } from "metabase/selectors/user";-import { connect } from "metabase/utils/redux";import type ForeignKey from "metabase-lib/v1/metadata/ForeignKey";import { ObjectDetailWrapper } from "./ObjectDetailWrapper";diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsxindex 3d61b81bb20..6c23883e343 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx@@ -9,9 +9,9 @@ import { NotFound } from "metabase/common/components/ErrorPages";import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";import { useDatabaseListQuery } from "metabase/common/hooks";import { runQuestionQuery } from "metabase/query_builder/actions";+import { useDispatch } from "metabase/redux";import { ActionsApi, MetabaseApi } from "metabase/services";import { Modal } from "metabase/ui";-import { useDispatch } from "metabase/utils/redux";import * as Lib from "metabase-lib";import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";import { isPK } from "metabase-lib/v1/types/utils/isa";diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsxindex f4741be1d7b..04d304f97ab 100644--- a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx+++ b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx@@ -43,11 +43,11 @@ import type {} from "metabase/data-grid/types";import { withMantineTheme } from "metabase/hoc/MantineTheme";import { useTranslateContent } from "metabase/i18n/hooks";+import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { Flex, type MantineTheme } from "metabase/ui";import { getScrollBarSize } from "metabase/utils/dom";import { formatValue } from "metabase/utils/formatting";-import { useDispatch } from "metabase/utils/redux";import {getTableCellClickedObject,getTableClickedObjectRowData,diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.ts b/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.tsindex bad2da13138..03942202c1a 100644--- a/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.ts+++ b/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.ts@@ -5,8 +5,8 @@ import {getRowIndexToPKMap,getZoomedObjectId,} from "metabase/query_builder/selectors";+import { useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { useDispatch, useSelector } from "metabase/utils/redux";import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";import type { ColumnDescriptor } from "metabase/visualizations/lib/graph/columns";import { isPK } from "metabase-lib/v1/types/utils/isa";diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsxindex 7a533450e51..e1bdb082ea4 100644--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx@@ -20,6 +20,7 @@ import CS from "metabase/css/core/index.css";import DashboardS from "metabase/css/dashboard.module.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import type { ContentTranslationFunction } from "metabase/i18n/types";+import { connect } from "metabase/redux";import { getIsDownloadingToImage } from "metabase/redux/downloads";import type { Dispatch, State } from "metabase/redux/store";import { getTokenFeature } from "metabase/setup/selectors";@@ -27,7 +28,6 @@ import { getFont } from "metabase/styled-components/selectors";import type { IconName, IconProps } from "metabase/ui";import { formatNumber } from "metabase/utils/formatting";import { memoizeClass } from "metabase/utils/memoize";-import { connect } from "metabase/utils/redux";import {extractRemappings,getVisualizationTransformed,diff --git a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsxindex 19285fc2363..87270bc16c3 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx@@ -2,11 +2,11 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Icon } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { CustomMapContent } from "../Maps.styled";diff --git a/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsxindex 1d24888da1f..4beb405ce28 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx@@ -15,12 +15,12 @@ import {type MockDashboardContextProps,} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";import { publicReducers } from "metabase/reducers-public";+import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import { MetabaseReduxProvider } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import { registerVisualization } from "metabase/visualizations";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsxindex c74fdefc60d..bc37b37e52d 100644--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx@@ -19,13 +19,13 @@ import _ from "underscore";import { ExplicitSize } from "metabase/common/components/ExplicitSize";import CS from "metabase/css/core/index.css";import { useTranslateContent } from "metabase/i18n/hooks";+import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";import { useMantineTheme } from "metabase/ui";import { sumArray } from "metabase/utils/arrays";import { getCspNonce } from "metabase/utils/csp";import { getScrollBarSize } from "metabase/utils/dom";-import { connect } from "metabase/utils/redux";import {COLUMN_SHOW_TOTALS,isPivotGroupColumn,diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsxindex 2adad7a494a..badc5a7ff65 100644--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx@@ -13,6 +13,7 @@ import {import { Api } from "metabase/api";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";import { commonReducers } from "metabase/reducers-common";+import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import {createMockSettingsState,@@ -20,7 +21,6 @@ import {} from "metabase/redux/store/mocks";import { Box } from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";-import { MetabaseReduxProvider } from "metabase/utils/redux";import { registerVisualization } from "metabase/visualizations";import Visualization from "metabase/visualizations/components/Visualization";import { Table } from "metabase/visualizations/visualizations/Table/Table";diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsxindex c96d6ecdd60..f35fb4ebf9c 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx@@ -2,8 +2,8 @@ import { useDraggable } from "@dnd-kit/core";import { t } from "ttag";import { ToolbarButton } from "metabase/common/components/ToolbarButton";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Flex, Icon, Loader, Menu, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { isPivotGroupColumn } from "metabase/visualizations/lib/data_grid";import { DRAGGABLE_ID } from "metabase/visualizer/constants";import { useIsCardPristine } from "metabase/visualizer/hooks/use-is-card-pristine";diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsxindex d1ef2221b49..dc619c52bb3 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx@@ -3,6 +3,7 @@ import { useCallback, useState } from "react";import { t } from "ttag";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";+import { useDispatch, useSelector } from "metabase/redux";import {Box,Button,@@ -14,7 +15,6 @@ import {Title,} from "metabase/ui";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";-import { useDispatch, useSelector } from "metabase/utils/redux";import { useBooleanMap } from "metabase/visualizer/hooks/use-boolean-map";import { getDataSources } from "metabase/visualizer/selectors";import {diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsxindex b2489c0f3bd..70ce4e4d180 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { useListRecentsQuery, useSearchQuery } from "metabase/api";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { getDashboard } from "metabase/dashboard/selectors";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Flex, Skeleton } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import { isCartesianChart } from "metabase/visualizations";import {diff --git a/frontend/src/metabase/visualizer/components/Footer/Footer.tsx b/frontend/src/metabase/visualizer/components/Footer/Footer.tsxindex 83c689bfcdc..0877c86fd7e 100644--- a/frontend/src/metabase/visualizer/components/Footer/Footer.tsx+++ b/frontend/src/metabase/visualizer/components/Footer/Footer.tsx@@ -1,8 +1,8 @@import { useCallback } from "react";import { t } from "ttag";+import { useDispatch, useSelector } from "metabase/redux";import { Button, Flex } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import {getDatasets,getIsLoading,diff --git a/frontend/src/metabase/visualizer/components/Header/Header.tsx b/frontend/src/metabase/visualizer/components/Header/Header.tsxindex d1da03ad6bf..d5e5302250d 100644--- a/frontend/src/metabase/visualizer/components/Header/Header.tsx+++ b/frontend/src/metabase/visualizer/components/Header/Header.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import _ from "underscore";import { EditableText } from "metabase/common/components/EditableText";+import { useDispatch, useSelector } from "metabase/redux";import { ActionIcon, Button, Flex, Icon, Tooltip } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { useVisualizerHistory } from "metabase/visualizer/hooks/use-visualizer-history";import {getCurrentVisualizerState,diff --git a/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsx b/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsxindex 3bed0d579cb..b6d12bf9c36 100644--- a/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsx+++ b/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import { useSelector } from "metabase/redux";import { Box, Modal } from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import Visualization from "metabase/visualizations/components/Visualization";import { getTabularPreviewSeries } from "metabase/visualizer/selectors";diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsxindex 759d59d802b..c82bb020735 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx@@ -3,6 +3,7 @@ import { useState } from "react";import { t } from "ttag";import metabot from "assets/img/metabot-96x96.svg";+import { useSelector } from "metabase/redux";import {ActionIcon,Box,@@ -16,7 +17,6 @@ import {Title,Tooltip,} from "metabase/ui";-import { useSelector } from "metabase/utils/redux";import { isCartesianChart } from "metabase/visualizations";import Visualization from "metabase/visualizations/components/Visualization";import {diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsxindex d08cb169295..9bbd920dd29 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsx@@ -2,8 +2,8 @@ import { useDraggable, useDroppable } from "@dnd-kit/core";import cx from "classnames";import { useMemo } from "react";+import { useDispatch, useSelector } from "metabase/redux";import { Flex, type FlexProps, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import { getDefaultDimensionFilter } from "metabase/visualizations/shared/settings/cartesian-chart";import { DRAGGABLE_ID, DROPPABLE_ID } from "metabase/visualizer/constants";diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsxindex a58df2fb6e0..a4cbbd237b4 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx@@ -17,8 +17,8 @@ import {import cx from "classnames";import { Sortable } from "metabase/common/components/Sortable";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Flex, type FlexProps, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { DROPPABLE_ID } from "metabase/visualizer/constants";import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";import {diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsxindex b5e298537ef..5982109ad3f 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx@@ -3,8 +3,8 @@ import cx from "classnames";import { useCallback } from "react";import { t } from "ttag";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { DROPPABLE_ID } from "metabase/visualizer/constants";import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";import {diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsxindex 2040eaf416a..2404db8d899 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsx@@ -1,8 +1,8 @@import { useDraggable, useDroppable } from "@dnd-kit/core";import { useMemo } from "react";+import { useDispatch, useSelector } from "metabase/redux";import { Flex, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { isNotNull } from "metabase/utils/types";import { getDefaultMetricFilter } from "metabase/visualizations/shared/settings/cartesian-chart";import { DRAGGABLE_ID, DROPPABLE_ID } from "metabase/visualizer/constants";diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsxindex 953139cf694..6807b69c618 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsx@@ -1,7 +1,7 @@import { useDroppable } from "@dnd-kit/core";+import { useDispatch, useSelector } from "metabase/redux";import { Flex, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { DROPPABLE_ID } from "metabase/visualizer/constants";import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";import {diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsxindex 6abe8792dee..24f9795e1e3 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsx@@ -3,8 +3,8 @@ import cx from "classnames";import { type ReactNode, forwardRef } from "react";import { t } from "ttag";+import { useDispatch, useSelector } from "metabase/redux";import { Box, Ellipsified, Stack, Text } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { DROPPABLE_ID } from "metabase/visualizer/constants";import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";import {diff --git a/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsx b/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsxindex 4e7180d1cfb..3b0203be1b8 100644--- a/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsx+++ b/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsx@@ -10,9 +10,9 @@ import { useCallback, useEffect } from "react";import { createPortal } from "react-dom";import { useUnmount } from "react-use";+import { useDispatch, useSelector } from "metabase/redux";import type { DraggedItem } from "metabase/redux/store/visualizer";import { Box } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { DROPPABLE_ID } from "metabase/visualizer/constants";import { useVisualizerHistory } from "metabase/visualizer/hooks/use-visualizer-history";import { getDraggedItem } from "metabase/visualizer/selectors";diff --git a/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsx b/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsxindex b63407ea36b..e0879bad552 100644--- a/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { useModalOpen } from "metabase/common/hooks/use-modal-open";+import { useDispatch, useSelector } from "metabase/redux";import { Modal } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { getIsDirty } from "metabase/visualizer/selectors";import { initializeVisualizer } from "metabase/visualizer/visualizer.slice";import type { CardId, VisualizerVizDefinition } from "metabase-types/api";diff --git a/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsx b/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsxindex 3cba9bf1b3c..b8efc14d689 100644--- a/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsx@@ -11,7 +11,7 @@ import {import { usePrevious } from "react-use";import _ from "underscore";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import { getDatasets } from "metabase/visualizer/selectors";type VisualizerUiState = {diff --git a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsxindex ebd329d1068..ab47ec4bce3 100644--- a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx+++ b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx@@ -1,8 +1,8 @@import { forwardRef, useCallback, useMemo, useState } from "react";import ErrorBoundary from "metabase/ErrorBoundary";+import { useDispatch, useSelector } from "metabase/redux";import { Center } from "metabase/ui";-import { useDispatch, useSelector } from "metabase/utils/redux";import { BaseChartSettings } from "metabase/visualizations/components/ChartSettings";import { ErrorView } from "metabase/visualizations/components/Visualization/ErrorView";import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";diff --git a/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.ts b/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.tsindex 0637e4f085d..e25f8e4fa68 100644--- a/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.ts+++ b/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.ts@@ -1,8 +1,8 @@import type { Active } from "@dnd-kit/core";import { useMemo } from "react";+import { useSelector } from "metabase/redux";import type { DraggedColumn } from "metabase/redux/store/visualizer";-import { useSelector } from "metabase/utils/redux";import {getHoveredItems,getReferencedColumns,diff --git a/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.ts b/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.tsindex 5850b2497bc..59e1b396596 100644--- a/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.ts+++ b/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.ts@@ -1,7 +1,7 @@import { useMemo } from "react";import _ from "underscore";-import { useSelector } from "metabase/utils/redux";+import { useSelector } from "metabase/redux";import type { VisualizerDataSource } from "metabase-types/api";import {diff --git a/frontend/src/metabase/visualizer/hooks/use-visualizer-history.ts b/frontend/src/metabase/visualizer/hooks/use-visualizer-history.tsindex 42bdfbf87be..7b5af24faa9 100644--- a/frontend/src/metabase/visualizer/hooks/use-visualizer-history.ts+++ b/frontend/src/metabase/visualizer/hooks/use-visualizer-history.ts@@ -1,4 +1,4 @@-import { useDispatch, useSelector } from "metabase/utils/redux";+import { useDispatch, useSelector } from "metabase/redux";import { getCanRedo, getCanUndo } from "../selectors";import { redo, undo } from "../visualizer.slice";diff --git a/frontend/src/metabase/visualizer/visualizer.slice.ts b/frontend/src/metabase/visualizer/visualizer.slice.tsindex bb8d21af6b4..46676d5a93d 100644--- a/frontend/src/metabase/visualizer/visualizer.slice.ts+++ b/frontend/src/metabase/visualizer/visualizer.slice.ts@@ -17,8 +17,8 @@ import type {VisualizerVizDefinitionWithColumns,VisualizerVizDefinitionWithColumnsAndFallbacks,} from "metabase/redux/store/visualizer";+import { createAsyncThunk, createThunkAction } from "metabase/redux/utils";import { clone } from "metabase/utils/clone";-import { createAsyncThunk, createThunkAction } from "metabase/utils/redux";import { isCartesianChart } from "metabase/visualizations";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import type {diff --git a/frontend/test/__support__/storybook.tsx b/frontend/test/__support__/storybook.tsxindex e78e79902b3..da6b6776a80 100644--- a/frontend/test/__support__/storybook.tsx+++ b/frontend/test/__support__/storybook.tsx@@ -7,13 +7,13 @@ import { useEffect, useMemo } from "react";import { SdkThemeProvider } from "embedding-sdk-bundle/components/private/SdkThemeProvider";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";import { mainReducers } from "metabase/reducers-main";+import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import { StaticVisualization } from "metabase/static-viz/components/StaticVisualization";import { createStaticRenderingContext } from "metabase/static-viz/lib/rendering-context";import type { MantineThemeOverride } from "metabase/ui";import { Box } from "metabase/ui";-import { MetabaseReduxProvider } from "metabase/utils/redux";import Visualization from "metabase/visualizations/components/Visualization";import type { RawSeries } from "metabase-types/api";diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsxindex da26556b57b..1e9a85d5b32 100644--- a/frontend/test/__support__/ui.tsx+++ b/frontend/test/__support__/ui.tsx@@ -25,6 +25,7 @@ import { baseStyle } from "metabase/css/core/base.styled";import { HistoryProvider } from "metabase/history";import { makeMainReducers } from "metabase/reducers-main";import { publicReducers } from "metabase/reducers-public";+import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import { RouterProvider } from "metabase/router";@@ -34,7 +35,6 @@ import { ThemeProvider, useMantineTheme } from "metabase/ui";import { mutateColors } from "metabase/ui/colors/colors";import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";import { PUT } from "metabase/utils/api";-import { MetabaseReduxProvider } from "metabase/utils/redux";import MetabaseSettings from "metabase/utils/settings";import { getStore } from "./entities-store";