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
Create current-user module (#79357)
Fraser8dbbb58c575a
diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.tsindex 00221ab3c45..5033405c8b8 100644--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts@@ -28,8 +28,12 @@ import { getWindow } from "embedding-sdk-shared/lib/get-window";import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";import type { SdkAuthState } from "embedding-sdk-shared/types/auth-state";import { SDK_AUTH_STATE_KEY } from "embedding-sdk-shared/types/auth-state";-import { loadCurrentUser, refetchCurrentUser, userApi } from "metabase/api";import { PLUGIN_API } from "metabase/api/client";+import {+ currentUserApi,+ loadCurrentUser,+ refetchCurrentUser,+} from "metabase/current-user";import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils";import { getSessionTokenHeaders } from "metabase/embedding/lib/auth/get-session-token-headers";import { setApiKeyHeader } from "metabase/embedding/lib/auth/set-api-key-header";@@ -101,7 +105,7 @@ PLUGIN_EMBEDDING_SDK_AUTH.initAuth = async (}),);dispatch(- userApi.util.upsertQueryData(+ currentUserApi.util.upsertQueryData("getCurrentUser",undefined,authState.user,diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsx b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsxindex b9bdd3cc36d..0d40d1def74 100644--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsx@@ -7,8 +7,8 @@ import { useQuestionAlertModalContext } from "embedding-sdk-bundle/components/primport { useSdkSelector } from "embedding-sdk-bundle/store";import { getIsGuestEmbed } from "embedding-sdk-bundle/store/selectors";import { useHasEmailSetup } from "metabase/common/hooks";+import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/current-user";import type { QuestionAlertsButtonProps } from "metabase/plugins";-import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { isInstanceAnalyticsCollection } from "metabase-enterprise/collections/utils";/**diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsxindex 27e890a03b5..5890e231c5a 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.tsx@@ -16,12 +16,12 @@ import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { canUserCreateQueries } from "metabase/current-user";import type { DataSourceSelectorProps } from "metabase/embedding-sdk/types/components/data-picker";import { connect } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";import { fetchTableMetadata } from "metabase/redux/tables";import { getMetadata } from "metabase/selectors/metadata";-import { canUserCreateQueries } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { Box, Popover } from "metabase/ui";import type Question from "metabase-lib/v1/Question";diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsxindex 160b834ce1e..2a92cb7061c 100644--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx@@ -15,8 +15,8 @@ import {import { Tree } from "metabase/common/components/tree";import type { ITreeNodeItem } from "metabase/common/components/tree/types";import CS from "metabase/css/core/index.css";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { Box, Icon } from "metabase/ui";import type {Collection,diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsxindex bdc53ccb73c..e81beac540b 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx@@ -13,8 +13,8 @@ import {getGroupNameLocalized,isAdminGroup,} from "metabase/common/utils/groups";+import { getUser } from "metabase/current-user";import { PLUGIN_TENANTS } from "metabase/plugins";-import { getUser } from "metabase/selectors/user";import type { Group } from "metabase-types/api";import { APPLICATION_PERMISSIONS_OPTIONS } from "./constants";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsxindex ec632277f8b..4fd5bc9c2f5 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx@@ -3,14 +3,14 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";+import {+ canUserCreateNativeQueries,+ canUserCreateQueries,+} from "metabase/current-user";import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { setOpenModalWithProps } from "metabase/redux/ui";import { useNavigate } from "metabase/router";-import {- canUserCreateNativeQueries,- canUserCreateQueries,-} from "metabase/selectors/user";import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsxindex be7cc937ab1..1e15549a1cb 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.tsx@@ -2,8 +2,8 @@ import { useDisclosure } from "@mantine/hooks";import { t } from "ttag";import { Link } from "metabase/common/components/Link";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";import { dataStudioArchivedSnippets } from "metabase/urls";import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store-auth.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store-auth.unit.spec.tsxindex 8b39045eeaf..5770b0119ea 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store-auth.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store-auth.unit.spec.tsx@@ -3,7 +3,7 @@ import fetchMock from "fetch-mock";import { setupCurrentUserEndpoint } from "__support__/server-mocks";import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";-import { getUser } from "metabase/selectors/user";+import { getUser } from "metabase/current-user";import { createMockUser } from "metabase-types/api/mocks";import { useHostSdkStore } from "./use-host-sdk-store";diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store.ts b/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store.tsindex 10004189adf..8ab41305d57 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store.ts+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/runtime/lib/use-host-sdk-store.ts@@ -7,7 +7,7 @@ import { setPluginsReady } from "embedding-sdk-bundle/store/reducer";import type { MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-provider";import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";import { SdkLoadingState } from "embedding-sdk-shared/types/sdk-loading";-import { loadCurrentUser } from "metabase/api";+import { loadCurrentUser } from "metabase/current-user";type SdkStore = ReturnType<typeof getSdkStore>;diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsxindex a3213c9d2f9..e6a697256b0 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx@@ -18,8 +18,8 @@ import { getErrorMessage } from "metabase/api/utils";import { Link } from "metabase/common/components/Link";import { useToast } from "metabase/common/hooks/use-toast";import { hasDbRoutingEnabled } from "metabase/common/utils/database";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {Alert,diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsxindex 0f89ae12ec4..02e418b7c78 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx@@ -5,8 +5,8 @@ import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/componentimport { useListDatabasesQuery } from "metabase/api";import { ForwardRefLink, Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Icon, Menu, Text, UnstyledButton } from "metabase/ui";import * as Urls from "metabase-enterprise/urls";import type { Database, DatabaseId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsxindex c45de60c57d..41cb78fb9cf 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/utils.tsx@@ -2,8 +2,8 @@ import type { ReactNode } from "react";import { jt, t } from "ttag";import { Link } from "metabase/common/components/Link";+import { getUser } from "metabase/current-user";import type { AdminPathKey, State } from "metabase/redux/store";-import { getUser } from "metabase/selectors/user";import type {PermissionSubject,SpecialGroupType,diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsxindex f5d1297f1fe..4ed04de5d42 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx@@ -15,6 +15,7 @@ import {useHasTokenFeature,useStoreUrl,} from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import {CONTENT_MAX_WIDTH,ContactAdminAlert,@@ -23,7 +24,6 @@ import {getStorageNotProvisionedSubtitle,} from "metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import {Alert,Anchor,diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsxindex 5cf89a4a8d9..7e4cf8596d6 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx@@ -6,8 +6,8 @@ import { t } from "ttag";import { Api, skipToken } from "metabase/api";import { tag } from "metabase/api/tags";import { getErrorMessage } from "metabase/api/utils";+import { getUser } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import StatusLarge from "metabase/status/components/StatusLarge";import { useGetGsheetsFolderQuery } from "metabase-enterprise/api";import { EnterpriseApi } from "metabase-enterprise/api/api";diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsxindex 1cdab7833ad..3a66c92b348 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useStoreUrl } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { _FileUploadErrorModal } from "metabase/status/components/FileUploadStatusLarge/FileUploadErrorModal";import { Box, Button, Modal, Stack, Text } from "metabase/ui";diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsxindex 11b847d6ab8..dec807905b9 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 } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {useDeleteGsheetsFolderLinkMutation,diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.tsindex 66586febfdb..b144ff30b41 100644--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts@@ -3,8 +3,8 @@ import { t } from "ttag";import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";import { useStoreUrl, useToast } from "metabase/common/hooks";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { useLicense } from "metabase-enterprise/settings/hooks/use-license";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsxindex 93ceef2e94e..e70a13a1fef 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx@@ -4,6 +4,7 @@ import { jt, t } from "ttag";import { useRefreshTokenStatusMutation } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";+import { getUserIsAdmin } from "metabase/current-user";import {useAIProviderConfigurationContext,useUpdateMetabotSettingsMutation,@@ -11,7 +12,6 @@ import {import { MetabotManagedProviderLimitActions } from "metabase/metabot/components/MetabotManagedProviderLimit";import type { MetabaseAIProviderSetupProps } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {Anchor,diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewText/ModerationReviewText.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewText/ModerationReviewText.tsxindex 1c7ec22ecc3..9152200a261 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewText/ModerationReviewText.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewText/ModerationReviewText.tsx@@ -1,6 +1,6 @@import { skipToken, useGetUserQuery } from "metabase/api";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { FixedSizeIcon, Flex, Text } from "metabase/ui";import { getRelativeTime } from "metabase/utils/time-dayjs";import {diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsxindex 40dad5fc9de..a9d5cf25440 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 { getUser } from "metabase/current-user";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { getUser } from "metabase/selectors/user";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 d38e3a6cafb..490018137a4 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { Icon, Menu } from "metabase/ui";import type { Card, Dashboard, ModerationReview } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/selectors.ts b/enterprise/frontend/src/metabase-enterprise/moderation/selectors.tsindex 0196896ba56..dfbf90364e9 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/moderation/selectors.ts@@ -1,5 +1,5 @@+import { getUserIsAdmin } from "metabase/current-user";import type { State } from "metabase/redux/store";-import { getUserIsAdmin } from "metabase/selectors/user";export const getIsModerator = (state: State) => {return getUserIsAdmin(state);diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands.tsindex df34d3354ea..7dd4a799923 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands.ts@@ -1,8 +1,8 @@+import { getUserIsAdmin } from "metabase/current-user";import { getMetabotConversation } from "metabase/metabot/state";import type { MetabotSlashCommandHandler } from "metabase/plugins/oss/audit";import { addUndo } from "metabase/redux/undo";import { navigate } from "metabase/router";-import { getUserIsAdmin } from "metabase/selectors/user";import * as Urls from "metabase/urls";export const handleMetabotSlashCommand: MetabotSlashCommandHandler = ({diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsxindex c7543ce0ff9..03e0df82e70 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/pages/DependencyDiagnosticsPage.tsx@@ -1,6 +1,6 @@import { useEffect, useMemo, useRef } from "react";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";+import { useUserKeyValue } from "metabase/current-user";import { useLocation, useNavigate } from "metabase/router";import type * as Urls from "metabase/urls";import { DependencyDiagnostics } from "metabase-enterprise/monitor/dependency-diagnostics/components";diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.tsxindex ce9554e340d..dc3d724a1ee 100644--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.tsx@@ -3,8 +3,8 @@ import { msgid, ngettext, t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { Link } from "metabase/common/components/Link";import { useHasTokenFeature } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useAdminSetting } from "metabase/settings";import { Alert, Anchor, Group, Switch, Text } from "metabase/ui";import { useGetMfaAdminOverviewQuery } from "metabase-enterprise/api";diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.tsxindex def337617a5..6a7e8046431 100644--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.tsx@@ -1,8 +1,8 @@import { useMemo, useState } from "react";import { t } from "ttag";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { ActionIcon, Icon, Menu, type TreeTableColumnDef } from "metabase/ui";import { useListEnrolledMfaUsersQuery } from "metabase-enterprise/api";import type { MfaEnrolledUser, UserId } from "metabase-types/api";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 56e4df321e8..9cc051c8709 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@@ -1,8 +1,8 @@import { t } from "ttag";+import { getUserIsAdmin } from "metabase/current-user";import type { GitSyncSetupMenuItemProps } from "metabase/plugins/types";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { FixedSizeIcon, Text, Tooltip, UnstyledButton } from "metabase/ui";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsxindex a7d2d32f5ab..63d9e43f776 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx@@ -2,8 +2,8 @@ import { useState } from "react";import { msgid, ngettext, t } from "ttag";import { useToast } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import {Button,Combobox,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsxindex e5f714a4ef6..52fe750d2c0 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx@@ -2,8 +2,8 @@ import { msgid, ngettext, t } from "ttag";import { ActionButton } from "metabase/common/components/ActionButton";import { useToast } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { Button, Group, Modal, Progress, Stack, Text } from "metabase/ui";import { useCancelRemoteSyncCurrentTaskMutation } from "metabase-enterprise/api";import type { RemoteSyncOutcome, 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 c535d9e85db..a0c4bdd3640 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,5 +1,5 @@+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useAdminSetting } from "metabase/settings";import { BRANCH_KEY, REMOTE_SYNC_KEY, TYPE_KEY } from "../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsxindex fc46c6c3060..ab6e2dd200f 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 { getUserIsAdmin } from "metabase/current-user";import type { SourceReplacementButtonProps } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useListSourceReplacementRunsQuery } from "metabase-enterprise/api";export function SourceReplacementButton({diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsxindex e109c527c88..0bb0f0c4abc 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { Link } from "metabase/common/components/Link";+import { getUserIsAdmin } from "metabase/current-user";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 * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/index.ts b/enterprise/frontend/src/metabase-enterprise/replacement/index.tsindex b0563f0f770..4d0e08a3f19 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/replacement/index.ts@@ -1,5 +1,5 @@+import { getUserIsAdmin } from "metabase/current-user";import { PLUGIN_REPLACEMENT } from "metabase/plugins";-import { getUserIsAdmin } from "metabase/selectors/user";import { hasPremiumFeature } from "metabase-enterprise/settings";import { SourceReplacementButton } from "./components/SourceReplacementButton";diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/hooks/useSchemaPreferencesStore.ts b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/hooks/useSchemaPreferencesStore.tsindex 5f241dda88e..5730807abdc 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/hooks/useSchemaPreferencesStore.ts+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/hooks/useSchemaPreferencesStore.ts@@ -1,7 +1,7 @@import { useCallback, useState } from "react";import { usePrevious } from "react-use";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";+import { useUserKeyValue } from "metabase/current-user";import type {ConcreteTableId,DatabaseId,diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.ts b/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.tsindex 91dc06d32ca..4e98960c581 100644--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.ts+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/pages/SchemaViewerPage/useRedirectToLastDatabase.ts@@ -1,7 +1,7 @@import { useEffect, useMemo, useRef } from "react";import { useListDatabasesQuery } from "metabase/api";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";+import { useUserKeyValue } from "metabase/current-user";import { useNavigate } from "metabase/router";import * as Urls from "metabase/urls";import type { DatabaseId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsxindex db6bb2ad58b..edb1215d50c 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.tsx@@ -7,9 +7,9 @@ import {useListSecurityAdvisoriesQuery,} from "metabase/api";import { getPlan } from "metabase/common/utils/plan";+import { getUserIsAdmin } from "metabase/current-user";import { NavbarPromoCard } from "metabase/nav/components/NavbarPromoCard";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Icon } from "metabase/ui";diff --git a/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.ts b/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.tsindex c18458a427a..3502166e022 100644--- a/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.ts+++ b/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.ts@@ -9,8 +9,8 @@ import {useHasTokenFeature,useToast,} from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";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 38d08b26efa..74f638d9169 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@@ -9,9 +9,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 { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { useLocation, useParams } from "metabase/router";-import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Flex, Stack, Text } from "metabase/ui";import { extractRemappedColumns } from "metabase/visualizations";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsxindex 9e003cd08df..1a2663775de 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx@@ -3,9 +3,9 @@ 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 { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { Outlet } from "metabase/router";-import { getUserIsAdmin } from "metabase/selectors/user";type Props = {children?: ReactNode;diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsxindex 304b5ec926d..8f0ed4010a0 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx@@ -9,6 +9,7 @@ import { CreateCollectionForm } from "metabase/common/collections/components/Creimport type { CreateCollectionProperties } from "metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm";import { buildCollectionTree } from "metabase/common/collections/utils";import { Tree } from "metabase/common/components/tree";+import { getIsTenantUser, getUserIsAdmin } from "metabase/current-user";import {PaddedSidebarLink,SidebarHeading,@@ -16,7 +17,6 @@ import {} 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 { useSetting } from "metabase/settings";import { ActionIcon, Flex, Icon, Modal, Tooltip } from "metabase/ui";import {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsxindex c17c528a55c..bf28ffa386a 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 { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { Outlet } from "metabase/router";-import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Group, Tabs, Title } from "metabase/ui";import { useListTenantsQuery } from "metabase-enterprise/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsxindex 5de0cee4990..ca960f486bd 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx@@ -17,6 +17,7 @@ import {} from "metabase/common/collections/utils";import { modalRoute } from "metabase/common/components/ModalRoute";import { getGroupNameLocalized } from "metabase/common/utils/groups";+import { getIsTenantUser, getUserIsAdmin } from "metabase/current-user";import {PLUGIN_ADMIN_PERMISSIONS_TABS,PLUGIN_ADMIN_USER_MENU_ROUTES,@@ -24,7 +25,6 @@ import {} from "metabase/plugins";import { useSelector } from "metabase/redux";import { Route, redirect } from "metabase/router";-import { getIsTenantUser, getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { useSetting } from "metabase/settings";import { Box, Text } from "metabase/ui";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 a9fedb57e57..6735d746cee 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,9 +4,9 @@ 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 { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {Button,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsxindex b0d69bf60c3..7e775d662d9 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx@@ -1,10 +1,10 @@import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux/hooks";import { useParams } from "metabase/router";import { getStoreUsers } from "metabase/selectors/store-users";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { TransformHeader } from "metabase/transforms/components/TransformHeader";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.tsindex 9d19db9ec72..2299ef41e69 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts@@ -1,5 +1,5 @@+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {useGetBillingInfoQuery,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 9db5467fb44..e579151e705 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@@ -5,10 +5,10 @@ import { jt, t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";import { LineDecorator } from "metabase/common/components/upsells/components/LineDecorator";+import { getUserIsAdmin } from "metabase/current-user";import { useMetadataToasts } from "metabase/metadata/hooks/useMetadataToasts";import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";-import { getUserIsAdmin } from "metabase/selectors/user";import { TransformsHeader } from "metabase/transforms/components/TransformsHeader";import { EnableTransformsCard } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard";import { Button, Center, Flex, Text, Title } from "metabase/ui";diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex b684247f596..f8f13d32c8c 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -99,6 +99,11 @@ const elements = [createElement({ type: "shared", name: "search-ui", pattern }),),createElement({ type: "shared", name: "common" }),+ createElement({+ type: "shared",+ name: "current-user",+ enforcePublicApi: true,+ }),createElement({type: "shared",name: "custom-viz",diff --git a/frontend/lint/shared-tiers.mjs b/frontend/lint/shared-tiers.mjsindex 023208b4f91..4b337d160b1 100644--- a/frontend/lint/shared-tiers.mjs+++ b/frontend/lint/shared-tiers.mjs@@ -23,7 +23,9 @@ const SHARED_UTILS_LEVELS = [["shared/redux"],// U3 — the plugin registry, and instance settings over the api and store.["shared/plugins", "shared/settings"],- // U4 — app services over the store and registry.+ // U4 — the current user, composed over the plugin registry for application permissions.+ ["shared/current-user"],+ // U5 — app services over the store, registry and current user.["shared/selectors","shared/content-translation",@@ -32,7 +34,7 @@ const SHARED_UTILS_LEVELS = ["shared/archive","shared/hooks",],- // U5 — composition over the levels below.+ // U6 — composition over the levels below.// The store factory composes reducers, plugin middlewares, and the router.["shared/hoc",diff --git a/frontend/src/embedding-sdk-bundle/sdk-bundle-exports.ts b/frontend/src/embedding-sdk-bundle/sdk-bundle-exports.tsindex bbe4363bcd6..bd764695422 100644--- a/frontend/src/embedding-sdk-bundle/sdk-bundle-exports.ts+++ b/frontend/src/embedding-sdk-bundle/sdk-bundle-exports.ts@@ -23,7 +23,7 @@ import {getAvailableFonts,getLoginStatus,} from "embedding-sdk-bundle/store/selectors";-import { getUser } from "metabase/selectors/user";+import { getUser } from "metabase/current-user";import { useInitData } from "./hooks/private/use-init-data";import { useLogVersionInfo } from "embedding-sdk-bundle/hooks/private/use-log-version-info";import { createDashboard } from "embedding-sdk-bundle/lib/create-dashboard";diff --git a/frontend/src/embedding-sdk-bundle/store/collections.ts b/frontend/src/embedding-sdk-bundle/store/collections.tsindex dbf155ffb7e..41267d883b2 100644--- a/frontend/src/embedding-sdk-bundle/store/collections.ts+++ b/frontend/src/embedding-sdk-bundle/store/collections.ts@@ -1,14 +1,16 @@import { createSelector } from "@reduxjs/toolkit";import { P, match } from "ts-pattern";-import {- getUserPersonalCollectionId,- getUserTenantCollectionId,-} from "metabase/selectors/user";+import { getUser, getUserPersonalCollectionId } from "metabase/current-user";import type { CollectionId, RegularCollectionId } from "metabase-types/api";import type { SdkCollectionId } from "../types/collection";+const getUserTenantCollectionId = createSelector(+ [getUser],+ (user) => user?.tenant_collection_id,+);+/*** Converts "personal", "tenant", and "root" to the ids accepted by the api* For the root collection id, the API expects null.diff --git a/frontend/src/metabase/AppKBarProvider.tsx b/frontend/src/metabase/AppKBarProvider.tsxindex 81a7f8b4788..34e8c5ddcad 100644--- a/frontend/src/metabase/AppKBarProvider.tsx+++ b/frontend/src/metabase/AppKBarProvider.tsx@@ -2,11 +2,11 @@ import { KBarProvider, useKBar, useRegisterActions } from "kbar";import { type PropsWithChildren, useMemo } from "react";import { getPerformanceAdminPaths } from "metabase/admin/performance/constants/complex";+import { getUserIsAdmin } from "metabase/current-user";import type { PaletteAction } from "metabase/palette/types";import { PLUGIN_CACHING } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getAdminPaths } from "metabase/selectors/admin";-import { getUserIsAdmin } from "metabase/selectors/user";export const AppKBarProvider = ({ children }: PropsWithChildren) => (<KBarProvider>diff --git a/frontend/src/metabase/LoadCurrentUser.tsx b/frontend/src/metabase/LoadCurrentUser.tsxindex f56a6c55ba2..76dbeff62ef 100644--- a/frontend/src/metabase/LoadCurrentUser.tsx+++ b/frontend/src/metabase/LoadCurrentUser.tsx@@ -1,7 +1,7 @@import type { ReactNode } from "react";import { useEffect, useState } from "react";-import { loadCurrentUser } from "metabase/api";+import { loadCurrentUser } from "metabase/current-user";import { useDispatch } from "metabase/redux";import { Outlet } from "metabase/router";diff --git a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsxindex 4fc6e6ef07e..81e8bc6249a 100644--- a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx+++ b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx@@ -1,6 +1,6 @@+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";import { useLocation, useNavigate } from "metabase/router";-import { getUser } from "metabase/selectors/user";import AccountLayout from "../../components/AccountLayout";diff --git a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsxindex 94e91ad2355..5ccc9c572d7 100644--- a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx+++ b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx@@ -5,9 +5,9 @@ import {useUpdateSubscriptionMutation,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";import { useSearchParams } from "metabase/router";-import { getUser } from "metabase/selectors/user";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 fe1db302948..62021aa1fae 100644--- a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx+++ b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx@@ -6,13 +6,13 @@ import {useListNotificationsQuery,useListSubscriptionsQuery,} from "metabase/api";-import type { NotificationListItem } from "metabase/notifications/types";-import { useSelector } from "metabase/redux";-import { Outlet, useNavigate } from "metabase/router";import {canManageSubscriptions as canManageSubscriptionsSelector,getUser,-} from "metabase/selectors/user";+} from "metabase/current-user";+import type { NotificationListItem } from "metabase/notifications/types";+import { useSelector } from "metabase/redux";+import { Outlet, useNavigate } from "metabase/router";import { parseTimestamp } from "metabase/utils/time-dayjs";import { getArchiveUrl, getHelpUrl, getUnsubscribeUrl } from "../../actions";diff --git a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsxindex 554dd07ad19..4e47cbe1e66 100644--- a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx@@ -8,10 +8,10 @@ import {} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks/use-toast";+import { getUser } from "metabase/current-user";import { UnsubscribeConfirmModal } from "metabase/notifications/modals/UnsubscribeConfirmModal";import { useSelector } from "metabase/redux";import { useNavigate } from "metabase/router";-import { getUser } from "metabase/selectors/user";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 ba8f1904981..ca187051615 100644--- a/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx@@ -2,9 +2,9 @@ import { skipToken } from "@reduxjs/toolkit/query/react";import { useGetSubscriptionQuery, useUnsubscribeMutation } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";import { useNavigate } from "metabase/router";-import { getUser } from "metabase/selectors/user";import { getArchiveUrl } 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 0aaed934b43..5edb1503196 100644--- a/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx+++ b/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx@@ -1,8 +1,8 @@import { getIsSsoUser } from "metabase/account/selectors";import { useValidatePassword } from "metabase/common/hooks";+import { getUser } from "metabase/current-user";import { PLUGIN_MULTI_FACTOR_AUTH } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { Stack } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx b/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsxindex 661a6c15bc1..fefb2d0bf94 100644--- a/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx+++ b/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx@@ -1,7 +1,7 @@import { getIsSsoUser } from "metabase/account/selectors";+import { getUser } from "metabase/current-user";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { getUser } from "metabase/selectors/user";import { checkNotNull } from "metabase/utils/types";import { updateUser } from "../../actions";diff --git a/frontend/src/metabase/account/selectors.ts b/frontend/src/metabase/account/selectors.tsindex cbc190bcec6..b0fb480934c 100644--- a/frontend/src/metabase/account/selectors.ts+++ b/frontend/src/metabase/account/selectors.ts@@ -1,7 +1,7 @@import { createSelector } from "@reduxjs/toolkit";+import { getUser } from "metabase/current-user";import { PLUGIN_IS_PASSWORD_USER } from "metabase/plugins";-import { getUser } from "metabase/selectors/user";export const getIsSsoUser = createSelector(getUser, (user) => {if (!user) {diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsxindex aa886934a02..f0a02e1f36d 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -12,8 +12,8 @@ import { FormField } from "metabase/common/components/FormField";import { SidebarContent } from "metabase/common/components/SidebarContent";import { TextArea } from "metabase/common/components/TextArea";import { useUniqueId } from "metabase/common/hooks/use-unique-id";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { ActionIcon, Icon, Switch, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/admin/app/reducers.ts b/frontend/src/metabase/admin/app/reducers.tsindex a5cd9442896..e25533284a8 100644--- a/frontend/src/metabase/admin/app/reducers.ts+++ b/frontend/src/metabase/admin/app/reducers.ts@@ -1,7 +1,7 @@import { createReducer } from "@reduxjs/toolkit";import { t } from "ttag";-import { userApi } from "metabase/api";+import { currentUserApi } from "metabase/current-user";import { PLUGIN_ADMIN_ALLOWED_PATH_GETTERS } from "metabase/plugins";import { combineReducers } from "metabase/redux";import type { AdminPath, AdminPathKey } from "metabase/redux/store";@@ -61,7 +61,7 @@ export const getAdminPaths: () => AdminPath[] = () => {const paths = createReducer(getAdminPaths(), (builder) => {builder.addMatcher(- userApi.endpoints.getCurrentUser.matchFulfilled,+ currentUserApi.endpoints.getCurrentUser.matchFulfilled,(state, { payload: user }) => {if (user?.is_superuser) {return state;diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsxindex 4cb36261911..8aca338830d 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx@@ -6,9 +6,9 @@ import { Link } from "metabase/common/components/Link";import { useDocsUrl } from "metabase/common/hooks";import { getHelpUrl } from "metabase/common/utils/help-url";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {ActionIcon,diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsxindex 84a7ae904e7..7454b9b0296 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx@@ -11,6 +11,7 @@ import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";import { GenericError } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";import { ReturnToSetupGuideModal } from "metabase/embedding/components/ReturnToSetupGuideModal";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";import { usePageTitle } from "metabase/hooks/use-page-title";@@ -22,7 +23,6 @@ import {} from "metabase/plugins";import { connect, useSelector } from "metabase/redux";import { Outlet, useParams } from "metabase/router";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Box, Divider, Flex } from "metabase/ui";import type { DatabaseId, Database as DatabaseType } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsxindex a4e92d52775..7e548e52ee3 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx@@ -5,9 +5,9 @@ import {useListDatabasesQuery,} from "metabase/api";import { LoadingAndGenericErrorWrapper } from "metabase/common/components/LoadingAndGenericErrorWrapper";+import { getUserIsAdmin } from "metabase/current-user";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { isSyncInProgress } from "metabase/utils/syncing";diff --git a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsxindex 4a49da7b955..75f030a32b0 100644--- a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx@@ -3,10 +3,10 @@ import { useEffect } from "react";import { useGetSegmentQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";+import { getUser } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { useParams } from "metabase/router";-import { getUser } from "metabase/selectors/user";import { checkNotNull } from "metabase/utils/types";import { RevisionHistory } from "../components/revisions/RevisionHistory";diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsxindex dd5a197c244..67948dfb791 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx@@ -11,11 +11,11 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { trackSegmentCreateStarted } from "metabase/common/data-studio/analytics";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector } from "metabase/redux";import { useLocation } from "metabase/router";import { getShallowTables } from "metabase/selectors/metadata";-import { getUserIsAdmin } from "metabase/selectors/user";import { Button } from "metabase/ui";import * as Urls from "metabase/urls";import type { Segment } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsxindex 32491c943a2..4b1c7ae4bf1 100644--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx@@ -7,9 +7,9 @@ import { Link } from "metabase/common/components/Link";import { PaginationControls } from "metabase/common/components/PaginationControls";import { usePagination } from "metabase/common/hooks/use-pagination";import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";+import { getUser } from "metabase/current-user";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 { getFullName } from "metabase/utils/user";import type { Group, Member, Membership } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx b/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsxindex cf227b3dcd6..dafdc1572f7 100644--- a/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx+++ b/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx@@ -6,9 +6,9 @@ import {useListUserMembershipsQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";import { useParams } from "metabase/router";-import { getUser } from "metabase/selectors/user";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 1fc2d2e840e..5275ce59ec0 100644--- a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx@@ -13,9 +13,9 @@ import {useUpdatePermissionsGroupMutation,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUserIsAdmin } from "metabase/current-user";import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import type { Group } 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 9da82726c99..320284c2fa9 100644--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx@@ -5,10 +5,10 @@ import { SettingsSection } from "metabase/admin/components/SettingsSection";import { useListPermissionsGroupsQuery, useListUsersQuery } from "metabase/api";import { Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUser, getUserIsAdmin } from "metabase/current-user";import { PLUGIN_TENANTS } from "metabase/plugins";import { useSelector } from "metabase/redux";import { Outlet } from "metabase/router";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Box, Button, Flex, Group, Tabs, Title } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/admin/people/selectors.ts b/frontend/src/metabase/admin/people/selectors.tsindex bc6df46b278..a52cbccfc32 100644--- a/frontend/src/metabase/admin/people/selectors.ts+++ b/frontend/src/metabase/admin/people/selectors.ts@@ -2,8 +2,8 @@ import { createSelector } from "@reduxjs/toolkit";import { ACTIVE_USERS_NUDGE_THRESHOLD } from "metabase/admin/people/constants";import { hasAnySsoFeature } from "metabase/common/utils/plan";+import { getUserIsAdmin } from "metabase/current-user";import type { State } from "metabase/redux/store";-import { getUserIsAdmin } from "metabase/selectors/user";import { getSetting } from "metabase/settings";export const getUserTemporaryPassword = (diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsxindex 5fb38bf784d..a91ab30c2c2 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx@@ -4,13 +4,13 @@ import { AdminNavWrapper } from "metabase/admin/components/AdminNav";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";import { useHasTokenFeature } from "metabase/common/hooks";import { getPlan, isProPlan } from "metabase/common/utils/plan";+import { getUserIsAdmin } from "metabase/current-user";import {PLUGIN_DATA_APPS,PLUGIN_REMOTE_SYNC,PLUGIN_SECURITY_CENTER,} from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Box, Divider, Flex } from "metabase/ui";diff --git a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsxindex f2f9bb64a62..ba2eff12abb 100644--- a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx@@ -19,8 +19,8 @@ import {screen,waitFor,} from "__support__/ui";-import { useGetCurrentUserQuery } from "metabase/api";import { UndoListing } from "metabase/common/components/UndoListing";+import { useGetCurrentUserQuery } from "metabase/current-user";import { PLUGIN_HOMEPAGE_SETTING } from "metabase/plugins";import { createMockSettingsState } from "metabase/redux/store/mocks";import {diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.tsindex c54e82bccce..fce64ed0526 100644--- a/frontend/src/metabase/api/index.ts+++ b/frontend/src/metabase/api/index.ts@@ -49,4 +49,3 @@ export * from "./transform";export * from "./transform-job";export * from "./transform-tag";export * from "./user";-export * from "./user-key-value";diff --git a/frontend/src/metabase/api/user.ts b/frontend/src/metabase/api/user.tsindex 669eccb9cfc..959429c54da 100644--- a/frontend/src/metabase/api/user.ts+++ b/frontend/src/metabase/api/user.ts@@ -1,5 +1,3 @@-import type { TagDescription } from "@reduxjs/toolkit/query";-import type {CreateUserRequest,ListUsersRequest,@@ -18,20 +16,6 @@ import {provideUserListTags,provideUserTags,} from "./tags";-import type { TagType } from "./tags/constants";--const provideCurrentUserTags = (user: User): TagDescription<TagType>[] => {- const tags = [idTag("current-user", user.id)];-- // api/dashboard.ts invalidates this tag when the homepage dashboard is archived.- if (user.custom_homepage) {- tags.push(- idTag("user-homepage-dashboard", user.custom_homepage.dashboard_id),- );- }-- return tags;-};export const userApi = Api.injectEndpoints({endpoints: (builder) => ({@@ -59,16 +43,6 @@ export const userApi = Api.injectEndpoints({}),providesTags: (user) => (user ? provideUserTags(user) : []),}),- getCurrentUser: builder.query<User, void>({- query: () => ({- method: "GET",- url: "/api/user/current",- }),- providesTags: (user) => (user ? provideCurrentUserTags(user) : []),- // Don't garbage-collect the current user from the cache- // since it's used in many places and we don't want to refetch it unnecessarily.- keepUnusedDataFor: Infinity,- }),createUser: builder.mutation<User, CreateUserRequest>({query: (body) => ({method: "POST",@@ -141,29 +115,13 @@ export const userApi = Api.injectEndpoints({query: () => "/api/mt/user/attributes",providesTags: (response) => (response ? [listTag("user")] : []),}),- updateUserModalQbnewb: builder.mutation<void, UserId>({- query: (id) => ({- method: "PUT",- url: `/api/user/${id}/modal/qbnewb`,- }),- invalidatesTags: (_, error, id) =>- invalidateTags(error, [idTag("user", id), idTag("current-user", id)]),- }),}),});-export const loadCurrentUser = () =>- userApi.endpoints.getCurrentUser.initiate();--export const refetchCurrentUser = () =>- userApi.endpoints.getCurrentUser.initiate(undefined, { forceRefetch: true });-export const {useListUsersQuery,useListUserRecipientsQuery,useGetUserQuery,- useGetCurrentUserQuery,- useLazyGetCurrentUserQuery,useCreateUserMutation,useUpdatePasswordMutation,useDeactivateUserMutation,@@ -171,5 +129,4 @@ export const {useUpdateUserMutation,useGetPasswordResetUrlMutation,useListUserAttributesQuery,- useUpdateUserModalQbnewbMutation,} = userApi;diff --git a/frontend/src/metabase/app-main.ts b/frontend/src/metabase/app-main.tsindex 0d895ebc015..9c36b3fa4e6 100644--- a/frontend/src/metabase/app-main.ts+++ b/frontend/src/metabase/app-main.ts@@ -5,12 +5,12 @@ import "metabase-dev";import { Api } from "metabase/api";import { PLUGIN_API, api } from "metabase/api/client";import { init } from "metabase/app";+import { getUser } from "metabase/current-user";import { setRequestClientHeaders } from "metabase/embedding/lib/auth/set-request-client-headers";import { mainReducers } from "metabase/reducers-main";import { setErrorPage } from "metabase/redux/app";import { navigate } from "metabase/router";import { getRoutes } from "metabase/routes";-import { getUser } from "metabase/selectors/user";import { IFRAMED_IN_SELF, isWithinIframe } from "metabase/utils/iframe";// Let embedded children detect that their parent is a Metabase instance.diff --git a/frontend/src/metabase/app.tsx b/frontend/src/metabase/app.tsxindex ca863928fcd..39cd69438ad 100644--- a/frontend/src/metabase/app.tsx+++ b/frontend/src/metabase/app.tsx@@ -33,6 +33,7 @@ import { AppThemeProvider } from "metabase/AppThemeProvider";import { createSnowplowTracker } from "metabase/analytics";import { DelayedLoadingSpinner } from "metabase/common/components/DelayedLoading/DelayedLoading";import { ModifiedBackend } from "metabase/common/components/dnd/ModifiedBackend";+import { getUserId } from "metabase/current-user";import { registerDashboardVisualizations } from "metabase/dashboard/visualizations/register";import { initializeInteractiveEmbedding } from "metabase/embedding/interactive-embedding";import { MetabotProvider } from "metabase/metabot/context";@@ -45,7 +46,6 @@ import {RouterProvider,createLocationMirror,} from "metabase/router";-import { getUserId } from "metabase/selectors/user";import { refetchSiteSettings } from "metabase/settings";import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";import { PortalContainer } from "metabase/ui";diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsxindex 8bad3654e17..66bc47f2f37 100644--- a/frontend/src/metabase/app/nav/AppBar.tsx+++ b/frontend/src/metabase/app/nav/AppBar.tsx@@ -12,6 +12,7 @@ import {getIsSearchVisible,} from "metabase/app/selectors";import { useInitialCollectionId } from "metabase/common/collections/hooks";+import { getUser } from "metabase/current-user";import {getCommentSidebarOpen,getSidebarOpen,@@ -28,7 +29,6 @@ import { useDispatch, useSelector } from "metabase/redux";import { closeNavbar, toggleNavbar } from "metabase/redux/app";import { useLocation, useNavigate, useParams } from "metabase/router";import { getDetailViewState, getIsNavbarOpen } from "metabase/selectors/app";-import { getUser } from "metabase/selectors/user";import { modelToUrl } from "metabase/urls";import { isWithinIframe } from "metabase/utils/iframe";import type { SearchResult } from "metabase-types/api";diff --git a/frontend/src/metabase/app/nav/Navbar.tsx b/frontend/src/metabase/app/nav/Navbar.tsxindex 98a96b48727..304e6c54217 100644--- a/frontend/src/metabase/app/nav/Navbar.tsx+++ b/frontend/src/metabase/app/nav/Navbar.tsx@@ -1,6 +1,7 @@import { useMemo } from "react";import { useListDatabasesQuery } from "metabase/api";+import { getUser } from "metabase/current-user";import { getDashboard } from "metabase/dashboard/shell-selectors";import { AdminNavbar } from "metabase/nav/components/AdminNavbar";import { MainNavbar } from "metabase/nav/containers/MainNavbar";@@ -9,7 +10,6 @@ import type { AdminPath, State, StoreDashboard } from "metabase/redux/store";import { useLocation, useParams } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";import { getIsNavbarOpen } from "metabase/selectors/app";-import { getUser } from "metabase/selectors/user";import type { User } from "metabase-types/api";type NavbarProps = {diff --git a/frontend/src/metabase/app/selectors.ts b/frontend/src/metabase/app/selectors.tsindex f8460eb1875..5dd9494ed80 100644--- a/frontend/src/metabase/app/selectors.ts+++ b/frontend/src/metabase/app/selectors.ts@@ -1,5 +1,6 @@import { createSelector } from "@reduxjs/toolkit";+import { getUser } from "metabase/current-user";import {getDashboard,getDashboardId,@@ -14,7 +15,6 @@ import {} from "metabase/query_builder/selectors/question";import type { State } from "metabase/redux/store";import { type RouterProps, getDetailViewState } from "metabase/selectors/app";-import { getUser } from "metabase/selectors/user";import * as Urls from "metabase/urls";import { selectIsWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.tsxindex 9a88a849be5..6d5a3825f94 100644--- a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.tsx@@ -7,9 +7,9 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";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 * as Urls from "metabase/urls";import { newDatabase } from "metabase/urls";diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsxindex f0497f9c212..2089119467b 100644--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx@@ -9,9 +9,9 @@ import { ForwardRefLink, Link } from "metabase/common/components/Link";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";import { useDocsUrl } from "metabase/common/hooks";+import { canUserCreateQueries } from "metabase/current-user";import { PLUGIN_CONTENT_VERIFICATION, PLUGIN_LIBRARY } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { canUserCreateQueries } from "metabase/selectors/user";import {ActionIcon,Box,diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsxindex ba9c2f789f4..67ec9fd0280 100644--- a/frontend/src/metabase/browse/models/BrowseModels.tsx+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx@@ -7,15 +7,15 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { ForwardRefLink } from "metabase/common/components/Link";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { useDocsUrl } from "metabase/common/hooks";+import {+ canUserCreateNativeQueries,+ canUserCreateQueries,+} from "metabase/current-user";import {PLUGIN_COLLECTIONS,PLUGIN_CONTENT_VERIFICATION,} from "metabase/plugins";import { useSelector } from "metabase/redux";-import {- canUserCreateNativeQueries,- canUserCreateQueries,-} from "metabase/selectors/user";import {ActionIcon,Box,diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsxindex 329c8f2df3d..34d6694a592 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx@@ -6,10 +6,10 @@ import { BrowseGrid } from "metabase/browse/components/BrowseGrid";import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";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 { isSyncInProgress } from "metabase/utils/syncing";import type Metadata from "metabase-lib/v1/metadata/Metadata";diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsxindex f24fb83a7ba..4ede8125c1c 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx@@ -5,8 +5,8 @@ import {useListDatabasesQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import type { CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsxindex bec317f52f3..c84bc31d9c0 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx@@ -6,12 +6,12 @@ import {isInstanceAnalyticsCollection,isRootTrashCollection,} from "metabase/common/collections/utils";+import { getIsTenantUser, getUser } from "metabase/current-user";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 type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx b/frontend/src/metabase/comments/components/Discussion/Discussion.tsxindex d77635f6023..c45a4255c6e 100644--- a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx+++ b/frontend/src/metabase/comments/components/Discussion/Discussion.tsx@@ -11,8 +11,8 @@ import { useCommentUrl } from "metabase/comments/hooks/use-comment-url";import type { CommentExtraRenderer } from "metabase/comments/types";import { getCommentNodeId } from "metabase/comments/utils";import { useToast } from "metabase/common/hooks";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { Avatar, Stack, Timeline, rem } from "metabase/ui";import type {Comment,diff --git a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsxindex ea6aaacd9db..24ed2e24b25 100644--- a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx+++ b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx@@ -7,8 +7,8 @@ import { t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";import type { CommentExtraRenderer } from "metabase/comments/types";import { formatCommentDate, getCommentNodeId } from "metabase/comments/utils";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { Avatar, Box, Group, Icon, Text, Timeline, Tooltip } from "metabase/ui";import type { Comment, DocumentContent } from "metabase-types/api";diff --git a/frontend/src/metabase/comments/components/Discussion/Reaction.tsx b/frontend/src/metabase/comments/components/Discussion/Reaction.tsxindex 86638c38881..4cfebad46fa 100644--- a/frontend/src/metabase/comments/components/Discussion/Reaction.tsx+++ b/frontend/src/metabase/comments/components/Discussion/Reaction.tsx@@ -1,8 +1,8 @@import cx from "classnames";import { useCallback, useMemo } from "react";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { Flex, Text, Tooltip } from "metabase/ui";import type { CommentReaction } from "metabase-types/api";diff --git a/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsxindex d2ea527af33..ccbefc657ba 100644--- a/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx+++ b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx@@ -10,6 +10,7 @@ import {import { listTag } from "metabase/api/tags";import { isRootCollection } from "metabase/common/collections/utils";import { useConfirmation } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useMetadataToasts } from "metabase/metadata/hooks";import {PLUGIN_LIBRARY,@@ -18,7 +19,6 @@ import {} from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { getUserIsAdmin } from "metabase/selectors/user";import {ActionIcon,Box,diff --git a/frontend/src/metabase/common/collections/containers/FormAuthorityLevelFieldContainer.tsx b/frontend/src/metabase/common/collections/containers/FormAuthorityLevelFieldContainer.tsxindex d07eb661ed2..b60ad4fe799 100644--- a/frontend/src/metabase/common/collections/containers/FormAuthorityLevelFieldContainer.tsx+++ b/frontend/src/metabase/common/collections/containers/FormAuthorityLevelFieldContainer.tsx@@ -1,6 +1,6 @@+import { getUserIsAdmin } from "metabase/current-user";import { PLUGIN_COLLECTION_COMPONENTS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";export function FormAuthorityLevelField() {const isAdmin = useSelector(getUserIsAdmin);diff --git a/frontend/src/metabase/common/collections/hooks.ts b/frontend/src/metabase/common/collections/hooks.tsindex 4ce98156fc7..e242729ab7a 100644--- a/frontend/src/metabase/common/collections/hooks.ts+++ b/frontend/src/metabase/common/collections/hooks.ts@@ -2,10 +2,10 @@ import { useMemo } from "react";import { skipToken, useGetCollectionQuery } from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import { getUser, getUserPersonalCollectionId } from "metabase/current-user";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { useSelector } from "metabase/redux";import type { Location } from "metabase/router";-import { getUser, getUserPersonalCollectionId } from "metabase/selectors/user";import * as Urls from "metabase/urls/collections";import type { Collection, CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/common/collections/utils.ts b/frontend/src/metabase/common/collections/utils.tsindex 901a97f8444..0e48b8b363a 100644--- a/frontend/src/metabase/common/collections/utils.ts+++ b/frontend/src/metabase/common/collections/utils.ts@@ -4,9 +4,9 @@ import {canPlaceEntityInCollection as canPlaceEntityInCollectionImpl,canPlaceEntityInCollectionOrDescendants as canPlaceEntityInCollectionOrDescendantsImpl,} from "metabase/common/data-studio/collection-utils";+import { getUserPersonalCollectionId } from "metabase/current-user";import { PLUGIN_COLLECTIONS, PLUGIN_LIBRARY } from "metabase/plugins";import type { State } from "metabase/redux/store";-import { getUserPersonalCollectionId } from "metabase/selectors/user";import type { IconProps } from "metabase/ui";import { color } from "metabase/ui/colors";import type { ColorName } from "metabase/ui/colors/types";diff --git a/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx b/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsxindex a016b2ab542..a4f6713fe8f 100644--- a/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx+++ b/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx@@ -1,8 +1,8 @@import type { ReactNode } from "react";import { EmptyState } from "metabase/common/components/EmptyState";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import type { IconName } from "metabase-types/api";/** AdminAwareEmptyState is a component that candiff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsxindex c96bb8ce6aa..8e36503ff04 100644--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx@@ -1,8 +1,8 @@import dayjs from "dayjs";+import { getUserIsAdmin } from "metabase/current-user";import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting, useUserSetting } from "metabase/settings";import { isWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts b/frontend/src/metabase/common/components/ErrorPages/use-error-info.tsindex e9707a80219..4c0915cbedf 100644--- a/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts+++ b/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts@@ -5,8 +5,8 @@ import { datasetApi } from "metabase/api";import { useLazyGetBugReportDetailsQuery } from "metabase/api/bug-report";import { useLazyListLogsQuery } from "metabase/api/logger";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";+import { getUser, getUserIsAdmin } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import type { ErrorPayload, ReportableEntityName } from "./types";import { getBrowserInfo, getEntityDetails, hasQueryData } from "./utils";diff --git a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsxindex d5beadd05ee..a1686283fa1 100644--- a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx+++ b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx@@ -3,8 +3,8 @@ import type { MouseEventHandler } from "react";import { t } from "ttag";import { DateTime } from "metabase/common/components/DateTime";+import { getUser } from "metabase/current-user";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 type { NamedUser } from "metabase/utils/user";diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsxindex 9749452d7ec..639ea14e321 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx@@ -7,11 +7,10 @@ import {useListCollectionDashboardQuestionCandidatesQuery,useMoveCollectionDashboardQuestionCandidatesMutation,} from "metabase/api";-import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";+import { getUserIsAdmin, useUserAcknowledgement } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { useNavigate } from "metabase/router";-import { getUserIsAdmin } from "metabase/selectors/user";import * as Urls from "metabase/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 9ccc9bf4c5b..83ad58174e6 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 { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";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 1c0e66ec081..eac6a0d7b03 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx@@ -1,11 +1,11 @@import { useListDatabasesQuery } from "metabase/api";-import { getHasDatabaseWithJsonEngine } from "metabase/databases/utils/predicates";-import { useDispatch, useSelector } from "metabase/redux";-import { closeNavbar } from "metabase/redux/app";import {canUserCreateNativeQueries,canUserCreateQueries,-} from "metabase/selectors/user";+} from "metabase/current-user";+import { getHasDatabaseWithJsonEngine } from "metabase/databases/utils/predicates";+import { useDispatch, useSelector } from "metabase/redux";+import { closeNavbar } from "metabase/redux/app";import { NewItemMenuView } from "./NewItemMenuView";diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsxindex 3d7e0a94976..f3e392d2cc1 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx@@ -3,11 +3,11 @@ import { useMemo } from "react";import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";+import { getUserCanWriteToCollections } from "metabase/current-user";import { NewMenuItemAIExploration } from "metabase/metabot/components/NewMenuItemAIExploration";import { useUserMetabotPermissions } from "metabase/metabot/hooks";import { useDispatch, useSelector } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";-import { getUserCanWriteToCollections } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { Box, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsxindex ca80d975d55..8c15510e3c2 100644--- a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx+++ b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx@@ -1,7 +1,7 @@import { useMount } from "react-use";-import { useLazyGetCurrentUserQuery } from "metabase/api";import { NotFound } from "metabase/common/components/ErrorPages";+import { useLazyGetCurrentUserQuery } from "metabase/current-user";import { useNavigate } from "metabase/router";export const NotFoundFallbackPage = () => {diff --git a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsxindex b9acffea248..093d04d75fe 100644--- a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx+++ b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { useGetMostRecentlyViewedDashboardQuery } from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { canPlaceEntityInCollectionOrDescendants } from "metabase/common/data-studio/collection-utils";+import { getUserPersonalCollectionId } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserPersonalCollectionId } from "metabase/selectors/user";import * as Urls from "metabase/urls";import type { Card, Dashboard } from "metabase-types/api";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 79669750a35..3b3d8208ae5 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,9 +5,9 @@ import { EntityIcon } from "metabase/common/components/EntityIcon";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { VirtualizedList } from "metabase/common/components/VirtualizedList";import { useTranslateContent } from "metabase/content-translation/hooks";+import { getIsTenantUser } from "metabase/current-user";import { PLUGIN_MODERATION } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getIsTenantUser } from "metabase/selectors/user";import {Box,type BoxProps,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 987e5f04cd8..402c051ae36 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@@ -13,9 +13,9 @@ import {useGetPersonalCollection,useHasTokenFeature,} from "metabase/common/hooks";+import { getUser, getUserIsAdmin } from "metabase/current-user";import { PLUGIN_LIBRARY, PLUGIN_TENANTS } from "metabase/plugins";import { type DispatchFn, useDispatch, useSelector } from "metabase/redux";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import type {Collection,diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsxindex 92b7420894a..62307fad502 100644--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx@@ -4,13 +4,13 @@ import { t } from "ttag";import { ExportSettingsWidget } from "metabase/common/components/ExportSettingsWidget";import { Link } from "metabase/common/components/Link";import { useDocsUrl } from "metabase/common/hooks";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import type {ExportFormat,TableExportFormat,} from "metabase/common/types/export";import { exportFormatPng, exportFormats } from "metabase/common/types/export";import CS from "metabase/css/core/index.css";+import { useUserKeyValue } from "metabase/current-user";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";import { useUserSetting } from "metabase/settings";import {diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsxindex ea302eaa685..d30ea3a13af 100644--- a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx@@ -18,9 +18,9 @@ import {getEntityTypeFromCardType,isInstanceAnalyticsCollection,} from "metabase/common/collections/utils";+import { getUser } from "metabase/current-user";import { FormProvider } from "metabase/forms";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";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/UserHasSeen/UserHasSeen.tsx b/frontend/src/metabase/common/components/UserHasSeen/UserHasSeen.tsxindex 4cd8117f687..cd8d597c7fc 100644--- a/frontend/src/metabase/common/components/UserHasSeen/UserHasSeen.tsx+++ b/frontend/src/metabase/common/components/UserHasSeen/UserHasSeen.tsx@@ -1,6 +1,6 @@import { useContext, useEffect } from "react";-import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";+import { useUserAcknowledgement } from "metabase/current-user";import { UserHasSeenAllContext } from "./UserHasSeenAllContext";diff --git a/frontend/src/metabase/common/components/UserHasSeen/UserHasSeenAllContext.tsx b/frontend/src/metabase/common/components/UserHasSeen/UserHasSeenAllContext.tsxindex 8050c7be135..b911cc63774 100644--- a/frontend/src/metabase/common/components/UserHasSeen/UserHasSeenAllContext.tsx+++ b/frontend/src/metabase/common/components/UserHasSeen/UserHasSeenAllContext.tsx@@ -6,7 +6,7 @@ import {useState,} from "react";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";+import { useUserKeyValue } from "metabase/current-user";const EMPTY_ARRAY: string[] = [];diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsxindex 25b97d6f187..06f407a7160 100644--- a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsx@@ -8,9 +8,9 @@ import {trackUpsellClicked,trackUpsellViewed,} from "metabase/common/components/upsells/components/analytics";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { getStoreUsers } from "metabase/selectors/store-users";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {Box,diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsxindex c7ae30c05f1..15f24bfecd6 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 { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";/*** we should wrap all upsell components in this HoC to ensure that they are only rendered for adminsdiff --git a/frontend/src/metabase/common/data-studio/selectors.ts b/frontend/src/metabase/common/data-studio/selectors.tsindex 730b42c1fd8..e185e1f5df0 100644--- a/frontend/src/metabase/common/data-studio/selectors.ts+++ b/frontend/src/metabase/common/data-studio/selectors.ts@@ -1,6 +1,6 @@+import { getUserIsAdmin, getUserIsAnalyst } from "metabase/current-user";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import type { State } from "metabase/redux/store";-import { getUserIsAdmin, getUserIsAnalyst } from "metabase/selectors/user";import { isWithinIframe } from "metabase/utils/iframe";// Must be in sync with CanAccessDataStudio in frontend/src/metabase/data-studio/route-guards.tsxdiff --git a/frontend/src/metabase/common/hooks/use-get-personal-collection.ts b/frontend/src/metabase/common/hooks/use-get-personal-collection.tsindex 86d626a1bb4..f00942cf264 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 { getUserPersonalCollectionId } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserPersonalCollectionId } from "metabase/selectors/user";/*** gets the personal collection for the current userdiff --git a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts b/frontend/src/metabase/common/hooks/use-locale/use-locale.tsindex 58d7afd7ee5..2a052f0a089 100644--- a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts+++ b/frontend/src/metabase/common/hooks/use-locale/use-locale.ts@@ -1,9 +1,9 @@import { useContext } from "react";import { useInstanceLocale } from "metabase/common/hooks/use-instance-locale";+import { getUser } from "metabase/current-user";import { FrontendLocaleContext } from "metabase/embedding/LocaleProvider";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";/** Get the user's locale or, if that has not been set, the instance locale*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 e7c17c1f039..d7fef7aadea 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 { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";/**diff --git a/frontend/src/metabase/common/monitor/selectors.ts b/frontend/src/metabase/common/monitor/selectors.tsindex 3df7a0e1238..0d1915a36c4 100644--- a/frontend/src/metabase/common/monitor/selectors.ts+++ b/frontend/src/metabase/common/monitor/selectors.ts@@ -1,9 +1,9 @@-import type { State } from "metabase/redux/store";import {getUser,getUserIsAdmin,getUserIsAnalyst,-} from "metabase/selectors/user";+} from "metabase/current-user";+import type { State } from "metabase/redux/store";import { isWithinIframe } from "metabase/utils/iframe";export function canAccessMonitorDiagnostics(state: State) {diff --git a/frontend/src/metabase/current-user/api/current-user.ts b/frontend/src/metabase/current-user/api/current-user.tsnew file mode 100644index 00000000000..785c6747fde--- /dev/null+++ b/frontend/src/metabase/current-user/api/current-user.ts@@ -0,0 +1,53 @@+import type { TagDescription } from "@reduxjs/toolkit/query";++import { Api } from "metabase/api/api";+import type { TagType } from "metabase/api/tags";+import { idTag, invalidateTags } from "metabase/api/tags";+import type { User, UserId } from "metabase-types/api";++const provideCurrentUserTags = (user: User): TagDescription<TagType>[] => {+ const tags = [idTag("current-user", user.id)];++ // api/dashboard.ts invalidates this tag when the homepage dashboard is archived.+ if (user.custom_homepage) {+ tags.push(+ idTag("user-homepage-dashboard", user.custom_homepage.dashboard_id),+ );+ }++ return tags;+};++export const currentUserApi = Api.injectEndpoints({+ endpoints: (builder) => ({+ getCurrentUser: builder.query<User, void>({+ query: () => ({+ method: "GET",+ url: "/api/user/current",+ }),+ providesTags: (user) => (user ? provideCurrentUserTags(user) : []),+ // Don't garbage-collect the current user from the cache+ // since it's used in many places and we don't want to refetch it unnecessarily.+ keepUnusedDataFor: Infinity,+ }),+ updateUserModalQbnewb: builder.mutation<void, UserId>({+ query: (id) => ({+ method: "PUT",+ url: `/api/user/${id}/modal/qbnewb`,+ }),+ invalidatesTags: (_, error, id) =>+ invalidateTags(error, [idTag("user", id), idTag("current-user", id)]),+ }),+ }),+});++export const loadCurrentUser = () =>+ currentUserApi.endpoints.getCurrentUser.initiate();++export const refetchCurrentUser = () =>+ currentUserApi.endpoints.getCurrentUser.initiate(undefined, {+ forceRefetch: true,+ });++export const { useGetCurrentUserQuery, useLazyGetCurrentUserQuery } =+ currentUserApi;diff --git a/frontend/src/metabase/api/user.unit.spec.ts b/frontend/src/metabase/current-user/api/current-user.unit.spec.tssimilarity index 85%rename from frontend/src/metabase/api/user.unit.spec.tsrename to frontend/src/metabase/current-user/api/current-user.unit.spec.tsindex cf1347292cc..f51ab6084a8 100644--- a/frontend/src/metabase/api/user.unit.spec.ts+++ b/frontend/src/metabase/current-user/api/current-user.unit.spec.ts@@ -3,10 +3,10 @@ import fetchMock from "fetch-mock";import { getStore } from "__support__/entities-store";import { findRequests } from "__support__/server-mocks";+import { Api } from "metabase/api/api";import { createMockUser } from "metabase-types/api/mocks";-import { Api } from "./api";-import { userApi } from "./user";+import { currentUserApi } from "./current-user";let activeStore: ReturnType<typeof getStore> | undefined;@@ -18,7 +18,7 @@ function setup() {return { store };}-describe("userApi", () => {+describe("currentUserApi", () => {afterEach(() => {// Drop the store's RTK Query subscriptions before pulling the fetch routes,// otherwise orphaned subscriptions refetch against removed routes.@@ -35,7 +35,7 @@ describe("userApi", () => {const { store } = setup();const { data } = await store.dispatch(- userApi.endpoints.getCurrentUser.initiate(),+ currentUserApi.endpoints.getCurrentUser.initiate(),);expect(data?.id).toBe(7);@@ -51,7 +51,9 @@ describe("userApi", () => {const { store } = setup();- await store.dispatch(userApi.endpoints.updateUserModalQbnewb.initiate(7));+ await store.dispatch(+ currentUserApi.endpoints.updateUserModalQbnewb.initiate(7),+ );await waitFor(async () => {const puts = await findRequests("PUT");diff --git a/frontend/src/metabase/api/user-key-value.ts b/frontend/src/metabase/current-user/api/user-key-value.tssimilarity index 97%rename from frontend/src/metabase/api/user-key-value.tsrename to frontend/src/metabase/current-user/api/user-key-value.tsindex 33b8644e485..942139df6e4 100644--- a/frontend/src/metabase/api/user-key-value.ts+++ b/frontend/src/metabase/current-user/api/user-key-value.ts@@ -1,11 +1,10 @@+import { Api } from "metabase/api/api";import type {DeleteUserKeyValueRequest,GetUserKeyValueRequest,UpdateUserKeyValueRequest,} from "metabase-types/api";-import { Api } from "./api";-export const userKeyValueApi = Api.injectEndpoints({endpoints: (builder) => ({getUserKeyValue: builder.query<any, GetUserKeyValueRequest>({diff --git a/frontend/src/metabase/current-user/index.ts b/frontend/src/metabase/current-user/index.tsnew file mode 100644index 00000000000..2fc10465dc2--- /dev/null+++ b/frontend/src/metabase/current-user/index.ts@@ -0,0 +1,23 @@+export {+ currentUserApi,+ loadCurrentUser,+ refetchCurrentUser,+ useGetCurrentUserQuery,+ useLazyGetCurrentUserQuery,+} from "./api/current-user";+export {+ canAccessSettings,+ canManageSubscriptions,+ canUserCreateNativeQueries,+ canUserCreateQueries,+ getIsTenantUser,+ getUser,+ getUserAttributes,+ getUserCanWriteToCollections,+ getUserId,+ getUserIsAdmin,+ getUserIsAnalyst,+ getUserPersonalCollectionId,+} from "./selectors";+export { useUserAcknowledgement } from "./use-user-acknowledgement";+export { useUserKeyValue } from "./use-user-key-value";diff --git a/frontend/src/metabase/selectors/user.ts b/frontend/src/metabase/current-user/selectors.tssimilarity index 90%rename from frontend/src/metabase/selectors/user.tsrename to frontend/src/metabase/current-user/selectors.tsindex cbe655fd6be..19031db255b 100644--- a/frontend/src/metabase/selectors/user.ts+++ b/frontend/src/metabase/current-user/selectors.ts@@ -1,12 +1,13 @@import { createSelector } from "@reduxjs/toolkit";-import { userApi } from "metabase/api/user";import { PLUGIN_APPLICATION_PERMISSIONS } from "metabase/plugins";import type { State } from "metabase/redux/store";import type { User } from "metabase-types/api";+import { currentUserApi } from "./api/current-user";+const selectCurrentUser: (state: State) => { data?: User } =- userApi.endpoints.getCurrentUser.select();+ currentUserApi.endpoints.getCurrentUser.select();export const getUser = (state: State): User | null =>selectCurrentUser(state).data ?? null;@@ -51,11 +52,6 @@ export const getUserPersonalCollectionId = createSelector((user) => user?.personal_collection_id,);-export const getUserTenantCollectionId = createSelector(- [getUser],- (user) => user?.tenant_collection_id,-);-export const canUserCreateQueries = createSelector([getUser],(user) => user?.permissions?.can_create_queries ?? false,diff --git a/frontend/src/metabase/selectors/user.unit.spec.ts b/frontend/src/metabase/current-user/selectors.unit.spec.tssimilarity index 93%rename from frontend/src/metabase/selectors/user.unit.spec.tsrename to frontend/src/metabase/current-user/selectors.unit.spec.tsindex 8c6dde74e4e..46f4454f0c5 100644--- a/frontend/src/metabase/selectors/user.unit.spec.ts+++ b/frontend/src/metabase/current-user/selectors.unit.spec.ts@@ -1,9 +1,9 @@import { createMockState } from "metabase/redux/store/mocks";import { createMockUser } from "metabase-types/api/mocks";-import { getUserAttributes, getUserIsAdmin } from "./user";+import { getUserAttributes, getUserIsAdmin } from "./selectors";-describe("metabase/selectors/user", () => {+describe("metabase/current-user", () => {it("should return true if user is an admin", () => {const state = createMockState({currentUser: createMockUser({ is_superuser: true }),diff --git a/frontend/src/metabase/common/hooks/use-user-acknowledgement.ts b/frontend/src/metabase/current-user/use-user-acknowledgement.tssimilarity index 100%rename from frontend/src/metabase/common/hooks/use-user-acknowledgement.tsrename to frontend/src/metabase/current-user/use-user-acknowledgement.tsdiff --git a/frontend/src/metabase/common/hooks/use-user-key-value.ts b/frontend/src/metabase/current-user/use-user-key-value.tssimilarity index 97%rename from frontend/src/metabase/common/hooks/use-user-key-value.tsrename to frontend/src/metabase/current-user/use-user-key-value.tsindex e076932eef7..5fca7d49598 100644--- a/frontend/src/metabase/common/hooks/use-user-key-value.ts+++ b/frontend/src/metabase/current-user/use-user-key-value.ts@@ -1,18 +1,19 @@import { useCallback } from "react";-import {- skipToken,- useDeleteUserKeyValueMutation,- useGetUserKeyValueQuery,- useUpdateKeyValueMutation,-} from "metabase/api";+import { skipToken } from "metabase/api/api";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import type {UpdateUserKeyValueRequest,UserKeyValue,} from "metabase-types/api";+import {+ useDeleteUserKeyValueMutation,+ useGetUserKeyValueQuery,+ useUpdateKeyValueMutation,+} from "./api/user-key-value";+import { getUser } from "./selectors";+type UserKeyValueNamespace<Namespace extends UserKeyValue["namespace"]> =Extract<UserKeyValue, { namespace: Namespace }>;diff --git a/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx b/frontend/src/metabase/current-user/use-user-key-value.unit.spec.tsxsimilarity index 97%rename from frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsxrename to frontend/src/metabase/current-user/use-user-key-value.unit.spec.tsxindex 6af19f43c48..3d27dee5bf7 100644--- a/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx+++ b/frontend/src/metabase/current-user/use-user-key-value.unit.spec.tsx@@ -1,7 +1,7 @@import { act, renderHook } from "@testing-library/react";import fetchMock from "fetch-mock";-import { mainReducers as reducers } from "__support__/entities-store";+import { getMainStore } from "__support__/entities-store";import {setupDeleteUserKeyValueEndpoint,setupGetUserKeyValueEndpoint,@@ -10,7 +10,6 @@ import {import { waitFor } from "__support__/ui";import { MetabaseReduxProvider } from "metabase/redux";import { createMockState } from "metabase/redux/store/mocks";-import { getStore } from "metabase/store";import type { UserKeyValue } from "metabase-types/api";import {@@ -23,7 +22,7 @@ function setup({}: {hookArgs: UseUserKeyValueParams<UserKeyValue>;}) {- const store = getStore(reducers, createMockState());+ const store = getMainStore(createMockState());function Wrapper({ children }: any) {return (diff --git a/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx b/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsxindex 9e68b12d9ac..23cc160e372 100644--- a/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx+++ b/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx@@ -1,15 +1,15 @@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";+} from "metabase/current-user";+import { useSelector } from "metabase/redux";import { Loader } from "metabase/ui";import type { DashboardCard } from "metabase-types/api";+import { useDashboardContext } from "../../../context";import {DashboardGridConnected,type DashboardGridProps,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsxindex 03322465851..8038985a631 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import { useGetCollectionQuery } from "metabase/api";import { LeaveConfirmModal } from "metabase/common/components/LeaveConfirmModal";+import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/current-user";import {cancelEditingDashboard,fetchDashboard,@@ -19,7 +20,6 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { fetchPulseFormInput } from "metabase/notifications/pulse/actions";import { useDispatch, useSelector } from "metabase/redux";import { useMaybeLocation } from "metabase/router";-import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { Flex, Loader } from "metabase/ui";import type { Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsxindex 8ea74589f68..b4d69bf9eda 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx@@ -1,5 +1,9 @@import { useCallback } from "react";+import {+ canManageSubscriptions as canManageSubscriptionsSelector,+ getUserIsAdmin,+} from "metabase/current-user";import { setSidebar } from "metabase/dashboard/actions";import { dashboardActionButtons } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons";import type {@@ -16,10 +20,6 @@ import {} 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";export const DashboardHeaderButtonRow = ({diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsxindex 1633f37165e..5c61bd259b9 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx@@ -2,6 +2,7 @@ import { useDisclosure } from "@mantine/hooks";import { t } from "ttag";import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";+import { getUserIsAdmin } from "metabase/current-user";import {getIsDashCardsRunning,getSelectedTabId,@@ -20,7 +21,6 @@ import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";import { useSharingModal } from "metabase/embedding/hooks/use-sharing-modal";import { trackPublicLinkCopied } from "metabase/embedding/lib/analytics";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Box, Flex } from "metabase/ui";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsxindex c95759f7a2b..c7c222dce8b 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx@@ -2,14 +2,14 @@ import { t } from "ttag";import { useGetChannelInfoQuery } from "metabase/api";import { ToolbarButton } from "metabase/common/components/ToolbarButton";+import {+ canManageSubscriptions as canManageSubscriptionsSelector,+ getUserIsAdmin,+} from "metabase/current-user";import { toggleSharing } from "metabase/dashboard/actions";import { useDashboardContext } from "metabase/dashboard/context";import { getIsSharing } from "metabase/dashboard/selectors";import { useDispatch, useSelector } from "metabase/redux";-import {- canManageSubscriptions as canManageSubscriptionsSelector,- getUserIsAdmin,-} from "metabase/selectors/user";export const DashboardSubscriptionsButton = () => {const { dashboard } = useDashboardContext();diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsxindex 62a42c066a7..2b17cc0e4a3 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx@@ -19,6 +19,7 @@ import SidesheetS from "metabase/common/components/Sidesheet/sidesheet.module.csimport { InsightsUpsellTab } from "metabase/common/components/upsells/InsightsUpsellTab";import { InsightsTabOrLink } from "metabase/common/components/upsells/components/InsightsTabOrLink";import { DASHBOARD_DESCRIPTION_MAX_LENGTH } from "metabase/common/utils/dashboard";+import { getUser } from "metabase/current-user";import { revertToRevision, updateDashboard } from "metabase/dashboard/actions";import {type DashboardContextReturned,@@ -26,7 +27,6 @@ import {} 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 type {Dashboard,diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsxindex b1a3160432c..e593e96b707 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx@@ -15,13 +15,13 @@ import {import { SendTestPulse } from "metabase/common/components/SendTestPulse";import { Sidebar } from "metabase/common/components/Sidebar";import CS from "metabase/css/core/index.css";+import { canAccessSettings, getUser } from "metabase/current-user";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { RecipientPicker } from "metabase/notifications/channels/RecipientPicker";import { PLUGIN_DASHBOARD_SUBSCRIPTION_PARAMETERS_SECTION_OVERRIDE } from "metabase/plugins";import { channelTargetIsValid, dashboardPulseIsValid } from "metabase/pulse";import { useSelector } from "metabase/redux";import type { DraftDashboardSubscription } from "metabase/redux/store";-import { canAccessSettings, getUser } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { getSetting } from "metabase/settings";import { Icon, Stack, Switch, Text, Title } from "metabase/ui";diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsxindex 2c809efe9a4..2f33ec507b1 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx@@ -7,6 +7,7 @@ import { useSetArchive } from "metabase/archive/hooks";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ScheduleChangeProp } from "metabase/common/components/Schedule/types";import { Sidebar } from "metabase/common/components/Sidebar";+import { getUser, getUserIsAdmin } from "metabase/current-user";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import {cancelEditingPulse,@@ -22,7 +23,6 @@ import {import { NEW_PULSE_TEMPLATE, cleanPulse, createChannel } from "metabase/pulse";import { connect, useDispatch } from "metabase/redux";import type { DraftDashboardSubscription, State } from "metabase/redux/store";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {Channel,diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsxindex 88452e0763d..86f63eb80dd 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx@@ -10,17 +10,17 @@ import { SelectList } from "metabase/common/components/SelectList";import type { BaseSelectListItemProps } from "metabase/common/components/SelectList/BaseSelectListItem";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { getCollectionBreadCrumbs } from "metabase/common/utils/collections";+import {+ canUserCreateNativeQueries,+ canUserCreateQueries,+ getUserPersonalCollectionId,+} from "metabase/current-user";import { useDashboardContext } from "metabase/dashboard/context";import { getDashboard } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { useGetIcon } from "metabase/hooks/use-icon";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";-import {- canUserCreateNativeQueries,- canUserCreateQueries,- getUserPersonalCollectionId,-} from "metabase/selectors/user";import { Button, Flex, Icon, Input, TextInput } from "metabase/ui";import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import type { CollectionId } 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 4ae47b0c57e..6c0bf86c318 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@@ -4,10 +4,10 @@ import { t } from "ttag";import { skipToken, useListCollectionsTreeQuery } from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";import getExpandedCollectionsById from "metabase/common/collections/getExpandedCollectionsById";+import { getUserPersonalCollectionId } from "metabase/current-user";import { PLUGIN_TENANTS } from "metabase/plugins";import { useSelector } from "metabase/redux";import type { ExpandedCollection } from "metabase/redux/store";-import { getUserPersonalCollectionId } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import type { CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/context/context.redux.ts b/frontend/src/metabase/dashboard/context/context.redux.tsindex a629c890127..fee1a58c1fc 100644--- a/frontend/src/metabase/dashboard/context/context.redux.ts+++ b/frontend/src/metabase/dashboard/context/context.redux.ts@@ -1,6 +1,7 @@import type { ConnectedProps } from "react-redux";import { deletePermanently } from "metabase/archive/actions";+import { canManageSubscriptions, getUserIsAdmin } from "metabase/current-user";import {addCardToDashboard,addHeadingDashCardToDashboard,@@ -57,10 +58,6 @@ import {showAddParameterPopover,} from "metabase/redux/dashboard";import type { State } from "metabase/redux/store";-import {- canManageSubscriptions,- getUserIsAdmin,-} from "metabase/selectors/user";import { isWithinIframe } from "metabase/utils/iframe";import {diff --git a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.tsindex bdbacb93a3d..c810e3008ee 100644--- a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts+++ b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts@@ -1,6 +1,7 @@import { useMemo } from "react";import _ from "underscore";+import { getUserAttributes } from "metabase/current-user";import {setOrUnsetParameterValues,setParameterValue,@@ -14,7 +15,6 @@ import {import { useStore } from "metabase/redux";import type { State } from "metabase/redux/store";import { getMetadata } from "metabase/selectors/metadata";-import { getUserAttributes } from "metabase/selectors/user";import type { ClickObject } from "metabase/visualizations/types";import Question from "metabase-lib/v1/Question";import type {diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsxindex f9bbd036edf..81c4fa3726b 100644--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx@@ -5,10 +5,10 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";import { useDocsUrl } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";import { getParameterValues } from "metabase/dashboard/selectors";import { fillParametersInText } from "metabase/dashboard/visualizations/parameter-substitution";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Box, Button, Group, Icon, Stack, Text } from "metabase/ui";import {diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex 80ff71147b5..daf4640b794 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import DataStudioLogo from "assets/img/data-studio-logo.svg";import { useHasTokenFeature } from "metabase/common/hooks";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";+import { useUserKeyValue } from "metabase/current-user";import { useDataStudioSettings } from "metabase/data-studio/settings/hooks";import {AreaLayout,diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsxindex cde500d7530..3f733a624cb 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx@@ -2,8 +2,8 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";+import { getUser, getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { TransformsHeader } from "metabase/transforms/components/TransformsHeader";import { Button, Center, Icon, Stack, Text, Title } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsxindex f48c39cc7d6..77155aa167e 100644--- a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import { useListRevisionsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUserId } from "metabase/current-user";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 type { RevisionEntityType, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsxindex 2c47e67ab4c..7190ea2d262 100644--- a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx@@ -3,8 +3,8 @@ import relativeTime from "dayjs/plugin/relativeTime";import { t } from "ttag";import { UserAvatar } from "metabase/common/components/UserAvatar";+import { getUserId } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserId } from "metabase/selectors/user";import { Box, Flex, Stack, Text, Timeline } from "metabase/ui";import type { FieldDiff, Revision, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.tsx b/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.tsxindex cb570c65643..58d85a17ede 100644--- a/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.tsx+++ b/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.tsx@@ -5,7 +5,7 @@ import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/Daimport { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";import { useHasTokenFeature } from "metabase/common/hooks";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";+import { useUserKeyValue } from "metabase/current-user";import { usePageTitle } from "metabase/hooks/use-page-title";import { Box, Card, Group, Icon, Stack, Text, Title } from "metabase/ui";import type { IconName } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsxindex ca209e89e4a..e7b4736a913 100644--- a/frontend/src/metabase/data-studio/routes.tsx+++ b/frontend/src/metabase/data-studio/routes.tsx@@ -1,6 +1,6 @@import { NotFound } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";+import { useUserKeyValue } from "metabase/current-user";import {PLUGIN_DEPENDENCIES,PLUGIN_FEATURE_LEVEL_PERMISSIONS,diff --git a/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.tsindex 3cf731647c5..75ea21d0639 100644--- a/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts+++ b/frontend/src/metabase/data-studio/settings/hooks/use-data-studio-settings.ts@@ -1,7 +1,7 @@import { t } from "ttag";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import type { DataStudioSetting } from "../types";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsxindex 0d7b0a83d27..cab6c979853 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";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 * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsxindex e83c914e3ef..2e55a5da739 100644--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx@@ -10,9 +10,9 @@ import {import { Link } from "metabase/common/components/Link";import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-next-frame-paints";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";import { usePrintContext } from "metabase/documents/contexts/PrintContext";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import {ActionIcon,diff --git a/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.tsx b/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.tsxindex 326e9f540ef..93aaa467aab 100644--- a/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader/DocumentPublicLinkPopover/DocumentPublicLinkPopoverContent.tsx@@ -2,9 +2,9 @@ import { useState } from "react";import { t } from "ttag";import { CopyButton } from "metabase/common/components/CopyButton";+import { getUserIsAdmin } from "metabase/current-user";import { getPublicEmbedHTMLWithResizer } from "metabase/embedding/lib/code-templates";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import {Anchor,Box,diff --git a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsxindex ef557f76ff1..a20db6aa359 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 { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import type { Document } from "metabase-types/api";interface DocumentRevisionHistorySidebarProps {diff --git a/frontend/src/metabase/documents/components/Editor/use-new-question-options.ts b/frontend/src/metabase/documents/components/Editor/use-new-question-options.tsindex 3d68eebd7b1..2c664153744 100644--- a/frontend/src/metabase/documents/components/Editor/use-new-question-options.ts+++ b/frontend/src/metabase/documents/components/Editor/use-new-question-options.ts@@ -2,13 +2,13 @@ import { useMemo } from "react";import { t } from "ttag";import { useListDatabasesQuery } from "metabase/api";-import { getHasDatabaseWithJsonEngine } from "metabase/databases/utils/predicates";-import { useSelector } from "metabase/redux";-import type { NewQuestionOption } from "metabase/rich_text_editing/tiptap/extensions/Command/types";import {canUserCreateNativeQueries,canUserCreateQueries,-} from "metabase/selectors/user";+} from "metabase/current-user";+import { getHasDatabaseWithJsonEngine } from "metabase/databases/utils/predicates";+import { useSelector } from "metabase/redux";+import type { NewQuestionOption } from "metabase/rich_text_editing/tiptap/extensions/Command/types";export const useNewQuestionOptions = (): NewQuestionOption[] => {const { data } = useListDatabasesQuery();diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsxindex d90d917eac0..4d4ae4b9326 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx@@ -2,8 +2,8 @@ import { useAsync } from "react-use";import { t } from "ttag";import type { ExportFormat } from "metabase/common/types/export";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Popover, Text, Title } from "metabase/ui";import { PublicLinkCopyPanel } from "./PublicLinkCopyPanel";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 0e3e3f48ad1..cea660881da 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 { getUserId } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserId } from "metabase/selectors/user";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 b323c62e88c..d3d12eb53bf 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx@@ -22,11 +22,11 @@ import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensurimport type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";import { createSnowplowTracker } from "metabase/analytics";import { type OnBeforeRequestHandler, PLUGIN_API } from "metabase/api/client";+import { getUserId } from "metabase/current-user";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 { getUserId } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { Stack } from "metabase/ui";diff --git a/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts b/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.tsindex 39fee420c85..4fe8a716ea0 100644--- a/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts+++ b/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts@@ -1,7 +1,7 @@import { useEffect, useState } from "react";import type { SdkStore } from "embedding-sdk-bundle/store/types";-import { refetchCurrentUser } from "metabase/api";+import { refetchCurrentUser } from "metabase/current-user";import { refetchSiteSettings } from "metabase/settings";import {diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsxindex 06c42db7209..db18a5adc84 100644--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx@@ -25,9 +25,9 @@ import {} from "metabase/comments/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks";+import { getUser } from "metabase/current-user";import { trackExplorationCommentCreated } from "metabase/explorations/analytics";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { Avatar, Box, Group, Stack, Text, Title, Tooltip } from "metabase/ui";import type {Comment,diff --git a/frontend/src/metabase/explorations/hooks/useExplorationSelection.ts b/frontend/src/metabase/explorations/hooks/useExplorationSelection.tsindex e7a3daae3c8..a469b611a4c 100644--- a/frontend/src/metabase/explorations/hooks/useExplorationSelection.ts+++ b/frontend/src/metabase/explorations/hooks/useExplorationSelection.ts@@ -10,13 +10,13 @@ import {import { t } from "ttag";import { useListTimelinesQuery } from "metabase/api";+import { getUserPersonalCollectionId } from "metabase/current-user";import {getDefaultExplorationName,isInterestingDimension,} from "metabase/explorations/constants";import type { ExplorationCollection } from "metabase/explorations/types";import { useSelector } from "metabase/redux";-import { getUserPersonalCollectionId } from "metabase/selectors/user";import type {DimensionId,ExplorationDimensionGroup,diff --git a/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.ts b/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.tsindex 689b76851aa..ee6e48bcc42 100644--- a/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.ts+++ b/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.ts@@ -3,8 +3,8 @@ import { act } from "@testing-library/react";import { setupTimelinesEndpoints } from "__support__/server-mocks/timeline";import { renderHookWithProviders, waitFor } from "__support__/ui";import { Api } from "metabase/api";+import { getUserPersonalCollectionId } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserPersonalCollectionId } from "metabase/selectors/user";import type {DimensionId,ExplorationMetric,diff --git a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsxindex 51bddf44587..d9cae0d74ba 100644--- a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx+++ b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx@@ -6,8 +6,8 @@ import {useListRecentsQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { isSyncCompleted } from "metabase/utils/syncing";import type {diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsxindex 9b9ebd7506e..6a22e51d8b6 100644--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx@@ -5,8 +5,8 @@ import _ from "underscore";import { MetabotLogo } from "metabase/common/components/MetabotLogo";import animationStyles from "metabase/css/core/animation.module.css";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Flex, Tooltip } from "metabase/ui";diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsxindex c35f7b0e8ac..c3447abf5c8 100644--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";import { useHasTokenFeature } from "metabase/common/hooks";+import { getUser, getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { getLandingPageIllustration } from "metabase/selectors/whitelabel";import { useSetting } from "metabase/settings";import { Box, Button, Icon, Tooltip } from "metabase/ui";diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsxindex f8a3b6a0cbc..8d09ea32761 100644--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { useListRecentsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { getUser } from "metabase/current-user";import { useGetIcon } from "metabase/hooks/use-icon";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import * as Urls from "metabase/urls";import { getName } from "metabase/utils/name";import type { RecentItem } from "metabase-types/api";diff --git a/frontend/src/metabase/home/components/Onboarding/items/DashboardItem.tsx b/frontend/src/metabase/home/components/Onboarding/items/DashboardItem.tsxindex 7b99caa1aff..368419d492c 100644--- a/frontend/src/metabase/home/components/Onboarding/items/DashboardItem.tsx+++ b/frontend/src/metabase/home/components/Onboarding/items/DashboardItem.tsx@@ -1,8 +1,8 @@import { t } from "ttag";+import { getUserCanWriteToCollections } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";-import { getUserCanWriteToCollections } from "metabase/selectors/user";import { Text } from "metabase/ui";import { ChecklistItem } from "../ChecklistItem";diff --git a/frontend/src/metabase/home/components/Onboarding/items/PermissionsItem.tsx b/frontend/src/metabase/home/components/Onboarding/items/PermissionsItem.tsxindex 7bc1094c1a0..19733b530c4 100644--- a/frontend/src/metabase/home/components/Onboarding/items/PermissionsItem.tsx+++ b/frontend/src/metabase/home/components/Onboarding/items/PermissionsItem.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import PermissionsIllustration from "assets/img/onboarding_permissions.svg?component";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { Text } from "metabase/ui";diff --git a/frontend/src/metabase/home/components/Onboarding/use-checklist-items.ts b/frontend/src/metabase/home/components/Onboarding/use-checklist-items.tsindex 480d01955c3..d74938260e5 100644--- a/frontend/src/metabase/home/components/Onboarding/use-checklist-items.ts+++ b/frontend/src/metabase/home/components/Onboarding/use-checklist-items.ts@@ -1,6 +1,7 @@import { useMemo } from "react";import { t } from "ttag";+import { getUserIsAdmin } from "metabase/current-user";import { AiItem } from "metabase/home/components/Onboarding/items/AiItem";import { AlertItem } from "metabase/home/components/Onboarding/items/AlertItem";import { DashboardItem } from "metabase/home/components/Onboarding/items/DashboardItem";@@ -11,7 +12,6 @@ import { PermissionsItem } from "metabase/home/components/Onboarding/items/Permiimport { QueryItem } from "metabase/home/components/Onboarding/items/QueryItem";import type { ChecklistItemGroup } from "metabase/home/components/Onboarding/types";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";export const useChecklistItems = () => {diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.tsxindex 714a691e86b..68e599962e0 100644--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.tsx+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.tsx@@ -3,9 +3,9 @@ import { useCallback } from "react";import { match } from "ts-pattern";import { jt, t } from "ttag";+import { canAccessSettings } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";import { dismissUndo } from "metabase/redux/undo";-import { canAccessSettings } from "metabase/selectors/user";import { Anchor, Flex, Text, type TextProps } from "metabase/ui";import { useUserMetabotPermissions } from "../hooks";diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsxindex e8a791ca60b..69af0a8ef76 100644--- a/frontend/src/metabase/metabot/components/Metabot.tsx+++ b/frontend/src/metabase/metabot/components/Metabot.tsx@@ -5,6 +5,7 @@ import { t } from "ttag";import MetabotFailure from "assets/img/metabot-failure.svg?component";import ErrorBoundary from "metabase/ErrorBoundary";import { idTag } from "metabase/api/tags";+import { getUser } from "metabase/current-user";import {useIsFullPageMetabot,useMetabotAgent,@@ -13,7 +14,6 @@ import {import { Sidebar } from "metabase/nav/containers/MainNavbar/MainNavbar.styled";import { useDispatch, useSelector } from "metabase/redux";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";-import { getUser } from "metabase/selectors/user";import {ActionIcon,Box,diff --git a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsxindex d01706cf11e..1d8070156ad 100644--- a/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx+++ b/frontend/src/metabase/metabot/components/MetabotManagedProviderLimit.tsx@@ -4,9 +4,9 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useStoreUrl } from "metabase/common/hooks";+import { canAccessSettings } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";import { dismissUndo } from "metabase/redux/undo";-import { canAccessSettings } from "metabase/selectors/user";import {Button,Flex,diff --git a/frontend/src/metabase/metabot/context.tsx b/frontend/src/metabase/metabot/context.tsxindex 99892630107..16f307a0307 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";+} from "metabase/current-user";+import { useStore } from "metabase/redux";+import type { State } from "metabase/redux/store";import type {MetabotChatContext,MetabotSuggestedTransform,diff --git a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.tsindex ce34f50539c..a7799ad7ff7 100644--- a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts+++ b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts@@ -1,7 +1,7 @@import { useMemo } from "react";+import { canAccessSettings, getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { canAccessSettings, getUser } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { useGetUserMetabotPermissionsQuery } from "../api";diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tsindex d02c1d0d679..05543df1222 100644--- a/frontend/src/metabase/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -14,6 +14,7 @@ import {} from "metabase/api/ai-streaming";import type { ProcessedChatResponse } from "metabase/api/ai-streaming/process-stream";import { listTag } from "metabase/api/tags";+import { getUser } from "metabase/current-user";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { PLUGIN_AUDIT } from "metabase/plugins";import { setIsNativeEditorOpen } from "metabase/redux/query-builder";@@ -21,7 +22,6 @@ import type { Dispatch, State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import { createAsyncThunk } from "metabase/redux/utils";import { navigate } from "metabase/router";-import { getUser } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { retry } from "metabase/utils/retry";diff --git a/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsxindex ef5e8b69b89..4c502c9bc1d 100644--- a/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx+++ b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx@@ -4,9 +4,9 @@ import { useListRevisionsQuery, useRevertRevisionMutation } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";+import { getUser } from "metabase/current-user";import { PLUGIN_MODERATION } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import type { Card } from "metabase-types/api";interface MetricActivityTimelineProps {diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsxindex 90d4f442b35..e81f26bd930 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx@@ -7,11 +7,11 @@ import {PaneHeaderTabs,} from "metabase/common/data-studio/components/PaneHeader";import type { MetricUrls } from "metabase/common/metrics/types";+import { getUserIsAdmin, getUserIsAnalyst } from "metabase/current-user";import { isNumericMetric } from "metabase/metrics/utils/validation";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { getUserIsAdmin, getUserIsAnalyst } from "metabase/selectors/user";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex 81a076b77b4..dedefd01795 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -10,6 +10,7 @@ import {import { AddToDashSelectDashModal } from "metabase/common/components/Pickers/AddToDashSelectDashModal";import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/common/data-studio/selectors";import type { MetricUrls } from "metabase/common/metrics/types";+import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/current-user";import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";import {PLUGIN_AUDIT,@@ -24,7 +25,6 @@ import { useDispatch, useSelector } from "metabase/redux";import { openUrl } from "metabase/redux/app";import { useNavigate } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";-import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { ActionIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsxindex c5209a28939..abc1e68aada 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx@@ -9,10 +9,10 @@ import { DateTime } from "metabase/common/components/DateTime";import { EditableText } from "metabase/common/components/EditableText";import { Markdown } from "metabase/common/components/Markdown";import type { MetricUrls } from "metabase/common/metrics/types";+import { getUserIsAdmin, getUserIsAnalyst } from "metabase/current-user";import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getUserIsAdmin, getUserIsAnalyst } from "metabase/selectors/user";import { Box, Stack, Text, Tooltip } from "metabase/ui";import { getRelativeTime } from "metabase/utils/time-dayjs";import type { Card as CardApiType, CardType } from "metabase-types/api";diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsxindex 29e589b1633..7041b644dd3 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx@@ -4,14 +4,14 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { NoDatabasesEmptyState } from "metabase/common/components/NoDatabasesEmptyState";import CS from "metabase/css/core/index.css";+import {+ canUserCreateNativeQueries,+ canUserCreateQueries,+} from "metabase/current-user";import { NewModelOption } from "metabase/models/components/NewModelOption";import { useSelector } from "metabase/redux";import { useLocation } from "metabase/router";import { getLearnUrl } from "metabase/selectors/settings";-import {- canUserCreateNativeQueries,- canUserCreateQueries,-} from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { getSetting } from "metabase/settings";import { Flex, Group } from "metabase/ui";diff --git a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsx b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsxindex a7185f20449..efa0317a614 100644--- a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsx+++ b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsx@@ -2,7 +2,6 @@ import { P, match } from "ts-pattern";import { t } from "ttag";import { useHasTokenFeature } from "metabase/common/hooks";-import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import {type MonitorSection,trackMonitorSectionClicked,@@ -13,6 +12,7 @@ import {canAccessMonitorDiagnostics,canAccessMonitoringTools,} from "metabase/common/monitor/selectors";+import { useUserKeyValue } from "metabase/current-user";import {AreaLayout,AreaTab,diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsxindex c3527c38c9c..b284cd23a66 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx@@ -4,13 +4,13 @@ import { t } from "ttag";import { Link } from "metabase/common/components/Link";import { LogoIcon } from "metabase/common/components/LogoIcon";+import { getUserIsAdmin } from "metabase/current-user";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";import { useSelector } from "metabase/redux";import type { AdminPath } from "metabase/redux/store";import { useNavigate } from "metabase/router";import { getIsPaidPlan } from "metabase/selectors/settings";-import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Flex, Group, Icon } from "metabase/ui";import { ADMIN_NAVBAR_HEIGHT } from "../../constants";diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsxindex a510bedf855..52ac66d57f5 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx@@ -10,6 +10,7 @@ import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/comimport { trackMonitorOpened } from "metabase/common/monitor/analytics";import { canAccessMonitor as canAccessMonitorSelector } from "metabase/common/monitor/selectors";import { prepareInitials } from "metabase/common/utils/user";+import { getUser } from "metabase/current-user";import { useDispatch, useSelector } from "metabase/redux";import { openDiagnostics } from "metabase/redux/app";import { logout } from "metabase/redux/auth";@@ -19,7 +20,6 @@ import {getCanAccessOnboardingPage,getIsNewInstance,} from "metabase/selectors/onboarding";-import { getUser } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import {ActionIcon,diff --git a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.tsindex 7442734a473..8d65220db89 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts+++ b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts@@ -1,11 +1,10 @@import { useGetBugReportDetailsQuery } from "metabase/api/bug-report";import { getHelpUrl } from "metabase/common/utils/help-url";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";import { useSetting } from "metabase/settings";-import { getUser } from "../../../selectors/user";-export const useHelpLink = (): { visible: boolean; href: string } => {const helpLinkSetting = useSetting("help-link");const helpLinkCustomDestinationSetting = useSetting(diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.tsindex e6c6957a0de..2503c90f819 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.ts@@ -2,8 +2,8 @@ import { useMemo } from "react";import { useListDatabasesQuery } from "metabase/api";import { type AttachedDwhInfo, getHasAttachedDwh } from "metabase/common/hooks";+import { canAccessSettings, getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { canAccessSettings, getUserIsAdmin } from "metabase/selectors/user";interface AddDataState extends AttachedDwhInfo {areDatabasesLoading: boolean;diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsxindex 86568d49fae..8498b376460 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx@@ -15,10 +15,10 @@ import { useDeleteBookmarkMutation } from "metabase/api";import { CollapseSection } from "metabase/common/components/CollapseSection";import { Sortable } from "metabase/common/components/Sortable";import GrabberS from "metabase/css/components/grabber.module.css";+import { getIsTenantUser } from "metabase/current-user";import { useGetIcon } from "metabase/hooks/use-icon";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getIsTenantUser } from "metabase/selectors/user";import { Icon, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";import type { Bookmark } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsxindex 49244028145..8843aafa00f 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx@@ -17,17 +17,17 @@ import {getCollectionIcon,nonPersonalOrArchivedCollection,} from "metabase/common/collections/utils";+import {+ getIsTenantUser,+ getUser,+ getUserCanWriteToCollections,+} from "metabase/current-user";import { PLUGIN_TENANTS } from "metabase/plugins";import { connect, useDispatch, useSelector } from "metabase/redux";import { logout } from "metabase/redux/auth";import type { State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import type { To } from "metabase/router";-import {- getIsTenantUser,- getUser,- getUserCanWriteToCollections,-} from "metabase/selectors/user";import { Modal } from "metabase/ui";import * as Urls from "metabase/urls";import type { 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 791c2a31fe0..cb2fdef00ff 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx@@ -15,6 +15,11 @@ import { CollapseSection } from "metabase/common/components/CollapseSection";import { Tree } from "metabase/common/components/tree";import { useIsAtHomepageDashboard } from "metabase/common/hooks/use-is-at-homepage-dashboard";import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";+import {+ getIsTenantUser,+ getUser,+ getUserCanWriteToCollections,+} from "metabase/current-user";import { NavbarLibrarySection } from "metabase/nav/containers/MainNavbar/NavbarLibrarySection";import {PLUGIN_DATA_APPS,@@ -26,11 +31,6 @@ import {getCanAccessOnboardingPage,getIsNewInstance,} from "metabase/selectors/onboarding";-import {- getIsTenantUser,- getUser,- getUserCanWriteToCollections,-} from "metabase/selectors/user";import { useSetting, useUserSetting } from "metabase/settings";import { ActionIcon, Icon, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsxindex 184ad41d2e9..10d32d92061 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx@@ -9,9 +9,9 @@ import type {ITreeNodeItem,TreeNodeProps,} from "metabase/common/components/tree/types";+import { getIsTenantUser } from "metabase/current-user";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getIsTenantUser } from "metabase/selectors/user";import * as Urls from "metabase/urls";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsxindex f8aea042693..73f7083f4d4 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx@@ -12,6 +12,11 @@ import {} from "metabase/api";import type { ScheduleValueType } from "metabase/common/components/Schedule/types";import CS from "metabase/css/core/index.css";+import {+ canAccessSettings,+ getUser,+ getUserIsAdmin,+} from "metabase/current-user";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import {alertIsValid,@@ -24,11 +29,6 @@ import {} from "metabase/pulse";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import {- canAccessSettings,- getUser,- getUserIsAdmin,-} from "metabase/selectors/user";import {Button,Flex,diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsxindex d3518409beb..1d9bd2c2aa9 100644--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx@@ -3,13 +3,13 @@ import type { MouseEvent } from "react";import { msgid, ngettext, t } from "ttag";import _ from "underscore";+import { getUser } from "metabase/current-user";import {formatCreatorMessage,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 { isNotFalsy } from "metabase/utils/types";import type {diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsxindex 497c62d2515..5b798be5a5c 100644--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx@@ -2,11 +2,11 @@ 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";+} from "metabase/current-user";+import { useSelector } from "metabase/redux";import { Button, Modal, Stack, rem } from "metabase/ui";import type { Notification } from "metabase-types/api";diff --git a/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx b/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsxindex 102b56ea290..d377f43cd1b 100644--- a/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx+++ b/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx@@ -1,6 +1,7 @@import { t } from "ttag";import { useListChannelsQuery, useListUserRecipientsQuery } from "metabase/api";+import { canAccessSettings, getUser } from "metabase/current-user";import { ChannelSettingsBlock } from "metabase/notifications/channels/ChannelSettingsBlock";import { EmailChannelEdit } from "metabase/notifications/channels/EmailChannelEdit";import { SlackChannelFieldNew } from "metabase/notifications/channels/SlackChannelFieldNew";@@ -10,7 +11,6 @@ import {} 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 type {ChannelApiResponse,diff --git a/frontend/src/metabase/palette/components/Palette.tsx b/frontend/src/metabase/palette/components/Palette.tsxindex 2f2fa7ecdd2..ea80c5f8a20 100644--- a/frontend/src/metabase/palette/components/Palette.tsx+++ b/frontend/src/metabase/palette/components/Palette.tsx@@ -2,9 +2,9 @@ import { KBarPortal, VisualState, useKBar } from "kbar";import { useEffect, useMemo, useRef } from "react";import { useOnClickOutside } from "metabase/common/hooks/use-on-click-outside";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";import { useLocation, useParams } from "metabase/router";-import { getUser } from "metabase/selectors/user";import { Box, Card, Center, Icon, Overlay, Stack, rem } from "metabase/ui";import { type SearchQuery, parseSearchQuery } from "metabase/utils/browser";import { isWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex 328c2b86648..09031c92851 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -8,11 +8,11 @@ import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { getCollection } from "metabase/common/collections/utils";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { trackSearchClick } from "metabase/common/search/analytics";+import { canAccessSettings, getUserIsAdmin } from "metabase/current-user";import { useGetIcon } from "metabase/hooks/use-icon";import { useSelector } from "metabase/redux";import { queryToSearch } from "metabase/router";import { getDocsUrl } from "metabase/selectors/settings";-import { canAccessSettings, getUserIsAdmin } from "metabase/selectors/user";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { getSettings, useSetting } from "metabase/settings";import { Icon, Text } from "metabase/ui";diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex 62b5b52aba1..64bbbb40693 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -8,6 +8,12 @@ import type { UseInitialCollectionIdProps } from "metabase/common/collections/hoimport { useInitialCollectionId } from "metabase/common/collections/hooks";import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";import { canAccessDataStudio } from "metabase/common/data-studio/selectors";+import {+ canUserCreateNativeQueries,+ canUserCreateQueries,+ getUserIsAdmin,+ getUserPersonalCollectionId,+} from "metabase/current-user";import { getHasDatabaseWithActionsEnabled } from "metabase/databases/utils/predicates";import { useDispatch, useSelector } from "metabase/redux";import { openDiagnostics } from "metabase/redux/app";@@ -18,12 +24,6 @@ import {setOpenModalWithProps,} from "metabase/redux/ui";import { useNavigate } from "metabase/router";-import {- canUserCreateNativeQueries,- canUserCreateQueries,- getUserIsAdmin,- getUserPersonalCollectionId,-} from "metabase/selectors/user";import { useColorScheme } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/plugins/oss/permissions.ts b/frontend/src/metabase/plugins/oss/permissions.tsindex e9e5815cdaa..bf1b0b84cc9 100644--- a/frontend/src/metabase/plugins/oss/permissions.ts+++ b/frontend/src/metabase/plugins/oss/permissions.ts@@ -1,8 +1,8 @@import type { Action, ThunkDispatch } from "@reduxjs/toolkit";import type { ReactElement, ReactNode } from "react";+import { getUserIsAdmin } from "metabase/current-user";import type { State } from "metabase/redux/store";-import { getUserIsAdmin } from "metabase/selectors/user";import type { ColorName } from "metabase/ui/colors/types";import type Database from "metabase-lib/v1/metadata/Database";import type {diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.tsindex 1b896460f5d..9c08db02c8b 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts@@ -5,6 +5,7 @@ import {deserializeCard,parseHash,} from "metabase/common/utils/card";+import { canUserCreateQueries, getUser } from "metabase/current-user";import {getIsEditingInDashboard,getNotebookNativePreviewSidebarWidth,@@ -24,7 +25,6 @@ import type { Location } from "metabase/router";import { navigate } from "metabase/router";import { FieldSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";-import { canUserCreateQueries, getUser } from "metabase/selectors/user";import * as Urls from "metabase/urls";import { parseSearchQuery } from "metabase/utils/browser";import { isNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsxindex 5092265cd8b..a6f4aa6b402 100644--- a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx+++ b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import ModelSVG from "img/model-illustration.svg?component";import { ModalContent } from "metabase/common/components/ModalContent";-import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";+import { useUserAcknowledgement } from "metabase/current-user";import { turnQuestionIntoModel } from "metabase/query_builder/actions";import { useDispatch } from "metabase/redux";import { Box, Button, Text } from "metabase/ui";diff --git a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsxindex 713d88b556f..4ddd5eaa7ee 100644--- a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx@@ -4,10 +4,10 @@ import { useListRevisionsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";+import { getUser } from "metabase/current-user";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 type Question from "metabase-lib/v1/Question";const { getModerationTimelineEvents } = PLUGIN_MODERATION;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 4ebe53d53c3..a05b443d49e 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@@ -4,7 +4,10 @@ import _ from "underscore";import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { ToolbarButton } from "metabase/common/components/ToolbarButton";-import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";+import {+ canManageSubscriptions as canManageSubscriptionsSelector,+ useUserAcknowledgement,+} from "metabase/current-user";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { PLUGIN_MODERATION } from "metabase/plugins";import {@@ -20,7 +23,6 @@ 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 * 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/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsxindex 6a8261ca4eb..5ce11d3b2a4 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx@@ -3,6 +3,7 @@ import { useMemo } from "react";import { t } from "ttag";import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";+import { getUserIsAdmin } from "metabase/current-user";import { CopyLinkButton } from "metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton";import { EmbedButton } from "metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton";import { InviteToViewModal } from "metabase/embedding/components/SharingMenu/InviteToViewModal";@@ -24,7 +25,6 @@ import { trackPublicLinkCopied } from "metabase/embedding/lib/analytics";import { MODAL_TYPES } from "metabase/querying/constants";import { useDispatch, useSelector } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { Box, CopyButton, Flex } from "metabase/ui";import {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 a2bcb4e67ef..aa968a28feb 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@@ -3,6 +3,7 @@ import type React from "react";import { useCallback } from "react";import { t } from "ttag";+import { getUserCanWriteToCollections } from "metabase/current-user";import { AIQuestionAnalysisButton } from "metabase/metabot/components/AIQuestionAnalysisButton";import { canAnalyzeQuestion } from "metabase/metabot/utils/chart-analysis";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";@@ -11,7 +12,6 @@ import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualizimport { 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 MetabaseSettings from "metabase/utils/settings";diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex ad43a313e10..53c297a005e 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -17,6 +17,11 @@ import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";import { useFavicon } from "metabase/common/hooks/use-favicon";import { useLoadingTimer } from "metabase/common/hooks/use-loading-timer";import { useWebNotification } from "metabase/common/hooks/use-web-notification";+import {+ canManageSubscriptions,+ getUser,+ getUserIsAdmin,+} from "metabase/current-user";import { usePageTitleWithLoadingTime } from "metabase/hooks/use-page-title";import { VISUALIZATION_SLOW_TIMEOUT } from "metabase/querying/constants";import {@@ -58,11 +63,6 @@ import {} from "metabase/router";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";-import {- canManageSubscriptions,- getUser,- getUserIsAdmin,-} from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { useForceUpdate } from "metabase/utils/use-force-update";import type { Series } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsxindex 10b59e1efb0..b53db124f77 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx@@ -16,11 +16,11 @@ import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import { canUserCreateQueries } from "metabase/current-user";import { connect } from "metabase/redux";import type { Dispatch, State } from "metabase/redux/store";import { fetchTableMetadata } from "metabase/redux/tables";import { getMetadata } from "metabase/selectors/metadata";-import { canUserCreateQueries } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { Box, Popover } from "metabase/ui";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsxindex 1147c38c46d..310d426411e 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsx@@ -16,8 +16,8 @@ import { Tree } from "metabase/common/components/tree";import type { ITreeNodeItem } from "metabase/common/components/tree/types";import { findCollectionById } from "metabase/common/utils/collections";import CS from "metabase/css/core/index.css";+import { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { Box, Icon } from "metabase/ui";import type {CardType,diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsxindex 6f393d9fa99..dd3d541c7d3 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx@@ -14,11 +14,11 @@ import type {MiniPickerItem,MiniPickerPickableItem,} from "metabase/common/components/Pickers/MiniPicker/types";+import { getIsTenantUser } from "metabase/current-user";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 { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/redux/auth.ts b/frontend/src/metabase/redux/auth.tsindex 65b87e47909..07ec5a7be66 100644--- a/frontend/src/metabase/redux/auth.ts+++ b/frontend/src/metabase/redux/auth.ts@@ -4,17 +4,17 @@ import {createReducer,} from "@reduxjs/toolkit";-import { Api, refetchCurrentUser } from "metabase/api";+import { Api } from "metabase/api";import { loadLocalization } from "metabase/api/localization";import {type MfaChallengeResponse,isMfaChallenge,sessionApi,} from "metabase/api/session";+import { getUser, refetchCurrentUser } from "metabase/current-user";import { openNavbar } from "metabase/redux/app";import { createAsyncThunk } from "metabase/redux/utils";import { navigate } from "metabase/router";-import { getUser } from "metabase/selectors/user";import { getSetting, refetchSiteSettings } from "metabase/settings";import * as Urls from "metabase/urls";import { isSmallScreen, reload } from "metabase/utils/dom";diff --git a/frontend/src/metabase/redux/hooks.unit.spec.tsx b/frontend/src/metabase/redux/hooks.unit.spec.tsxindex 1ec75003048..18eac858469 100644--- a/frontend/src/metabase/redux/hooks.unit.spec.tsx+++ b/frontend/src/metabase/redux/hooks.unit.spec.tsx@@ -1,6 +1,6 @@import { renderWithProviders, screen } from "__support__/ui";+import { getUser } from "metabase/current-user";import type { State } from "metabase/redux/store";-import { getUser } from "metabase/selectors/user";import { createMockUser } from "metabase-types/api/mocks";import { useDispatch, useSelector } from "./hooks";diff --git a/frontend/src/metabase/redux/query-builder.ts b/frontend/src/metabase/redux/query-builder.tsindex c2883304e4d..707b2891019 100644--- a/frontend/src/metabase/redux/query-builder.ts+++ b/frontend/src/metabase/redux/query-builder.ts@@ -9,10 +9,9 @@*/import { createAction } from "redux-actions";-import { userApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";+import { currentUserApi, getUser } from "metabase/current-user";import { createThunkAction } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { checkNotNull } from "metabase/utils/types";import type { ParameterId, ParameterValueOrArray } from "metabase-types/api";@@ -189,7 +188,7 @@ export const closeQbNewbModal = createThunkAction(CLOSE_QB_NEWB_MODAL, () => {await runRtkEndpoint(user.id,dispatch,- userApi.endpoints.updateUserModalQbnewb,+ currentUserApi.endpoints.updateUserModalQbnewb,);};});diff --git a/frontend/src/metabase/redux/store/mocks/api.ts b/frontend/src/metabase/redux/store/mocks/api.tsindex e6aedea2135..c938a750c8b 100644--- a/frontend/src/metabase/redux/store/mocks/api.ts+++ b/frontend/src/metabase/redux/store/mocks/api.ts@@ -1,7 +1,9 @@// Import the `metabase/api` index, not the bare `Api` from ./api.// The index injects every endpoint module, and an endpoint must be registered-// before an upsert can build its cache entry.+// before an upsert can build its cache entry. `getCurrentUser` is injected by+// the current-user module, so pull that in for the same reason.import { Api } from "metabase/api";+import "metabase/current-user";import type { State } from "metabase/redux/store";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/reference/glossary/GlossaryContainer.tsx b/frontend/src/metabase/reference/glossary/GlossaryContainer.tsxindex 187f20f34ce..93d32a81a3b 100644--- a/frontend/src/metabase/reference/glossary/GlossaryContainer.tsx+++ b/frontend/src/metabase/reference/glossary/GlossaryContainer.tsx@@ -10,10 +10,10 @@ import {import S from "metabase/common/components/Glossary/Glossary.module.css";import { GlossaryTable } from "metabase/common/components/Glossary/GlossaryTable";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin, getUserIsAnalyst } from "metabase/current-user";import { useSelector } from "metabase/redux";import { SidebarLayout } from "metabase/reference/components/SidebarLayout";import BaseSidebar from "metabase/reference/guide/BaseSidebar";-import { getUserIsAdmin, getUserIsAnalyst } from "metabase/selectors/user";import { Card, Group, Stack, Text } from "metabase/ui";export function GlossaryContainer() {diff --git a/frontend/src/metabase/reference/selectors.ts b/frontend/src/metabase/reference/selectors.tsindex 1e7e063b8da..2377d045bc4 100644--- a/frontend/src/metabase/reference/selectors.ts+++ b/frontend/src/metabase/reference/selectors.ts@@ -47,7 +47,7 @@ export type StateWithReference = State & {revisions?: Record<string, Record<string | number, unknown>>;};-export { getUser } from "metabase/selectors/user";+export { getUser } from "metabase/current-user";export const getSegmentId = (_state: State, props: ReferenceRouteProps) =>Number.parseInt(props.params.segmentId ?? "");diff --git a/frontend/src/metabase/route-guards/auth-guards.tsx b/frontend/src/metabase/route-guards/auth-guards.tsxindex 68f5f852d4c..a4d3e9ca4a3 100644--- a/frontend/src/metabase/route-guards/auth-guards.tsx+++ b/frontend/src/metabase/route-guards/auth-guards.tsx@@ -1,9 +1,9 @@import { useEffect } from "react";+import { getUser, getUserIsAdmin } from "metabase/current-user";import { type Location, Navigate, Outlet } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";import { getCanAccessOnboardingPage } from "metabase/selectors/onboarding";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { getSetting } from "metabase/settings";import { replaceLocation } from "metabase/utils/dom";import { isWithinIframe } from "metabase/utils/iframe";diff --git a/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx b/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsxindex 49fd540444a..ec9b6b52275 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 { canUserCreateNativeQueries } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { canUserCreateNativeQueries } from "metabase/selectors/user";export const NativeQueryLabel = () => {const hasNativeWrite = useSelector(canUserCreateNativeQueries);diff --git a/frontend/src/metabase/selectors/app.ts b/frontend/src/metabase/selectors/app.tsindex 97cbe33a2df..b7861259df3 100644--- a/frontend/src/metabase/selectors/app.ts+++ b/frontend/src/metabase/selectors/app.ts@@ -1,10 +1,10 @@import type { Selector } from "@reduxjs/toolkit";import { createSelector } from "@reduxjs/toolkit";+import { getUser } from "metabase/current-user";import { getEmbedOptions } from "metabase/embedding/interactive-embedding";import type { State } from "metabase/redux/store";import type { Location } from "metabase/router";-import { getUser } from "metabase/selectors/user";import { selectIsWithinIframe } from "metabase/utils/iframe";export interface RouterProps {diff --git a/frontend/src/metabase/selectors/store-users.ts b/frontend/src/metabase/selectors/store-users.tsindex 30fa1a63878..b15e67caba1 100644--- a/frontend/src/metabase/selectors/store-users.ts+++ b/frontend/src/metabase/selectors/store-users.ts@@ -1,7 +1,7 @@import { createSelector } from "@reduxjs/toolkit";+import { getUser } from "metabase/current-user";import { getTokenStatus } from "metabase/selectors/settings";-import { getUser } from "metabase/selectors/user";export const getStoreUsers = createSelector(getUser,diff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.tsindex 4c3146134b1..44d4c5d0cbf 100644--- a/frontend/src/metabase/setup/actions.ts+++ b/frontend/src/metabase/setup/actions.ts@@ -1,11 +1,12 @@import { createAction } from "@reduxjs/toolkit";import { t } from "ttag";-import { refetchCurrentUser, setupApi, userApi } from "metabase/api";+import { setupApi, userApi } from "metabase/api";import { loadLocalization } from "metabase/api/localization";import { isEmailAlreadyInUse } from "metabase/api/utils/errors";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { trackUserInvited } from "metabase/common/analytics";+import { refetchCurrentUser } from "metabase/current-user";import { createDatabase } from "metabase/redux/databases";import type {InviteInfo,diff --git a/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx b/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsxindex cf86a768743..7252be58caf 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 { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import { isSyncInProgress } from "metabase/utils/syncing";import type { Database, User } from "metabase-types/api";diff --git a/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx b/frontend/src/metabase/status/components/StatusListing/StatusListing.tsxindex e0e5f936c37..c4baa668259 100644--- a/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx+++ b/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx@@ -1,6 +1,7 @@import { useBeforeUnload } from "react-use";import { t } from "ttag";+import { getUserIsAdmin } from "metabase/current-user";import {PLUGIN_REMOTE_SYNC,PLUGIN_REPLACEMENT,@@ -8,7 +9,6 @@ import {} 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 { AnalyticsExportStatus } from "../AnalyticsExportStatus";diff --git a/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.tsx b/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.tsxindex 5683d9d4765..45ec25ca8d1 100644--- a/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.tsx+++ b/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useStoreUrl } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux/hooks";import { getStoreUsers } from "metabase/selectors/store-users";-import { getUserIsAdmin } from "metabase/selectors/user";import { Box, Button, Flex, Stack, Text } from "metabase/ui";export const LockedTransformsBanner = () => {diff --git a/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.tsx b/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.tsxindex 9e5300a983a..cb091b0a1c9 100644--- a/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.tsx+++ b/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useStoreUrl } from "metabase/common/hooks";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux/hooks";import { getStoreUsers } from "metabase/selectors/store-users";-import { getUserIsAdmin } from "metabase/selectors/user";import { Button, HoverCard, Text } from "metabase/ui";export const LockedTransformsHoverCard = ({ children }: PropsWithChildren) => {diff --git a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsxindex 54cb0a03bab..c42a5d40b0c 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 { getUser } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUser } from "metabase/selectors/user";import type { Transform } from "metabase-types/api";interface TransformRevisionHistorySidebarProps {diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsxindex 7480b2bba71..bd18be4a72a 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting, useUpdateSettingMutation } from "metabase/settings";import { TransformsHeader } from "metabase/transforms/components/TransformsHeader";import { Center, Text } from "metabase/ui";diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsxindex 33e1d3e758e..3ca7ae53682 100644--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx@@ -7,9 +7,9 @@ import { ForwardRefLink } from "metabase/common/components/Link";import { ListEmptyState } from "metabase/common/components/ListEmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";+import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { useNavigate } from "metabase/router";-import { getUserIsAdmin } from "metabase/selectors/user";import { useSetting } from "metabase/settings";import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";import { TransformBadge } from "metabase/transforms/components/TransformBadge/TransformBadge";diff --git a/frontend/src/metabase/transforms/selectors.ts b/frontend/src/metabase/transforms/selectors.tsindex 4b50422bec9..6d90cd07543 100644--- a/frontend/src/metabase/transforms/selectors.ts+++ b/frontend/src/metabase/transforms/selectors.ts@@ -1,8 +1,8 @@import { createSelector } from "@reduxjs/toolkit";import { getPlan } from "metabase/common/utils/plan";+import { getUser, getUserIsAdmin } from "metabase/current-user";import type { State } from "metabase/redux/store";-import { getUser, getUserIsAdmin } from "metabase/selectors/user";import { getSetting, getTokenFeature } from "metabase/settings";export const canAccessTransforms = (state: State): boolean => {diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.tsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.tsxindex 7f85ea4bccf..5dc189f5a97 100644--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.tsx+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.tsx@@ -8,10 +8,10 @@ import _ from "underscore";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import { getUserIsAdmin } from "metabase/current-user";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";-import { getUserIsAdmin } from "metabase/selectors/user";import { Flex, Loader, Text } from "metabase/ui";import MetabaseSettings from "metabase/utils/settings";import {diff --git a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsxindex 87270bc16c3..d2cec844232 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";+import { getUserIsAdmin } from "metabase/current-user";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";