Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Delete thin wrapper selectors over settings reads (#79144)

Fraserceccf16d4d2f
diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx
index 9e313b499ce..2c78d36438d 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx
@@ -13,11 +13,9 @@ import { SdkQuestionDefaultView } from "embedding-sdk-bundle/components/private/
import { METABOT_SDK_EE_PLUGIN } from "embedding-sdk-bundle/components/public/MetabotQuestion/MetabotQuestion";
import { EnsureSingleInstance } from "embedding-sdk-shared/components/EnsureSingleInstance/EnsureSingleInstance";
import { useLocale } from "metabase/common/hooks/use-locale";
-import {
- useMetabotEnabledEmbeddingAware,
- useMetabotName,
-} from "metabase/metabot/hooks";
+import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";
import { useMetabotReactions } from "metabase/metabot/hooks/use-metabot-reactions";
+import { useSetting } from "metabase/settings";
import { Stack } from "metabase/ui";
import { MetabotChatHistory } from "./MetabotChatHistory";
@@ -48,7 +46,7 @@ const MetabotQuestionInner = ({
targetCollection,
}: MetabotQuestionProps) => {
const isEmbeddedMetabotEnabled = useMetabotEnabledEmbeddingAware();
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const { isLocaleLoading } = useLocale();
const { navigateToPath } = useMetabotReactions();
const { ref: containerRef, width: containerWidth } = useElementSize();
diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
index 006e4930be3..66586febfdb 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
@@ -4,7 +4,6 @@ import { t } from "ttag";
import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";
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";
@@ -23,7 +22,7 @@ export function useUpsellFlow({
campaign: string;
location: string;
}) {
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const storeWindowRef = useRef<WindowProxy | null>(null);
const [sendToast] = useToast();
const storeUrl = useStoreUrl("checkout/upgrade/self-hosted");
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
index 052e0547d45..a9fedb57e57 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
@@ -5,9 +5,9 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { trackUpsellViewed } from "metabase/common/components/upsells/components/analytics";
import { useStoreUrl } from "metabase/common/hooks";
import { useSelector } from "metabase/redux";
-import { getIsHosted } from "metabase/selectors/settings";
import { getStoreUsers } from "metabase/selectors/store-users";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSetting } from "metabase/settings";
import {
Button,
Center,
@@ -44,7 +44,7 @@ export function PythonTransformsUpsell({
t`Add a separate database connection for write operations`,
];
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const { isStoreUser, anyStoreUserEmailAddress } = useSelector(getStoreUsers);
const isAdmin = useSelector(getUserIsAdmin);
const canPurchaseTransforms = isStoreUser || isAdmin;
@@ -143,7 +143,7 @@ export function PythonTransformsUpsell({
export function PythonTransformsUpsellModal({
onClose,
}: PythonTransformsUpsellModalProps) {
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const { isStoreUser } = useSelector(getStoreUsers);
const isAdmin = useSelector(getUserIsAdmin);
const canPurchaseTransforms = isStoreUser || isAdmin;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
index e999f8962ad..b0d69bf60c3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
@@ -3,9 +3,9 @@ import { DottedBackground } from "metabase/common/components/upsells/components/
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useSelector } from "metabase/redux/hooks";
import { useParams } from "metabase/router";
-import { getIsHosted } from "metabase/selectors/settings";
import { getStoreUsers } from "metabase/selectors/store-users";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSetting } from "metabase/settings";
import { TransformHeader } from "metabase/transforms/components/TransformHeader";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";
@@ -20,7 +20,7 @@ export function TransformInspectorUpsellPage() {
const transformId = Urls.extractEntityId(transformIdParam);
const { transform, isLoading, error } = useTransformWithPolling(transformId);
const { readOnly } = useTransformPermissions({ transform });
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const { isStoreUser } = useSelector(getStoreUsers);
const isAdmin = useSelector(getUserIsAdmin);
const shouldShowLeftColumn = (isStoreUser || isAdmin) && isHosted;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts
index 54e04988303..9d19db9ec72 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts
@@ -1,6 +1,6 @@
-import { getIsHosted } from "metabase/databases/selectors";
import { useSelector } from "metabase/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSetting } from "metabase/settings";
import {
useGetBillingInfoQuery,
useListAddOnsQuery,
@@ -8,7 +8,7 @@ import {
export function useTransformsBilling() {
const isAdmin = useSelector(getUserIsAdmin);
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const {
data: addOns,
diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.ts
index b7a22cda3ce..09c51ac9ed2 100644
--- a/frontend/src/metabase-types/api/mocks/settings.ts
+++ b/frontend/src/metabase-types/api/mocks/settings.ts
@@ -374,7 +374,7 @@ export const createMockSettings = (
"search-engine": "appdb",
"search-typeahead-enabled": true,
"setup-token": null,
- "session-cookies": null,
+ "session-cookies": false,
"session-cookie-samesite": "lax",
"session-timeout": null,
"slack-bug-report-channel": null,
diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.ts
index a706e2d3ecb..67e29435172 100644
--- a/frontend/src/metabase-types/api/settings.ts
+++ b/frontend/src/metabase-types/api/settings.ts
@@ -573,7 +573,9 @@ interface PublicSettings {
"application-name": string;
"application-favicon-url": string;
"available-fonts": string[];
- "available-locales": LocaleData[] | null;
+ // Non-null: :public visibility and a total getter (computed from the jar's
+ // bundled translation resources), so every viewer always receives a list.
+ "available-locales": LocaleData[];
"available-timezones": string[] | null;
"bug-reporting-enabled": boolean;
"check-for-updates": boolean;
@@ -632,7 +634,7 @@ interface PublicSettings {
"report-timezone": string | null;
"report-timezone-long": string;
"report-timezone-short": string;
- "session-cookies": boolean | null;
+ "session-cookies": boolean;
"setup-token": string | null;
"metabot-enabled?": boolean;
"metabot-name": string;
diff --git a/frontend/src/metabase/admin/app/selectors.ts b/frontend/src/metabase/admin/app/selectors.ts
index fb9d8ca63de..b1510fa2d1d 100644
--- a/frontend/src/metabase/admin/app/selectors.ts
+++ b/frontend/src/metabase/admin/app/selectors.ts
@@ -1,4 +1,3 @@
-import { getEngines } from "metabase/databases/selectors";
import { isDeprecatedEngine } from "metabase/databases/utils/engine";
import type { State } from "metabase/redux/store";
import { getSetting } from "metabase/settings";
@@ -9,7 +8,7 @@ interface Props {
}
export const hasDeprecatedDatabase = (state: State, props: Props): boolean => {
- const engines = getEngines(state);
+ const engines = getSetting(state, "engines");
return (
props.databases?.some(
(d) => !d.is_sample && d.engine && isDeprecatedEngine(engines, d.engine),
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
index dc5fb0dcc46..4cb36261911 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
@@ -6,7 +6,6 @@ import { Link } from "metabase/common/components/Link";
import { useDocsUrl } from "metabase/common/hooks";
import { getHelpUrl } from "metabase/common/utils/help-url";
import CS from "metabase/css/core/index.css";
-import { getEngines } from "metabase/databases/selectors";
import { useSelector } from "metabase/redux";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
@@ -34,7 +33,7 @@ interface Props {
}
export const DatabaseHelpSidePanel = ({ engineKey, onClose }: Props) => {
- const engines = useSelector(getEngines);
+ const engines = useSetting("engines");
const { url: fullDocsUrl, showMetabaseLinks } = useDocsUrl(
`databases/connections/${ENGINE_DOC_MAP[engineKey]}`,
);
diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx
index a7b74e41f25..79559589b03 100644
--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx
+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx
@@ -1,7 +1,6 @@
import { c } from "ttag";
-import { getEngines } from "metabase/databases/selectors";
-import { useSelector } from "metabase/redux";
+import { useSetting } from "metabase/settings";
import { Flex, Stack, Text, Title } from "metabase/ui";
import type { Database } from "metabase-types/api";
import { isEngineKey } from "metabase-types/guards";
@@ -13,7 +12,7 @@ export const ExistingDatabaseHeader = ({
}: {
database: Database;
}) => {
- const engines = useSelector(getEngines);
+ const engines = useSetting("engines");
const engineKey = isEngineKey(database.engine) ? database.engine : undefined;
const driverName = engineKey
? engines[engineKey]?.["driver-name"]
diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
index 1f82e2f27ab..1d589957b01 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
@@ -3,9 +3,8 @@ import { useEffect, useState } from "react";
import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
-import { getEngines } from "metabase/databases/selectors";
-import { useSelector } from "metabase/redux";
import { useParams } from "metabase/router";
+import { useSetting } from "metabase/settings";
import {
Box,
Button,
@@ -29,7 +28,7 @@ import { trackHelpButtonClick } from "./analytics";
export function DatabasePage() {
const params = useParams<{ databaseId: string }>();
- const engines = useSelector(getEngines);
+ const engines = useSetting("engines");
const { database, databaseReq, handleCancel, handleOnSubmit, title, config } =
useDatabaseConnection({ databaseId: params.databaseId, engines });
const [showSidePanel, { open: openSidePanel, close: closeSidePanel }] =
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.tsx
index fdeb17cffc7..4a34cc75671 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
@@ -9,7 +9,6 @@ import {
isDefaultGroup,
} from "metabase/common/utils/groups";
import { getPlan } from "metabase/common/utils/plan";
-import { getIsHosted } from "metabase/databases/selectors";
import {
PLUGIN_AUDIT,
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
@@ -191,7 +190,7 @@ type EntityWithPermissions = {
export const getShouldShowTransformPermissions = createSelector(
(state: State) => getPlan(getSetting(state, "token-features")),
- getIsHosted,
+ (state: State) => getSetting(state, "is-hosted?"),
(state: State) => getSetting(state, "transforms-enabled"),
(state: State) => getTokenFeature(state, "transforms-basic"),
(plan, isHosted, transformsSettingEnabled, transformsFeatureEnabled) => {
diff --git a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx
index 5d16377827a..f60879aeeec 100644
--- a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx
@@ -3,11 +3,10 @@ import { t } from "ttag";
import { UpsellPill } from "metabase/common/components/upsells/components";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { useSelector } from "metabase/redux";
-import { getIsHosted } from "metabase/selectors/settings";
+import { useSetting } from "metabase/settings";
export const UpsellEmailWhitelabelPill = ({ source }: { source: string }) => {
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const hasCloudSMTPFeature = useHasTokenFeature("cloud_custom_smtp");
if (!isHosted || hasCloudSMTPFeature) {
diff --git a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
index d5807f6c3b4..c0f6fb69b0a 100644
--- a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
@@ -2,12 +2,10 @@ import { jt, t } from "ttag";
import { UpsellBanner } from "metabase/common/components/upsells/components";
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);
+ const isHosted = useSetting("is-hosted?");
const features = useSetting("token-features");
const plan = getPlan(features);
diff --git a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx
index 9c183ece70f..bca32241dae 100644
--- a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx
+++ b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx
@@ -1,12 +1,12 @@
import { useCallback, useState } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/redux";
+import { useDispatch } from "metabase/redux";
import { forgotPassword } from "metabase/redux/auth";
import type { Location } from "metabase/router";
+import { useSetting } from "metabase/settings";
import { Button } from "metabase/ui";
-import { getIsEmailConfigured, getIsLdapEnabled } from "../../selectors";
import { AuthLayout } from "../AuthLayout";
import { ForgotPasswordForm } from "../ForgotPasswordForm";
@@ -27,8 +27,8 @@ interface ForgotPasswordProps {
export const ForgotPassword = ({
location,
}: ForgotPasswordProps): JSX.Element => {
- const isEmailConfigured = useSelector(getIsEmailConfigured);
- const isLdapEnabled = useSelector(getIsLdapEnabled);
+ const isEmailConfigured = useSetting("email-configured?");
+ const isLdapEnabled = useSetting("ldap-enabled");
const canResetPassword = isEmailConfigured && !isLdapEnabled;
const initialEmail =
new URLSearchParams(location?.search).get("email") ?? undefined;
diff --git a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
index 2d23285a7d4..95f499bf16b 100644
--- a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
+++ b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
@@ -6,14 +6,13 @@ import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
import { Link } from "metabase/common/components/Link";
-import { useDispatch, useSelector } from "metabase/redux";
+import { useDispatch } from "metabase/redux";
import { loginGoogle } from "metabase/redux/auth";
+import { useSetting } from "metabase/settings";
import { Box, Checkbox, useColorScheme } from "metabase/ui";
import * as Urls from "metabase/urls";
import { getCspNonce } from "metabase/utils/csp";
-import { getGoogleClientId, getSiteLocale } from "../../selectors";
-
import S from "./GoogleButton.module.css";
interface GoogleButtonProps {
@@ -27,8 +26,8 @@ interface CredentialResponse {
export const GoogleButton = ({ redirectUrl, isCard }: GoogleButtonProps) => {
const [remember, setRemember] = useState(false);
- const clientId = useSelector(getGoogleClientId);
- const locale = useSelector(getSiteLocale);
+ const clientId = useSetting("google-auth-client-id");
+ const locale = useSetting("site-locale");
const [errors, setErrors] = useState<string[]>([]);
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx
index 137921f0351..1668b990267 100644
--- a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx
+++ b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx
@@ -1,9 +1,8 @@
import { t } from "ttag";
-import { useSelector } from "metabase/redux";
+import { useSetting } from "metabase/settings";
import * as Urls from "metabase/urls";
-import { getIsLdapEnabled } from "../../selectors";
import { AuthTextLink } from "../AuthButton";
interface PasswordButtonProps {
@@ -11,7 +10,7 @@ interface PasswordButtonProps {
}
export const PasswordButton = ({ redirectUrl }: PasswordButtonProps) => {
- const isLdapEnabled = useSelector(getIsLdapEnabled);
+ const isLdapEnabled = useSetting("ldap-enabled");
return (
<AuthTextLink to={Urls.password(redirectUrl)}>
diff --git a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx
index 3a7377be186..67e1f05a6f8 100644
--- a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx
+++ b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx
@@ -6,12 +6,9 @@ import { PLUGIN_MULTI_FACTOR_AUTH } from "metabase/plugins";
import { useDispatch, useSelector } from "metabase/redux";
import type { LoginData } from "metabase/redux/auth";
import { login } from "metabase/redux/auth";
+import { useSetting } from "metabase/settings";
-import {
- getExternalAuthProviders,
- getHasSessionCookies,
- getIsLdapEnabled,
-} from "../../selectors";
+import { getExternalAuthProviders } from "../../selectors";
import { AuthTextLink } from "../AuthButton";
import { LoginForm } from "../LoginForm";
@@ -23,8 +20,8 @@ interface PasswordPanelProps {
export const PasswordPanel = ({ redirectUrl }: PasswordPanelProps) => {
const providers = useSelector(getExternalAuthProviders);
- const isLdapEnabled = useSelector(getIsLdapEnabled);
- const hasSessionCookies = useSelector(getHasSessionCookies);
+ const isLdapEnabled = useSetting("ldap-enabled");
+ const hasSessionCookies = useSetting("session-cookies");
const dispatch = useDispatch();
const [mfaChallenge, setMfaChallenge] = useState<MfaChallengeResponse | null>(
diff --git a/frontend/src/metabase/auth/selectors.ts b/frontend/src/metabase/auth/selectors.ts
index f4392700ece..5169919485d 100644
--- a/frontend/src/metabase/auth/selectors.ts
+++ b/frontend/src/metabase/auth/selectors.ts
@@ -2,8 +2,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/settings";
+import { getSettings } from "metabase/settings";
const EMPTY_PROVIDERS: AuthProvider[] = [];
@@ -18,23 +17,3 @@ export const getExternalAuthProviders = createSelector(
[getAuthProviders],
(providers) => providers.filter((provider) => provider.name !== "password"),
);
-
-export const getIsEmailConfigured = (state: State) => {
- return getSetting(state, "email-configured?");
-};
-
-export const getIsLdapEnabled = (state: State) => {
- return getSetting(state, "ldap-enabled");
-};
-
-export const getHasSessionCookies = (state: State) => {
- return getSetting(state, "session-cookies") ?? false;
-};
-
-export const getSiteLocale = (state: State) => {
- return getSetting(state, "site-locale");
-};
-
-export const getGoogleClientId = (state: State) => {
- return getSetting(state, "google-auth-client-id");
-};
diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
index 75833072835..c96bb8ce6aa 100644
--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
@@ -2,7 +2,6 @@ import dayjs from "dayjs";
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";
@@ -23,7 +22,7 @@ export const AppBanner = () => {
);
const isAdmin = useSelector(getUserIsAdmin);
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const tokenStatus = useSetting("token-status");
const migrateReadOnly = useSetting("read-only-mode");
const isDevMode = useSetting("development-mode?");
diff --git a/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx b/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx
index e0218c1055c..bfbe9c33ded 100644
--- a/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx
+++ b/frontend/src/metabase/common/components/Glossary/GlossaryTable.tsx
@@ -7,7 +7,7 @@ import type { GlossaryItem } from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { Table as CommonTable } from "metabase/common/components/Table/Table";
import { NoObjectError } from "metabase/common/components/errors/NoObjectError";
-import { useMetabotName } from "metabase/metabot/hooks";
+import { useSetting } from "metabase/settings";
import {
ActionIcon,
Box,
@@ -46,7 +46,7 @@ export function GlossaryTable({
onDelete,
}: GlossaryTableProps) {
const [isCreating, setIsCreating] = useState(false);
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const [editingId, setEditingId] = useState<number | null>(null);
const [editingField, setEditingField] = useState<GlossaryField | null>(null);
const [deletingItem, setDeletingItem] = useState<GlossaryItem | null>(null);
diff --git a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx
index 5ee2cc564c3..a543f5577aa 100644
--- a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx
+++ b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx
@@ -6,7 +6,7 @@ import cloud from "assets/img/metabot-cloud-96x96.svg?component";
import happy from "assets/img/metabot-happy.svg?component";
import sad from "assets/img/metabot-sad.svg?component";
import cool from "assets/img/metabot-shades.svg?component";
-import { useMetabotName } from "metabase/metabot/hooks";
+import { useSetting } from "metabase/settings";
import Styles from "./MetabotLogo.module.css";
@@ -31,7 +31,7 @@ export const MetabotLogo = forwardRef(function MetabotLogo(
ref: Ref<any>,
) {
const MetabotComponent = urlByVariant[variant];
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
return (
<MetabotComponent
diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsx
index 247a2aa207c..25b97d6f187 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.tsx
@@ -9,9 +9,9 @@ import {
trackUpsellViewed,
} from "metabase/common/components/upsells/components/analytics";
import { useSelector } from "metabase/redux";
-import { getIsHosted } from "metabase/selectors/settings";
import { getStoreUsers } from "metabase/selectors/store-users";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSetting } from "metabase/settings";
import {
Box,
Card,
@@ -44,7 +44,7 @@ export const UpsellCardContent = ({
upgradeUrl,
variant = "image-card",
}: UpsellCardContentProps) => {
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const { data: trialData } = useCheckTrialAvailableQuery(undefined, {
skip: !isHosted,
});
@@ -141,7 +141,7 @@ const UpsellCardLeftColumnContent = ({
}: UpsellCardLeftColumnContentProps & {
isTrialAvailable: boolean;
}) => {
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const isAdmin = useSelector(getUserIsAdmin);
const { isStoreUser, anyStoreUserEmailAddress } = useSelector(getStoreUsers);
diff --git a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx
index 563ecf785fb..7f7cdc8356d 100644
--- a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx
@@ -3,12 +3,10 @@ import { t } from "ttag";
import { LogoIcon } from "metabase/common/components/LogoIcon";
import { MAX_INITIAL_ENGINES_SHOWN } from "metabase/databases/constants";
-import { getEngines } from "metabase/databases/selectors";
import {
getEngineLogo,
getEngineOptions,
} from "metabase/databases/utils/engine";
-import { useSelector } from "metabase/redux";
import { useSetting } from "metabase/settings";
import {
Button,
@@ -49,7 +47,7 @@ export const DatabaseEngineList = ({
const [search, setSearch] = useState("");
const [isExpanded, setIsExpanded] = useState(false);
- const engines = useSelector(getEngines);
+ const engines = useSetting("engines");
const options = getEngineOptions(engines);
const elevatedEngines = options.slice(0, MAX_INITIAL_ENGINES_SHOWN);
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx
index f4c9442010c..1805b4fc0dc 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx
@@ -2,10 +2,9 @@ import { useCallback, useMemo } from "react";
import _ from "underscore";
import { Form, FormProvider } from "metabase/forms";
-import { useSelector } from "metabase/redux";
+import { useSetting } from "metabase/settings";
import type { DatabaseData } from "metabase-types/api";
-import { getEngines } from "../../selectors";
import type { FormLocation } from "../../types";
import { getSubmitValues, getValidationSchema } from "../../utils/schema";
@@ -64,7 +63,7 @@ export const DatabaseForm = ({
}: DatabaseFormProps): JSX.Element => {
const isAdvanced = config.isAdvanced || false;
- const engines = useSelector(getEngines);
+ const engines = useSetting("engines");
const initialEngineKey = useMemo(() => {
return getEngineKey(engines, initialData, isAdvanced);
}, [engines, initialData, isAdvanced]);
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx
index 3b087ec285e..9eba84cdf56 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx
@@ -5,8 +5,9 @@ import { identity } from "underscore";
import { useSelector } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { getDocsUrl, getIsHosted } from "metabase/selectors/settings";
+import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { useSetting } from "metabase/settings";
import { Code } from "metabase/ui";
import type { TipProps as _TipProps } from "./TroubleshootingTip";
@@ -25,7 +26,7 @@ export const useTroubleshootingTips = (
expanded: boolean,
): TipProps[] => {
const showMetabaseLinks = useSelector(getShowMetabaseLinks);
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const getDocPageUrl = useSelector(docPageUrlGetter);
const metabaseIPAddresses = useCloudGatewayIPs();
diff --git a/frontend/src/metabase/databases/selectors.ts b/frontend/src/metabase/databases/selectors.ts
deleted file mode 100644
index 5e20212eb3f..00000000000
--- a/frontend/src/metabase/databases/selectors.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { State } from "metabase/redux/store";
-import { getSetting } from "metabase/settings";
-
-export const getEngines = (state: State) => {
- return getSetting(state, "engines");
-};
-
-export const getIsHosted = (state: State) => {
- return getSetting(state, "is-hosted?");
-};
diff --git a/frontend/src/metabase/documents/components/Editor/DocumentCommandSuggestion.tsx b/frontend/src/metabase/documents/components/Editor/DocumentCommandSuggestion.tsx
index 7b9a90136a3..212c47cda5e 100644
--- a/frontend/src/metabase/documents/components/Editor/DocumentCommandSuggestion.tsx
+++ b/frontend/src/metabase/documents/components/Editor/DocumentCommandSuggestion.tsx
@@ -1,14 +1,12 @@
import { forwardRef, useMemo } from "react";
-import {
- useMetabotName,
- useUserMetabotPermissions,
-} from "metabase/metabot/hooks";
+import { useUserMetabotPermissions } from "metabase/metabot/hooks";
import {
CommandSuggestion,
type CommandSuggestionProps,
type CommandSuggestionRef,
} from "metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion";
+import { useSetting } from "metabase/settings";
type DocumentCommandSuggestionProps = Omit<
CommandSuggestionProps,
@@ -20,7 +18,7 @@ export const DocumentCommandSuggestion = forwardRef<
DocumentCommandSuggestionProps
>(function DocumentCommandSuggestion(props, ref) {
const { canUseMetabot } = useUserMetabotPermissions();
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const metabotCommand = useMemo(
() => (canUseMetabot ? { name: metabotName } : null),
diff --git a/frontend/src/metabase/embedding/mcp/McpUiAppRoute.tsx b/frontend/src/metabase/embedding/mcp/McpUiAppRoute.tsx
index 4904b269152..742d9275f33 100644
--- a/frontend/src/metabase/embedding/mcp/McpUiAppRoute.tsx
+++ b/frontend/src/metabase/embedding/mcp/McpUiAppRoute.tsx
@@ -4,8 +4,7 @@ import { SdkError } from "embedding-sdk-bundle/components/private/PublicComponen
import { ComponentProvider } from "embedding-sdk-bundle/components/public/ComponentProvider";
import { SdkQuestion } from "embedding-sdk-bundle/components/public/SdkQuestion";
import { getSdkStore } from "embedding-sdk-bundle/store";
-import { useSelector } from "metabase/redux";
-import { getIsHosted } from "metabase/selectors/settings";
+import { useSetting } from "metabase/settings";
import { Flex } from "metabase/ui";
import type { ResolvedColorScheme } from "metabase/utils/color-scheme";
@@ -100,7 +99,7 @@ function McpUiAppRouteContent({
uiCredential,
}: McpUiAppRouteContentProps) {
const handleDrillThrough = useHandleMcpDrillThrough(app);
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const { mcpSessionId = "" } =
// Unjustified type cast. FIXME
diff --git a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
index 9217e9ba296..15d6e64a527 100644
--- a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
+++ b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
@@ -10,7 +10,6 @@ import { isSyncCompleted } from "metabase/utils/syncing";
import type Database from "metabase-lib/v1/metadata/Database";
import type { PopularItem, RecentItem, User } from "metabase-types/api";
-import { getIsXrayEnabled } from "../../selectors";
import { isWithinWeeks } from "../../utils";
import { EmbedHomepage } from "../EmbedHomepage";
import { HomePopularSection } from "../HomePopularSection";
@@ -20,7 +19,7 @@ import { HomeXraySection } from "../HomeXraySection";
export const HomeContent = (): JSX.Element | null => {
const user = useSelector(getUser);
const embeddingHomepage = useSetting("embedding-homepage");
- const isXrayEnabled = useSelector(getIsXrayEnabled);
+ const isXrayEnabled = useSetting("enable-xrays");
const { data: databases, error: databasesError } = useDatabaseListQuery();
const { data: recentItemsRaw, error: recentItemsError } = useListRecentsQuery(
diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
index 2dd1a69fb96..9b9ebd7506e 100644
--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
@@ -7,15 +7,14 @@ import { MetabotLogo } from "metabase/common/components/MetabotLogo";
import animationStyles from "metabase/css/core/animation.module.css";
import { useSelector } from "metabase/redux";
import { getUser } from "metabase/selectors/user";
+import { useSetting } from "metabase/settings";
import { Flex, Tooltip } from "metabase/ui";
-import { getShowMetabotLogoAndGreeting } from "../../selectors";
-
import S from "./HomeGreeting.module.css";
export const HomeGreeting = (): JSX.Element | null => {
const user = useSelector(getUser);
- const showGreeting = useSelector(getShowMetabotLogoAndGreeting);
+ const showGreeting = useSetting("show-metabot");
const name = user?.first_name;
const message = useMemo(() => getMessage(name), [name]);
diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.tsx
index 4c447d13d8f..0e697cdddbe 100644
--- a/frontend/src/metabase/home/components/HomePage/HomePage.tsx
+++ b/frontend/src/metabase/home/components/HomePage/HomePage.tsx
@@ -3,11 +3,10 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useHomepageDashboard } from "metabase/home/use-homepage-dashboard";
-import { useDispatch, useSelector } from "metabase/redux";
+import { useDispatch } from "metabase/redux";
import { addUndo } from "metabase/redux/undo";
import { useNavigate } from "metabase/router";
-import { getHasDismissedCustomHomePageToast } from "metabase/selectors/app";
-import { useUpdateSettingMutation } from "metabase/settings";
+import { useSetting, useUpdateSettingMutation } from "metabase/settings";
import { HomeContent } from "../HomeContent";
import { HomeLayout } from "../HomeLayout";
@@ -27,7 +26,7 @@ export const HomePage = (): JSX.Element => {
const useDashboardRedirect = () => {
const { dashboardId, dashboard, isLoading } = useHomepageDashboard();
- const hasDismissedToast = useSelector(getHasDismissedCustomHomePageToast);
+ const hasDismissedToast = useSetting("dismissed-custom-dashboard-toast");
const dispatch = useDispatch();
const navigate = useNavigate();
const [updateSetting] = useUpdateSettingMutation();
diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
index 9b2d6dcdc6b..1dfd568e2b4 100644
--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
@@ -14,15 +14,10 @@ import { Link } from "metabase/common/components/Link";
import { OnboardingIllustration } from "metabase/common/components/OnboardingIllustration";
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";
import { useSelector } from "metabase/redux";
import type { ChecklistItemValue } from "metabase/redux/store";
-import {
- getDocsUrl,
- getIsHosted,
- getIsPaidPlan,
-} from "metabase/selectors/settings";
+import { getDocsUrl, getIsPaidPlan } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import {
getApplicationName,
@@ -54,10 +49,10 @@ export const Onboarding = () => {
const isPaidPlan = useSelector(getIsPaidPlan);
const isAdmin = useSelector(getUserIsAdmin);
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const shouldConfigureCommunicationChannels = isAdmin && !isHosted;
- const isXrayEnabled = useSelector(getIsXrayEnabled);
+ const isXrayEnabled = useSetting("enable-xrays");
const exampleDashboardId = useSetting("example-dashboard-id");
diff --git a/frontend/src/metabase/home/selectors.ts b/frontend/src/metabase/home/selectors.ts
deleted file mode 100644
index 790b262ed06..00000000000
--- a/frontend/src/metabase/home/selectors.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { State } from "metabase/redux/store";
-import { getSetting } from "metabase/settings";
-
-export const getIsXrayEnabled = (state: State) => {
- return getSetting(state, "enable-xrays");
-};
-
-export const getShowMetabotLogoAndGreeting = (state: State) => {
- return getSetting(state, "show-metabot");
-};
diff --git a/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.tsx b/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.tsx
index fa560bf635e..f933858c788 100644
--- a/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.tsx
+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.tsx
@@ -4,9 +4,9 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { useToast } from "metabase/common/hooks/use-toast";
import {
useMetabotAgent,
- useMetabotName,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
+import { useSetting } from "metabase/settings";
import { trackExplainChartClicked } from "../analytics";
@@ -15,7 +15,7 @@ import { getMetabotNotConfiguredToastProps } from "./AIProviderConfigurationNoti
export const AIQuestionAnalysisButton = () => {
const { hasMetabotAccess, canUseMetabot } = useUserMetabotPermissions();
const { submitInput } = useMetabotAgent("omnibot");
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const [sendToast] = useToast();
if (!hasMetabotAccess) {
diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
index 8915f08a658..23ed6e030d5 100644
--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
@@ -6,11 +6,11 @@ import { getMetabotManagedProviderLimitToastProps } from "metabase/metabot/compo
import { METABOT_ERR_MSG } from "metabase/metabot/constants";
import {
useMetabotAgent,
- useMetabotName,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
import { useDispatch } from "metabase/redux";
import { setIsNativeEditorOpen } from "metabase/redux/query-builder";
+import { useSetting } from "metabase/settings";
import { Button } from "metabase/ui";
import { trackQueryFixClicked } from "../../analytics";
@@ -20,7 +20,7 @@ export function FixSqlQueryButton() {
const dispatch = useDispatch();
const { hasSqlGenerationAccess, canUseSqlGeneration } =
useUserMetabotPermissions();
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const [sendToast] = useToast();
const { submitInput, isDoingScience } = useMetabotAgent("sql");
diff --git a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
index 3a20ba1001a..ea815db5e10 100644
--- a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
@@ -3,9 +3,9 @@ import { t } from "ttag";
import {
useIsAskPage,
useMetabotAgent,
- useMetabotName,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
+import { useSetting } from "metabase/settings";
import { ActionIcon, type ActionIconProps, Tooltip } from "metabase/ui";
import { METAKEY } from "metabase/utils/browser";
@@ -23,7 +23,7 @@ export function MetabotAppBarButton({
}: MetabotAppBarButtonProps) {
const { hasMetabotAccess } = useUserMetabotPermissions();
const metabot = useMetabotAgent("omnibot");
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const isAskPage = useIsAskPage();
if (!hasMetabotAccess) {
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
index a4e55270798..a2e487742f0 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
@@ -11,11 +11,7 @@ import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotC
import { useSetting } from "metabase/settings";
import { Box, Button, Flex, Paper, Stack, Text } from "metabase/ui";
-import {
- useMetabotAgent,
- useMetabotName,
- useUserMetabotPermissions,
-} from "../../hooks";
+import { useMetabotAgent, useUserMetabotPermissions } from "../../hooks";
import type { MetabotConfig } from "../Metabot";
import Styles from "./MetabotChat.module.css";
@@ -52,7 +48,7 @@ export const MetabotChat = ({
},
] = useDisclosure(false);
const metabot = useMetabotAgent(config.agentId);
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const { isConfigured } = useUserMetabotPermissions();
const showIllustrations = useSetting("metabot-show-illustrations");
const supportsReasoning =
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
index fd4d88f865d..d80cb909271 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
@@ -8,7 +8,6 @@ import { t } from "ttag";
import { useSubmitMetabotFeedbackMutation } from "metabase/api/metabot";
import { useToast } from "metabase/common/hooks";
import { MetabotManagedProviderLimitActions } from "metabase/metabot/components/MetabotManagedProviderLimit";
-import { useMetabotName } from "metabase/metabot/hooks";
import {
type MetabotAgentChatMessage,
type MetabotAgentDataPartMessage,
@@ -24,6 +23,7 @@ import {
isChainOfThoughtMessage,
} from "metabase/metabot/state";
import { useDispatch } from "metabase/redux";
+import { useSetting } from "metabase/settings";
import {
ActionIcon,
Box,
@@ -454,7 +454,7 @@ const AbortedTurnAlert = ({
debug: boolean;
onRetry?: (messageId: string) => void;
}) => {
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
return (
<AgentTurnAlert
variant="info"
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
index 98e29a43933..33de8bde3fd 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
@@ -5,10 +5,10 @@ import * as Yup from "yup";
import { Form, FormProvider } from "metabase/forms";
import { FormSelect } from "metabase/forms/components/FormSelect";
import { FormTextarea } from "metabase/forms/components/FormTextarea";
-import { useMetabotName } from "metabase/metabot/hooks";
import { getMetabotId } from "metabase/metabot/state";
import { useSelector } from "metabase/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
+import { useSetting } from "metabase/settings";
import { Button, Group, Modal, Stack, Text } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import type { MetabotFeedback, MetabotIssueType } from "metabase-types/api";
@@ -64,7 +64,7 @@ export const MetabotFeedbackModal = ({
positive,
}: MetabotFeedbackModalProps) => {
const applicationName = useSelector(getApplicationName);
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const metabotId = useSelector(getMetabotId);
const handleSubmit = (values: {
diff --git a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx
index 1dbb15284ee..2343efca4a9 100644
--- a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx
@@ -2,10 +2,10 @@ import { t } from "ttag";
import {
useMetabotAgent,
- useMetabotName,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
import { useLocation } from "metabase/router";
+import { useSetting } from "metabase/settings";
import { ActionIcon, Tooltip } from "metabase/ui";
import * as Urls from "metabase/urls";
import { METAKEY } from "metabase/utils/browser";
@@ -17,7 +17,7 @@ import { MetabotIcon } from "./MetabotIcon";
export const MetabotDataStudioButton = () => {
const { hasMetabotAccess } = useUserMetabotPermissions();
const metabot = useMetabotAgent("omnibot");
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const location = useLocation();
if (!hasMetabotAccess) {
diff --git a/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsx b/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsx
index 3292ba34f23..53bd63dc0cc 100644
--- a/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotIcon/MetabotIcon.tsx
@@ -1,6 +1,5 @@
import { forwardRef } from "react";
-import { useMetabotName } from "metabase/metabot/hooks";
import { useSetting } from "metabase/settings";
import { Box, type BoxProps, Icon } from "metabase/ui";
@@ -15,7 +14,7 @@ export interface MetabotIconProps extends BoxProps {
export const MetabotIcon = forwardRef<HTMLImageElement, MetabotIconProps>(
function MetabotIcon({ size = 16, ...rest }, ref) {
const metabotIcon = useSetting("metabot-icon");
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const isCustomIcon = metabotIcon && metabotIcon !== "metabot";
diff --git a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx
index 5b6e0c6c1ba..7511ce2c364 100644
--- a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx
@@ -7,12 +7,10 @@ import type { MetabotPromptInputRef } from "metabase/metabot";
import { AIProviderConfigurationModal } from "metabase/metabot/components/AIProviderConfigurationModal";
import { MetabotManagedProviderLimitHoverCard } from "metabase/metabot/components/MetabotManagedProviderLimit";
import { MetabotPromptInput } from "metabase/metabot/components/MetabotPromptInput";
-import {
- useMetabotName,
- useUserMetabotPermissions,
-} from "metabase/metabot/hooks";
+import { useUserMetabotPermissions } from "metabase/metabot/hooks";
import type { MetabotAgentTurnDisplayError } from "metabase/metabot/state";
import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";
+import { useSetting } from "metabase/settings";
import { Box, Button, Flex, Icon, Loader, Tooltip } from "metabase/ui";
import type { DatabaseId } from "metabase-types/api";
@@ -55,7 +53,7 @@ export const MetabotInlineSQLPrompt = ({
] = useDisclosure(false);
const { canUseSqlGeneration, hasSqlGenerationAccess } =
useUserMetabotPermissions();
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const isSubmitDisabled = !canUseSqlGeneration || !value.trim() || isLoading;
diff --git a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
index 9ad98b81356..1f796a875f6 100644
--- a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
+++ b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
@@ -14,14 +14,12 @@ import { t } from "ttag";
import { useLazyMetabotGenerateContentQuery } from "metabase/api";
import CS from "metabase/css/core/index.css";
import { MetabotIcon } from "metabase/metabot/components/MetabotIcon";
-import {
- useMetabotName,
- useUserMetabotPermissions,
-} from "metabase/metabot/hooks";
+import { useUserMetabotPermissions } from "metabase/metabot/hooks";
import { useDispatch, useSelector } from "metabase/redux";
import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";
import { buildDraftCard } from "metabase/rich_text_editing/tiptap/extensions/shared/draft-card";
import { wrapCardEmbed } from "metabase/rich_text_editing/tiptap/extensions/shared/layout";
+import { useSetting } from "metabase/settings";
import { Box, Button, Flex, Icon, Text, Tooltip } from "metabase/ui";
import type { MetabotGenerateContentRequest } from "metabase-types/api";
@@ -153,7 +151,7 @@ export const MetabotComponent = memo(
const [errorText, setErrorText] = useState("");
const [queryMetabot] = useLazyMetabotGenerateContentQuery();
const { canUseMetabot: isMetabotEnabled } = useUserMetabotPermissions();
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const handleRunMetabot = async () => {
const serializePrompt =
diff --git a/frontend/src/metabase/metabot/components/editor-extensions/MetabotMention/MetabotSuggestion.tsx b/frontend/src/metabase/metabot/components/editor-extensions/MetabotMention/MetabotSuggestion.tsx
index 2998db23dc7..166897d3701 100644
--- a/frontend/src/metabase/metabot/components/editor-extensions/MetabotMention/MetabotSuggestion.tsx
+++ b/frontend/src/metabase/metabot/components/editor-extensions/MetabotMention/MetabotSuggestion.tsx
@@ -15,11 +15,11 @@ import type {
Section,
} from "metabase/common/components/AccordionList/types";
import { searchFilter } from "metabase/common/components/AccordionList/utils";
-import { useMetabotName } from "metabase/metabot/hooks";
import type { MenuItem } from "metabase/rich_text_editing/tiptap/extensions/shared/MenuComponents";
import { MenuItemComponent } from "metabase/rich_text_editing/tiptap/extensions/shared/MenuComponents";
import { SuggestionPaper } from "metabase/rich_text_editing/tiptap/extensions/shared/SuggestionPaper";
import { useBuildDbMenuItems } from "metabase/rich_text_editing/tiptap/extensions/shared/suggestionHooks";
+import { useSetting } from "metabase/settings";
import { Box, Group, Loader, Text } from "metabase/ui";
import type { Database, SearchResult } from "metabase-types/api";
@@ -50,7 +50,7 @@ const MetabotMentionSuggestionComponent = forwardRef<
) {
const [selectedIndex, setSelectedIndex] = useState(0);
const { data: dbsResponse, isLoading } = useListDatabasesQuery();
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const buildDbMenuItems = useBuildDbMenuItems();
const handleDbSelect = useCallback(
diff --git a/frontend/src/metabase/metabot/hooks/index.ts b/frontend/src/metabase/metabot/hooks/index.ts
index cf8b053086f..44b4ca0aec6 100644
--- a/frontend/src/metabase/metabot/hooks/index.ts
+++ b/frontend/src/metabase/metabot/hooks/index.ts
@@ -3,6 +3,5 @@ export { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-e
export { useBranchableMessages } from "./use-branchable-messages";
export { useMetabotAgent } from "./use-metabot-agent";
export { useMetabotAgentsManager } from "./use-metabot-agents-manager";
-export { useMetabotName } from "./use-metabot-name";
export { useDashCardAnalysis } from "./useDashCardAnalysis";
export { useUserMetabotPermissions } from "./use-user-metabot-permissions";
diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-name.ts b/frontend/src/metabase/metabot/hooks/use-metabot-name.ts
deleted file mode 100644
index b646f1f8aaf..00000000000
--- a/frontend/src/metabase/metabot/hooks/use-metabot-name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useSetting } from "metabase/settings";
-
-/** Returns the user-configured display name for Metabot (defaults to "Metabot"). */
-export const useMetabotName = (): string => {
- return useSetting("metabot-name") || "Metabot";
-};
diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.ts
index a60e6e473ed..06e87c22de8 100644
--- a/frontend/src/metabase/metabot/state/actions.ts
+++ b/frontend/src/metabase/metabot/state/actions.ts
@@ -778,7 +778,7 @@ export const sendAgentRequest = createAsyncThunk<
const handled = handleResponseError(
error,
- getSetting(getState(), "metabot-name") || "Metabot",
+ getSetting(getState(), "metabot-name"),
);
return rejectWithValue({
type: "error" as const,
diff --git a/frontend/src/metabase/selectors/app.ts b/frontend/src/metabase/selectors/app.ts
index 2a5b62fd5d9..97cbe33a2df 100644
--- a/frontend/src/metabase/selectors/app.ts
+++ b/frontend/src/metabase/selectors/app.ts
@@ -5,7 +5,6 @@ import { getEmbedOptions } from "metabase/embedding/interactive-embedding";
import type { State } from "metabase/redux/store";
import type { Location } from "metabase/router";
import { getUser } from "metabase/selectors/user";
-import { getSetting } from "metabase/settings";
import { selectIsWithinIframe } from "metabase/utils/iframe";
export interface RouterProps {
@@ -61,9 +60,5 @@ export const getCustomHomePageDashboardId = createSelector(
(user) => user?.custom_homepage?.dashboard_id || null,
);
-export const getHasDismissedCustomHomePageToast = (state: State) => {
- return getSetting(state, "dismissed-custom-dashboard-toast");
-};
-
export const getIsErrorDiagnosticModalOpen = (state: State) =>
state.app.isErrorDiagnosticsOpen;
diff --git a/frontend/src/metabase/selectors/settings.ts b/frontend/src/metabase/selectors/settings.ts
index a871d165943..9648cb6a5ae 100644
--- a/frontend/src/metabase/selectors/settings.ts
+++ b/frontend/src/metabase/selectors/settings.ts
@@ -11,10 +11,6 @@ export const isSsoEnabled = (state: State) =>
getSetting(state, "saml-enabled") ||
getSetting(state, "other-sso-enabled?");
-export const getIsHosted = (state: State): boolean => {
- return getSetting(state, "is-hosted?");
-};
-
export type StorePaths =
/** store main page */
| ""
diff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.ts
index 9792c42115a..4c3146134b1 100644
--- a/frontend/src/metabase/setup/actions.ts
+++ b/frontend/src/metabase/setup/actions.ts
@@ -34,11 +34,9 @@ import {
trackUsageReasonSelected,
} from "./analytics";
import {
- getAvailableLocales,
getIsEmbeddingUseCase,
getLocale,
getNextStep,
- getSetupToken,
getUsageReason,
} from "./selectors";
import { getDefaultLocale, getLocales } from "./utils";
@@ -65,7 +63,7 @@ export const loadLocaleDefaults = createAsyncThunk<
void,
ThunkConfig
>(LOAD_LOCALE_DEFAULTS, async (_, { getState }) => {
- const data = getAvailableLocales(getState());
+ const data = getSetting(getState(), "available-locales");
const locale = getDefaultLocale(getLocales(data));
if (locale) {
await loadLocalization(locale.code);
@@ -95,7 +93,7 @@ export const updateLocale = createAsyncThunk(
export const submitUser = createAsyncThunk<void, UserInfo, ThunkConfig>(
"metabase/setup/SUBMIT_USER_INFO",
async (user: UserInfo, { dispatch, getState, rejectWithValue }) => {
- const token = getSetupToken(getState());
+ const token = getSetting(getState(), "setup-token");
const locale = getLocale(getState());
try {
diff --git a/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx b/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx
index e8d27d8f597..60f17171ad5 100644
--- a/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx
+++ b/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx
@@ -1,18 +1,15 @@
import { t } from "ttag";
import { HelpCard } from "metabase/common/components/HelpCard";
-import { useSelector } from "metabase/redux";
-import {
- getIsHosted,
- migrateToCloudGuideUrl,
-} from "metabase/selectors/settings";
+import { migrateToCloudGuideUrl } from "metabase/selectors/settings";
+import { useSetting } from "metabase/settings";
import { useStep } from "../../useStep";
import { SetupCardContainer } from "../SetupCardContainer";
export const CloudMigrationHelp = () => {
const { isStepActive } = useStep("completed");
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const isVisible = isHosted && isStepActive;
diff --git a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx
index f238310f2eb..98c6014ef7a 100644
--- a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx
+++ b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx
@@ -5,11 +5,11 @@ import { useToast } from "metabase/common/hooks";
import { DatabaseForm } from "metabase/databases/components/DatabaseForm";
import { useDispatch, useSelector } from "metabase/redux";
import type { InviteInfo } from "metabase/redux/store";
+import { useSetting } from "metabase/settings";
import {
getDatabase,
getDatabaseEngine,
getInvite,
- getIsEmailConfigured,
getUser,
} from "metabase/setup";
import { Text } from "metabase/ui";
@@ -34,7 +34,7 @@ export const DatabaseStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {
const database = useSelector(getDatabase);
const engine = useSelector(getDatabaseEngine);
const invite = useSelector(getInvite);
- const isEmailConfigured = useSelector(getIsEmailConfigured);
+ const isEmailConfigured = useSetting("email-configured?");
const dispatch = useDispatch();
const [sendToast] = useToast();
diff --git a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx
index bf6a5bdade5..3be4a94bcfb 100644
--- a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx
+++ b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx
@@ -3,12 +3,8 @@ import { t } from "ttag";
import { findWhere } from "underscore";
import { useDispatch, useSelector } from "metabase/redux";
-import { useUpdateSettingMutation } from "metabase/settings";
-import {
- getAvailableLocales,
- getIsStepCompleted,
- getLocale,
-} from "metabase/setup/selectors";
+import { useSetting, useUpdateSettingMutation } from "metabase/settings";
+import { getIsStepCompleted, getLocale } from "metabase/setup/selectors";
import { Select } from "metabase/ui";
import { updateLocale } from "../../actions";
@@ -17,7 +13,7 @@ import { getLocales } from "../../utils";
export const LanguageSelector = () => {
const dispatch = useDispatch();
const locale = useSelector(getLocale);
- const localeData = useSelector(getAvailableLocales);
+ const localeData = useSetting("available-locales");
const [updateSetting] = useUpdateSettingMutation();
const isUserInfoStepCompleted = useSelector((state) =>
getIsStepCompleted(state, "user_info"),
diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx
index 76c2e527815..a189714c724 100644
--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx
+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx
@@ -5,11 +5,12 @@ import _ from "underscore";
import { CommunityLocalizationNotice } from "metabase/common/components/CommunityLocalizationNotice";
import { useDispatch, useSelector } from "metabase/redux";
import type { Locale } from "metabase/redux/store";
+import { useSetting } from "metabase/settings";
import { Button, Stack } from "metabase/ui";
import { useStep } from "../..//useStep";
import { goToNextStep, updateLocale } from "../../actions";
-import { getAvailableLocales, getLocale } from "../../selectors";
+import { getLocale } from "../../selectors";
import { getLocales } from "../../utils";
import { ActiveStep } from "../ActiveStep";
import { InactiveStep } from "../InactiveStep";
@@ -26,7 +27,7 @@ import {
export const LanguageStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {
const { isStepActive, isStepCompleted } = useStep("language");
const locale = useSelector(getLocale);
- const localeData = useSelector(getAvailableLocales);
+ const localeData = useSetting("available-locales");
const fieldId = useMemo(() => _.uniqueId(), []);
const locales = useMemo(() => getLocales(localeData), [localeData]);
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.tsx
index 83d19933739..646cc7b90a8 100644
--- a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx
+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.tsx
@@ -2,7 +2,7 @@ import { t } from "ttag";
import { useDispatch, useSelector } from "metabase/redux";
import type { UserInfo } from "metabase/redux/store";
-import { getIsHosted } from "metabase/selectors/settings";
+import { useSetting } from "metabase/settings";
import { submitUser } from "../../actions";
import { getUser } from "../../selectors";
@@ -18,7 +18,7 @@ export const UserStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {
const { isStepActive, isStepCompleted } = useStep("user_info");
const user = useSelector(getUser);
- const isHosted = useSelector(getIsHosted);
+ const isHosted = useSetting("is-hosted?");
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/setup/selectors.ts b/frontend/src/metabase/setup/selectors.ts
index 09871379cad..08180086c1d 100644
--- a/frontend/src/metabase/setup/selectors.ts
+++ b/frontend/src/metabase/setup/selectors.ts
@@ -9,9 +9,7 @@ import type {
UserInfo,
} from "metabase/redux/store";
import { getSetting } from "metabase/settings";
-import type { DatabaseData, LocaleData } from "metabase-types/api";
-
-const DEFAULT_LOCALES: LocaleData[] = [];
+import type { DatabaseData } from "metabase-types/api";
export const getStep = (state: State): SetupStep => {
return state.setup.step;
@@ -73,18 +71,6 @@ export const getDatabaseEngine = (state: State): string | undefined => {
return getDatabase(state)?.engine || state.setup.databaseEngine;
};
-export const getSetupToken = (state: State) => {
- return getSetting(state, "setup-token");
-};
-
-export const getAvailableLocales = (state: State): LocaleData[] => {
- return getSetting(state, "available-locales") ?? DEFAULT_LOCALES;
-};
-
-export const getIsEmailConfigured = (state: State): boolean => {
- return getSetting(state, "email-configured?");
-};
-
export const getIsAiConfigRequested = (state: State): boolean => {
return state.setup.isAiConfigRequested;
};
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
index e8f46356ae9..a6d7b2999a5 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
@@ -7,11 +7,11 @@ import { UpsellGem } from "metabase/common/components/upsells/components/UpsellG
import { useHasTokenFeature } from "metabase/common/hooks";
import {
useMetabotAgent,
- useMetabotName,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
import { useSelector } from "metabase/redux";
import { useNavigate } from "metabase/router";
+import { useSetting } from "metabase/settings";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";
import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";
@@ -44,7 +44,7 @@ export const CreateTransformMenu = () => {
const { remoteSyncReadOnly } = useTransformPermissions();
const metabot = useMetabotAgent("omnibot");
- const metabotName = useMetabotName();
+ const metabotName = useSetting("metabot-name");
const { hasMetabotAccess } = useUserMetabotPermissions();
const handleMetabotClick = () => {
diff --git a/frontend/src/metabase/transforms/selectors.ts b/frontend/src/metabase/transforms/selectors.ts
index 481b5f9ead8..4b50422bec9 100644
--- a/frontend/src/metabase/transforms/selectors.ts
+++ b/frontend/src/metabase/transforms/selectors.ts
@@ -2,7 +2,6 @@ import { createSelector } from "@reduxjs/toolkit";
import { getPlan } from "metabase/common/utils/plan";
import type { State } from "metabase/redux/store";
-import { getIsHosted } from "metabase/selectors/settings";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
import { getSetting, getTokenFeature } from "metabase/settings";
@@ -15,7 +14,7 @@ export const canAccessTransforms = (state: State): boolean => {
};
export const getShouldShowTransformsUpsell = createSelector(
- getIsHosted,
+ (state: State) => getSetting(state, "is-hosted?"),
(state: State) => getTokenFeature(state, "transforms-basic"),
(isHosted, hasTransformsFeature) => isHosted && !hasTransformsFeature,
);
diff --git a/src/metabase/session/settings.clj b/src/metabase/session/settings.clj
index 7d28fc1dbb3..b48af2d623f 100644
--- a/src/metabase/session/settings.clj
+++ b/src/metabase/session/settings.clj
@@ -33,7 +33,7 @@
(deferred-tru "When set, enforces the use of session cookies for all users which expire when the browser is closed.")
:type :boolean
:visibility :public
- :default nil
+ :default false
:audit :getter
:doc "The user login session will always expire after the amount of time defined in MAX_SESSION_AGE (by default 2 weeks).
This overrides the “Remember me” checkbox when logging in.