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 settings module (#78981)
Fraserfead86be0ad3
diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.tsindex d81b0c0cac5..00221ab3c45 100644--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts@@ -28,13 +28,7 @@ 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,- refetchSiteSettings,- sessionApi,- userApi,-} from "metabase/api";+import { loadCurrentUser, refetchCurrentUser, userApi } from "metabase/api";import { PLUGIN_API } from "metabase/api/client";import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils";import { getSessionTokenHeaders } from "metabase/embedding/lib/auth/get-session-token-headers";@@ -47,6 +41,7 @@ import {import { samlTokenStorage } from "metabase/embedding-sdk/lib/saml-token-storage";import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";import { createAsyncThunk } from "metabase/redux/utils";+import { refetchSiteSettings, settingsApi } from "metabase/settings";import MetabaseSettings from "metabase/utils/settings";const GET_OR_REFRESH_SESSION = "sdk/token/GET_OR_REFRESH_SESSION";@@ -113,7 +108,7 @@ PLUGIN_EMBEDDING_SDK_AUTH.initAuth = async (),);dispatch(- sessionApi.util.upsertQueryData(+ settingsApi.util.upsertQueryData("getSessionProperties",undefined,authState.siteSettings,@@ -122,7 +117,7 @@ PLUGIN_EMBEDDING_SDK_AUTH.initAuth = async (// Add subscriptions so that the user and settings entries don't get deleted from the cache.// RTK will delete entries with no subscribers if they are invalidated.dispatch(loadCurrentUser());- dispatch(sessionApi.endpoints.getSessionProperties.initiate());+ dispatch(settingsApi.endpoints.getSessionProperties.initiate());MetabaseSettings.setAll(authState.siteSettings);// The session handler emits the X-Metabase-Session header on every APIdiff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsxindex 18ce9502f02..2f08a96d9de 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx@@ -19,8 +19,8 @@ import CS from "metabase/css/core/index.css";import { connect } from "metabase/redux";import { fetchTableMetadata } from "metabase/redux/tables";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";import { canUserCreateQueries } from "metabase/selectors/user";+import { getSetting } from "metabase/settings";import { Box, Popover } from "metabase/ui";import {SAVED_QUESTIONS_VIRTUAL_DB_ID,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsxindex a8e9ec58b87..5051898ebee 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.tsx@@ -1,8 +1,8 @@import { useLayoutEffect } from "react";-import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";import { Outlet, replace } from "metabase/router";+import { useSetting } from "metabase/settings";const FALLBACK_PATH = "/admin/metabot/";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.tsindex dd22995376d..9ef4aeb0a31 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.ts+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.ts@@ -1,7 +1,7 @@import { useCallback, useEffect, useRef } from "react";-import { useAdminSetting } from "metabase/api/utils";import { useBeforeUnload } from "metabase/common/hooks/use-before-unload";+import { useAdminSetting } from "metabase/settings";import type {EnterpriseSettingKey,EnterpriseSettings,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.tsindex 63d300baa76..341ff30e375 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.ts+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.ts@@ -2,8 +2,8 @@ import { useDebouncedCallback } from "@mantine/hooks";import { useCallback } from "react";import { c } from "ttag";-import { useAdminSetting } from "metabase/api/utils";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useAdminSetting } from "metabase/settings";import type {EnterpriseSettingKey,EnterpriseSettingValue,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsxindex 68c5e366c69..eaf51e6cbf3 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import { AdminNavItem } from "metabase/admin/components/AdminNav";import { UpsellGem } from "metabase/common/components/upsells/components";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";export function getAiControlsNavItems() {return <AiControlsNavItems />;diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsxindex b10f08da614..3e8de9bc4c5 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx@@ -3,8 +3,8 @@ import { type ChangeEvent, useRef, useState } from "react";import { t } from "ttag";import EmptyDashboardBot from "assets/img/dashboard-empty.svg";-import { useAdminSetting } from "metabase/api/utils";import CS from "metabase/css/core/index.css";+import { useAdminSetting } from "metabase/settings";import {ActionIcon,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.tsxindex 43e2f9a57d0..943ae5bcf5c 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";import { useListPermissionsGroupsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Group, Stack, Title } from "metabase/ui";import { AiFeatureAccessTable } from "./components/AiFeatureAccessTable";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsxindex 546a4824f12..1952fe901a7 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { useListPermissionsGroupsQuery } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { isDefaultGroup } from "metabase/common/utils/groups";import { PLUGIN_TENANTS } from "metabase/plugins";+import { useSetting } from "metabase/settings";import { Tabs } from "metabase/ui";import {useGetAIControlsGroupLimitsQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/auth/actions.ts b/enterprise/frontend/src/metabase-enterprise/auth/actions.tsindex f40eeb6c309..e918618a17d 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/actions.ts+++ b/enterprise/frontend/src/metabase-enterprise/auth/actions.ts@@ -1,7 +1,7 @@import { createAsyncThunk } from "@reduxjs/toolkit";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { redirect } from "metabase/utils/dom";import { getSSOUrl } from "./utils";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/Ldap.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/Ldap.tsxindex f5959d2c082..3e62ae36d04 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/Ldap.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/Ldap.tsx@@ -2,8 +2,8 @@ import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { AdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useAdminSetting } from "metabase/api/utils";import { FormTextInput } from "metabase/forms";+import { useAdminSetting } from "metabase/settings";import { provisioningOptions } from "metabase-enterprise/auth/utils";export function LdapUserProvisioning() {diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsxindex a202ed83c53..5224d2b9d26 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";import { useHasTokenFeature } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import { Flex, Select, Stack, Text, TextInput } from "metabase/ui";import type { TimeoutValue } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/SettingsJWTForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/SettingsJWTForm.tsxindex da98bf1cd04..35a9f435659 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/SettingsJWTForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/SettingsJWTForm.tsx@@ -8,8 +8,6 @@ import {import { AdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";import { GroupMappingsWidget } from "metabase/admin/settings/components/widgets/GroupMappingsWidget";import { getExtraFormFieldProps } from "metabase/admin/settings/utils";-import { useGetAdminSettingsDetailsQuery } from "metabase/api";-import { useAdminSetting } from "metabase/api/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks";import {@@ -21,6 +19,10 @@ import {FormSubmitButton,FormTextInput,} from "metabase/forms";+import {+ useAdminSetting,+ useGetAdminSettingsDetailsQuery,+} from "metabase/settings";import { Flex, Stack } from "metabase/ui";import { provisioningOptions } from "metabase-enterprise/auth/utils";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsxindex 92e751c1b25..ec758a9c70f 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx@@ -17,7 +17,7 @@ import {import { getErrorMessage } from "metabase/api/utils/errors";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import {Form,FormErrorMessage,@@ -28,6 +28,7 @@ import {} from "metabase/forms";import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";import { Button, Flex, Stack, Text } from "metabase/ui";import {type CustomOidcConfig,diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsxindex 6e2b222c69b..7b5bf6960a8 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsx@@ -11,15 +11,11 @@ import { SettingHeader } from "metabase/admin/settings/components/SettingHeader"import { AdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";import { GroupMappingsWidget } from "metabase/admin/settings/components/widgets/GroupMappingsWidget";import { getExtraFormFieldProps } from "metabase/admin/settings/utils";-import {- useGetAdminSettingsDetailsQuery,- useGetSettingsQuery,-} from "metabase/api";import { CopyTextInput } from "metabase/common/components/CopyTextInput";import { ExternalLink } from "metabase/common/components/ExternalLink";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { Markdown } from "metabase/common/components/Markdown";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import {Form,FormErrorMessage,@@ -29,6 +25,11 @@ import {FormTextInput,FormTextarea,} from "metabase/forms";+import {+ useGetAdminSettingsDetailsQuery,+ useGetSettingsQuery,+ useSetting,+} from "metabase/settings";import { Flex, Stack, Text, Title } from "metabase/ui";import { useUpdateSamlMutation } from "metabase-enterprise/api";import { provisioningOptions } from "metabase-enterprise/auth/utils";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/containers/JwtAuthCard/JwtAuthCard.tsx b/enterprise/frontend/src/metabase-enterprise/auth/containers/JwtAuthCard/JwtAuthCard.tsxindex 3264c068845..07924c7bc22 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/containers/JwtAuthCard/JwtAuthCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/containers/JwtAuthCard/JwtAuthCard.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { AuthCard } from "metabase/admin/settings/auth/components/AuthCard";-import { useAdminSetting } from "metabase/api/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useHasTokenFeature } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import { JWT_SCHEMA } from "../../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsx b/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsxindex 77e303f85aa..2695a3ab77a 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsx@@ -2,10 +2,10 @@ import { useCallback } from "react";import { t } from "ttag";import { AuthCard } from "metabase/admin/settings/auth/components/AuthCard";-import { useAdminSetting } from "metabase/api/utils";import { getErrorMessage } from "metabase/api/utils/errors";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useHasTokenFeature, useToast } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import {useDeleteCustomOidcMutation,useGetCustomOidcProvidersQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/auth/containers/SamlAuthCard/SamlAuthCard.tsx b/enterprise/frontend/src/metabase-enterprise/auth/containers/SamlAuthCard/SamlAuthCard.tsxindex bb0dca7b25d..1b78e8689f0 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/containers/SamlAuthCard/SamlAuthCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/containers/SamlAuthCard/SamlAuthCard.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { AuthCard } from "metabase/admin/settings/auth/components/AuthCard";-import { useAdminSetting } from "metabase/api/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useHasTokenFeature } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import { SAML_SCHEMA } from "../../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/auth/utils.ts b/enterprise/frontend/src/metabase-enterprise/auth/utils.tsindex 107ecb7b646..4bfb2902469 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/auth/utils.ts@@ -1,7 +1,7 @@import { t } from "ttag";-import { useGetSettingsQuery } from "metabase/api";import { hasAnySsoFeature } from "metabase/common/utils/plan";+import { useGetSettingsQuery } from "metabase/settings";export const getSSOUrl = (siteUrl: string, redirectUrl?: string): string => {if (redirectUrl) {diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsxindex ae057ec8375..b0241d35ca1 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx@@ -4,9 +4,9 @@ import { t } from "ttag";import { skipToken } from "metabase/api";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { PaginationControls } from "metabase/common/components/PaginationControls";-import { useUserSetting } from "metabase/common/hooks";import { useListSelect } from "metabase/common/hooks/use-list-select";import type { Location } from "metabase/router";+import { useUserSetting } from "metabase/settings";import { Flex, Modal } from "metabase/ui";import * as Urls from "metabase/urls";import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";diff --git a/enterprise/frontend/src/metabase-enterprise/content_verification/metrics.tsx b/enterprise/frontend/src/metabase-enterprise/content_verification/metrics.tsxindex 2113c5a4b67..6fd04bdbef5 100644--- a/enterprise/frontend/src/metabase-enterprise/content_verification/metrics.tsx+++ b/enterprise/frontend/src/metabase-enterprise/content_verification/metrics.tsx@@ -5,9 +5,8 @@ import type {MetricFilterControlsProps,MetricFilterSettings,} from "metabase/browse/metrics";-import { useUserSetting } from "metabase/common/hooks";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting, useUserSetting } from "metabase/settings";import { VerifiedToggle } from "./VerifiedFilter/VerifiedToggle";diff --git a/enterprise/frontend/src/metabase-enterprise/content_verification/models.tsx b/enterprise/frontend/src/metabase-enterprise/content_verification/models.tsxindex c5bad079bc8..5df307650d2 100644--- a/enterprise/frontend/src/metabase-enterprise/content_verification/models.tsx+++ b/enterprise/frontend/src/metabase-enterprise/content_verification/models.tsx@@ -5,9 +5,8 @@ import type {ModelFilterControlsProps,ModelFilterSettings,} from "metabase/browse/models";-import { useUserSetting } from "metabase/common/hooks";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting, useUserSetting } from "metabase/settings";import { VerifiedToggle } from "./VerifiedFilter/VerifiedToggle";diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsx b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsxindex 877fe66ab7a..ad7e057dff6 100644--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsx@@ -2,9 +2,9 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";-import { useAdminSetting } from "metabase/api/utils";import { Link } from "metabase/common/components/Link";import { useHasTokenFeature } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import {ActionIcon,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.tsxindex 09daebf0543..c64b39d702e 100644--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { CopyTextArea } from "metabase/common/components/CopyTextArea";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Stack, Text, Title } from "metabase/ui";import {isLocalOrSnapshotVersion,diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.tsxindex a4d78032b04..8117527030e 100644--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.tsx@@ -5,7 +5,7 @@ import {DatabaseInfoSection,DatabaseInfoSectionDivider,} from "metabase/admin/databases/components/DatabaseInfoSection";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Button, Flex, Icon } from "metabase/ui";import { useDeleteDatabaseReplicationMutation } from "metabase-enterprise/api/database-replication";import type { Database } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsxindex d57611edf3d..5d9142e1de1 100644--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsx@@ -1,7 +1,7 @@import { memo } from "react";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Badge, Flex, type FlexProps, Text, Tooltip } from "metabase/ui";import type { DatabaseId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsxindex 907fe2b201a..a3213c9d2f9 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx@@ -16,11 +16,11 @@ import {} from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { Link } from "metabase/common/components/Link";-import { useSetting } from "metabase/common/hooks";import { useToast } from "metabase/common/hooks/use-toast";import { hasDbRoutingEnabled } from "metabase/common/utils/database";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import {Alert,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/embedding/components/InteractiveEmbeddingSettingsCard.tsx b/enterprise/frontend/src/metabase-enterprise/embedding/components/InteractiveEmbeddingSettingsCard.tsxindex a7a47ab7035..79efb7b358f 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding/components/InteractiveEmbeddingSettingsCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/embedding/components/InteractiveEmbeddingSettingsCard.tsx@@ -1,7 +1,8 @@import { t } from "ttag";import { EmbeddingSettingsCard } from "metabase/admin/settings/components/EmbeddingSettings";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Stack } from "metabase/ui/components";import { InteractiveEmbeddingAuthorizedOriginsWidget } from "metabase-enterprise/embedding/components/InteractiveEmbeddingAuthorizedOriginsWidget";diff --git a/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts b/enterprise/frontend/src/metabase-enterprise/embedding/selectors.tsindex ed8c060315b..a5b989de100 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts@@ -1,6 +1,6 @@import { getPlan } from "metabase/common/utils/plan";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";export const isInteractiveEmbeddingEnabled = (state: State) => {const plan = getPlan(getSetting(state, "token-features"));diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsxindex 67790848885..1cdab7833ad 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx@@ -2,9 +2,10 @@ import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useSetting, useStoreUrl } from "metabase/common/hooks";+import { useStoreUrl } from "metabase/common/hooks";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 af80c292463..11b847d6ab8 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx@@ -4,9 +4,10 @@ import { t } from "ttag";import { skipToken } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import {useDeleteGsheetsFolderLinkMutation,useGetServiceAccountQuery,diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsxindex a919b84d5a2..9e5c14ccd71 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx@@ -5,7 +5,7 @@ import ErrorBoundary from "metabase/ErrorBoundary";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Box, Card, Flex, Icon, Text } from "metabase/ui";import type { BillingInfo, BillingInfoLineItem } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsxindex 9bdeebd6311..a4cc0f76b14 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx@@ -9,13 +9,13 @@ import {import { LicenseInput } from "metabase/admin/settings/components/LicenseInput";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { ExplorePlansIllustration } from "metabase/admin/settings/components/SettingsLicense/ExplorePlansIllustration";-import { useGetAdminSettingsDetailsQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { getUpgradeUrl } from "metabase/selectors/settings";+import { useGetAdminSettingsDetailsQuery, useSetting } from "metabase/settings";import { Box, Divider, Flex, Stack } from "metabase/ui";import { useGetBillingInfoQuery } from "metabase-enterprise/api";import { useLicense } from "metabase-enterprise/settings/hooks/use-license";diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.tsindex cca3bc1bbdf..006e4930be3 100644--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts@@ -2,10 +2,11 @@ import { useEffect, useRef } from "react";import { t } from "ttag";import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";-import { useSetting, useStoreUrl, useToast } from "metabase/common/hooks";+import { useStoreUrl, useToast } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getIsHosted } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import { useLicense } from "metabase-enterprise/settings/hooks/use-license";const NOTIFICATION_TIMEOUT = 30_000;diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsxindex 540cfaaeb8b..4b362725dba 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx@@ -7,12 +7,12 @@ import {useUpdateMetabotSettingsMutation,} from "metabase/api";import { getErrorMessage } from "metabase/api/utils";-import { useSetting } from "metabase/common/hooks";import { useAIProviderConfigurationContext } from "metabase/metabot";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,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.tsxindex ed5a9b8314d..aa4f0a018e0 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.tsx@@ -2,11 +2,11 @@ import { useMemo } from "react";import { match } from "ts-pattern";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import { useUrlState } from "metabase/common/hooks/use-url-state";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { useLocation } from "metabase/router";+import { useSetting } from "metabase/settings";import { Flex, Loader, SimpleGrid, Stack, Tabs, Title } from "metabase/ui";import {VIEW_AGENT_API_CALLS,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.tsxindex b1b5a33e855..bfc42753681 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.tsx@@ -2,9 +2,9 @@ import { t } from "ttag";import EmptyDashboardBot from "assets/img/dashboard-empty.svg";import { EmptyState } from "metabase/common/components/EmptyState";-import { useSetting } from "metabase/common/hooks";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { Outlet } from "metabase/router";+import { useSetting } from "metabase/settings";import { Flex } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.tsxindex 0c80619a12e..1fcb07c37cc 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.tsx@@ -3,11 +3,11 @@ import { P, match } from "ts-pattern";import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting } from "metabase/common/hooks";import { useUrlState } from "metabase/common/hooks/use-url-state";import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { useLocation } from "metabase/router";+import { useSetting } from "metabase/settings";import { Flex, Loader, SimpleGrid, Stack, Tabs, Title } from "metabase/ui";import {VIEW_GROUP_MEMBERS,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxindex d9f190a8970..f20c59ef7e9 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx@@ -24,7 +24,7 @@ import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useSelector } from "metabase/redux";import { useParams } from "metabase/router";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import {Badge,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.tsxindex 0952a7700a2..e646a16f5d3 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx@@ -3,7 +3,6 @@ import { useMemo, useState } from "react";import { P, match } from "ts-pattern";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import { getOperatorDefaultValue } from "metabase/querying/common/components/DatePicker/SpecificDatePicker/utils";import type {DatePickerOperator,@@ -15,6 +14,7 @@ import {deserializeDateParameterValue,serializeDateParameterValue,} from "metabase/querying/parameters/utils/parsing";+import { useSetting } from "metabase/settings";import { Flex, Icon, Popover, Select } from "metabase/ui";// width needed to show Previous 12 months option w/ clippingdiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.tsindex 67e1b9e8bbd..bf48668c844 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.ts@@ -2,9 +2,9 @@ import { useMemo } from "react";import { t } from "ttag";import { useListPermissionsGroupsQuery, useListUsersQuery } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import type { DateFilterValue } from "metabase/querying/common/types";import { deserializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";+import { useSetting } from "metabase/settings";import { getUserName } from "metabase/utils/user";import { useListTenantsQuery } from "metabase-enterprise/api";import { hasPremiumFeature } from "metabase-enterprise/settings";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 05312d21708..ce9554e340d 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@@ -1,11 +1,11 @@import { msgid, ngettext, t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";-import { useAdminSetting } from "metabase/api/utils";import { Link } from "metabase/common/components/Link";import { useHasTokenFeature } from "metabase/common/hooks";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";import type { MfaAdminOverview } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsxindex 53c54fb6a61..182ba035357 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsx@@ -2,7 +2,7 @@ import { Fragment, useMemo } from "react";import { t } from "ttag";import { useListCollectionsTreeQuery } from "metabase/api";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import {Box,Divider,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 39a85b7b824..9bd133d90e7 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,9 +1,9 @@import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import type { GitSyncSetupMenuItemProps } from "metabase/plugins/types";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import { FixedSizeIcon, Text, Tooltip, UnstyledButton } from "metabase/ui";import S from "./GitSyncSetupMenuItem.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsxindex 0aa7bc72061..a3c153217eb 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx@@ -2,14 +2,10 @@ import { type ComponentProps, useCallback, useMemo, useRef } from "react";import { jt, t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";-import {- useGetAdminSettingsDetailsQuery,- useGetSettingsQuery,- useListCollectionItemsQuery,-} from "metabase/api";+import { useListCollectionItemsQuery } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useDocsUrl, useSetting, useToast } from "metabase/common/hooks";+import { useDocsUrl, useToast } from "metabase/common/hooks";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import {Form,@@ -23,6 +19,11 @@ import {import { PLUGIN_TRANSFORMS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";+import {+ useGetAdminSettingsDetailsQuery,+ useGetSettingsQuery,+ useSetting,+} from "metabase/settings";import {Box,Button,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsxindex c960d0f366a..12c9708612c 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx@@ -1,10 +1,9 @@import { useCallback, useMemo, useState } from "react";import { t } from "ttag";-import { useGetSettingsQuery } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { useMetadataToasts } from "metabase/metadata/hooks";import { useSelector } from "metabase/redux";+import { useGetSettingsQuery, useSetting } from "metabase/settings";import { Box, Button, Group, Icon, Modal } from "metabase/ui";import {useGetBranchesQuery,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 edf6731f2ea..c535d9e85db 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts@@ -1,6 +1,6 @@-import { useAdminSetting } from "metabase/api/utils";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useAdminSetting } from "metabase/settings";import { BRANCH_KEY, REMOTE_SYNC_KEY, TYPE_KEY } from "../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.tsindex 5fb6e3e9b67..97714766e66 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.ts@@ -3,7 +3,7 @@ import { useMemo } from "react";import { useListCollectionsTreeQuery } from "metabase/api";import { buildCollectionTree } from "metabase/common/collections/utils";import { getAllDescendantIds } from "metabase/common/components/tree/utils";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { TRANSFORMS_ROOT_ID } from "metabase-enterprise/remote_sync/utils";import { useGitSyncVisible } from "./use-git-sync-visible";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsxindex e1821a58766..69e6c3c675e 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx@@ -1,7 +1,7 @@import dayjs from "dayjs";-import { useSetting } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";+import { useSetting } from "metabase/settings";import { useGetRemoteSyncCurrentTaskQuery } from "metabase-enterprise/api";import { SyncProgressModal } from "../components/SyncProgressModal";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/register-listeners.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/register-listeners.tsindex 34c3fa836cf..749cb2658cf 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/register-listeners.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/register-listeners.ts@@ -9,7 +9,7 @@ import { isAnyOf } from "@reduxjs/toolkit";import { Api } from "metabase/api";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import type { Card, Collection, Dashboard, Document } from "metabase-types/api";import { REMOTE_SYNC_INVALIDATION_TAGS, TRANSFORMS_KEY } from "../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/selectors.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/selectors.tsindex 64ef25927b7..4782d691aaf 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/selectors.ts@@ -1,7 +1,7 @@import { createSelector } from "@reduxjs/toolkit";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { remoteSyncApi } from "metabase-enterprise/api";import { initialState } from "./sync-task-slice";diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsxindex 7a3a237db3d..b235586aaf9 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.tsx@@ -1,7 +1,7 @@import { match } from "ts-pattern";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import {Anchor,Badge,diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsxindex 5a7ef8d3921..3d05262a0fa 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx@@ -2,8 +2,9 @@ import { useCallback, useState } from "react";import { t } from "ttag";import { useSendTestNotificationMutation } from "metabase/api/security-center";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";+import { useSetting } from "metabase/settings";import { Button, Flex, Group, Icon, Modal, Stack } from "metabase/ui";import {diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsxindex fcdbb51ab32..e989f1fa109 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.tsx@@ -6,8 +6,8 @@ import {} from "metabase/api";import { Banner } from "metabase/common/components/Banner";import { Link } from "metabase/common/components/Link";-import { useSetting } from "metabase/common/hooks";import { getPlan } from "metabase/common/utils/plan";+import { useSetting } from "metabase/settings";import { Anchor, Text } from "metabase/ui";import { isAffected } from "../../utils";diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsxindex 1dd74d9f302..7a1b8f5e9dd 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx@@ -4,9 +4,10 @@ import { t } from "ttag";import { AdminSettingsLayout } from "metabase/admin/components/AdminLayout/AdminSettingsLayout";import { useSyncSecurityAdvisoriesMutation } from "metabase/api";import { EmptyState } from "metabase/common/components/EmptyState";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";import { useSearchParams } from "metabase/router";+import { useSetting } from "metabase/settings";import {Box,Button,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 a0e06a1f266..db6bb2ad58b 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@@ -6,11 +6,11 @@ import {useGetChannelInfoQuery,useListSecurityAdvisoriesQuery,} from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { getPlan } from "metabase/common/utils/plan";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";import { isAffected } from "../../utils";diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/hooks/use-notification-config.ts b/enterprise/frontend/src/metabase-enterprise/security_center/hooks/use-notification-config.tsindex 8561a486212..a8fa91e2f4d 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/hooks/use-notification-config.ts+++ b/enterprise/frontend/src/metabase-enterprise/security_center/hooks/use-notification-config.ts@@ -9,9 +9,8 @@ import {import {useGetChannelInfoQuery,useListUserRecipientsQuery,- useUpdateSettingsMutation,} from "metabase/api";-import { useSetting } from "metabase/common/hooks";+import { useSetting, useUpdateSettingsMutation } from "metabase/settings";import type {ChannelApiResponse,NotificationHandlerEmail,diff --git a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsxindex a4014776659..ca183f81387 100644--- a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx@@ -5,11 +5,11 @@ import _ from "underscore";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";import { UpsellSemanticSearchPill } from "metabase/admin/upsells/UpsellSemanticSearch";-import { getErrorMessage, useAdminSetting } from "metabase/api/utils";+import { getErrorMessage } from "metabase/api/utils";import { getPlan, isProPlan } from "metabase/common/utils/plan";import type { SearchSettingsWidgetProps } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting, useAdminSetting } from "metabase/settings";import { Box, Progress, Stack, Text, Tooltip } from "metabase/ui";import { useGetSemanticSearchStatusQuery } from "metabase-enterprise/api/search";diff --git a/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts b/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.tsindex 89c0ba254ff..03b30cae66a 100644--- a/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts+++ b/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts@@ -1,9 +1,10 @@import { useCallback, useEffect, useState } from "react";import { t } from "ttag";-import { premiumFeaturesApi, useUpdateSettingMutation } from "metabase/api";+import { premiumFeaturesApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { useDispatch } from "metabase/redux";+import { useUpdateSettingMutation } from "metabase/settings";import { reload } from "metabase/utils/dom";import type { TokenStatus } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts b/enterprise/frontend/src/metabase-enterprise/settings/selectors.tsindex f2b78fe9fec..dbb6c6fb4f2 100644--- a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts@@ -1,7 +1,7 @@import noResultsSource from "assets/img/no_results.svg";import type { IllustrationValue } from "metabase/plugins";import type { State } from "metabase/redux/store";-import { getSetting, getSettings } from "metabase/selectors/settings";+import { getSetting, getSettings } from "metabase/settings";import type {EnterpriseSettings,IllustrationSettingValue,diff --git a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.tsx b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.tsxindex 8b2da36f145..5a217788e58 100644--- a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.tsx+++ b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.tsx@@ -3,8 +3,7 @@ import { useEffect, useState } from "react";import { t } from "ttag";import { trackSMTPSetupClick } from "metabase/admin/settings/components/Email/analytics";-import { useAdminSetting } from "metabase/api/utils";-import { useSetting } from "metabase/common/hooks";+import { useAdminSetting, useSetting } from "metabase/settings";import {Box,Button,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 fe345efa9fc..c18458a427a 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@@ -7,11 +7,11 @@ import { useTokenRefreshUntil } from "metabase/api/utils";import {useAttachedDwh,useHasTokenFeature,- useSetting,useToast,} from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";import { STORAGE_PRODUCT_TYPE } from "./use-storage-add-on";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsxindex 1e39407d74f..0b698ca7d91 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx@@ -2,12 +2,12 @@ import { useEffect, useState } from "react";import { t } from "ttag";import { permissionApi } from "metabase/api";-import { useAdminSetting } from "metabase/api/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useToast } from "metabase/common/hooks";import { useConfirmation } from "metabase/common/hooks/use-confirmation";import { useDispatch } from "metabase/redux";import { push } from "metabase/router";+import { useAdminSetting } from "metabase/settings";import { Button, Flex, Group, Modal, Radio, Stack, Text } from "metabase/ui";import S from "./EditUserStrategyModal.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsxindex 2734cfc4e12..304b5ec926d 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx@@ -9,7 +9,6 @@ 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 { useSetting } from "metabase/common/hooks";import {PaddedSidebarLink,SidebarHeading,@@ -18,6 +17,7 @@ import {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 {tenantSpecificCollections,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsxindex 41c946c7895..2928b12f660 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx@@ -16,7 +16,6 @@ import {getCollectionIcon,} from "metabase/common/collections/utils";import { modalRoute } from "metabase/common/components/ModalRoute";-import { useSetting } from "metabase/common/hooks/use-setting";import { getGroupNameLocalized } from "metabase/common/utils/groups";import {PLUGIN_ADMIN_PERMISSIONS_TABS,@@ -27,6 +26,7 @@ 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";import { useListTenantsQuery } from "metabase-enterprise/api";import { hasPremiumFeature } from "metabase-enterprise/settings";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonRunnerSettingsPage/PythonRunnerSettingsPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonRunnerSettingsPage/PythonRunnerSettingsPage.tsxindex a2d51a0dc5e..e083e53d669 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonRunnerSettingsPage/PythonRunnerSettingsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonRunnerSettingsPage/PythonRunnerSettingsPage.tsx@@ -5,7 +5,7 @@ import {SettingsSection,} from "metabase/admin/components/SettingsSection";import { AdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";export function PythonRunnerSettingsPage() {const isHosted = useSetting("is-hosted?");diff --git a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsx b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsxindex b342e229b58..9c0b3b22372 100644--- a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsx+++ b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.tsx@@ -10,15 +10,16 @@ import {AdminSettingInput,BasicAdminSettingInput,} from "metabase/admin/settings/components/widgets/AdminSettingInput";+import { NotFound } from "metabase/common/components/ErrorPages";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useHasTokenFeature } from "metabase/common/hooks";import {useGetAdminSettingsDetailsQuery,useGetSettingsQuery,+ useSetting,useUpdateSettingMutation,-} from "metabase/api";-import { NotFound } from "metabase/common/components/ErrorPages";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+} from "metabase/settings";import {Alert,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.tsxindex 466d23b20ad..80732d61089 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.tsx@@ -1,7 +1,7 @@import { useDebouncedCallback } from "@mantine/hooks";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSetting } from "metabase/settings";import { useMantineTheme } from "metabase/ui";import type { ColorSettings as ColorSettingsType } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsxindex 62cbdc6aae0..b75bcf20812 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx@@ -2,7 +2,7 @@ import type { FocusEvent } from "react";import { useCallback, useMemo } from "react";import { t } from "ttag";-import { useAdminSetting } from "metabase/api/utils";+import { useAdminSetting } from "metabase/settings";import { Stack, Text, TextInput } from "metabase/ui";import type { FontFile } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.tsxindex de75af4d662..88919db3073 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.tsx@@ -2,8 +2,8 @@ import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSetting } from "metabase/settings";import { Box } from "metabase/ui";import { FontFilesWidget } from "./FontFilesWidget";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/utils.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/utils.tsindex 8dbc0c2b2f0..ea869f84364 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/utils.ts@@ -2,7 +2,7 @@ import { useMemo } from "react";import { t } from "ttag";import _ from "underscore";-import { useAdminSetting } from "metabase/api/utils";+import { useAdminSetting } from "metabase/settings";import type { FontFile, FontFormat } from "metabase-types/api";import type { FontFileOption } from "./types";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.tsxindex 1bf65766db9..ecbf57c4864 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.tsx@@ -4,9 +4,10 @@ import { jt, t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { getErrorMessage, useAdminSetting } from "metabase/api/utils";+import { getErrorMessage } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSetting } from "metabase/settings";import { Stack, TextInput } from "metabase/ui";import type { HelpLinkSetting } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsxindex 3890c6ba001..f2dd816bb9c 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx@@ -5,10 +5,10 @@ import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useAdminSetting } from "metabase/api/utils";import { LighthouseIllustrationThumbnail } from "metabase/common/components/LighthouseIllustration";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";import CS from "metabase/css/core/index.css";+import { useAdminSetting } from "metabase/settings";import { Box, Button, Flex, Icon, Paper, Text } from "metabase/ui";import type {EnterpriseSettingKey,diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsxindex 76a6b871fd3..347f526a481 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx@@ -4,9 +4,9 @@ import { useRef, useState } from "react";import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";import CS from "metabase/css/core/index.css";+import { useAdminSetting } from "metabase/settings";import { Box, Button, Flex, Icon, Paper, Text } from "metabase/ui";import type { EnterpriseSettingKey } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageUrlField/LandingPageUrlField.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageUrlField/LandingPageUrlField.tsxindex 3418ee87b35..2a9a058d83b 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageUrlField/LandingPageUrlField.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageUrlField/LandingPageUrlField.tsx@@ -1,7 +1,7 @@import { useEffect, useState } from "react";import { t } from "ttag";-import { useAdminSetting } from "metabase/api/utils";+import { useAdminSetting } from "metabase/settings";import { Stack, Text, TextInput } from "metabase/ui";import type { GenericErrorResponse } from "metabase/utils/errors";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsxindex d8b628e6d65..c77c06d548c 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";-import { useAdminSetting } from "metabase/api/utils";+import { useAdminSetting } from "metabase/settings";import { Box } from "metabase/ui";import { ImageToggle } from "../ImageToggle";diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex f8208f87a97..85fc99bdd63 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -213,6 +213,7 @@ const elements = [name: "selectors",enforceSharedTiers: false,}),+ createElement({ type: "shared", name: "settings", enforcePublicApi: true }),createElement({ type: "feature", name: "setup" }),createElement({ type: "shared", name: "status" }),createElement({diff --git a/frontend/lint/shared-tiers.mjs b/frontend/lint/shared-tiers.mjsindex 8ad085c17b5..81e8d183837 100644--- a/frontend/lint/shared-tiers.mjs+++ b/frontend/lint/shared-tiers.mjs@@ -23,8 +23,8 @@ const SHARED_UTILS_LEVELS = [["shared/router"],// U3 — the store slices and hooks.["shared/redux"],- // U4 — the plugin registry.- ["shared/plugins"],+ // U4 — the plugin registry, and instance settings over the api and store.+ ["shared/plugins", "shared/settings"],// U5 — app services over the store and registry.["shared/selectors",diff --git a/frontend/src/embedding-sdk-bundle/analytics/component-events.ts b/frontend/src/embedding-sdk-bundle/analytics/component-events.tsindex c6c2b6f53d0..e0a88f9832f 100644--- a/frontend/src/embedding-sdk-bundle/analytics/component-events.ts+++ b/frontend/src/embedding-sdk-bundle/analytics/component-events.ts@@ -2,8 +2,8 @@ import { useEffect } from "react";import { useSdkSelector } from "embedding-sdk-bundle/store";import { getSdkPackageVersion } from "embedding-sdk-shared/lib/get-build-info";-import { useSetting } from "metabase/common/hooks";import { isEmbeddingEajs, isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { useSetting } from "metabase/settings";import {getSdkAuthMethod,diff --git a/frontend/src/embedding-sdk-bundle/analytics/snowplow.ts b/frontend/src/embedding-sdk-bundle/analytics/snowplow.tsindex d04bc019a22..3d1bcda83fe 100644--- a/frontend/src/embedding-sdk-bundle/analytics/snowplow.ts+++ b/frontend/src/embedding-sdk-bundle/analytics/snowplow.ts@@ -5,7 +5,7 @@ import {} from "@snowplow/browser-tracker";import type { SdkStoreState } from "embedding-sdk-bundle/store/types";-import { getSettings } from "metabase/selectors/settings";+import { getSettings } from "metabase/settings";import { trackMetaplowEvent } from "metabase/utils/metaplow";import type { SimpleEventSchema } from "metabase-types/analytics/event";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsxindex 276cf724322..b52f1a0007f 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx@@ -9,7 +9,7 @@ import {import { Notebook as QBNotebook } from "metabase/querying/notebook/components/Notebook";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { ScrollArea } from "metabase/ui";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsxindex e6830d27771..ba8d296b3b5 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx@@ -6,12 +6,12 @@ import { DEFAULT_FONT } from "embedding-sdk-bundle/config";import { useEmbeddingThemeOverride } from "embedding-sdk-bundle/hooks/private/use-embedding-theme-override";import type { SdkStore } from "embedding-sdk-bundle/store/types";import { EnsureSingleInstance } from "embedding-sdk-shared/components/EnsureSingleInstance/EnsureSingleInstance";-import { useSetting } from "metabase/common/hooks";import {type MetabaseEmbeddingTheme,isEmbeddingThemeV1,} from "metabase/embedding-sdk/theme";import { MetabaseReduxProvider, useSelector } from "metabase/redux";+import { useSetting } from "metabase/settings";import { getFont } from "metabase/styled-components/selectors";import { getMetabaseSdkCssVariables } from "metabase/styled-components/theme/css-variables";import { ThemeProvider, useMantineTheme } from "metabase/ui";diff --git a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsxindex 35b0fed394a..2b46a6994e5 100644--- a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx@@ -26,7 +26,7 @@ import { isEmbeddingEajs } from "metabase/embedding-sdk/config";import { isEmbeddingThemeV1 } from "metabase/embedding-sdk/theme";import { MetabaseReduxProvider, useSelector } from "metabase/redux";import { setOptions } from "metabase/redux/embed";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { OverlayStackProvider } from "metabase/ui/components/overlays/overlay-stack";import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";import { initializePlugins } from "sdk-ee-plugins";diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.tsindex f18ba7d2624..2b23624bc94 100644--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts@@ -3,7 +3,6 @@ import { useMemo } from "react";import { DEFAULT_FONT } from "embedding-sdk-bundle/config";import { getEmbeddingThemeOverride } from "embedding-sdk-bundle/lib/theme";import { applyThemePreset } from "embedding-sdk-shared/lib/apply-theme-preset";-import { useSetting } from "metabase/common/hooks";import {type MetabaseEmbeddingTheme,getEmbeddingComponentOverrides,@@ -12,6 +11,7 @@ import {} from "metabase/embedding-sdk/theme";import { setGlobalEmbeddingColors } from "metabase/embedding-sdk/theme/embedding-color-palette";import { useSelector } from "metabase/redux";+import { useSetting } from "metabase/settings";import { getFont } from "metabase/styled-components/selectors";import type { MantineThemeOverride } from "metabase/ui";import { deriveFullMetabaseTheme } from "metabase/ui/colors";diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.tsindex 398b1862bdf..f684dbf8a52 100644--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.ts+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.ts@@ -10,10 +10,9 @@ import {getUsageProblem,} from "embedding-sdk-bundle/store/selectors";import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";-import { useSetting } from "metabase/common/hooks";import { EMBEDDING_SDK_CONFIG } from "metabase/embedding-sdk/config";import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";-import { getSetting, getTokenFeature } from "metabase/selectors/settings";+import { getSetting, getTokenFeature, useSetting } from "metabase/settings";export function useSdkUsageProblem({authConfig,diff --git a/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts b/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.tsindex e800c14ff2b..4acc6199e64 100644--- a/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts+++ b/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts@@ -1,13 +1,13 @@import { merge } from "icepick";import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";-import { refetchSiteSettings } from "metabase/api";import {type OnBeforeRequestHandlerConfig,PLUGIN_API,} from "metabase/api/client";import { overrideRequestsForGuestEmbeds } from "metabase/embedding/lib/override-requests-for-embeds";import { createAsyncThunk } from "metabase/redux/utils";+import { refetchSiteSettings } from "metabase/settings";import { isJWT } from "metabase/utils/jwt";import { getOrRefreshGuestSession } from "./auth";diff --git a/frontend/src/embedding-sdk-bundle/store/selectors.ts b/frontend/src/embedding-sdk-bundle/store/selectors.tsindex da80e8e3456..d13ed914930 100644--- a/frontend/src/embedding-sdk-bundle/store/selectors.ts+++ b/frontend/src/embedding-sdk-bundle/store/selectors.ts@@ -1,7 +1,7 @@import type { SdkStoreState } from "embedding-sdk-bundle/store/types";import { EMBEDDING_SDK_CONFIG } from "metabase/embedding-sdk/config";import type { State } from "metabase/redux/store";-import { getSetting, getTokenFeature } from "metabase/selectors/settings";+import { getSetting, getTokenFeature } from "metabase/settings";export const getIsGuestEmbedRaw = (state: SdkStoreState) =>state.sdk?.isGuestEmbed;diff --git a/frontend/src/metabase/AppComponent.tsx b/frontend/src/metabase/AppComponent.tsxindex 2ebac9fe037..d44a3cd0f4e 100644--- a/frontend/src/metabase/AppComponent.tsx+++ b/frontend/src/metabase/AppComponent.tsx@@ -1,6 +1,5 @@import { useEffect, useState } from "react";-import { useGetSettingsQuery } from "metabase/api";import { AppBarContainer } from "metabase/app/nav/AppBar";import { Navbar } from "metabase/app/nav/Navbar";import {@@ -30,6 +29,7 @@ import type { AppErrorDescriptor } from "metabase/redux/store";import { Outlet, useLocation } from "metabase/router";import { getErrorPage } from "metabase/selectors/app";import { getApplicationName } from "metabase/selectors/whitelabel";+import { useGetSettingsQuery } from "metabase/settings";import { StatusListing } from "metabase/status/components/StatusListing";import { initializeIframeResizer } from "metabase/utils/dom";diff --git a/frontend/src/metabase/AppThemeProvider.tsx b/frontend/src/metabase/AppThemeProvider.tsxindex 714388386a9..d61649a0911 100644--- a/frontend/src/metabase/AppThemeProvider.tsx+++ b/frontend/src/metabase/AppThemeProvider.tsx@@ -1,12 +1,12 @@import { type ReactNode, useCallback, useEffect, useState } from "react";-import { useUpdateSettingMutation } from "metabase/api";import {isPublicEmbedding,isStaticEmbedding,} from "metabase/embedding/config";import type { DisplayTheme } from "metabase/embedding/types";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { useUpdateSettingMutation } from "metabase/settings";import type { MantineThemeOverride } from "metabase/ui";import { mutateColors } from "metabase/ui/colors/colors";import { ThemeProvider } from "metabase/ui/components/theme/ThemeProvider";diff --git a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsxindex 0f313e9e2f7..fb77ea5e702 100644--- a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx+++ b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx@@ -2,8 +2,8 @@ import { useMemo } from "react";import { t } from "ttag";import { UserAvatar } from "metabase/common/components/UserAvatar";-import { useSetting } from "metabase/common/hooks";import { PLUGIN_IS_PASSWORD_USER } from "metabase/plugins";+import { useSetting } from "metabase/settings";import { Box, Flex, Tabs, Title, rem } from "metabase/ui";import { getFullName } from "metabase/utils/user";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/account/profile/selectors.ts b/frontend/src/metabase/account/profile/selectors.tsindex 598a3166685..27f9c204ccd 100644--- a/frontend/src/metabase/account/profile/selectors.ts+++ b/frontend/src/metabase/account/profile/selectors.ts@@ -1,8 +1,8 @@import { createSelector } from "@reduxjs/toolkit";import { PLUGIN_IS_PASSWORD_USER } from "metabase/plugins";-import { getSettings } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";+import { getSettings } from "metabase/settings";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 832430d7e30..aa886934a02 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -13,8 +13,8 @@ import { SidebarContent } from "metabase/common/components/SidebarContent";import { TextArea } from "metabase/common/components/TextArea";import { useUniqueId } from "metabase/common/hooks/use-unique-id";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";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";import type { ActionFormSettings, WritebackAction } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsx b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsxindex fd5a90dcabd..bed4d282dd8 100644--- a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsx+++ b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsx@@ -4,14 +4,13 @@ import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { skipToken, useGetMetabotSettingsQuery } from "metabase/api";-import { useAdminSetting } from "metabase/api/utils";-import { useSetting } from "metabase/common/hooks";import {AIProviderConfigurationForm,getProviderOptions,parseProviderAndModel,} from "metabase/metabot";import { PLUGIN_METABOT } from "metabase/plugins";+import { useAdminSetting, useSetting } from "metabase/settings";import { Badge, Flex, Group } from "metabase/ui";export function AIProviderSettingsSection({ id }: { id?: string }) {diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.tsxindex 6a8d1558dd0..aafef3d7cb7 100644--- a/frontend/src/metabase/admin/ai/AISettingsPage.tsx+++ b/frontend/src/metabase/admin/ai/AISettingsPage.tsx@@ -6,18 +6,18 @@ import {SettingsSection,} from "metabase/admin/components/SettingsSection";import { useListMetabotsQuery } from "metabase/api";-import { useAdminSetting } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import { FIXED_METABOT_IDS } from "metabase/metabot/constants";import {PLUGIN_EMBEDDING_IFRAME_SDK,PLUGIN_EMBEDDING_SDK,} from "metabase/plugins";import { queryToSearch, useSearchParams } from "metabase/router";+import { useAdminSetting, useSetting } from "metabase/settings";import { Divider, Flex, Stack, Switch, Tabs } from "metabase/ui";import { AIProviderSettingsSection } from "./AIProviderSettingsSection";diff --git a/frontend/src/metabase/admin/ai/McpAppsSettings.tsx b/frontend/src/metabase/admin/ai/McpAppsSettings.tsxindex 07b5f33b995..4bb3035ae66 100644--- a/frontend/src/metabase/admin/ai/McpAppsSettings.tsx+++ b/frontend/src/metabase/admin/ai/McpAppsSettings.tsx@@ -4,9 +4,9 @@ import { jt, t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { AdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useAdminSetting } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import { Box, Flex, Stack, Switch, Text } from "metabase/ui";import { CursorInstallLink } from "./CursorInstallLink";diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.tsxindex c762561eaa2..28df169ddf4 100644--- a/frontend/src/metabase/admin/ai/MetabotNavPane.tsx+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.tsx@@ -4,8 +4,8 @@ import {AdminNavItem,AdminNavWrapper,} from "metabase/admin/components/AdminNav";-import { useSetting } from "metabase/common/hooks";import { PLUGIN_AI_CONTROLS } from "metabase/plugins";+import { useSetting } from "metabase/settings";import { Flex } from "metabase/ui";export function MetabotNavPane() {diff --git a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsxindex 3f052211907..d3393c66b40 100644--- a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx+++ b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx@@ -9,7 +9,6 @@ import {useGetCollectionQuery,useUpdateMetabotMutation,} from "metabase/api";-import { useAdminSetting } from "metabase/api/utils/settings";import { canonicalCollectionId } from "metabase/common/collections/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";@@ -17,6 +16,7 @@ import { useToast } from "metabase/common/hooks";import { useGetIcon } from "metabase/hooks/use-icon";import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";import { PLUGIN_MODERATION } from "metabase/plugins";+import { useAdminSetting } from "metabase/settings";import {Box,Button,diff --git a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsxindex 030c112e097..7b160c48073 100644--- a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx+++ b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx@@ -11,10 +11,9 @@ import {useGetSlackAppInfoQuery,useGetSlackManifestQuery,} from "metabase/api/slack";-import { useAdminSetting, useAdminSettings } from "metabase/api/utils/settings";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import {Form,FormErrorMessage,@@ -22,6 +21,11 @@ import {FormSubmitButton,FormTextInput,} from "metabase/forms";+import {+ useAdminSetting,+ useAdminSettings,+ useSetting,+} from "metabase/settings";import { Accordion, Button, Flex, Stack, Text } from "metabase/ui";import * as Errors from "metabase/utils/errors";import type { SlackAppInfo } from "metabase-types/api/slack";diff --git a/frontend/src/metabase/admin/ai/useMCPServerURL.ts b/frontend/src/metabase/admin/ai/useMCPServerURL.tsindex bc37eadb762..72de65e3374 100644--- a/frontend/src/metabase/admin/ai/useMCPServerURL.ts+++ b/frontend/src/metabase/admin/ai/useMCPServerURL.ts@@ -1,4 +1,4 @@-import { useAdminSetting } from "metabase/api/utils";+import { useAdminSetting } from "metabase/settings";export function useMCPServerURL() {const { value: siteUrl } = useAdminSetting("site-url");diff --git a/frontend/src/metabase/admin/app/actions.ts b/frontend/src/metabase/admin/app/actions.tsindex b6545cb352c..2185ffaae60 100644--- a/frontend/src/metabase/admin/app/actions.ts+++ b/frontend/src/metabase/admin/app/actions.ts@@ -1,5 +1,5 @@-import { settingsApi } from "metabase/api";import { createAsyncThunk } from "metabase/redux/utils";+import { settingsApi } from "metabase/settings";import { getCurrentVersion } from "./selectors";diff --git a/frontend/src/metabase/admin/app/selectors.ts b/frontend/src/metabase/admin/app/selectors.tsindex 05623353bec..fb9d8ca63de 100644--- a/frontend/src/metabase/admin/app/selectors.ts+++ b/frontend/src/metabase/admin/app/selectors.ts@@ -1,7 +1,7 @@import { getEngines } from "metabase/databases/selectors";import { isDeprecatedEngine } from "metabase/databases/utils/engine";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import type Database from "metabase-lib/v1/metadata/Database";interface Props {diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsxindex 756a96b177f..dc5fb0dcc46 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx@@ -3,13 +3,14 @@ import { c, t } from "ttag";import { NewUserModal } from "metabase/admin/people/containers/NewUserModal";import { Link } from "metabase/common/components/Link";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import { getHelpUrl } from "metabase/common/utils/help-url";import CS from "metabase/css/core/index.css";import { getEngines } from "metabase/databases/selectors";import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import {ActionIcon,Box,diff --git a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsx b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsxindex 8204c66ca5d..bec46273e6b 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsx@@ -6,8 +6,9 @@ import {useUnpersistDatabaseMutation,} from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import { hasFeature } from "metabase/common/utils/database";+import { useSetting } from "metabase/settings";import { Alert, Box, Flex, Icon, Switch } from "metabase/ui";import { getModelCacheSchemaName } from "metabase-lib/v1/metadata/utils/models";import type { Database } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsxindex 9b3ef3a5c07..84a7ae904e7 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx@@ -10,7 +10,6 @@ import {import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";import { GenericError } from "metabase/common/components/ErrorPages";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { ReturnToSetupGuideModal } from "metabase/embedding/components/ReturnToSetupGuideModal";import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/constants";@@ -24,6 +23,7 @@ import {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 5cc9b647fdb..a4e92d52775 100644--- a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx@@ -5,10 +5,10 @@ import {useListDatabasesQuery,} from "metabase/api";import { LoadingAndGenericErrorWrapper } from "metabase/common/components/LoadingAndGenericErrorWrapper";-import { useSetting } from "metabase/common/hooks";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import { isSyncInProgress } from "metabase/utils/syncing";import { DatabaseList } from "../components/DatabaseList";diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EnableEmbeddingPrompt.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EnableEmbeddingPrompt.tsxindex fa84da43804..ae9c6a2ebbc 100644--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/EnableEmbeddingPrompt.tsx+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/EnableEmbeddingPrompt.tsx@@ -1,6 +1,6 @@import { c, t } from "ttag";-import { useUpdateSettingsMutation } from "metabase/api";+import { useUpdateSettingsMutation } from "metabase/settings";import { Anchor, Button, Center, Stack, Text } from "metabase/ui";interface EnableEmbeddingPromptProps {diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.tsxindex a77f61ab85c..29cd82de58b 100644--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.tsx+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.tsx@@ -1,8 +1,8 @@import { useState } from "react";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";+import { useSetting } from "metabase/settings";import { Box, Center, Flex, Loader, Text } from "metabase/ui";import { EnableEmbeddingPrompt } from "./EnableEmbeddingPrompt";diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/ResourcePreview.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/ResourcePreview.tsxindex beaad08566a..1d38ce04348 100644--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/ResourcePreview.tsx+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/ResourcePreview.tsx@@ -8,11 +8,11 @@ import {} from "react";import { match } from "ts-pattern";-import { useSetting } from "metabase/common/hooks";import { METABASE_CONFIG_IS_PROXY_FIELD_NAME } from "metabase/embedding/embedding-iframe-sdk/constants";import { setupConfigWatcher } from "metabase/embedding/embedding-iframe-sdk/embed";import type { SdkIframeEmbedBaseSettings } from "metabase/embedding/embedding-iframe-sdk/types/embed";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";+import { useSetting } from "metabase/settings";import { Box, Center, Loader } from "metabase/ui";import S from "./PreviewPanel.module.css";diff --git a/frontend/src/metabase/admin/embedding/embedding-hub/EmbeddingHubAdminSettingsPage.tsx b/frontend/src/metabase/admin/embedding/embedding-hub/EmbeddingHubAdminSettingsPage.tsxindex a8c21689015..ba8d2434e5b 100644--- a/frontend/src/metabase/admin/embedding/embedding-hub/EmbeddingHubAdminSettingsPage.tsx+++ b/frontend/src/metabase/admin/embedding/embedding-hub/EmbeddingHubAdminSettingsPage.tsx@@ -4,8 +4,9 @@ import {RelatedSettingsSection,getModularEmbeddingRelatedSettingItems,} from "metabase/admin/components/RelatedSettingsSection";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { EmbeddingHub } from "metabase/embedding/embedding-hub";+import { useSetting } from "metabase/settings";import { Stack, Text, Title } from "metabase/ui";export const EmbeddingHubAdminSettingsPage = () => {diff --git a/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.ts b/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.tsindex b7ea96b1d81..857365589e8 100644--- a/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.ts+++ b/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.ts@@ -1,7 +1,7 @@import { useMemo } from "react";-import { useSetting } from "metabase/common/hooks";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";+import { useSetting } from "metabase/settings";import { deriveSdkThemeSettings } from "../utils/derive-sdk-theme-settings";diff --git a/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-themes.ts b/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-themes.tsindex c01c948bd5c..1bb273206d4 100644--- a/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-themes.ts+++ b/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-themes.ts@@ -1,7 +1,7 @@import { useMemo } from "react";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import type { CreateEmbeddingThemeRequest } from "metabase-types/api";import { deriveSdkThemeSettings } from "../utils/derive-sdk-theme-settings";diff --git a/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.ts b/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.tsindex ee6696ea17c..1914504acf7 100644--- a/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.ts+++ b/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.ts@@ -9,7 +9,7 @@ import {useGetEmbeddingThemeQuery,useUpdateEmbeddingThemeMutation,} from "metabase/api/embedding-theme";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import type {ChartColor,MetabaseColor,@@ -17,6 +17,7 @@ import type {} from "metabase/embedding-sdk/theme";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { useSetting } from "metabase/settings";import { suggestHarmonyColors } from "metabase/ui/colors/harmonies";import type { EmbeddingTheme } from "metabase-types/api";import type { ColorSettings } from "metabase-types/api/settings";diff --git a/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.ts b/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.tsindex 3d3c8b39bff..39dfbe20ab1 100644--- a/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.ts+++ b/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.ts@@ -1,7 +1,7 @@import { useEffect, useRef } from "react";import { useSeedDefaultEmbeddingThemesMutation } from "metabase/api/embedding-theme";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { useDefaultEmbeddingThemes } from "./use-default-embedding-themes";diff --git a/frontend/src/metabase/admin/help/Help.tsx b/frontend/src/metabase/admin/help/Help.tsxindex 95ae933e33e..a7262780ba7 100644--- a/frontend/src/metabase/admin/help/Help.tsx+++ b/frontend/src/metabase/admin/help/Help.tsx@@ -12,12 +12,12 @@ import { UpsellBetterSupport } from "metabase/admin/upsells";import { useGetBugReportDetailsQuery } from "metabase/api/bug-report";import { CopyButton } from "metabase/common/components/CopyButton";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { PLUGIN_SUPPORT } from "metabase/plugins";import { useSelector } from "metabase/redux";import { Outlet } from "metabase/router";import { getIsPaidPlan } from "metabase/selectors/settings";+import { useSetting } from "metabase/settings";import { Box, Code, Group } from "metabase/ui";import { getBasename } from "metabase/utils/basename";diff --git a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx b/frontend/src/metabase/admin/people/components/PeopleListRow.tsxindex 488d73f820b..db42853ee62 100644--- a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleListRow.tsx@@ -6,7 +6,7 @@ import { ForwardRefLink } from "metabase/common/components/Link";import { UserAvatar } from "metabase/common/components/UserAvatar";import { PLUGIN_ADMIN_USER_MENU_ITEMS, PLUGIN_TENANTS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import {Box,Flex,diff --git a/frontend/src/metabase/admin/people/components/PeopleNav.tsx b/frontend/src/metabase/admin/people/components/PeopleNav.tsxindex d60882047f6..a38c8420a87 100644--- a/frontend/src/metabase/admin/people/components/PeopleNav.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleNav.tsx@@ -11,9 +11,9 @@ import {} from "metabase/admin/people/selectors";import { UpsellSSO } from "metabase/admin/upsells";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { useLocation } from "metabase/router";+import { useSetting } from "metabase/settings";import { Divider, Stack } from "metabase/ui";export function PeopleNav() {diff --git a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsxindex 28234031150..1fc2d2e840e 100644--- a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx@@ -13,10 +13,10 @@ import {useUpdatePermissionsGroupMutation,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting } from "metabase/common/hooks";import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import type { Group } from "metabase-types/api";import { GroupsListing } from "../components/GroupsListing";diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsxindex 7ce60b8f6d8..9da82726c99 100644--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx@@ -5,11 +5,11 @@ 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 { useSetting } from "metabase/common/hooks";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/containers/UserSuccessModal.tsx b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsxindex d27ada3f70a..2c867ac25f2 100644--- a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx+++ b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx@@ -11,7 +11,8 @@ import CS from "metabase/css/core/index.css";import { PLUGIN_TENANTS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { push, replace } from "metabase/router";-import { getSetting, isSsoEnabled } from "metabase/selectors/settings";+import { isSsoEnabled } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box } from "metabase/ui";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/people/selectors.ts b/frontend/src/metabase/admin/people/selectors.tsindex 2d0496bc57b..bc6df46b278 100644--- a/frontend/src/metabase/admin/people/selectors.ts+++ b/frontend/src/metabase/admin/people/selectors.ts@@ -3,8 +3,8 @@ import { createSelector } from "@reduxjs/toolkit";import { ACTIVE_USERS_NUDGE_THRESHOLD } from "metabase/admin/people/constants";import { hasAnySsoFeature } from "metabase/common/utils/plan";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";+import { getSetting } from "metabase/settings";export const getUserTemporaryPassword = (state: State,diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsxindex ee9183101e1..c39a89c33e2 100644--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx@@ -15,12 +15,13 @@ import {} from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";-import { useDocsUrl, useSetting, useToast } from "metabase/common/hooks";+import { useDocsUrl, useToast } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import {getApplicationName,getShowMetabaseLinks,} from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";import { Switch, Text } from "metabase/ui";import ModelPersistenceConfigurationS from "./ModelPersistenceConfiguration.module.css";diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsxindex 3d995bcad94..a06d7751066 100644--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx@@ -7,8 +7,8 @@ import {} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { useGetSettingsQuery } from "metabase/api";import { createMockState } from "metabase/redux/store/mocks";+import { useGetSettingsQuery } from "metabase/settings";import { createMockSettings } from "metabase-types/api/mocks";import { ModelPersistenceConfiguration } from "./ModelPersistenceConfiguration";diff --git a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx b/frontend/src/metabase/admin/performance/components/StrategyForm.tsxindex 0d421ab93de..fe3fc3bdb64 100644--- a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx+++ b/frontend/src/metabase/admin/performance/components/StrategyForm.tsx@@ -18,7 +18,7 @@ import {} from "metabase/forms";import { PLUGIN_CACHING, isModelWithClearableCache } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import {Box,Button,diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsxindex 0c8273ea3a3..7e697c8414d 100644--- a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx+++ b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx@@ -5,7 +5,7 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";import { PLUGIN_TRANSFORMS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import {Accordion,Box,diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsxindex 26bc99afe8b..8db1297fb79 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx@@ -1,8 +1,8 @@import { t } from "ttag";-import { useUpdateSettingMutation } from "metabase/api";import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";+import { useUpdateSettingMutation } from "metabase/settings";import { Alert, Anchor, Box, Icon } from "metabase/ui";export const PermissionsEditorSplitPermsMessage = () => {diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsxindex 51961a0c1e0..244b300d9bb 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx@@ -15,9 +15,9 @@ import { getIsHelpReferenceOpen } from "metabase/admin/permissions/selectors/helimport type { PermissionsGraphDiff } from "metabase/admin/permissions/types";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";-import { useUserSetting } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";import { push } from "metabase/router";+import { useUserSetting } from "metabase/settings";import {Group,Button as NewButton,diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsxindex 4c51012f67c..77869ee1016 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsTabs.tsx@@ -1,10 +1,10 @@import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import {PLUGIN_ADMIN_PERMISSIONS_TABS,PLUGIN_APPLICATION_PERMISSIONS,} from "metabase/plugins";+import { useSetting } from "metabase/settings";import { Box, Tabs } from "metabase/ui";import type { PermissionsPageTab } from "./PermissionsPageLayout";diff --git a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsxindex e862da3d97d..1767cdafabc 100644--- a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx@@ -7,7 +7,7 @@ import type { ITreeNodeItem } from "metabase/common/components/tree/types";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { Outlet, push, useParams } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Center, Loader } from "metabase/ui";import {diff --git a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsxindex a22268b5203..0001c94757d 100644--- a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx@@ -7,7 +7,7 @@ import type { ITreeNodeItem } from "metabase/common/components/tree/types";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { Outlet, push, useParams } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Center, Loader } from "metabase/ui";import {diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsxindex 8f54d9a0d5f..fdeb17cffc7 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx@@ -17,7 +17,7 @@ import {} from "metabase/plugins";import type { State } from "metabase/redux/store";import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";-import { getSetting, getTokenFeature } from "metabase/selectors/settings";+import { getSetting, getTokenFeature } from "metabase/settings";import { getResponseErrorMessage } from "metabase/utils/errors";import type Schema from "metabase-lib/v1/metadata/Schema";import type {diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsxindex d83f66f9bd3..6b1bb20a601 100644--- a/frontend/src/metabase/admin/routes.tsx+++ b/frontend/src/metabase/admin/routes.tsx@@ -48,7 +48,7 @@ import {} from "metabase/plugins";import type { State } from "metabase/redux/store";import { Route, type RouteComponent, redirect } from "metabase/router";-import { getTokenFeature } from "metabase/selectors/settings";+import { getTokenFeature } from "metabase/settings";import { AISettingsPage, McpSettingsPage } from "./ai/AISettingsPage";import { MetabotAdminLayout } from "./ai/MetabotAdminLayout";diff --git a/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx b/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsxindex c8a48e07450..361c80a0ed5 100644--- a/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx+++ b/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx@@ -5,17 +5,9 @@ import {SettingsPageWrapper,SettingsSection,} from "metabase/admin/components/SettingsSection";-import {- useGetAdminSettingsDetailsQuery,- useGetSettingsQuery,- useUpdateGoogleAuthMutation,-} from "metabase/api";+import { useUpdateGoogleAuthMutation } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";-import {- useDocsUrl,- useHasTokenFeature,- useSetting,-} from "metabase/common/hooks";+import { useDocsUrl, useHasTokenFeature } from "metabase/common/hooks";import {Form,FormErrorMessage,@@ -23,6 +15,11 @@ import {FormSubmitButton,FormTextInput,} from "metabase/forms";+import {+ useGetAdminSettingsDetailsQuery,+ useGetSettingsQuery,+ useSetting,+} from "metabase/settings";import { Flex, Stack, Text, Title } from "metabase/ui";import type { SettingDefinition, Settings } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/settings/auth/containers/GoogleAuthCard/GoogleAuthCard.tsx b/frontend/src/metabase/admin/settings/auth/containers/GoogleAuthCard/GoogleAuthCard.tsxindex 5c82a205a77..9db4a3fda75 100644--- a/frontend/src/metabase/admin/settings/auth/containers/GoogleAuthCard/GoogleAuthCard.tsx+++ b/frontend/src/metabase/admin/settings/auth/containers/GoogleAuthCard/GoogleAuthCard.tsx@@ -1,7 +1,7 @@import { t } from "ttag";-import { useAdminSetting } from "metabase/api/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useAdminSetting } from "metabase/settings";import type { EnterpriseSettings } from "metabase-types/api";import { AuthCard } from "../../components/AuthCard";diff --git a/frontend/src/metabase/admin/settings/auth/containers/LdapAuthCard/LdapAuthCard.tsx b/frontend/src/metabase/admin/settings/auth/containers/LdapAuthCard/LdapAuthCard.tsxindex 5f1cebcecfc..d6db0674959 100644--- a/frontend/src/metabase/admin/settings/auth/containers/LdapAuthCard/LdapAuthCard.tsx+++ b/frontend/src/metabase/admin/settings/auth/containers/LdapAuthCard/LdapAuthCard.tsx@@ -1,7 +1,7 @@import { t } from "ttag";-import { useAdminSetting } from "metabase/api/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useAdminSetting } from "metabase/settings";import type { EnterpriseSettings } from "metabase-types/api";import { AuthCard } from "../../components/AuthCard";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsxindex c61c0059e33..20d3de447d9 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx@@ -3,13 +3,12 @@ import { useEffect, useState } from "react";import {useCreateCloudMigrationMutation,useGetCloudMigrationQuery,- useLazyGetSettingsQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useStoreUrl } from "metabase/common/hooks";import { type Plan, getPlan } from "metabase/common/utils/plan";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting, useLazyGetSettingsQuery } from "metabase/settings";import { Box } from "metabase/ui";import type { CloudMigration } from "metabase-types/api/cloud-migration";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsxindex fe93cdc79d4..c6b39edeb4d 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx@@ -8,7 +8,7 @@ import {import { renderWithProviders, screen, waitFor, within } from "__support__/ui";import { getPlan } from "metabase/common/utils/plan";import { createMockState } from "metabase/redux/store/mocks";-import { getSettings } from "metabase/selectors/settings";+import { getSettings } from "metabase/settings";import type { CloudMigration } from "metabase-types/api/cloud-migration";import { createMockSettings, createMockUser } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsxindex 0b97d8a899e..93fdd2ed9e1 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx@@ -3,11 +3,11 @@ import { t } from "ttag";import { useCancelCloudMigrationMutation } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useSetting } from "metabase/common/hooks";import { useToggle } from "metabase/common/hooks/use-toggle";import type { Plan } from "metabase/common/utils/plan";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";+import { useSetting } from "metabase/settings";import {Box,Button,diff --git a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsxindex 8862baad135..3d31711c216 100644--- a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx+++ b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx@@ -4,10 +4,6 @@ import { t } from "ttag";import * as Yup from "yup";import { isErrorWithMessage } from "metabase/admin/performance/utils";-import {- useGetAdminSettingsDetailsQuery,- useGetSettingsQuery,-} from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { useToast } from "metabase/common/hooks";import {@@ -17,6 +13,10 @@ import {FormSubmitButton,FormTextInput,} from "metabase/forms";+import {+ useGetAdminSettingsDetailsQuery,+ useGetSettingsQuery,+} from "metabase/settings";import { Box, Button, Chip, Flex, Modal, Stack } from "metabase/ui";import * as Errors from "metabase/utils/errors";import type { SettingDefinitionMap, SettingKey } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/SMTPConnectionCard.tsx b/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/SMTPConnectionCard.tsxindex f7a12af92a9..4d64c912c4b 100644--- a/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/SMTPConnectionCard.tsx+++ b/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/SMTPConnectionCard.tsx@@ -1,5 +1,5 @@-import { useSetting } from "metabase/common/hooks";import { PLUGIN_SMTP_OVERRIDE } from "metabase/plugins";+import { useSetting } from "metabase/settings";import { SelfHostedSMTPConnectionCard } from "../SelfHostedSMTPConnectionCard";diff --git a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.tsx b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.tsxindex d855890ba86..3525ac1446c 100644--- a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.tsx+++ b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.tsx@@ -2,7 +2,7 @@ import { useDisclosure } from "@mantine/hooks";import { t } from "ttag";import { SettingsSection } from "metabase/admin/components/SettingsSection";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Button, Flex, Paper, Title } from "metabase/ui";import { SelfHostedSMTPConnectionForm } from "./SelfHostedSMTPConnectionForm";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsxindex b2703fa8525..107bff74bb4 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingLegaleseModal/EmbeddingLegaleseModal.tsx@@ -2,7 +2,7 @@ import { useState } from "react";import { match } from "ts-pattern";import { t } from "ttag";-import { useUpdateSettingsMutation } from "metabase/api";+import { useUpdateSettingsMutation } from "metabase/settings";import { Button, Group, List, Modal, type ModalProps, Text } from "metabase/ui";type SettingKey = "enable-embedding-sdk" | "enable-embedding-simple";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsxindex 25eab184ca4..b63885de1d0 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecretKeyWidget.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import { SetByEnvVarWrapper } from "metabase/admin/settings/components/widgets/AdminSettingInput";import { useLazyGenerateRandomTokenQuery } from "metabase/api/util";-import { useAdminSetting } from "metabase/api/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { CopyButton } from "metabase/common/components/CopyButton";+import { useAdminSetting } from "metabase/settings";import { Box, Button, Flex, TextInputBlurChange } from "metabase/ui";import { SettingHeader } from "../SettingHeader";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsxindex fbc13d8ea1b..71295041c34 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx@@ -1,7 +1,7 @@import { jt, t } from "ttag";import { AdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Box, Group, HoverCard, Icon, Text } from "metabase/ui";export const CorsInputWidget = () => {diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsxindex 6eef93baf14..cae81f9bbb5 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx@@ -1,9 +1,9 @@import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";+import { useSetting } from "metabase/settings";import { Alert, Box, Center, Stack, Text } from "metabase/ui";import { isSameOrigin } from "metabase/utils/dom";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsxindex ed407808c88..cace20d4cc0 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/SameSiteSelectWidget.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";import { SetByEnvVarWrapper } from "metabase/admin/settings/components/widgets/AdminSettingInput";-import { useAdminSetting } from "metabase/api/utils";+import { useAdminSetting } from "metabase/settings";import { Box, Button, Group, Icon, Menu, Stack, Text } from "metabase/ui";import type { SessionCookieSameSite } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsxindex e8a3aa514c0..ba71bd23344 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx@@ -9,17 +9,14 @@ import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";import { NewEmbedButton } from "metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton";import { UpsellDevInstances } from "metabase/admin/upsells";import { ExternalLink } from "metabase/common/components/ExternalLink";-import {- useDocsUrl,- useHasTokenFeature,- useSetting,-} from "metabase/common/hooks";+import { useDocsUrl, useHasTokenFeature } from "metabase/common/hooks";import {PLUGIN_ADMIN_SETTINGS,PLUGIN_CONTENT_TRANSLATION,PLUGIN_EMBEDDING_SDK,PLUGIN_IS_EE_BUILD,} from "metabase/plugins";+import { useSetting } from "metabase/settings";import { Box, Group, Icon, Stack, Text } from "metabase/ui";import { EmbeddingSdkSettings } from "../EmbeddingSdkSettings/EmbeddingSdkSettings";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsxindex c593277aa24..8e56c213def 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsx@@ -2,8 +2,11 @@ import { useDisclosure } from "@mantine/hooks";import type { ChangeEvent } from "react";import { t } from "ttag";-import { useAdminSetting, useAdminSettings } from "metabase/api/utils";-import { useSetting } from "metabase/common/hooks";+import {+ useAdminSetting,+ useAdminSettings,+ useSetting,+} from "metabase/settings";import { Switch, type SwitchProps, Text } from "metabase/ui";import { EmbeddingLegaleseModal } from "../EmbeddingLegaleseModal";diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsxindex 07d1ecfe3ab..23f043d1998 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx@@ -4,7 +4,6 @@ import { SettingsSection } from "metabase/admin/components/SettingsSection";import { EmbeddingSettingsCard } from "metabase/admin/settings/components/EmbeddingSettings";import { NewEmbedButton } from "metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton";import { UpsellBanner } from "metabase/common/components/upsells/components";-import { useSetting } from "metabase/common/hooks";import {PLUGIN_ADMIN_SETTINGS,PLUGIN_CONTENT_TRANSLATION,@@ -12,6 +11,7 @@ import {} from "metabase/plugins";import { useSelector } from "metabase/redux";import { getUpgradeUrl } from "metabase/selectors/settings";+import { useSetting } from "metabase/settings";import { Box, Text } from "metabase/ui";import { SettingTitle } from "../../SettingHeader";diff --git a/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.tsx b/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.tsxindex dc420d15ae2..e8dbed98763 100644--- a/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.tsx+++ b/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.tsx@@ -1,6 +1,7 @@import { t } from "ttag";-import { useSetting, useStoreUrl } from "metabase/common/hooks";+import { useStoreUrl } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Alert, Anchor, Icon } from "metabase/ui";export function DevInstanceBanner() {diff --git a/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsx b/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsxindex f6021cb658f..883c7cd438e 100644--- a/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsLdapForm.tsx@@ -10,11 +10,7 @@ import {} from "metabase/admin/components/SettingsSection";import { GroupMappingsWidget } from "metabase/admin/settings/components/widgets/GroupMappingsWidget";import { getExtraFormFieldProps } from "metabase/admin/settings/utils";-import {- useGetAdminSettingsDetailsQuery,- useGetSettingsQuery,- useUpdateLdapMutation,-} from "metabase/api";+import { useUpdateLdapMutation } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import {Form,@@ -26,6 +22,10 @@ import {FormTextInput,} from "metabase/forms";import { PLUGIN_LDAP_FORM_FIELDS } from "metabase/plugins";+import {+ useGetAdminSettingsDetailsQuery,+ useGetSettingsQuery,+} from "metabase/settings";import { Box, Divider, Flex, Group, Radio, Stack } from "metabase/ui";import type { EnterpriseSettings, Settings } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/CustomVisualizationsNav.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/CustomVisualizationsNav.tsxindex b10e36717a3..a81328cba59 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/CustomVisualizationsNav.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/CustomVisualizationsNav.tsx@@ -1,8 +1,9 @@import { t } from "ttag";import { UpsellGem } from "metabase/common/components/upsells/components";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { useLocation } from "metabase/router";+import { useSetting } from "metabase/settings";import { Flex } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsxindex 2c268476e8b..5fb38bf784d 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import { AdminNavWrapper } from "metabase/admin/components/AdminNav";import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { getPlan, isProPlan } from "metabase/common/utils/plan";import {PLUGIN_DATA_APPS,@@ -11,6 +11,7 @@ import {} 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";import { CustomVisualizationsNav } from "./CustomVisualizationsNav";diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsxindex 2ab1d9613c3..07ddcf53333 100644--- a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { getCurrentVersion } from "metabase/admin/app/selectors";-import { useGetVersionInfoQuery } from "metabase/api";import { useSelector } from "metabase/redux";+import { useGetVersionInfoQuery } from "metabase/settings";import { Indicator } from "metabase/ui";import { newVersionAvailable } from "metabase/utils/version";diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsxindex 796734a8a17..b069f8c7f76 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/AuthenticationSettingsPage.tsx@@ -2,13 +2,13 @@ import { t } from "ttag";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";import { UpsellSSO } from "metabase/admin/upsells";-import { useGetSettingsQuery } from "metabase/api";import { hasAnySsoFeature } from "metabase/common/utils/plan";import {type AuthSettingsPageTab,PLUGIN_AUTH_PROVIDERS,PLUGIN_MULTI_FACTOR_AUTH,} from "metabase/plugins";+import { useGetSettingsQuery } from "metabase/settings";import { Box, Flex, Stack } from "metabase/ui";import { ApiKeysAuthCard } from "../../auth/components/ApiKeysAuthCard";diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/CustomVisualizationsSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/CustomVisualizationsSettingsPage.tsxindex 2a15e7c07e2..0c382184310 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/CustomVisualizationsSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/CustomVisualizationsSettingsPage.tsx@@ -2,12 +2,12 @@ import { jt, t } from "ttag";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";import { UpsellCustomViz } from "metabase/admin/upsells";-import { useAdminSetting } from "metabase/api/utils";import { Link } from "metabase/common/components/Link";import { useHasTokenFeature } from "metabase/common/hooks";import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_CUSTOM_VIZ } from "metabase/plugins";import { useParams } from "metabase/router";+import { useAdminSetting } from "metabase/settings";import {Alert,Button,diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.tsxindex 45be6289760..b776154f38c 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.tsx@@ -5,9 +5,9 @@ import {SettingsSection,} from "metabase/admin/components/SettingsSection";import { UpsellHostingBanner } from "metabase/admin/upsells";-import { useGetSettingsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useHasTokenFeature } from "metabase/common/hooks";+import { useGetSettingsQuery } from "metabase/settings";import { Center } from "metabase/ui";import { SMTPConnectionCard } from "../Email/SMTPConnectionCard";diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.tsxindex 12160c1aded..01d29cefc86 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/GeneralSettingsPage.tsx@@ -6,11 +6,11 @@ import {} from "metabase/admin/components/SettingsSection";import { CollectUserDataInput } from "metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput";import { UpsellDevInstances } from "metabase/admin/upsells";-import { useAdminSetting } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";import { useDocsUrl, useHasTokenFeature } from "metabase/common/hooks";import { PLUGIN_SEMANTIC_SEARCH } from "metabase/plugins";+import { useAdminSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { DevInstanceBanner } from "../GeneralSettings/DevInstanceBanner";diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsxindex f840ca98780..d4ec5a0bbf5 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx@@ -6,9 +6,9 @@ import {SettingsSection,} from "metabase/admin/components/SettingsSection";import { CommunityLocalizationNotice } from "metabase/common/components/CommunityLocalizationNotice";-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";import { Stack } from "metabase/ui";import { AdminSettingInput } from "../widgets/AdminSettingInput";diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.tsxindex fe3849f687d..e68a40d9cee 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.tsx@@ -4,7 +4,7 @@ import {SettingsPageWrapper,SettingsSection,} from "metabase/admin/components/SettingsSection";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { AdminSettingInput } from "../widgets/AdminSettingInput";import {diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsxindex 434d01be060..a81822192ab 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.tsx@@ -1,7 +1,8 @@import { UpsellRemoteSync } from "metabase/admin/upsells";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { getPlan, isProPlan } from "metabase/common/utils/plan";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useSetting } from "metabase/settings";export function RemoteSyncSettingsPage() {const hasRemoteSync = useHasTokenFeature("remote_sync");diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsxindex fb5a1bb8189..cfa972a8a97 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.tsx@@ -7,8 +7,8 @@ import {} from "metabase/admin/components/SettingsSection";import { UpsellHostingBanner } from "metabase/admin/upsells";import { NotFound } from "metabase/common/components/ErrorPages";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { useSetting } from "metabase/settings";import { AdminSettingInput } from "../widgets/AdminSettingInput";import { VersionUpdateNotice } from "../widgets/VersionUpdateNotice";diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsxindex 72e78ab9412..1a372bd012b 100644--- a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx@@ -7,15 +7,16 @@ import {useListDatabasesQuery,useListSyncableDatabaseSchemasQuery,} from "metabase/api";-import { getErrorMessage, useAdminSetting } from "metabase/api/utils";+import { getErrorMessage } from "metabase/api/utils";import {ActionButton,type ActionButtonHandle,} from "metabase/common/components/ActionButton";import { Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { useAdminSetting, useSetting } from "metabase/settings";import {Alert,Box,diff --git a/frontend/src/metabase/admin/settings/components/widgets/AdminSettingInput.tsx b/frontend/src/metabase/admin/settings/components/widgets/AdminSettingInput.tsxindex 482b07f0ce4..8ff301495b7 100644--- a/frontend/src/metabase/admin/settings/components/widgets/AdminSettingInput.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/AdminSettingInput.tsx@@ -2,8 +2,8 @@ import { useEffect, useState } from "react";import { t } from "ttag";import { isSettingSetFromEnvVar } from "metabase/admin/settings/settings";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSetting } from "metabase/settings";import {Box,type BoxProps,diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsxindex b96baeacc47..be1a59e12f1 100644--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx@@ -11,12 +11,12 @@ import { t } from "ttag";import noResultsSource from "assets/img/no_results.svg";import { useLazyLoadGeoJSONQuery } from "metabase/admin/settings/api/geojson";-import { useAdminSetting } from "metabase/api/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import AdminS from "metabase/css/admin.module.css";import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";+import { useAdminSetting } from "metabase/settings";import {Box,Button,diff --git a/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.tsxindex 31b70e9a600..7a63c931665 100644--- a/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { UpsellEmailWhitelabelPill } from "metabase/admin/upsells";-import { useAdminSetting } from "metabase/api/utils";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";+import { useAdminSetting, useSetting } from "metabase/settings";import { Box, Icon, TextInput } from "metabase/ui";import { SettingHeader } from "../SettingHeader";diff --git a/frontend/src/metabase/admin/settings/components/widgets/EmailReplyToWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/EmailReplyToWidget.tsxindex d18a67ee1e2..24fbb7f8481 100644--- a/frontend/src/metabase/admin/settings/components/widgets/EmailReplyToWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/EmailReplyToWidget.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import _ from "underscore";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSetting } from "metabase/settings";import { Stack } from "metabase/ui";import { SettingHeader } from "../SettingHeader";diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsxindex 5cd6fdeb89a..7c6346cb7ad 100644--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import _ from "underscore";import { SettingsSection } from "metabase/admin/components/SettingsSection";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSetting } from "metabase/settings";import { Box, Radio, Select, Stack, Switch, Text } from "metabase/ui";import {type CurrencyStyle,diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsxindex 2b12baedda7..e40df92437c 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx@@ -1,14 +1,16 @@import { useCallback } from "react";import {- sessionApi,useClearGroupMembershipMutation,useDeletePermissionsGroupMutation,useListPermissionsGroupsQuery,- useUpdateSettingMutation,} from "metabase/api";import { useDispatch, useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import {+ getSetting,+ settingsApi,+ useUpdateSettingMutation,+} from "metabase/settings";import type { GroupId, GroupInfo } from "metabase-types/api";import type { MappingSettingKey } from "./GroupMappingsWidgetView";@@ -50,7 +52,7 @@ export function GroupMappingsWidget(props: GroupMappingsWidgetProps) {// For this particular setting we don't need to fully wait for the refetch.// So long as unwrap succeeds, we can update the cache to reflect the new valuedispatch(- sessionApi.util.updateQueryData(+ settingsApi.util.updateQueryData("getSessionProperties",undefined,(draft) => {diff --git a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.tsx b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.tsxindex 5eb06cb3643..b5bd5090b9c 100644--- a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.tsx@@ -1,10 +1,10 @@import { useState } from "react";import { t } from "ttag";-import { useAdminSetting } from "metabase/api/utils";import { trackCustomHomepageDashboardEnabled } from "metabase/common/analytics";import { DashboardSelector } from "metabase/common/components/DashboardSelector";import { PLUGIN_HOMEPAGE_SETTING } from "metabase/plugins";+import { useAdminSetting } from "metabase/settings";import { Box, Radio, Stack, Text } from "metabase/ui";import type { DashboardId } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsxindex 6ac1890acd9..8b2949d023d 100644--- a/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsx@@ -1,8 +1,8 @@import { useCallback, useEffect, useState } from "react";import { t } from "ttag";-import { useAdminSetting } from "metabase/api/utils";import { useHasTokenFeature } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import { fetchWithTimeout } from "metabase/utils/fetchWithTimeout";import { AdminSettingInput } from "./AdminSettingInput";diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsxindex 234c6406493..0c43e59b814 100644--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx@@ -8,7 +8,7 @@ import {useListPublicCardsQuery,useListPublicDashboardsQuery,} from "metabase/api";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import * as Urls from "metabase/urls";import type {GetPublicAction,diff --git a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsxindex 782a16732e3..cd26f65309f 100644--- a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx@@ -2,7 +2,8 @@ import { t } from "ttag";import { useSendTestEmailMutation } from "metabase/api/email";import { getErrorMessage } from "metabase/api/utils";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Button, Text } from "metabase/ui";export function SendTestEmailWidget() {diff --git a/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsxindex 1a8beb9909b..893db2ba31c 100644--- a/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsx@@ -1,9 +1,9 @@import { useState } from "react";import { t } from "ttag";-import { useAdminSetting } from "metabase/api/utils";import { InputWithSelectPrefix } from "metabase/common/components/InputWithSelectPrefix";import { useHasTokenFeature } from "metabase/common/hooks";+import { useAdminSetting } from "metabase/settings";import { Box, Text } from "metabase/ui";import type { GenericErrorResponse } from "metabase/utils/errors";diff --git a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/BaseUsageTrackingSettingToggle.tsx b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/BaseUsageTrackingSettingToggle.tsxindex 71eedfac042..b6358ab7775 100644--- a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/BaseUsageTrackingSettingToggle.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/BaseUsageTrackingSettingToggle.tsx@@ -1,6 +1,6 @@import { isSettingSetFromEnvVar } from "metabase/admin/settings/settings";-import { useAdminSetting } from "metabase/api/utils";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSetting } from "metabase/settings";import { Stack } from "metabase/ui";import type { Settings } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsxindex 133c859c042..0d10a57cf35 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx@@ -2,11 +2,11 @@ import cx from "classnames";import { c, t } from "ttag";import { getCurrentVersion } from "metabase/admin/app/selectors";-import { useGetVersionInfoQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import { useSelector } from "metabase/redux";+import { useGetVersionInfoQuery } from "metabase/settings";import { Tabs } from "metabase/ui";import { newVersionAvailable, versionIsLatest } from "metabase/utils/version";diff --git a/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsx b/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsxindex 5ca48e18c14..d6fea0d5c25 100644--- a/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackBugReportChannelInput.tsx@@ -2,7 +2,8 @@ import { useEffect, useState } from "react";import { t } from "ttag";import { useUpdateSlackSettingsMutation } from "metabase/api";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Box, Text, TextInput } from "metabase/ui";import { SettingHeader } from "../components/SettingHeader";diff --git a/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsx b/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsxindex 9d3bcaeff49..413d73d9cf8 100644--- a/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackConfiguration.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import { useGetSlackAppInfoQuery } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Box, Button, Flex, Stack, Text } from "metabase/ui";import { SlackBugReportChannelInput } from "./SlackBugReportChannelInput";diff --git a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsxindex 981682fe401..3c9db376bdc 100644--- a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx@@ -13,7 +13,8 @@ import {ExternalLink,} from "metabase/common/components/ExternalLink";import { Markdown } from "metabase/common/components/Markdown";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import {Badge,Box,diff --git a/frontend/src/metabase/admin/settingsRoutes.tsx b/frontend/src/metabase/admin/settingsRoutes.tsxindex 27d79c500e9..7c2a2b967e7 100644--- a/frontend/src/metabase/admin/settingsRoutes.tsx+++ b/frontend/src/metabase/admin/settingsRoutes.tsx@@ -10,7 +10,7 @@ import {} from "metabase/plugins";import type { State } from "metabase/redux/store";import { Outlet, Route, type RouteComponent, redirect } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { GoogleAuthForm } from "./settings/auth/components/GoogleAuthForm";diff --git a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsxindex b303921121d..802f36f5b17 100644--- a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx@@ -5,7 +5,7 @@ import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { getPlan } from "metabase/common/utils/plan";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Text } from "metabase/ui";export const UpsellBetterSupport = ({ location }: { location: string }) => {diff --git a/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx b/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsxindex b6d8e8f505b..d805b0868ae 100644--- a/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx@@ -1,7 +1,8 @@import { t } from "ttag";import { UpsellBanner } from "metabase/common/components/upsells/components";-import { useSetting, useStoreUrl } from "metabase/common/hooks";+import { useStoreUrl } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Text } from "metabase/ui";type LOCATION = "embedding-page" | "settings-general";diff --git a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx b/frontend/src/metabase/admin/upsells/UpsellHosting.tsxindex 1d0b55374a6..d5807f6c3b4 100644--- a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx@@ -1,10 +1,10 @@import { jt, t } from "ttag";import { UpsellBanner } from "metabase/common/components/upsells/components";-import { useSetting } from "metabase/common/hooks";import { getPlan, isProPlan } from "metabase/common/utils/plan";import { useSelector } from "metabase/redux";import { getIsHosted } from "metabase/selectors/settings";+import { useSetting } from "metabase/settings";export const UpsellHostingBanner = ({ location }: { location: string }) => {const isHosted = useSelector(getIsHosted);diff --git a/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsx b/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsxindex 3483fa2c7b1..03e7d5a2fb4 100644--- a/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellRemoteSync.tsx@@ -4,11 +4,12 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";import { UpsellBigCard } from "metabase/common/components/upsells/components";import S from "metabase/common/components/upsells/components/Upsells.module.css";import { UPGRADE_URL } from "metabase/common/components/upsells/constants";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { getPlan, isProPlan } from "metabase/common/utils/plan";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";export const UpsellRemoteSync = ({ source }: { source: string }) => {const hasRemoteSync = useHasTokenFeature("remote_sync");diff --git a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx b/frontend/src/metabase/admin/upsells/UpsellSSO.tsxindex 9fe98f68bcd..ef2900554a4 100644--- a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellSSO.tsx@@ -5,7 +5,7 @@ import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { hasAnySsoFeature } from "metabase/common/utils/plan";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box, List } from "metabase/ui";export const UpsellSSO = ({ location }: { location: string }) => {diff --git a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx b/frontend/src/metabase/admin/upsells/UpsellUploads.tsxindex c514fb16623..7444e9929ef 100644--- a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellUploads.tsx@@ -5,7 +5,7 @@ import { UPGRADE_URL } from "metabase/common/components/upsells/constants";import { getPlan } from "metabase/common/utils/plan";import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";export const UpsellUploads = ({ location }: { location: string }) => {const campaign = "manage-uploads";diff --git a/frontend/src/metabase/admin/utils.ts b/frontend/src/metabase/admin/utils.tsindex 5c02abaf949..3e20a1a1b18 100644--- a/frontend/src/metabase/admin/utils.ts+++ b/frontend/src/metabase/admin/utils.ts@@ -7,7 +7,7 @@ import type { AdminPath } from "metabase/redux/store/admin";import { createRedirectGuard } from "metabase/route-guards";import { push, replace } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";export const createAdminRouteGuard = (routeKey: string) =>createRedirectGuard(diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.tsindex 678b90b1dbd..48fdc4bda88 100644--- a/frontend/src/metabase/api/index.ts+++ b/frontend/src/metabase/api/index.ts@@ -47,7 +47,6 @@ export * from "./search";export * from "./security-center";export * from "./segment";export * from "./session";-export * from "./settings";export * from "./setup";export * from "./slack";export * from "./snippet";diff --git a/frontend/src/metabase/api/session.ts b/frontend/src/metabase/api/session.tsindex f60e3a32e71..ed7861f1562 100644--- a/frontend/src/metabase/api/session.ts+++ b/frontend/src/metabase/api/session.ts@@ -1,19 +1,7 @@import type { LoginData } from "metabase/redux/auth";-import {- isValidColorScheme,- setUserColorSchemeAfterUpdate,-} from "metabase/utils/color-scheme";-import MetabaseSettings from "metabase/utils/settings";-import type {- EnterpriseSettings,- MfaMethod,- PasswordResetTokenStatus,-} from "metabase-types/api";+import type { MfaMethod, PasswordResetTokenStatus } from "metabase-types/api";import { Api } from "./api";-import { handleQueryFulfilled } from "./utils/lifecycle";--export const sessionPropertiesPath = "/api/session/properties";export interface SessionResponse {id: string;@@ -108,30 +96,6 @@ export const sessionApi = Api.injectEndpoints({body,}),}),- getSessionProperties: builder.query<EnterpriseSettings, void>({- query: () => ({- method: "GET",- url: sessionPropertiesPath,- }),- providesTags: ["session-properties"],- // Subscriptions keep the entry fresh and invalidation-safe- // Infinity keeps it from aging out if the subscriptions happen to be gone- keepUnusedDataFor: Infinity,- onQueryStarted: (_, { queryFulfilled }) =>- handleQueryFulfilled(queryFulfilled, (data) => {- // Keep the non-redux settings consumers in sync. `MetabaseSettings`- // is read by code that runs outside the store/React (i18n, dom helpers, theming).- MetabaseSettings.setAll(data);-- // Sync color-scheme setting to window.MetabaseUserColorScheme- if (- data["color-scheme"] &&- isValidColorScheme(data["color-scheme"])- ) {- setUserColorSchemeAfterUpdate(data["color-scheme"]);- }- }),- }),}),});@@ -144,20 +108,4 @@ export const {useGetPasswordResetTokenStatusQuery,useForgotPasswordMutation,useCheckPasswordMutation,- useGetSessionPropertiesQuery,- useLazyGetSessionPropertiesQuery,} = sessionApi;--// aliases for easier use-export const useGetSettingsQuery = useGetSessionPropertiesQuery;-export const useLazyGetSettingsQuery = useLazyGetSessionPropertiesQuery;--/**- * Force a refetch of the session properties (settings) from non-React code.- * Dispatch it via `dispatch(refetchSiteSettings())`.- * In React, prefer `useLazyGetSettingsQuery()`'s trigger instead.- */-export const refetchSiteSettings = () =>- sessionApi.endpoints.getSessionProperties.initiate(undefined, {- forceRefetch: true,- });diff --git a/frontend/src/metabase/api/utils/index.ts b/frontend/src/metabase/api/utils/index.tsindex f359f728c2f..285d528a179 100644--- a/frontend/src/metabase/api/utils/index.ts+++ b/frontend/src/metabase/api/utils/index.ts@@ -1,5 +1,4 @@export * from "./errors";export * from "./hydrate-metadata-store";export * from "./run-rtk-endpoint";-export * from "./settings";export * from "./use-token-refresh";diff --git a/frontend/src/metabase/api/utils/use-token-refresh.ts b/frontend/src/metabase/api/utils/use-token-refresh.tsindex 4034bb54d9b..8a6b571bafb 100644--- a/frontend/src/metabase/api/utils/use-token-refresh.ts+++ b/frontend/src/metabase/api/utils/use-token-refresh.ts@@ -1,11 +1,8 @@import { useCallback, useEffect, useRef } from "react";-import {- Api,- useGetSettingsQuery,- useRefreshTokenStatusMutation,-} from "metabase/api";+import { Api, useRefreshTokenStatusMutation } from "metabase/api";import { useDispatch } from "metabase/redux";+import { useGetSettingsQuery } from "metabase/settings";import type { TokenStatusFeature } from "metabase-types/api";const REFRESH_INTERVAL = 10 * 1000; // 10 secondsdiff --git a/frontend/src/metabase/api/utils/use-token-refresh.unit.spec.tsx b/frontend/src/metabase/api/utils/use-token-refresh.unit.spec.tsxindex 754c2faa1c0..50a09ccc3bd 100644--- a/frontend/src/metabase/api/utils/use-token-refresh.unit.spec.tsx+++ b/frontend/src/metabase/api/utils/use-token-refresh.unit.spec.tsx@@ -6,14 +6,13 @@ import {setupTokenRefreshEndpoint,} from "__support__/server-mocks";import { act, renderWithProviders, screen, waitFor } from "__support__/ui";+import { useGetSettingsQuery } from "metabase/settings";import type { TokenStatusFeature } from "metabase-types/api";import {createMockSettings,createMockTokenStatus,} from "metabase-types/api/mocks";-import { useGetSettingsQuery } from "../session";-import { useTokenRefresh, useTokenRefreshUntil } from "./use-token-refresh";const TestComponent = () => {diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex 304ea565bf7..a21c5e658b9 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -30,7 +30,6 @@ import { createRoot } from "react-dom/client";import { initializePlugins } from "ee-plugins";import { AppThemeProvider } from "metabase/AppThemeProvider";import { createSnowplowTracker } from "metabase/analytics";-import { refetchSiteSettings } from "metabase/api";import { ModifiedBackend } from "metabase/common/components/dnd/ModifiedBackend";import { registerDashboardVisualizations } from "metabase/dashboard/visualizations/register";import { initializeInteractiveEmbedding } from "metabase/embedding/interactive-embedding";@@ -39,6 +38,7 @@ import { PLUGIN_APP_INIT_FUNCTIONS } from "metabase/plugins";import { MetabaseReduxProvider } from "metabase/redux";import { LOCATION_CHANGE, createRouterNavigator } 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";import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";diff --git a/frontend/src/metabase/auth/selectors.ts b/frontend/src/metabase/auth/selectors.tsindex e79e68201a5..f4392700ece 100644--- a/frontend/src/metabase/auth/selectors.ts+++ b/frontend/src/metabase/auth/selectors.ts@@ -3,7 +3,7 @@ import { createSelector } from "@reduxjs/toolkit";import { PLUGIN_AUTH_PROVIDERS } from "metabase/plugins";import type { AuthProvider } from "metabase/plugins/types";import type { State } from "metabase/redux/store";-import { getSetting, getSettings } from "metabase/selectors/settings";+import { getSetting, getSettings } from "metabase/settings";const EMPTY_PROVIDERS: AuthProvider[] = [];diff --git a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsxindex fc7f6a4adcf..33bd7a4af75 100644--- a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx+++ b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx@@ -2,7 +2,8 @@ import { useState } from "react";import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { useDocsUrl, useUserSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";+import { useUserSetting } from "metabase/settings";import {Button,Flex,diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsxindex 400b43a0efd..895baee6193 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx@@ -8,7 +8,7 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";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 75169ea1758..77977ff4b60 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx@@ -13,8 +13,8 @@ import { useDispatch, useSelector } from "metabase/redux";import type { UploadFileProps } from "metabase/redux/uploads";import { uploadFile as uploadFileAction } from "metabase/redux/uploads";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";+import { getSetting } from "metabase/settings";import type {BookmarkId,BookmarkType,diff --git a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsxindex b65651388ce..1ce2046aeba 100644--- a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx+++ b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx@@ -17,7 +17,7 @@ import { createMentionSuggestion } from "metabase/rich_text_editing/tiptap/extenimport { SmartLink } from "metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode";import { LINK_SEARCH_MODELS } from "metabase/rich_text_editing/tiptap/extensions/shared/constants";import { createSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { ActionIcon, Box, Flex, Icon, Tooltip } from "metabase/ui";import { METAKEY } from "metabase/utils/browser";import type { DocumentContent } from "metabase-types/api";diff --git a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsxindex f58a8d32e19..0ae7d70bf8d 100644--- a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx+++ b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx@@ -36,7 +36,7 @@ import {import { useSetCollectionPreview } from "metabase/common/hooks/use-set-collection-preview";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsxindex d0f6593cb98..75833072835 100644--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx@@ -1,10 +1,10 @@import dayjs from "dayjs";-import { useSetting, useUserSetting } from "metabase/common/hooks";import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getIsHosted } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting, useUserSetting } from "metabase/settings";import { isWithinIframe } from "metabase/utils/iframe";import { DevModeBanner } from "./DevModeBanner";diff --git a/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.tsindex 0223b8eee17..ec952f29cf0 100644--- a/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts+++ b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts@@ -1,9 +1,8 @@import dayjs from "dayjs";import utc from "dayjs/plugin/utc";-import { useUpdateSettingMutation } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";+import { useSetting, useUpdateSettingMutation } from "metabase/settings";import type { TokenStatus } from "metabase-types/api";dayjs.extend(utc);diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsxindex ac2033cf88c..c68b04f4479 100644--- a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx@@ -5,7 +5,6 @@ import _ from "underscore";import ErrorBoundary from "metabase/ErrorBoundary";import { useSendBugReportMutation } from "metabase/api/bug-report";import { MetabotLogo } from "metabase/common/components/MetabotLogo";-import { useSetting } from "metabase/common/hooks";import { useToggle } from "metabase/common/hooks/use-toggle";import { useDispatch, useSelector } from "metabase/redux";import { closeDiagnostics } from "metabase/redux/app";@@ -13,6 +12,7 @@ import { addUndo } from "metabase/redux/undo";import { getIsErrorDiagnosticModalOpen } from "metabase/selectors/app";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { getApplicationName } from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";import { Button, Flex, Icon, Loader, Modal, Stack, Text } from "metabase/ui";import { downloadObjectAsJson } from "metabase/utils/download";diff --git a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsxindex 247881ebc1b..e93a785e880 100644--- a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx+++ b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx@@ -1,11 +1,11 @@import { match } from "ts-pattern";import { c, t } from "ttag";-import { useSetting } from "metabase/common/hooks";import type { ExportFormat } from "metabase/common/types/export";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { useSelector } from "metabase/redux";import { getApplicationName } from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";import { Checkbox, SegmentedControl, Stack } from "metabase/ui";interface ExportSettingsWidgetProps {diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsxindex 0dd4d5a2167..f56f05e02f5 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx@@ -7,8 +7,8 @@ import { NewMenuItemAIExploration } from "metabase/metabot/components/NewMenuIteimport { useUserMetabotPermissions } from "metabase/metabot/hooks";import { useDispatch, useSelector } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";-import { getSetting } from "metabase/selectors/settings";import { getUserCanWriteToCollections } from "metabase/selectors/user";+import { getSetting } from "metabase/settings";import { Box, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import type { CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/DataPickerModal.tsx b/frontend/src/metabase/common/components/Pickers/DataPicker/DataPickerModal.tsxindex 363b5f9b3c5..09e1c3083a2 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/DataPickerModal.tsx+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/DataPickerModal.tsx@@ -1,6 +1,6 @@import { useCallback, useMemo } from "react";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import type {DatabaseId,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 5965797b750..98d50f7e411 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@@ -11,11 +11,11 @@ import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import {useGetPersonalCollection,useHasTokenFeature,- useSetting,} from "metabase/common/hooks";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,CollectionNamespace,diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsxindex 337c629cae7..31fd53c374b 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx@@ -14,12 +14,12 @@ import {} from "metabase/api";import { canCollectionCardBeUsed } from "metabase/common/components/Pickers/utils";import { VirtualizedList } from "metabase/common/components/VirtualizedList";-import { useSetting } from "metabase/common/hooks";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { useGetIcon } from "metabase/hooks/use-icon";import { PLUGIN_LIBRARY } from "metabase/plugins";import type { LibrarySubCollectionType } from "metabase/plugins/oss/library";import { useSelector } from "metabase/redux";+import { useSetting } from "metabase/settings";import {Box,Ellipsified,diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsxindex 08206c1c37d..7ad7ed3fe43 100644--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { ExportSettingsWidget } from "metabase/common/components/ExportSettingsWidget";import { Link } from "metabase/common/components/Link";-import { useDocsUrl, useUserSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import type {ExportFormat,@@ -12,6 +12,7 @@ import type {import { exportFormatPng, exportFormats } from "metabase/common/types/export";import CS from "metabase/css/core/index.css";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";+import { useUserSetting } from "metabase/settings";import {Box,Button,diff --git a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsxindex cafc7f9d30d..a20d00c67a4 100644--- a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx+++ b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx@@ -1,7 +1,7 @@import { useMemo } from "react";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import type { SelectProps } from "metabase/ui";import { Select } from "metabase/ui";import type { FontStyle } from "metabase/utils/measure-text";diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsxindex e8454b76333..c1c12b0ec5c 100644--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModalLoading.tsx@@ -1,7 +1,7 @@import { t } from "ttag";-import { useGetSettingsQuery } from "metabase/api";import { useTokenRefreshUntil } from "metabase/api/utils";+import { useGetSettingsQuery } from "metabase/settings";import { Button, Flex, Icon, Loader, Stack, Text, Title } from "metabase/ui";import type { UpgradeFlow } from "./types";diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsxindex c700c154e73..a33be3a24e6 100644--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx@@ -1,8 +1,8 @@import { useCallback } from "react";-import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";import { setOpenModal } from "metabase/redux/ui";+import { useSetting } from "metabase/settings";import { DATA_STUDIO_UPGRADE_URL, UPGRADE_URL } from "../../constants";import { useUpsellLink } from "../use-upsell-link";diff --git a/frontend/src/metabase/common/hooks/index.ts b/frontend/src/metabase/common/hooks/index.tsindex 1ae8abf28ae..d8be914e3c0 100644--- a/frontend/src/metabase/common/hooks/index.ts+++ b/frontend/src/metabase/common/hooks/index.ts@@ -10,7 +10,6 @@ export * from "./use-locale";export * from "./use-notification-channels";export * from "./use-scroll-to-top";export * from "./use-set-collection-preview";-export * from "./use-setting";export * from "./use-sorting-state-change";export * from "./use-temp-storage";export * from "./use-temporary-state";diff --git a/frontend/src/metabase/common/hooks/use-favicon.ts b/frontend/src/metabase/common/hooks/use-favicon.tsindex 5206573f08e..a3a22e96327 100644--- a/frontend/src/metabase/common/hooks/use-favicon.ts+++ b/frontend/src/metabase/common/hooks/use-favicon.ts@@ -1,6 +1,6 @@import { useEffect } from "react";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";export const useFavicon = ({ favicon }: { favicon: string | null }) => {const defaultFavicon = useSetting("application-favicon-url");diff --git a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.tsindex cf8516ae266..6a71f2490bc 100644--- a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts+++ b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts@@ -1,5 +1,5 @@import { useSelector } from "metabase/redux";-import { getTokenFeature } from "metabase/selectors/settings";+import { getTokenFeature } from "metabase/settings";import type { TokenFeature } from "metabase-types/api";export const useHasTokenFeature = (settingName: TokenFeature) => {diff --git a/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts b/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.tsindex 49957d88f2a..c0dab6d3776 100644--- a/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts+++ b/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts@@ -1,5 +1,5 @@import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";export const useInstanceLocale = () => {return useSelector((state) => getSetting(state, "site-locale"));diff --git a/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts b/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.tsindex 156d7773231..78c77e26765 100644--- a/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts+++ b/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts@@ -2,8 +2,7 @@ import { useLocation } from "react-use";import { useSelector } from "metabase/redux";import { getCustomHomePageDashboardId } from "metabase/selectors/app";--import { useSetting } from "./use-setting";+import { useSetting } from "metabase/settings";export const useIsAtHomepageDashboard = () => {const dashboardId = useSelector(getCustomHomePageDashboardId);diff --git a/frontend/src/metabase/common/hooks/use-number-formatter.ts b/frontend/src/metabase/common/hooks/use-number-formatter.tsindex aa87c76f93b..9d120ad3d23 100644--- a/frontend/src/metabase/common/hooks/use-number-formatter.ts+++ b/frontend/src/metabase/common/hooks/use-number-formatter.ts@@ -1,6 +1,6 @@import { useCallback } from "react";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import {type FormatNumberOptions,formatNumber,diff --git a/frontend/src/metabase/common/hooks/use-setting/index.ts b/frontend/src/metabase/common/hooks/use-setting/index.tsdeleted file mode 100644index 8dea9ac4489..00000000000--- a/frontend/src/metabase/common/hooks/use-setting/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./use-setting";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 018fdc62c7b..e7c17c1f039 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,7 +1,6 @@import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";--import { useSetting } from "./use-setting";+import { useSetting } from "metabase/settings";/*** Hook to determine if other users' collections are shown in the UI.diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex b41d788ba03..9b9a9ac6afe 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -23,7 +23,7 @@ import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import type { LocationDescriptorObject } from "metabase/router";import { push } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Flex, Group, type IconProps, Menu, Title } from "metabase/ui";import { parseSearchQuery } from "metabase/utils/browser";import { isVirtualDashCard } from "metabase/utils/dashboard";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsxindex ddedb6df858..03322465851 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx@@ -19,8 +19,8 @@ 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 { getSetting } from "metabase/selectors/settings";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/DashboardSharingMenu/DashboardSharingMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsxindex dfb8385d3d8..86d50b241ee 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx@@ -2,7 +2,6 @@ import { useDisclosure } from "@mantine/hooks";import { t } from "ttag";import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";-import { useSetting } from "metabase/common/hooks";import {getIsDashCardsRunning,getSelectedTabId,@@ -21,6 +20,7 @@ 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 {dashboard as getDashboardUrl,diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsxindex 714a71c7322..e0cd23561bf 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditEmailSidebar.tsx@@ -14,9 +14,9 @@ import { PLUGIN_DASHBOARD_SUBSCRIPTION_PARAMETERS_SECTION_OVERRIDE } from "metabimport { dashboardPulseIsValid } from "metabase/pulse";import { useSelector } from "metabase/redux";import type { DraftDashboardSubscription } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";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";import type { UiParameter } from "metabase-lib/v1/parameters/types";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSlackSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSlackSidebar.tsxindex 125006c67f4..fa0ae2f2cb2 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSlackSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/AddEditSlackSidebar.tsx@@ -13,8 +13,8 @@ import { PLUGIN_DASHBOARD_SUBSCRIPTION_PARAMETERS_SECTION_OVERRIDE } from "metabimport { dashboardPulseIsValid } from "metabase/pulse";import { useSelector } from "metabase/redux";import type { DraftDashboardSubscription } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";import { getApplicationName } from "metabase/selectors/whitelabel";+import { getSetting } from "metabase/settings";import { Icon, Stack, Switch, Text, Title } from "metabase/ui";import type { UiParameter } from "metabase-lib/v1/parameters/types";import {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 8fc27c1c50c..4ae47b0c57e 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,11 +4,11 @@ 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 { useSetting } from "metabase/common/hooks/use-setting";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";export const SHARED_TENANT_COLLECTIONS_ROOT_ID: CollectionId =diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.tsindex 1320836ec66..d5a0f267f8b 100644--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts@@ -2,7 +2,6 @@ import { useEffect, useMemo, useRef } from "react";import { usePrevious } from "react-use";import _ from "underscore";-import { useSetting } from "metabase/common/hooks";import { isEmbedPreview } from "metabase/embedding/config";import { useDispatch, useSelector } from "metabase/redux";import { selectTab } from "metabase/redux/dashboard";@@ -14,6 +13,7 @@ import {subscribeLocation,useIsNavigationHeld,} from "metabase/router";+import { useSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { parseSearchQuery } from "metabase/utils/browser";import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";diff --git a/frontend/src/metabase/dashboard/selectors.ts b/frontend/src/metabase/dashboard/selectors.tsindex 9ad6fb2f91d..5eed21013e2 100644--- a/frontend/src/metabase/dashboard/selectors.ts+++ b/frontend/src/metabase/dashboard/selectors.ts@@ -27,8 +27,8 @@ import {getIsEmbeddingIframe,} from "metabase/selectors/embed";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";import { getIsWebApp } from "metabase/selectors/web-app";+import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";import { isNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsxindex 53c5049326d..130d08798c6 100644--- a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx+++ b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx@@ -16,7 +16,7 @@ import {} from "metabase/dashboard/selectors";import { fillParametersInText } from "metabase/dashboard/visualizations/parameter-substitution";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box, Ellipsified, Flex } from "metabase/ui";import { measureTextWidth } from "metabase/utils/measure-text";import { isEmpty } from "metabase/utils/validate";diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsxindex 1220f8952bb..f9bbd036edf 100644--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx@@ -3,12 +3,13 @@ import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";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 {getAllowedIframeAttributes,diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsxindex 52034384ec5..41fc50d2393 100644--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx@@ -2,7 +2,7 @@ import { useState } from "react";import { t } from "ttag";import DataStudioLogo from "assets/img/data-studio-logo.svg";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";import { useDataStudioSettings } from "metabase/data-studio/settings/hooks";import { AreaLayout, AreaTab } from "metabase/nav/components/AreaLayout";@@ -12,6 +12,7 @@ import {} from "metabase/plugins";import { useSelector } from "metabase/redux";import { Outlet, useLocation } from "metabase/router";+import { useSetting } from "metabase/settings";import { canAccessTransforms as canAccessTransformsSelector } from "metabase/transforms/selectors";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsxindex ab452d1f577..66c5eb687b2 100644--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx@@ -1,11 +1,11 @@import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useSetting } from "metabase/common/hooks";import { usePageTitle } from "metabase/hooks/use-page-title";import { PLUGIN_TRANSFORMS } from "metabase/plugins";import { useSelector } from "metabase/redux";import { Outlet, useParams } from "metabase/router";+import { useSetting } from "metabase/settings";import { useTransformSupportedDbs } from "metabase/transforms/hooks/use-transform-supported-dbs";import { EnableTransformsPage } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage";import { getShouldShowTransformsUpsell } from "metabase/transforms/selectors";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 f7114362fd6..3cf731647c5 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,8 +1,8 @@import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";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/data-studio/settings/hooks/use-local-setting.ts b/frontend/src/metabase/data-studio/settings/hooks/use-local-setting.tsindex 1e54eaf4ee0..fd6ffd58afc 100644--- a/frontend/src/metabase/data-studio/settings/hooks/use-local-setting.ts+++ b/frontend/src/metabase/data-studio/settings/hooks/use-local-setting.ts@@ -1,8 +1,8 @@import { useCallback, useRef, useState } from "react";import { t } from "ttag";-import { useUpdateSettingMutation } from "metabase/api";import { useToast } from "metabase/common/hooks";+import { useUpdateSettingMutation } from "metabase/settings";import type {EnterpriseSettingKey,EnterpriseSettingValue,diff --git a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsxindex 17dc0ed1fd8..563ecf785fb 100644--- a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx+++ b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx@@ -2,7 +2,6 @@ import { useCallback, useState } from "react";import { t } from "ttag";import { LogoIcon } from "metabase/common/components/LogoIcon";-import { useSetting } from "metabase/common/hooks";import { MAX_INITIAL_ENGINES_SHOWN } from "metabase/databases/constants";import { getEngines } from "metabase/databases/selectors";import {@@ -10,6 +9,7 @@ import {getEngineOptions,} from "metabase/databases/utils/engine";import { useSelector } from "metabase/redux";+import { useSetting } from "metabase/settings";import {Button,Center,diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsxindex 915f9ea85d9..7d5378c593b 100644--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx@@ -3,12 +3,13 @@ import { c, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { FormFooter } from "metabase/common/components/FormFooter";-import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { useDocsUrl } from "metabase/common/hooks";import type {ContinueWithoutDataComponent,FormLocation,} from "metabase/databases/types";import { FormSubmitButton } from "metabase/forms/components/FormSubmitButton";+import { useSetting } from "metabase/settings";import { Button, Flex, Text } from "metabase/ui";import type { DatabaseData } from "metabase-types/api";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsxindex 65c1e7cab31..21fff47485e 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import { Link } from "metabase/common/components/Link";-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";+import { useSetting } from "metabase/settings";import { Button, Flex } from "metabase/ui";import { TroubleshootingTip } from "./TroubleshootingTip";diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsxindex 57964f3ad1b..c2d8de6b55f 100644--- a/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsx+++ b/frontend/src/metabase/databases/components/DatabaseFormError/utils.tsx@@ -3,9 +3,9 @@ import type { ReactNode } from "react";import { t } from "ttag";import { Link } from "metabase/common/components/Link";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { useFormErrorMessage } from "metabase/forms";+import { useSetting } from "metabase/settings";import { Box } from "metabase/ui";import type { DatabaseData } from "metabase-types/api";diff --git a/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx b/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsxindex 78dcd1a7892..3cadc0ec66b 100644--- a/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx+++ b/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx@@ -3,7 +3,8 @@ import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { HelpCard } from "metabase/common/components/HelpCard";import { useSelector } from "metabase/redux";-import { getDocsUrl, getSetting } from "metabase/selectors/settings";+import { getDocsUrl } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";export interface DatabaseHelpCardProps {className?: string;diff --git a/frontend/src/metabase/databases/selectors.ts b/frontend/src/metabase/databases/selectors.tsindex 8dcf0049a55..5e20212eb3f 100644--- a/frontend/src/metabase/databases/selectors.ts+++ b/frontend/src/metabase/databases/selectors.ts@@ -1,5 +1,5 @@import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";export const getEngines = (state: State) => {return getSetting(state, "engines");diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsxindex f79bd2e32dc..2c8dcd7b112 100644--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx@@ -7,12 +7,12 @@ import {getFormattedTime,} from "metabase/common/components/DateTime";import { Link } from "metabase/common/components/Link";-import { useSetting } from "metabase/common/hooks";import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-next-frame-paints";import CS from "metabase/css/core/index.css";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,Box,diff --git a/frontend/src/metabase/documents/components/Editor/Editor.tsx b/frontend/src/metabase/documents/components/Editor/Editor.tsxindex 11dc345cac5..ae202d62b33 100644--- a/frontend/src/metabase/documents/components/Editor/Editor.tsx+++ b/frontend/src/metabase/documents/components/Editor/Editor.tsx@@ -37,7 +37,7 @@ import { SmartLink } from "metabase/rich_text_editing/tiptap/extensions/SmartLinimport { SupportingText } from "metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText";import { DROP_ZONE_COLOR } from "metabase/rich_text_editing/tiptap/extensions/shared/constants";import { createSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box, Center, Loader } from "metabase/ui";import { DocumentBlockShell } from "./DocumentBlockShell";diff --git a/frontend/src/metabase/embedding/LocaleProvider.tsx b/frontend/src/metabase/embedding/LocaleProvider.tsxindex b0eb3ad7554..3e1dc0e4be6 100644--- a/frontend/src/metabase/embedding/LocaleProvider.tsx+++ b/frontend/src/metabase/embedding/LocaleProvider.tsx@@ -8,8 +8,8 @@ import {import { setLocaleHeader } from "metabase/api/client";import { loadLocalization } from "metabase/api/localization";-import { useSetting } from "metabase/common/hooks";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { useSetting } from "metabase/settings";import { DatesProvider } from "metabase/ui/components/theme/DatesProvider/DatesProvider";import type { LocaleDataWithLanguage } from "metabase/utils/i18n";diff --git a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsxindex c9cbc6c6ecc..bb43a8ae085 100644--- a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx@@ -10,8 +10,9 @@ import type {EmbeddingDisplayOptions,} from "metabase/embedding/types";import { useSelector } from "metabase/redux";-import { getSetting, getUpgradeUrl } from "metabase/selectors/settings";+import { getUpgradeUrl } from "metabase/selectors/settings";import { getCanWhitelabel } from "metabase/selectors/whitelabel";+import { getSetting } from "metabase/settings";import {Divider,SegmentedControl,diff --git a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsxindex 4c2e9471577..805587ed889 100644--- a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx@@ -3,7 +3,6 @@ import { useMemo, useState } from "react";import { useAsync } from "react-use";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { getPreviewParamsBySlug } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug";import { getStaticEmbedSetupPublishHandlers } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers";@@ -20,6 +19,7 @@ import type {} from "metabase/embedding/types";import { useSelector } from "metabase/redux";import { getCanWhitelabel } from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";import { Paper, Stack, Tabs } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";import type { EmbeddingParameters } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsxindex 45215c855a1..69c7892d8e0 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx@@ -16,9 +16,10 @@ import { CopyTextInput } from "metabase/common/components/CopyTextInput";import { Link } from "metabase/common/components/Link";import { PasswordReveal } from "metabase/common/components/PasswordReveal";import { UserForm } from "metabase/common/components/UserForm";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import { useSelector } from "metabase/redux";-import { getSetting, isSsoEnabled } from "metabase/selectors/settings";+import { isSsoEnabled } from "metabase/selectors/settings";+import { getSetting, useSetting } from "metabase/settings";import {Button,Center,diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsxindex 7067a906077..fa052afe31b 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsx@@ -6,10 +6,10 @@ import { t } from "ttag";import {useCreateCollectionMutation,useListCollectionsTreeQuery,- useUpdateSettingMutation,} from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import { useToast } from "metabase/common/hooks";+import { useUpdateSettingMutation } from "metabase/settings";import { Button, Group, Stack, Text } from "metabase/ui";import S from "./SetupPermissionsAndTenantsPage.module.css";diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupJwtStep.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupJwtStep.tsxindex 9a3badb1116..c5ae53a6e2f 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupJwtStep.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupJwtStep.tsx@@ -2,9 +2,9 @@import { useCallback, useEffect, useState } from "react";import { t } from "ttag";-import { useUpdateSettingsMutation } from "metabase/api";import { useLazyGenerateRandomTokenQuery } from "metabase/api/util";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";+import { useSetting, useUpdateSettingsMutation } from "metabase/settings";import { Button, Group, Stack, Text, TextInput } from "metabase/ui";export const SetupJwtStep = ({ onSuccess }: { onSuccess: () => void }) => {diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsxindex 721cc36c3e8..9d4c8fe8487 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/TestJwtStep.tsx@@ -3,10 +3,10 @@import { useState } from "react";import { t } from "ttag";-import { useUpdateSettingsMutation } from "metabase/api";import { Link } from "metabase/common/components/Link";import { useToast } from "metabase/common/hooks";import { useHelpUrl } from "metabase/embedding/embedding-hub/hooks";+import { useUpdateSettingsMutation } from "metabase/settings";import { Button, Group, Stack, Text, Title } from "metabase/ui";const SETUP_GUIDE_PATH = "/admin/embedding/setup-guide";diff --git a/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts b/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.tsindex 7521f38b472..ed42312099c 100644--- a/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts+++ b/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts@@ -1,6 +1,6 @@-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";+import { useSetting } from "metabase/settings";export const useHelpUrl = () => {const isPaidPlan = useSelector(getIsPaidPlan);diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsxindex cb6c91b6fb7..c6fcf6848b3 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsx@@ -2,8 +2,8 @@ import { useEffect, useState } from "react";import { usePrevious } from "react-use";import { ColorPillPicker } from "metabase/common/components/ColorPicker";-import { useSetting } from "metabase/common/hooks";import type { MetabaseColors } from "metabase/embedding-sdk/theme";+import { useSetting } from "metabase/settings";import { Group, Stack, Text } from "metabase/ui";import { originalColors, staticVizOverrides } from "metabase/ui/colors";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsxindex c37535529df..55bd3811954 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx@@ -2,8 +2,8 @@ import { useRef, useState } from "react";import { match } from "ts-pattern";import { jt, t } from "ttag";-import { useUpdateSettingsMutation } from "metabase/api";import { useToast } from "metabase/common/hooks";+import { useUpdateSettingsMutation } from "metabase/settings";import { Anchor, Button, Group, Icon, Stack, Text } from "metabase/ui";import { UsageConditionsInfoIcon } from "./UsageConditionsInfoIcon";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsxindex d2544e8340f..fb4c8cd437f 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx@@ -2,8 +2,8 @@ import { useRef, useState } from "react";import { match } from "ts-pattern";import { t } from "ttag";-import { useUpdateSettingsMutation } from "metabase/api";import { useToast } from "metabase/common/hooks";+import { useUpdateSettingsMutation } from "metabase/settings";import { Button, Group, Icon, Stack, Text } from "metabase/ui";import { UsageConditionsInfoIcon } from "./UsageConditionsInfoIcon";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsxindex 3ef6c36db5c..e3a0cead9a7 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsx@@ -10,7 +10,6 @@ import { match } from "ts-pattern";import { applyThemePreset } from "embedding-sdk-shared/lib/apply-theme-preset";import { useListEmbeddingThemesQuery } from "metabase/api/embedding-theme";-import { useSetting } from "metabase/common/hooks";import { METABASE_CONFIG_IS_PROXY_FIELD_NAME } from "metabase/embedding/embedding-iframe-sdk/constants";// we import the equivalent of embed.js so that we don't add extra loading time// by appending the script@@ -18,6 +17,7 @@ import { setupConfigWatcher } from "metabase/embedding/embedding-iframe-sdk/embeimport type { SdkIframeEmbedBaseSettings } from "metabase/embedding/embedding-iframe-sdk/types/embed";import { buildEmbedAttributes } from "metabase/embedding/embedding-iframe-sdk-setup/utils/build-embed-attributes";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";+import { useSetting } from "metabase/settings";import { Card } from "metabase/ui";import { colors as defaultMetabaseColors } from "metabase/ui/colors";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsxindex 11864e1b056..1a4210cd50a 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx@@ -6,8 +6,6 @@ import { t } from "ttag";import "react-resizable/css/styles.css";import noResultsSource from "assets/img/no_results.svg";-import { useUpdateSettingsMutation } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { SdkIframeGuestEmbedStatusBar } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeGuestEmbedStatusBar";import { EMBED_STEPS } from "metabase/embedding/embedding-iframe-sdk-setup/constants";import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";@@ -15,6 +13,7 @@ import { isSiteUrlMatchingCurrentOrigin } from "metabase/embedding/embedding-ifrimport type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";import { useDispatch } from "metabase/redux";import { closeModal } from "metabase/redux/ui";+import { useSetting, useUpdateSettingsMutation } from "metabase/settings";import {Box,Button,diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsxindex 5d5ab21453b..c8165f22a3d 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupProvider.tsx@@ -2,7 +2,6 @@ import { type ReactNode, useMemo, useState } from "react";import { useMount } from "react-use";import { useSearchQuery } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { trackEmbedWizardOpened } from "metabase/embedding/embedding-iframe-sdk-setup/analytics";import { useEmbeddingParameters } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-embedding-parameters";import { useGetGuestEmbedSignedToken } from "metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token";@@ -12,6 +11,7 @@ import {PLUGIN_EMBEDDING_IFRAME_SDK_SETUP,type SdkIframeEmbedSetupModalInitialState,} from "metabase/plugins";+import { useSetting } from "metabase/settings";import {SdkIframeEmbedSetupContext,diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/GetCodeStep/GetCodeStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/GetCodeStep/GetCodeStep.tsxindex d1472a5878e..60c1d65374e 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/GetCodeStep/GetCodeStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/steps/GetCodeStep/GetCodeStep.tsx@@ -1,4 +1,4 @@-import { useUpdateSettingsMutation } from "metabase/api";+import { useUpdateSettingsMutation } from "metabase/settings";import { Stack } from "metabase/ui";import type { SettingKey } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.tsindex 9b86343bc67..1fdc79ced44 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-guest-embed-signed-token.ts@@ -1,10 +1,10 @@import { useState } from "react";import { useDeepCompareEffect } from "react-use";-import { useSetting } from "metabase/common/hooks";import type { SdkIframeEmbedSetupContextType } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { getResourceTypeFromExperience } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience";import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";+import { useSetting } from "metabase/settings";import { getSignedToken } from "../../lib/auth/get-signed-token";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-handle-experience-change.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-handle-experience-change.tsindex 6a67f821247..9a0861aa2b1 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-handle-experience-change.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-handle-experience-change.ts@@ -2,13 +2,13 @@ import { useCallback } from "react";import { P, match } from "ts-pattern";import _ from "underscore";-import { useSetting } from "metabase/common/hooks";import { ALLOWED_EMBED_SETTING_KEYS_MAP } from "metabase/embedding/embedding-iframe-sdk/constants";import { EMBED_FALLBACK_QUESTION_ID } from "metabase/embedding/embedding-iframe-sdk-setup/constants";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";import { determineDashboardId } from "metabase/embedding/embedding-iframe-sdk-setup/utils/determine-dashboard-id";import { getDefaultSdkIframeEmbedSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-default-sdk-iframe-embed-setting";+import { useSetting } from "metabase/settings";export const useHandleExperienceChange = () => {const {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-is-sso-enabled-and-configured.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-is-sso-enabled-and-configured.tsindex 5b5facf7ac0..e52efde2fc7 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-is-sso-enabled-and-configured.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-is-sso-enabled-and-configured.ts@@ -1,4 +1,4 @@-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";export const useIsSsoEnabledAndConfigured = () => {const isJwtEnabledAndConfigured = useSetting("jwt-enabled-and-configured");diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.tsindex 75fbc2d6758..3761736f103 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-server-snippet.ts@@ -1,6 +1,5 @@import { useMemo, useState } from "react";-import { useSetting } from "metabase/common/hooks";import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";import { getResourceTypeFromExperience } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience";import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";@@ -14,6 +13,7 @@ import type {CodeSampleParameters,ServerCodeSampleConfig,} from "metabase/embedding/types";+import { useSetting } from "metabase/settings";const getEmbedServerCodeExampleOptions = (codeSampleParameters: Omit<CodeSampleParameters, "displayOptions">,diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-settings.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-settings.tsindex 690e1481ab7..aec8187447d 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-settings.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-settings.ts@@ -1,7 +1,6 @@import { useCallback, useEffect, useMemo, useState } from "react";import { P, match } from "ts-pattern";-import { useSetting, useUserSetting } from "metabase/common/hooks";import { USER_SETTINGS_DEBOUNCE_MS } from "metabase/embedding/embedding-iframe-sdk-setup/constants";import type {SdkIframeEmbedSetupRecentItem,@@ -9,6 +8,7 @@ import type {} from "metabase/embedding/embedding-iframe-sdk-setup/types";import { determineDashboardId } from "metabase/embedding/embedding-iframe-sdk-setup/utils/determine-dashboard-id";import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";+import { useSetting, useUserSetting } from "metabase/settings";import { getAdjustedSdkIframeEmbedSetting } from "../utils/get-adjusted-sdk-iframe-embed-setting";import {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-snippet.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-snippet.tsindex 164f1273aaa..d542d340292 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-snippet.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-sdk-iframe-embed-snippet.ts@@ -1,7 +1,7 @@import { useMemo } from "react";import { useListEmbeddingThemesQuery } from "metabase/api/embedding-theme";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { useSdkIframeEmbedSetupContext } from "../context";import { getDerivedDefaultColorsForEmbedFlow } from "../utils/derived-colors-for-embed-flow";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.tsindex 4ba93683f97..81b79581f3b 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-toggle-resource-embedding.ts@@ -4,9 +4,9 @@ import {useUpdateDashboardEmbeddingParamsMutation,useUpdateDashboardEnableEmbeddingMutation,} from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { getStaticEmbedSetupPublishHandlers } from "metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers";import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";+import { useSetting } from "metabase/settings";import type { EmbeddingParameters } from "metabase-types/api";import { useSdkIframeEmbedSetupContext } from "../context";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsxindex 836acebf84c..b323c62e88c 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx@@ -26,8 +26,8 @@ import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/Eimport { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";import { PLUGIN_EMBEDDING_IFRAME_SDK } from "metabase/plugins";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";import { getUserId } from "metabase/selectors/user";+import { getSetting } from "metabase/settings";import { Stack } from "metabase/ui";import { useParamRerenderKey } from "../hooks/use-param-rerender-key";diff --git a/frontend/src/metabase/embedding/lib/override-requests-for-embeds.ts b/frontend/src/metabase/embedding/lib/override-requests-for-embeds.tsindex c98cd9e76da..3e83052a944 100644--- a/frontend/src/metabase/embedding/lib/override-requests-for-embeds.ts+++ b/frontend/src/metabase/embedding/lib/override-requests-for-embeds.ts@@ -1,4 +1,3 @@-import { sessionPropertiesPath } from "metabase/api";import {type OnBeforeRequestHandlerConfig,PLUGIN_API,@@ -6,6 +5,7 @@ import {} from "metabase/api/client";import { isEmbedPreview } from "metabase/embedding/config";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";+import { sessionPropertiesPath } from "metabase/settings";type EmbedType = "guest" | "static" | "public";diff --git a/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts b/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.tsindex 2a0d8d53b81..39fee420c85 100644--- a/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts+++ b/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts@@ -1,7 +1,8 @@import { useEffect, useState } from "react";import type { SdkStore } from "embedding-sdk-bundle/store/types";-import { refetchCurrentUser, refetchSiteSettings } from "metabase/api";+import { refetchCurrentUser } from "metabase/api";+import { refetchSiteSettings } from "metabase/settings";import {type McpAppsUserAndSettingsFetchErrorType,diff --git a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsxindex 71cf9b47fc7..a4917e3787e 100644--- a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx+++ b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx@@ -1,13 +1,13 @@import { useCallback, useState } from "react";import { jt, t } from "ttag";-import { useUpdateSettingsMutation } from "metabase/api";import { trackCustomHomepageDashboardEnabled } from "metabase/common/analytics";import { DashboardSelector } from "metabase/common/components/DashboardSelector/DashboardSelector";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/redux";import { addUndo, dismissUndo } from "metabase/redux/undo";+import { useUpdateSettingsMutation } from "metabase/settings";import { Box, Button, Flex, Modal, Text } from "metabase/ui";import type { DashboardId } from "metabase-types/api";diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsxindex 3b4137bf8a5..36693f47699 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx@@ -2,12 +2,13 @@ import { useState } from "react";import { t } from "ttag";import { useSendProductFeedbackMutation } from "metabase/api/product-feedback";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import { getPlan } from "metabase/common/utils/plan";import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import { getDocsUrl, getSetting } from "metabase/selectors/settings";+import { getDocsUrl } from "metabase/selectors/settings";+import { getSetting, useSetting } from "metabase/settings";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";import { EmbedHomepageView } from "./EmbedHomepageView";diff --git a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts b/frontend/src/metabase/home/components/EmbedHomepage/actions.tsindex a4eb110343f..0e21fef9313 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts+++ b/frontend/src/metabase/home/components/EmbedHomepage/actions.ts@@ -1,5 +1,5 @@-import { settingsApi } from "metabase/api";import { createAsyncThunk } from "metabase/redux/utils";+import { settingsApi } from "metabase/settings";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";import { trackEmbeddingHomepageDismissed } from "./analytics";diff --git a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsxindex 80f0843299c..9217e9ba296 100644--- a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx+++ b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx@@ -2,9 +2,10 @@ import { useMemo } from "react";import { useListPopularItemsQuery, useListRecentsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useDatabaseListQuery, useSetting } from "metabase/common/hooks";+import { useDatabaseListQuery } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import { isSyncCompleted } from "metabase/utils/syncing";import type Database from "metabase-lib/v1/metadata/Database";import type { PopularItem, RecentItem, User } from "metabase-types/api";diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsxindex 8e4651548a9..c35f7b0e8ac 100644--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx@@ -3,10 +3,11 @@ import { useState } from "react";import { t } from "ttag";import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";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";import { CustomHomePageModal } from "../CustomHomePageModal";diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.tsxindex 292985d4799..828c43f3f0d 100644--- a/frontend/src/metabase/home/components/HomePage/HomePage.tsx+++ b/frontend/src/metabase/home/components/HomePage/HomePage.tsx@@ -1,13 +1,13 @@import { useLayoutEffect } from "react";import { t } from "ttag";-import { useUpdateSettingMutation } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useHomepageDashboard } from "metabase/home/use-homepage-dashboard";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { replace } from "metabase/router";import { getHasDismissedCustomHomePageToast } from "metabase/selectors/app";+import { useUpdateSettingMutation } from "metabase/settings";import { HomeContent } from "../HomeContent";import { HomeLayout } from "../HomeLayout";diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsxindex 88d1c9a801a..9b2d6dcdc6b 100644--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx@@ -12,7 +12,7 @@ import { jt, t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Link } from "metabase/common/components/Link";import { OnboardingIllustration } from "metabase/common/components/OnboardingIllustration";-import { useSetting, useTempStorage } from "metabase/common/hooks";+import { useTempStorage } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { getIsXrayEnabled } from "metabase/home/selectors";import { useHelpLink } from "metabase/nav/components/AppSwitcher/useHelpLink";@@ -22,13 +22,13 @@ import {getDocsUrl,getIsHosted,getIsPaidPlan,- getSetting,} from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import {getApplicationName,getShowMetabaseLinks,} from "metabase/selectors/whitelabel";+import { getSetting, useSetting } from "metabase/settings";import {Accordion,Box,diff --git a/frontend/src/metabase/home/selectors.ts b/frontend/src/metabase/home/selectors.tsindex d885fbd9698..790b262ed06 100644--- a/frontend/src/metabase/home/selectors.ts+++ b/frontend/src/metabase/home/selectors.ts@@ -1,5 +1,5 @@import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";export const getIsXrayEnabled = (state: State) => {return getSetting(state, "enable-xrays");diff --git a/frontend/src/metabase/home/use-homepage-dashboard.tsx b/frontend/src/metabase/home/use-homepage-dashboard.tsxindex ca1e372e4f7..996c47a1935 100644--- a/frontend/src/metabase/home/use-homepage-dashboard.tsx+++ b/frontend/src/metabase/home/use-homepage-dashboard.tsx@@ -1,7 +1,7 @@import { skipToken, useGetDashboardQuery } from "metabase/api";import { useSelector } from "metabase/redux";import { getCustomHomePageDashboardId } from "metabase/selectors/app";-import { getSettingsLoading } from "metabase/selectors/settings";+import { getSettingsLoading } from "metabase/settings";export const useHomepageDashboard = () => {const dashboardId = useSelector(getCustomHomePageDashboardId);diff --git a/frontend/src/metabase/metabot/components/AIAnalysisSidebar/AIAnalysisSidebar.tsx b/frontend/src/metabase/metabot/components/AIAnalysisSidebar/AIAnalysisSidebar.tsxindex a90a66e803c..d3935e598a4 100644--- a/frontend/src/metabase/metabot/components/AIAnalysisSidebar/AIAnalysisSidebar.tsx+++ b/frontend/src/metabase/metabot/components/AIAnalysisSidebar/AIAnalysisSidebar.tsx@@ -6,10 +6,10 @@ import { t } from "ttag";import { useAnalyzeChartMutation } from "metabase/api";import { CopyButton } from "metabase/common/components/CopyButton";import { SidebarContent } from "metabase/common/components/SidebarContent";-import { useSetting } from "metabase/common/hooks";import { AIAnalysisContent } from "metabase/metabot/components/AIAnalysisContent/AIAnalysisContent";import { AIProviderConfigurationModal } from "metabase/metabot/components/AIProviderConfigurationModal";import { AIProviderConfigurationNotice } from "metabase/metabot/components/AIProviderConfigurationNotice";+import { useSetting } from "metabase/settings";import { Box } from "metabase/ui";import {getChartImagePngDataUri,diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsxindex c09edf9eb21..8bfe8ca7e30 100644--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx@@ -2,19 +2,18 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { P, match } from "ts-pattern";import { t } from "ttag";-import {- useUpdateMetabotSettingsMutation,- useUpdateSettingsMutation,-} from "metabase/api";-import {- getErrorMessage,- useAdminSetting,- useAdminSettings,-} from "metabase/api/utils";+import { useUpdateMetabotSettingsMutation } from "metabase/api";+import { getErrorMessage } from "metabase/api/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";-import { useSetting, useToast } from "metabase/common/hooks";+import { useToast } from "metabase/common/hooks";import { PLUGIN_METABOT } from "metabase/plugins";+import {+ useAdminSetting,+ useAdminSettings,+ useSetting,+ useUpdateSettingsMutation,+} from "metabase/settings";import {Box,Button,diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsxindex e517bea90dc..e1a75a33ada 100644--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsx+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsx@@ -2,9 +2,10 @@ import { type ChangeEvent, useEffect, useState } from "react";import { c, t } from "ttag";import { useUpdateMetabotSettingsMutation } from "metabase/api";-import { getErrorMessage, useAdminSettings } from "metabase/api/utils";+import { getErrorMessage } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";+import { useAdminSettings } from "metabase/settings";import { Text, TextInput } from "metabase/ui";import { useAIProviderConfigurationContext } from "./AIProviderConfigurationContext";diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsxindex f263f36b3e0..fdd6ff49755 100644--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsx+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsx@@ -3,7 +3,6 @@ import { useMemo } from "react";import { c, t } from "ttag";import { useUpdateMetabotSettingsMutation } from "metabase/api";-import { useAdminSettings } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";import {@@ -12,6 +11,7 @@ import {FormSelect,FormTextInput,} from "metabase/forms";+import { useAdminSettings } from "metabase/settings";import { useAIProviderConfigurationContext } from "./AIProviderConfigurationContext";import {diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsxindex 8da3a99daee..147a1e981cf 100644--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsx+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsx@@ -3,10 +3,10 @@ import { useMemo } from "react";import { t } from "ttag";import { useUpdateMetabotSettingsMutation } from "metabase/api";-import { useAdminSettings } from "metabase/api/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";import { FormErrorMessage, FormProvider, FormTextInput } from "metabase/forms";+import { useAdminSettings } from "metabase/settings";import { Text } from "metabase/ui";import type { BedrockCredentials } from "metabase-types/api";diff --git a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsxindex 11d1b79e1c9..909d1657ab3 100644--- a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx@@ -5,11 +5,11 @@ import _ from "underscore";import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";import { MetabotLogo } from "metabase/common/components/MetabotLogo";-import { useSetting } from "metabase/common/hooks";import { AIProviderConfigurationModal } from "metabase/metabot/components/AIProviderConfigurationModal";import { AIProviderConfigurationNotice } from "metabase/metabot/components/AIProviderConfigurationNotice";import { MetabotPromptInput } from "metabase/metabot/components/MetabotPromptInput";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";+import { useSetting } from "metabase/settings";import {ActionIcon,Box,diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsxindex 7b6bd284551..a4e55270798 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx@@ -5,10 +5,10 @@ import { t } from "ttag";import EmptyDashboardBot from "assets/img/dashboard-empty.svg?component";import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { AIProviderConfigurationModal } from "metabase/metabot/components/AIProviderConfigurationModal";import { AIProviderConfigurationNotice } from "metabase/metabot/components/AIProviderConfigurationNotice";import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotChat/MetabotResetLongChatButton";+import { useSetting } from "metabase/settings";import { Box, Button, Flex, Paper, Stack, Text } from "metabase/ui";import {diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsxindex b678aad7a7e..fbee2a94516 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx@@ -14,12 +14,12 @@ import { useSaveMetabotEntityMutation } from "metabase/api/metabot";import { ForwardRefLink } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";-import { useSetting } from "metabase/common/hooks";import { serializeChartClipboard } from "metabase/common/utils/chart-clipboard";import { getSavedChartCardId, markChartSaved } from "metabase/metabot/state";import { useDispatch, useSelector } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import { push } from "metabase/router";+import { useSetting } from "metabase/settings";import {ActionIcon,Anchor,diff --git a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsx b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsxindex 20667b5e110..48737bbd54d 100644--- a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsx@@ -16,7 +16,7 @@ import {import { normalizeFetchedChatMessages } from "metabase/metabot/utils/normalize-fetched-chat-messages";import { useDispatch, useSelector } from "metabase/redux";import { Navigate, useParams } from "metabase/router";-import { getSettingsLoading } from "metabase/selectors/settings";+import { getSettingsLoading } from "metabase/settings";import { Center, Loader } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsx b/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsxindex 62cbb958303..3292ba34f23 100644--- a/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsx+++ b/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsx@@ -1,7 +1,7 @@import { forwardRef } from "react";-import { useSetting } from "metabase/common/hooks";import { useMetabotName } from "metabase/metabot/hooks";+import { useSetting } from "metabase/settings";import { Box, type BoxProps, Icon } from "metabase/ui";export interface MetabotIconProps extends BoxProps {diff --git a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsxindex f26ac31f62a..62b7bfba603 100644--- a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx+++ b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx@@ -20,7 +20,7 @@ import { createMetabotMentionSuggestionNew } from "metabase/rich_text_editing/tiimport { SmartLink } from "metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";import { createBareSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { getCspNonce } from "metabase/utils/csp";import type { DatabaseId } from "metabase-types/api";diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.tsindex 718319ec862..a235b6be060 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts@@ -1,5 +1,5 @@-import { useSetting } from "metabase/common/hooks";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { useSetting } from "metabase/settings";import { isWithinIframe } from "metabase/utils/iframe";/** Returns the value for `metabot-enabled?` or `embedded-metabot-enabled?` depending on the contextdiff --git a/frontend/src/metabase/metabot/hooks/use-metabot-name.ts b/frontend/src/metabase/metabot/hooks/use-metabot-name.tsindex f69b9e44d08..b646f1f8aaf 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-name.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-name.ts@@ -1,4 +1,4 @@-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";/** Returns the user-configured display name for Metabot (defaults to "Metabot"). */export const useMetabotName = (): string => {diff --git a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.tsindex 479bce88cd6..1d86bd46409 100644--- a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts+++ b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts@@ -1,9 +1,9 @@import { useMemo } from "react";import { useGetUserMetabotPermissionsQuery } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { canAccessSettings, getUser } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-enabled";diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tsindex 41938499b10..a3e8c3ec320 100644--- a/frontend/src/metabase/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -22,8 +22,8 @@ import type { Dispatch, State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import { createAsyncThunk } from "metabase/redux/utils";import { push } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";+import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { retry } from "metabase/utils/retry";import { uuid } from "metabase/utils/uuid";diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsxindex f4edd944c4b..29e589b1633 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx@@ -7,12 +7,13 @@ import CS from "metabase/css/core/index.css";import { NewModelOption } from "metabase/models/components/NewModelOption";import { useSelector } from "metabase/redux";import { useLocation } from "metabase/router";-import { getLearnUrl, getSetting } from "metabase/selectors/settings";+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";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx b/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsxindex 85d653105c3..5091472d08b 100644--- a/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx+++ b/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx@@ -2,12 +2,12 @@ import { t } from "ttag";import _ from "underscore";import { LogoIcon } from "metabase/common/components/LogoIcon";-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import {getApplicationName,getIsWhiteLabeling,} from "metabase/selectors/whitelabel";+import { useSetting } from "metabase/settings";import {Box,Divider,diff --git a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.tsindex e552df990f3..7442734a473 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts+++ b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts@@ -1,8 +1,8 @@import { useGetBugReportDetailsQuery } from "metabase/api/bug-report";-import { useSetting } from "metabase/common/hooks";import { getHelpUrl } from "metabase/common/utils/help-url";import { useSelector } from "metabase/redux";import { getIsPaidPlan } from "metabase/selectors/settings";+import { useSetting } from "metabase/settings";import { getUser } from "../../../selectors/user";diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsxindex d1745acf078..f85abb06962 100644--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx@@ -1,12 +1,15 @@import { useCallback, useMemo } from "react";import { t } from "ttag";-import { useGetVersionInfoQuery, useUpdateSettingMutation } from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { NavbarPromoCard } from "metabase/nav/components/NavbarPromoCard";import { useSelector } from "metabase/redux";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { getIsWhiteLabeling } from "metabase/selectors/whitelabel";+import {+ useGetVersionInfoQuery,+ useSetting,+ useUpdateSettingMutation,+} from "metabase/settings";import Sparkles from "./sparkles.svg?component";import { getLatestEligibleReleaseNotes } from "./utils";diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsxindex 048547e1e28..d7e17a8c5bd 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx@@ -28,7 +28,7 @@ import {useLocation,useNavigationType,} from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box, Flex, Icon, UnstyledButton, rem } from "metabase/ui";import { modelToUrl } from "metabase/urls";import { isSmallScreen } from "metabase/utils/dom";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsxindex e4134606d63..79aa9d5f09a 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx@@ -2,9 +2,9 @@ import { useEffect, useMemo, useState } from "react";import { t } from "ttag";import { useStorageSetup } from "metabase/common/components/upsells/StoragePurchaseModal";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";+import { useSetting } from "metabase/settings";import { Box, Icon, Modal, Tabs } from "metabase/ui";import type { IconName } from "metabase-types/api";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsxindex fb001695085..c66cd40cb25 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx@@ -5,7 +5,7 @@ import { c, t } from "ttag";import { Link } from "metabase/common/components/Link";import { StoragePurchaseButton } from "metabase/common/components/upsells/StoragePurchaseModal";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import {Alert,Box,diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsxindex 6fac39ef178..4c05050273d 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx@@ -1,10 +1,10 @@import { c, t } from "ttag";import { CollapseSection } from "metabase/common/components/CollapseSection";-import { useUserSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getEntityTypes } from "metabase/redux/embedding-data-picker";import { getIsEmbeddingIframe } from "metabase/selectors/embed";+import { useUserSetting } from "metabase/settings";import { ActionIcon, Icon, Tooltip } from "metabase/ui";import { PaddedSidebarLink, SidebarHeading } from "../MainNavbar.styled";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsxindex 05325631088..791c2a31fe0 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx@@ -13,7 +13,6 @@ import {} from "metabase/common/collections/utils";import { CollapseSection } from "metabase/common/components/CollapseSection";import { Tree } from "metabase/common/components/tree";-import { useSetting, useUserSetting } from "metabase/common/hooks";import { useIsAtHomepageDashboard } from "metabase/common/hooks/use-is-at-homepage-dashboard";import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";import { NavbarLibrarySection } from "metabase/nav/containers/MainNavbar/NavbarLibrarySection";@@ -32,6 +31,7 @@ import {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";import { isSmallScreen } from "metabase/utils/dom";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsxindex 9a5f476a267..e3d83e24bc4 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx@@ -10,13 +10,13 @@ import {} from "metabase/common/collections/utils";import { CollapseSection } from "metabase/common/components/CollapseSection";import { Tree } from "metabase/common/components/tree";-import { useUserSetting } from "metabase/common/hooks";import {SidebarHeading,SidebarSection,} from "metabase/nav/containers/MainNavbar/MainNavbar.styled";import { SidebarCollectionLink } from "metabase/nav/containers/MainNavbar/SidebarItems";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { useUserSetting } from "metabase/settings";import type { Collection, CollectionType } from "metabase-types/api";type LibraryCollectionSectionProps = {diff --git a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx b/frontend/src/metabase/notifications/channels/RecipientPicker.tsxindex 7bf717c981f..da43bdc8115 100644--- a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx+++ b/frontend/src/metabase/notifications/channels/RecipientPicker.tsx@@ -2,8 +2,8 @@ import { useMemo } from "react";import { t } from "ttag";import { UserAvatar } from "metabase/common/components/UserAvatar";-import { useSetting } from "metabase/common/hooks";import { type RecipientPickerValue, recipientIsValid } from "metabase/pulse";+import { useSetting } from "metabase/settings";import { Flex, MultiAutocomplete, Text } from "metabase/ui";import { isEmail } from "metabase/utils/email";import type { User } from "metabase-types/api";diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsxindex 21751b2957e..4e9b25ec342 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx@@ -13,8 +13,8 @@ import {formatNotificationScheduleDescription,} from "metabase/notifications/utils";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";import { getApplicationName } from "metabase/selectors/whitelabel";+import { getSetting } from "metabase/settings";import { Box, type BoxProps, Flex, Text } from "metabase/ui";import { getScheduleExplanation } from "metabase/utils/cron";import type {diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex ee139dda0d6..328c2b86648 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -7,14 +7,14 @@ import { useListRecentsQuery, useSearchQuery } from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { getCollection } from "metabase/common/collections/utils";import type { OmniPickerItem } from "metabase/common/components/Pickers";-import { useSetting } from "metabase/common/hooks";import { trackSearchClick } from "metabase/common/search/analytics";import { useGetIcon } from "metabase/hooks/use-icon";import { useSelector } from "metabase/redux";import { queryToSearch } from "metabase/router";-import { getDocsUrl, getSettings } from "metabase/selectors/settings";+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";import * as Urls from "metabase/urls";import { modelToUrl } from "metabase/urls";diff --git a/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.tsx b/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.tsxindex fe8993dd8c8..999101c7527 100644--- a/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.tsx+++ b/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.tsx@@ -1,9 +1,9 @@import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import { useTranslateContent } from "metabase/content-translation/hooks";import { ParameterFieldWidgetValue } from "metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidgetValue/ParameterFieldWidgetValue";import { formatParameterValue } from "metabase/parameters/utils/formatting";+import { useSetting } from "metabase/settings";import { Ellipsified } from "metabase/ui";import type { UiParameter } from "metabase-lib/v1/parameters/types";import {diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsxindex 2ee15a4217f..94598992562 100644--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx@@ -23,7 +23,7 @@ import { getVisibleParameters } from "metabase/parameters/utils/ui";import { SyncedParametersList } from "metabase/querying/components/SyncedParametersList";import { useSyncUrlParameters } from "metabase/querying/components/use-sync-url-parameters";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Box } from "metabase/ui";import { getDashboardType } from "metabase/utils/dashboard";diff --git a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsxindex 46a63a90911..4f158b5a821 100644--- a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx+++ b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx@@ -1,8 +1,8 @@import { jt, t } from "ttag";-import { useUpdateSettingMutation } from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { LegaleseStepDetailsContainer } from "metabase/public/components/widgets/LegaleseStep/LegaleseStep.styled";+import { useUpdateSettingMutation } from "metabase/settings";import { Button, Center, Stack, Text, Title } from "metabase/ui";export const LegaleseStep = ({diff --git a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsxindex 9418b539315..549c5009a33 100644--- a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx+++ b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx@@ -24,7 +24,7 @@ import { SmartLink } from "metabase/rich_text_editing/tiptap/extensions/SmartLinimport { SupportingText } from "metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText";import { DROP_ZONE_COLOR } from "metabase/rich_text_editing/tiptap/extensions/shared/constants";import { useLocation, useParams } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box } from "metabase/ui";import { initializeIframeResizer } from "metabase/utils/dom";import type { Document } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.tsindex 74a07b77d58..84d185ae89a 100644--- a/frontend/src/metabase/query_builder/actions/native.ts+++ b/frontend/src/metabase/query_builder/actions/native.ts@@ -1,9 +1,10 @@import { createAction } from "redux-actions";-import { cardApi, settingsApi } from "metabase/api";+import { cardApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { createThunkAction } from "metabase/redux";import type { Dispatch, GetState } from "metabase/redux/store";+import { settingsApi } from "metabase/settings";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";import type {CardId,diff --git a/frontend/src/metabase/query_builder/actions/ui.ts b/frontend/src/metabase/query_builder/actions/ui.tsindex 215f3974eb7..b368d2cf92a 100644--- a/frontend/src/metabase/query_builder/actions/ui.ts+++ b/frontend/src/metabase/query_builder/actions/ui.ts@@ -1,4 +1,3 @@-import { settingsApi } from "metabase/api";import { getOriginalCard } from "metabase/query_builder/selectors";import {CANCEL_QUERY,@@ -11,6 +10,7 @@ import type {GetState,QueryBuilderMode,} from "metabase/redux/store";+import { settingsApi } from "metabase/settings";import type { Card } from "metabase-types/api";import { trackFirstNonTableChartGenerated } from "../analytics";diff --git a/frontend/src/metabase/query_builder/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx b/frontend/src/metabase/query_builder/components/MetabotQueryBuilder/MetabotQueryBuilder.tsxindex ed96c6a8490..eabf476dc62 100644--- a/frontend/src/metabase/query_builder/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx@@ -7,7 +7,7 @@ import {} from "metabase/metabot/hooks";import { QueryBuilder } from "metabase/query_builder/containers/QueryBuilder";import { useSelector } from "metabase/redux";-import { getSettingsLoading } from "metabase/selectors/settings";+import { getSettingsLoading } from "metabase/settings";/*** Routes /question/ask to either the Metabot NLQ prompt view or the regular QueryBuilder, depending on NLQ access.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 d71b97150f9..6a8261ca4eb 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,7 +3,6 @@ import { useMemo } from "react";import { t } from "ttag";import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";-import { useSetting } from "metabase/common/hooks";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";@@ -26,6 +25,7 @@ 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 {publicQuestion as getPublicQuestionUrl,diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex 3882eccd8d8..63d81b26831 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -59,12 +59,12 @@ import {} from "metabase/router";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";import {canManageSubscriptions,getUser,getUserIsAdmin,} from "metabase/selectors/user";+import { getSetting } from "metabase/settings";import type { Series } from "metabase-types/api";import {diff --git a/frontend/src/metabase/query_builder/selectors.ts b/frontend/src/metabase/query_builder/selectors.tsindex d10ba96e49d..2a99855971c 100644--- a/frontend/src/metabase/query_builder/selectors.ts+++ b/frontend/src/metabase/query_builder/selectors.ts@@ -19,7 +19,7 @@ import {getIsEmbeddingIframe,} from "metabase/selectors/embed";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { parseTimestamp } from "metabase/utils/time-dayjs";import { isNotNull } from "metabase/utils/types";import {diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsxindex 7cc7499f808..167d250a023 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.tsx@@ -20,8 +20,8 @@ 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 { getSetting } from "metabase/selectors/settings";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";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsxindex a0f5b2853e9..32816835078 100644--- a/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx@@ -1,7 +1,6 @@import { type FormEvent, type ReactNode, useMemo, useState } from "react";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import type {DatePickerExtractionUnit,DatePickerOperator,@@ -9,6 +8,7 @@ import type {ExcludeDatePickerOperator,ExcludeDatePickerValue,} from "metabase/querying/common/types";+import { useSetting } from "metabase/settings";import type { PopoverBackButtonProps } from "metabase/ui";import {Box,diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsxindex 36d4215032f..9bc79ff0a88 100644--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsx+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsx@@ -9,7 +9,7 @@ import {useLazyListCardAutocompleteSuggestionsQuery,useListSnippetsQuery,} from "metabase/api";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { isNotNull } from "metabase/utils/types";import type { Card, CardId, DatabaseId, Field } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.tsxindex d7616684e1a..92adc3c50ed 100644--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.tsx+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.tsx@@ -1,6 +1,6 @@-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import QueryBuilderS from "metabase/css/query_builder.module.css";+import { useSetting } from "metabase/settings";export const AdminEmail = () => {const adminEmail = useSetting("admin-email");diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsxindex e8c055033d1..eb1f4918c64 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx@@ -5,9 +5,9 @@ import { useWindowSize } from "react-use";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { ResizeHandle } from "metabase/common/components/ResizeHandle";-import { useSetting } from "metabase/common/hooks";import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";import { Notebook } from "metabase/querying/notebook/components/Notebook";+import { useSetting } from "metabase/settings";import { Box } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";diff --git a/frontend/src/metabase/redux/auth.ts b/frontend/src/metabase/redux/auth.tsindex 2a6d5ba09f8..9c3c5bb2c61 100644--- a/frontend/src/metabase/redux/auth.ts+++ b/frontend/src/metabase/redux/auth.ts@@ -4,7 +4,7 @@ import {createReducer,} from "@reduxjs/toolkit";-import { Api, refetchCurrentUser, refetchSiteSettings } from "metabase/api";+import { Api, refetchCurrentUser } from "metabase/api";import { loadLocalization } from "metabase/api/localization";import {type MfaChallengeResponse,@@ -14,8 +14,8 @@ import {import { openNavbar } from "metabase/redux/app";import { createAsyncThunk } from "metabase/redux/utils";import { push } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";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";import { isResourceNotFoundError } from "metabase/utils/errors";diff --git a/frontend/src/metabase/redux/downloads.ts b/frontend/src/metabase/redux/downloads.tsindex f94998a7323..5cb9485e62c 100644--- a/frontend/src/metabase/redux/downloads.ts+++ b/frontend/src/metabase/redux/downloads.ts@@ -14,7 +14,7 @@ import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-nextimport { isEmbeddingSdk } from "metabase/embedding-sdk/config";import type { DownloadsState, State } from "metabase/redux/store";import { createAsyncThunk } from "metabase/redux/utils";-import { getTokenFeature } from "metabase/selectors/settings";+import { getTokenFeature } from "metabase/settings";import * as Urls from "metabase/urls";import { getBasename } from "metabase/utils/basename";import { openSaveDialog } from "metabase/utils/dom";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsxindex 3b617dcd493..52ec3624c7e 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx@@ -6,7 +6,7 @@ import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useDispatch, useSelector, useStore } from "metabase/redux";import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box, Button, Flex, Modal, Text } from "metabase/ui";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsxindex 83ae56d6357..1092fae77b3 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx@@ -6,7 +6,7 @@ import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useDispatch, useSelector, useStore } from "metabase/redux";import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";import { getMetadata } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { Box, Button, Flex, Modal } from "metabase/ui";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/route-guards/auth-guards.tsx b/frontend/src/metabase/route-guards/auth-guards.tsxindex b39ef7cd246..c2c30e823ed 100644--- a/frontend/src/metabase/route-guards/auth-guards.tsx+++ b/frontend/src/metabase/route-guards/auth-guards.tsx@@ -4,8 +4,8 @@ import { type Location, Navigate, Outlet } from "metabase/router";import { getAdminPaths } from "metabase/selectors/admin";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { getCanAccessOnboardingPage } from "metabase/selectors/onboarding";-import { getSetting } from "metabase/selectors/settings";import { getUser, getUserIsAdmin } from "metabase/selectors/user";+import { getSetting } from "metabase/settings";import { replaceLocation } from "metabase/utils/dom";import { createGuard, createRedirectGuard } from "./create-guard";diff --git a/frontend/src/metabase/selectors/app.ts b/frontend/src/metabase/selectors/app.tsindex a4d3aef1fb4..4df54807954 100644--- a/frontend/src/metabase/selectors/app.ts+++ b/frontend/src/metabase/selectors/app.ts@@ -8,8 +8,7 @@ import {getIsEmbeddingIframe,} from "metabase/selectors/embed";import { getUser } from "metabase/selectors/user";--import { getSetting } from "./settings";+import { getSetting } from "metabase/settings";export interface RouterProps {location: Location;diff --git a/frontend/src/metabase/selectors/metadata.ts b/frontend/src/metabase/selectors/metadata.tsindex a0f7d609f2c..5b69aab70e5 100644--- a/frontend/src/metabase/selectors/metadata.ts+++ b/frontend/src/metabase/selectors/metadata.ts@@ -3,6 +3,7 @@ import { normalize } from "normalizr";import type { State } from "metabase/redux/store";import { FieldSchema } from "metabase/schema";+import { getSettings } from "metabase/settings";import Question from "metabase-lib/v1/Question";import Database from "metabase-lib/v1/metadata/Database";import Field from "metabase-lib/v1/metadata/Field";@@ -31,8 +32,6 @@ import type {Segment,} from "metabase-types/api";-import { getSettings } from "./settings";-type TableSelectorOpts = {includeHiddenTables?: boolean;};diff --git a/frontend/src/metabase/selectors/onboarding.ts b/frontend/src/metabase/selectors/onboarding.tsindex c0a1d37e3f5..2bba9c45d14 100644--- a/frontend/src/metabase/selectors/onboarding.ts+++ b/frontend/src/metabase/selectors/onboarding.ts@@ -3,8 +3,8 @@ import dayjs from "dayjs";import type { State } from "metabase/redux/store";import { getIsEmbeddingIframe } from "metabase/selectors/embed";-import { getSetting } from "metabase/selectors/settings";import { getIsWhiteLabeling } from "metabase/selectors/whitelabel";+import { getSetting } from "metabase/settings";export const getIsNewInstance = (state: State) => {const instanceCreated = getSetting(state, "instance-creation");diff --git a/frontend/src/metabase/selectors/settings.ts b/frontend/src/metabase/selectors/settings.tsindex 894f104393d..a871d165943 100644--- a/frontend/src/metabase/selectors/settings.ts+++ b/frontend/src/metabase/selectors/settings.ts@@ -1,55 +1,9 @@import { createSelector } from "@reduxjs/toolkit";-import { sessionApi } from "metabase/api/session";import { getPlan } from "metabase/common/utils/plan";import type { State } from "metabase/redux/store";-import type {- EnterpriseSettingKey,- EnterpriseSettings,- TokenFeature,- TokenStatus,- Version,-} from "metabase-types/api";--// Settings (a.k.a. session properties) live in the `getSessionProperties` RTK-// Query cache; `getSettings` reads them from there, falling back to-// `window.MetabaseBootstrap` so reads aren't empty before the first fetch.-//-// The explicit annotation collapses the RTK-generated selector generics; left-// inferred, they leak into every consumer and can push deeply-nested reducer-// files over TypeScript's instantiation-depth limit (TS2589).-const selectSessionProperties: (state: State) => {- data?: EnterpriseSettings;- isLoading: boolean;-} = sessionApi.endpoints.getSessionProperties.select();--// Fallback for when neither the cache nor the bootstrap has data: the main app-// always has the server-injected bootstrap, but the embedding SDK runs on a host-// page with no bootstrap and reads settings before auth injects them into the cache.-//-// Hoisted so `getSettings` returns a stable reference-const EMPTY_SETTINGS = {};--// Typed as `EnterpriseSettings` (a superset of the OSS `Settings`): the cache-// holds whatever the backend returned, and reads of OSS keys narrow naturally.-// There is no `settings` key on `State` — settings are not redux state.-export const getSettings = (state: State): EnterpriseSettings =>- // Unjustified type cast. FIXME- (selectSessionProperties(state).data ??- (typeof window !== "undefined" ? window.MetabaseBootstrap : undefined) ??- EMPTY_SETTINGS) as EnterpriseSettings;--export const getSettingsLoading = (state: State): boolean =>- selectSessionProperties(state).isLoading;--export const getSetting = <T extends EnterpriseSettingKey>(- state: State,- key: T,-): EnterpriseSettings[T] => {- const settings = getSettings(state);- const setting = settings[key];- return setting;-};+import { getSetting } from "metabase/settings";+import type { TokenStatus, Version } from "metabase-types/api";export const isSsoEnabled = (state: State) =>getSetting(state, "ldap-enabled") ||@@ -61,11 +15,6 @@ export const getIsHosted = (state: State): boolean => {return getSetting(state, "is-hosted?");};-export const getTokenFeature = (state: State, feature: TokenFeature) => {- const tokenFeatures = getSetting(state, "token-features");- return tokenFeatures[feature];-};-export type StorePaths =/** store main page */| ""diff --git a/frontend/src/metabase/selectors/web-app.ts b/frontend/src/metabase/selectors/web-app.tsindex d09fb466921..59d98ad3940 100644--- a/frontend/src/metabase/selectors/web-app.ts+++ b/frontend/src/metabase/selectors/web-app.ts@@ -1,9 +1,9 @@import { createSelector } from "reselect";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { getSetting } from "metabase/settings";import { getIsEmbeddingIframe } from "./embed";-import { getSetting } from "./settings";export const getIsWebApp = createSelector([(state) => getSetting(state, "site-url"), getIsEmbeddingIframe],diff --git a/frontend/src/metabase/api/settings.ts b/frontend/src/metabase/settings/api.tssimilarity index 72%rename from frontend/src/metabase/api/settings.tsrename to frontend/src/metabase/settings/api.tsindex 2095c78d06c..a1a84598a1f 100644--- a/frontend/src/metabase/api/settings.ts+++ b/frontend/src/metabase/settings/api.ts@@ -1,5 +1,13 @@import _ from "underscore";+import { Api } from "metabase/api/api";+import { invalidateTags, listTag, tag } from "metabase/api/tags";+import { handleQueryFulfilled } from "metabase/api/utils/lifecycle";+import {+ isValidColorScheme,+ setUserColorSchemeAfterUpdate,+} from "metabase/utils/color-scheme";+import MetabaseSettings from "metabase/utils/settings";import type {EnterpriseSettingKey,EnterpriseSettingValue,@@ -8,9 +16,7 @@ import type {SettingDefinitionMap,} from "metabase-types/api";-import { Api } from "./api";-import { sessionApi } from "./session";-import { invalidateTags, listTag, tag } from "./tags";+export const sessionPropertiesPath = "/api/session/properties";export type UpdateSettingArg = {key: EnterpriseSettingKey;@@ -25,6 +31,32 @@ const putSettingQuery = ({ key, value }: UpdateSettingArg) => ({export const settingsApi = Api.injectEndpoints({endpoints: (builder) => ({+ // The instance's settings payload.+ // `getSettings` and `useSetting` resolve out of this cache entry.+ getSessionProperties: builder.query<EnterpriseSettings, void>({+ query: () => ({+ method: "GET",+ url: sessionPropertiesPath,+ }),+ providesTags: ["session-properties"],+ // Subscriptions keep the entry fresh and invalidation-safe+ // Infinity keeps it from aging out if the subscriptions happen to be gone+ keepUnusedDataFor: Infinity,+ onQueryStarted: (_, { queryFulfilled }) =>+ handleQueryFulfilled(queryFulfilled, (data) => {+ // Keep the non-redux settings consumers in sync. `MetabaseSettings`+ // is read by code that runs outside the store/React (i18n, dom helpers, theming).+ MetabaseSettings.setAll(data);++ // Sync color-scheme setting to window.MetabaseUserColorScheme+ if (+ data["color-scheme"] &&+ isValidColorScheme(data["color-scheme"])+ ) {+ setUserColorSchemeAfterUpdate(data["color-scheme"]);+ }+ }),+ }),// admin-only endpoint that returns all settings with lots of extra metadatagetAdminSettingsDetails: builder.query<SettingDefinitionMap, void>({query: () => ({@@ -104,7 +136,7 @@ export const settingsApi = Api.injectEndpoints({query: putSettingQuery,onQueryStarted: async ({ key, value }, { dispatch, queryFulfilled }) => {const patch = dispatch(- sessionApi.util.updateQueryData(+ settingsApi.util.updateQueryData("getSessionProperties",undefined,(draft) => {@@ -130,7 +162,7 @@ export const settingsApi = Api.injectEndpoints({// where this mutation causes a refetch.if (patch.patches.length === 0) {dispatch(- sessionApi.util.invalidateTags([tag("session-properties")]),+ settingsApi.util.invalidateTags([tag("session-properties")]),);}} catch {@@ -148,7 +180,23 @@ export const {useGetSettingQuery,useGetVersionInfoQuery,useGetAdminSettingsDetailsQuery,+ useGetSessionPropertiesQuery,+ useLazyGetSessionPropertiesQuery,useUpdateSettingMutation,useUpdateSettingsMutation,useUpdateUserSettingMutation,} = settingsApi;++// aliases for easier use+export const useGetSettingsQuery = useGetSessionPropertiesQuery;+export const useLazyGetSettingsQuery = useLazyGetSessionPropertiesQuery;++/**+ * Force a refetch of the session properties (settings) from non-React code.+ * Dispatch it via `dispatch(refetchSiteSettings())`.+ * In React, prefer `useLazyGetSettingsQuery()`'s trigger instead.+ */+export const refetchSiteSettings = () =>+ settingsApi.endpoints.getSessionProperties.initiate(undefined, {+ forceRefetch: true,+ });diff --git a/frontend/src/metabase/settings/index.ts b/frontend/src/metabase/settings/index.tsnew file mode 100644index 00000000000..bf0857ea6d9--- /dev/null+++ b/frontend/src/metabase/settings/index.ts@@ -0,0 +1,22 @@+// The module's public interface.+// Names absent here are module-private on purpose — add them only when a real consumer needs them.++export {+ refetchSiteSettings,+ sessionPropertiesPath,+ settingsApi,+ useGetAdminSettingsDetailsQuery,+ useGetSettingsQuery,+ useGetVersionInfoQuery,+ useLazyGetSettingsQuery,+ useUpdateSettingMutation,+ useUpdateSettingsMutation,+} from "./api";+export {+ getSetting,+ getSettings,+ getSettingsLoading,+ getTokenFeature,+} from "./selectors";+export { useAdminSetting, useAdminSettings } from "./use-admin-setting";+export { useSetting, useUserSetting } from "./use-setting";diff --git a/frontend/src/metabase/settings/selectors.ts b/frontend/src/metabase/settings/selectors.tsnew file mode 100644index 00000000000..0dab4d52f27--- /dev/null+++ b/frontend/src/metabase/settings/selectors.ts@@ -0,0 +1,53 @@+import type { State } from "metabase/redux/store";+import type {+ EnterpriseSettingKey,+ EnterpriseSettings,+ TokenFeature,+} from "metabase-types/api";++import { settingsApi } from "./api";++// Settings (a.k.a. session properties) live in the `getSessionProperties` RTK+// Query cache; `getSettings` reads them from there, falling back to+// `window.MetabaseBootstrap` so reads aren't empty before the first fetch.+//+// The explicit annotation collapses the RTK-generated selector generics; left+// inferred, they leak into every consumer and can push deeply-nested reducer+// files over TypeScript's instantiation-depth limit (TS2589).+const selectSessionProperties: (state: State) => {+ data?: EnterpriseSettings;+ isLoading: boolean;+} = settingsApi.endpoints.getSessionProperties.select();++// Fallback for when neither the cache nor the bootstrap has data: the main app+// always has the server-injected bootstrap, but the embedding SDK runs on a host+// page with no bootstrap and reads settings before auth injects them into the cache.+//+// Hoisted so `getSettings` returns a stable reference+const EMPTY_SETTINGS = {};++// Typed as `EnterpriseSettings` (a superset of the OSS `Settings`): the cache+// holds whatever the backend returned, and reads of OSS keys narrow naturally.+// There is no `settings` key on `State` — settings are not redux state.+export const getSettings = (state: State): EnterpriseSettings =>+ // Unjustified type cast. FIXME+ (selectSessionProperties(state).data ??+ (typeof window !== "undefined" ? window.MetabaseBootstrap : undefined) ??+ EMPTY_SETTINGS) as EnterpriseSettings;++export const getSettingsLoading = (state: State): boolean =>+ selectSessionProperties(state).isLoading;++export const getSetting = <T extends EnterpriseSettingKey>(+ state: State,+ key: T,+): EnterpriseSettings[T] => {+ const settings = getSettings(state);+ const setting = settings[key];+ return setting;+};++export const getTokenFeature = (state: State, feature: TokenFeature) => {+ const tokenFeatures = getSetting(state, "token-features");+ return tokenFeatures[feature];+};diff --git a/frontend/src/metabase/redux/settings-cache.unit.spec.tsx b/frontend/src/metabase/settings/settings-cache.unit.spec.tsxsimilarity index 93%rename from frontend/src/metabase/redux/settings-cache.unit.spec.tsxrename to frontend/src/metabase/settings/settings-cache.unit.spec.tsxindex 07aaf8efa5d..5f3d396a5b1 100644--- a/frontend/src/metabase/redux/settings-cache.unit.spec.tsx+++ b/frontend/src/metabase/settings/settings-cache.unit.spec.tsx@@ -3,18 +3,19 @@ import { useState } from "react";import { setupPropertiesEndpoints } from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import {- sessionApi,- useGetSessionPropertiesQuery,- useGetSettingsQuery,-} from "metabase/api";-import { useSetting } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockSettingsState } from "metabase/redux/store/mocks";-import { getSetting } from "metabase/selectors/settings";import { createMockSettings } from "metabase-types/api/mocks";+import {+ settingsApi,+ useGetSessionPropertiesQuery,+ useGetSettingsQuery,+} from "./api";+import { getSetting } from "./selectors";+import { useSetting } from "./use-setting";+const TestGetComponent = () => {const siteNameFromSelector = useSelector((state: State) =>getSetting(state, "site-name"),@@ -55,12 +56,12 @@ const TestUpdateComponent = () => {const dispatch = useDispatch();const refresh = () =>dispatch(- sessionApi.endpoints.getSessionProperties.initiate(undefined, {+ settingsApi.endpoints.getSessionProperties.initiate(undefined, {forceRefetch: true,}),);const invalidate = () =>- dispatch(sessionApi.util.invalidateTags(["session-properties"]));+ dispatch(settingsApi.util.invalidateTags(["session-properties"]));return (<div>diff --git a/frontend/src/metabase/api/utils/settings.ts b/frontend/src/metabase/settings/use-admin-setting.tssimilarity index 95%rename from frontend/src/metabase/api/utils/settings.tsrename to frontend/src/metabase/settings/use-admin-setting.tsindex 768958c4bc4..78a2a322d8d 100644--- a/frontend/src/metabase/api/utils/settings.ts+++ b/frontend/src/metabase/settings/use-admin-setting.ts@@ -3,9 +3,9 @@ import { shallowEqual } from "react-redux";import { t } from "ttag";import _ from "underscore";-import { useToast } from "metabase/common/hooks";+import { getErrorMessage } from "metabase/api/utils/errors";+import { useToast } from "metabase/common/hooks/use-toast";import { useSelector } from "metabase/redux";-import { getSetting, getSettings } from "metabase/selectors/settings";import type {EnterpriseSettingKey,EnterpriseSettingValue,@@ -13,14 +13,13 @@ import type {SettingDefinition,} from "metabase-types/api";-import { useGetSettingsQuery } from "../session";import {useGetAdminSettingsDetailsQuery,+ useGetSettingsQuery,useUpdateSettingMutation,useUpdateSettingsMutation,-} from "../settings";--import { getErrorMessage } from "./errors";+} from "./api";+import { getSetting, getSettings } from "./selectors";/*** One hook to get setting values and mutators for a given settingdiff --git a/frontend/src/metabase/api/utils/settings.unit.spec.tsx b/frontend/src/metabase/settings/use-admin-setting.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/api/utils/settings.unit.spec.tsxrename to frontend/src/metabase/settings/use-admin-setting.unit.spec.tsxindex 22f10fffa34..8fd90e7088a 100644--- a/frontend/src/metabase/api/utils/settings.unit.spec.tsx+++ b/frontend/src/metabase/settings/use-admin-setting.unit.spec.tsx@@ -13,7 +13,7 @@ import {createMockSettings,} from "metabase-types/api/mocks";-import { useAdminSetting, useAdminSettings } from "./settings";+import { useAdminSetting, useAdminSettings } from "./use-admin-setting";const TestComponent = () => {const { value, settingDetails, updateSetting, isLoading } =diff --git a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts b/frontend/src/metabase/settings/use-setting.tssimilarity index 95%rename from frontend/src/metabase/common/hooks/use-setting/use-setting.tsrename to frontend/src/metabase/settings/use-setting.tsindex 263247fa8cd..e78edd81e01 100644--- a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts+++ b/frontend/src/metabase/settings/use-setting.ts@@ -1,14 +1,15 @@import { useCallback, useMemo } from "react";import _ from "underscore";+import { useSelector } from "metabase/redux";+import type { EnterpriseSettingKey, UserSettings } from "metabase-types/api";+import {type UpdateSettingArg,useUpdateSettingMutation,useUpdateUserSettingMutation,-} from "metabase/api";-import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";-import type { EnterpriseSettingKey, UserSettings } from "metabase-types/api";+} from "./api";+import { getSetting } from "./selectors";export const useSetting = <SettingName extends EnterpriseSettingKey>(settingName: SettingName,diff --git a/frontend/src/metabase/common/hooks/use-setting/use-setting.unit.spec.tsx b/frontend/src/metabase/settings/use-setting.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/common/hooks/use-setting/use-setting.unit.spec.tsxrename to frontend/src/metabase/settings/use-setting.unit.spec.tsxdiff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.tsindex 3eea25f48e0..9792c42115a 100644--- a/frontend/src/metabase/setup/actions.ts+++ b/frontend/src/metabase/setup/actions.ts@@ -1,13 +1,7 @@import { createAction } from "@reduxjs/toolkit";import { t } from "ttag";-import {- refetchCurrentUser,- refetchSiteSettings,- settingsApi,- setupApi,- userApi,-} from "metabase/api";+import { refetchCurrentUser, 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";@@ -21,7 +15,11 @@ import type {UserInfo,} from "metabase/redux/store";import { createAsyncThunk } from "metabase/redux/utils";-import { getSetting } from "metabase/selectors/settings";+import {+ getSetting,+ refetchSiteSettings,+ settingsApi,+} from "metabase/settings";import MetabaseSettings from "metabase/utils/settings";import type { DatabaseData, Settings, UsageReason } from "metabase-types/api";diff --git a/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.tsx b/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.tsxindex f2a293a3aa3..7af5b81a0f2 100644--- a/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.tsx+++ b/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.tsx@@ -1,7 +1,6 @@import { P, match } from "ts-pattern";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";import {AIProviderConfigurationForm,getProviderOptions,@@ -9,6 +8,7 @@ import {} from "metabase/metabot";import { PLUGIN_METABOT } from "metabase/plugins";import { useDispatch } from "metabase/redux";+import { useSetting } from "metabase/settings";import { Text } from "metabase/ui";import type { MetabotProvider } from "metabase-types/api";diff --git a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsxindex 7b9830e6051..bf6a5bdade5 100644--- a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx+++ b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx@@ -2,8 +2,8 @@ import { useMemo } from "react";import { t } from "ttag";import { findWhere } from "underscore";-import { useUpdateSettingMutation } from "metabase/api";import { useDispatch, useSelector } from "metabase/redux";+import { useUpdateSettingMutation } from "metabase/settings";import {getAvailableLocales,getIsStepCompleted,diff --git a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsx b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsxindex 261e7d2e9fc..3339ac5b7f1 100644--- a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsx+++ b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.tsx@@ -3,7 +3,7 @@ import { useState } from "react";import { useSelector } from "metabase/redux";import { Navigate, Outlet } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";/*** Sends users away from `/setup` once the instance has been set up.diff --git a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsxindex 0aaf124ad30..111b57825e7 100644--- a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx@@ -1,12 +1,11 @@import { act, renderWithProviders, screen, waitFor } from "__support__/ui";-import { sessionApi } from "metabase/api/session";import type { DispatchFn } from "metabase/redux/hooks";import {createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";import { Route } from "metabase/router";-import { getSetting } from "metabase/selectors/settings";+import { getSetting, settingsApi } from "metabase/settings";import { createMockSettings } from "metabase-types/api/mocks";import { RedirectIfSetup } from "./RedirectIfSetup";@@ -53,7 +52,7 @@ describe("RedirectIfSetup", () => {// The store's test-harness dispatch type isn't thunk-aware,// the app DispatchFn is.await (store.dispatch as DispatchFn)(- sessionApi.util.upsertQueryData(+ settingsApi.util.upsertQueryData("getSessionProperties",undefined,createMockSettings({ "has-user-setup": true }),diff --git a/frontend/src/metabase/setup/selectors.ts b/frontend/src/metabase/setup/selectors.tsindex 89db847fe1b..09871379cad 100644--- a/frontend/src/metabase/setup/selectors.ts+++ b/frontend/src/metabase/setup/selectors.ts@@ -8,7 +8,7 @@ import type {State,UserInfo,} from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import type { DatabaseData, LocaleData } from "metabase-types/api";const DEFAULT_LOCALES: LocaleData[] = [];diff --git a/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx b/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsxindex 90c8f7702fd..d0da05ce78c 100644--- a/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx+++ b/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx@@ -2,7 +2,6 @@import { Global, css } from "@emotion/react";import { useMemo } from "react";-import { useSetting } from "metabase/common/hooks";import { baseStyle, rootStyle } from "metabase/css/core/base.styled";import { defaultFontFiles } from "metabase/css/core/fonts.styled";import {@@ -10,6 +9,7 @@ import {isStaticEmbedding,} from "metabase/embedding/config";import { useSelector } from "metabase/redux";+import { useSetting } from "metabase/settings";import { getMetabaseCssVariables } from "metabase/styled-components/theme/css-variables";import { useMantineTheme } from "metabase/ui";import { getSitePath } from "metabase/utils/dom";diff --git a/frontend/src/metabase/styled-components/selectors.ts b/frontend/src/metabase/styled-components/selectors.tsindex 2cdda37f087..02174bf0ab8 100644--- a/frontend/src/metabase/styled-components/selectors.ts+++ b/frontend/src/metabase/styled-components/selectors.ts@@ -2,7 +2,7 @@ import { createSelector } from "@reduxjs/toolkit";import _ from "underscore";import { getEmbedOptions } from "metabase/selectors/embed";-import { getSettings } from "metabase/selectors/settings";+import { getSettings } from "metabase/settings";export const getFont = createSelector([getSettings, getEmbedOptions],diff --git a/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsxindex dbd1ddc2e7a..c8db17e9e0e 100644--- a/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx+++ b/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx@@ -1,6 +1,6 @@import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import type {EventFormOwnProps,diff --git a/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsxindex 8234d3b8e19..20aba6f9059 100644--- a/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx+++ b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx@@ -8,8 +8,8 @@ import {import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { Schedule } from "metabase/common/components/Schedule";import { TitleSection } from "metabase/common/data-studio/components/TitleSection";-import { useSetting } from "metabase/common/hooks";import { useMetadataToasts } from "metabase/metadata/hooks";+import { useSetting } from "metabase/settings";import { Box, Divider, Group, Tooltip } from "metabase/ui";import { getScheduleExplanation } from "metabase/utils/cron";import { isResourceNotFoundError } from "metabase/utils/errors";diff --git a/frontend/src/metabase/transforms/components/JobHeader/JobHeader.tsx b/frontend/src/metabase/transforms/components/JobHeader/JobHeader.tsxindex 1ecafc6e2ac..ea15a8e1cce 100644--- a/frontend/src/metabase/transforms/components/JobHeader/JobHeader.tsx+++ b/frontend/src/metabase/transforms/components/JobHeader/JobHeader.tsx@@ -7,7 +7,7 @@ import {PaneHeader,PaneHeaderInput,} from "metabase/common/data-studio/components/PaneHeader";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Group } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx b/frontend/src/metabase/transforms/components/RunButton/RunButton.tsxindex 819b352dd73..d1aebd954df 100644--- a/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx+++ b/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx@@ -7,7 +7,7 @@ import {} from "react";import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import {Button,type ButtonProps,diff --git a/frontend/src/metabase/transforms/components/RunStatus/RunStatus.tsx b/frontend/src/metabase/transforms/components/RunStatus/RunStatus.tsxindex b8bf9592558..72078e99902 100644--- a/frontend/src/metabase/transforms/components/RunStatus/RunStatus.tsx+++ b/frontend/src/metabase/transforms/components/RunStatus/RunStatus.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Box, Group, Icon } from "metabase/ui";import type { TransformRun } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx b/frontend/src/metabase/transforms/components/TimezoneIndicator/TimezoneIndicator.tsxindex 85546884124..53fdfdae874 100644--- a/frontend/src/metabase/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx+++ b/frontend/src/metabase/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { FixedSizeIcon } from "metabase/ui";export function TimezoneIndicator() {diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsxindex ae1b0e5ee69..0c81538d2ce 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsCard.tsx@@ -4,7 +4,7 @@ import { useListDatabasesQuery } from "metabase/api/database";import { Link } from "metabase/common/components/Link";import { getPlan, isProPlan } from "metabase/common/utils/plan";import { useSelector } from "metabase/redux";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import { doesDatabaseSupportTransforms } from "metabase/transforms/utils";import {Alert,diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsxindex a0fb5775e00..c1a47daaddf 100644--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx@@ -1,12 +1,11 @@import { t } from "ttag";-import { useUpdateSettingMutation } from "metabase/api";import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";-import { useSetting } from "metabase/common/hooks";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting, useUpdateSettingMutation } from "metabase/settings";import { Center, Text } from "metabase/ui";import { EnableTransformsCard } from "./EnableTransformsCard";diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsxindex 1f8a6f03e7c..b14aa81229a 100644--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx@@ -9,10 +9,10 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";-import { useSetting } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";import { push } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";+import { useSetting } from "metabase/settings";import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";import { TransformBadge } from "metabase/transforms/components/TransformBadge/TransformBadge";import type { TreeTableColumnDef } from "metabase/ui";diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/JobRunTable.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/JobRunTable.tsxindex 2ae05d6868e..c458436fe40 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/JobRunTable.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/JobRunTable.tsx@@ -3,8 +3,8 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import { ListEmptyState } from "metabase/common/components/ListEmptyState";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { useSetting } from "metabase/settings";import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";import type { TransformJobRun, TransformJobRunId } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsxindex dfcf9d35386..866bb5d6fcd 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx@@ -11,9 +11,9 @@ import {import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";-import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/redux";import { replace, useLocation } from "metabase/router";+import { useSetting } from "metabase/settings";import { DetailedViewSwitch } from "metabase/transforms/components/DetailedViewSwitch";import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";import { POLLING_INTERVAL } from "metabase/transforms/constants";diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.tsxindex ca784765dfa..fb3e86d9cc6 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/RunTable.tsx@@ -3,8 +3,8 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import { ListEmptyState } from "metabase/common/components/ListEmptyState";-import { useSetting } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { useSetting } from "metabase/settings";import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";import type {TransformRun,diff --git a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/TransformGraphRunTable.tsx b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/TransformGraphRunTable.tsxindex be317d53ca0..e49c50662ee 100644--- a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/TransformGraphRunTable.tsx+++ b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/TransformGraphRunTable.tsx@@ -3,7 +3,7 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import { ListEmptyState } from "metabase/common/components/ListEmptyState";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";import type { TransformGraphRun } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/TransformIndexTable.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/TransformIndexTable.tsxindex 9db9f2e6adc..fe318c892b4 100644--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/TransformIndexTable.tsx+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/TransformIndexTable.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { useListUsersQuery } from "metabase/api";import { ListEmptyState } from "metabase/common/components/ListEmptyState";-import { useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/settings";import type { TreeTableColumnDef } from "metabase/ui";import { TreeTable, useTreeTableInstance } from "metabase/ui";import { isNullOrUndefined } from "metabase/utils/types";diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsxindex 0dc634c1596..fa8c5da3672 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx@@ -16,11 +16,12 @@ import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGimport { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useHasTokenFeature } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import { PLUGIN_REPLACEMENT, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { useSelector } from "metabase/redux";import { Outlet, useLocation } from "metabase/router";+import { useSetting } from "metabase/settings";import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";diff --git a/frontend/src/metabase/transforms/route-guards.tsx b/frontend/src/metabase/transforms/route-guards.tsxindex 0f3f7e9aeee..95adad78ae9 100644--- a/frontend/src/metabase/transforms/route-guards.tsx+++ b/frontend/src/metabase/transforms/route-guards.tsx@@ -1,5 +1,5 @@import { createRedirectGuard } from "metabase/route-guards";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";export const TransformsNotDisabled = createRedirectGuard(diff --git a/frontend/src/metabase/transforms/selectors.ts b/frontend/src/metabase/transforms/selectors.tsindex e46affc36f8..481b5f9ead8 100644--- a/frontend/src/metabase/transforms/selectors.ts+++ b/frontend/src/metabase/transforms/selectors.ts@@ -2,12 +2,9 @@ import { createSelector } from "@reduxjs/toolkit";import { getPlan } from "metabase/common/utils/plan";import type { State } from "metabase/redux/store";-import {- getIsHosted,- getSetting,- getTokenFeature,-} from "metabase/selectors/settings";+import { getIsHosted } from "metabase/selectors/settings";import { getUser, getUserIsAdmin } from "metabase/selectors/user";+import { getSetting, getTokenFeature } from "metabase/settings";export const canAccessTransforms = (state: State): boolean => {if (getUserIsAdmin(state)) {diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsxindex 13f49d2ab91..9940fa09d12 100644--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx@@ -25,7 +25,7 @@ import { getIsDownloadingToImage } from "metabase/redux/downloads";import type { Dispatch, State } from "metabase/redux/store";import { CardEmbedLoadingState } from "metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedLoadingState";import type { LocationDescriptorObject } from "metabase/router";-import { getTokenFeature } from "metabase/selectors/settings";+import { getTokenFeature } from "metabase/settings";import { getFont } from "metabase/styled-components/selectors";import type { IconProps } from "metabase/ui";import { formatNumber } from "metabase/utils/formatting";diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsxindex c61ef4d1fd4..1563d6e658a 100644--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";-import { getSetting } from "metabase/selectors/settings";+import { getSetting } from "metabase/settings";import TableSkeleton from "metabase/visualizations/components/skeletons/TableSkeleton";import {getDefaultSize,diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsxindex 94f5fcbf60a..e4240babbfe 100644--- a/frontend/test/__support__/ui.tsx+++ b/frontend/test/__support__/ui.tsx@@ -30,7 +30,6 @@ import _ from "underscore";import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";import { AppKBarProvider } from "metabase/AppKBarProvider";import { Api } from "metabase/api";-import { useUpdateSettingMutation } from "metabase/api/settings";import { UndoListing } from "metabase/common/components/UndoListing";import { baseStyle } from "metabase/css/core/base.styled";import { makeMainReducers } from "metabase/reducers-main";@@ -55,6 +54,7 @@ import {toNavigateArgs,toRouteObjects,} from "metabase/router";+import { useUpdateSettingMutation } from "metabase/settings";import { getMetabaseCssVariables } from "metabase/styled-components/theme/css-variables";import type { MantineThemeOverride } from "metabase/ui";import { PortalContainer, ThemeProvider, useMantineTheme } from "metabase/ui";