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
Remove settings slice (#75983)
Fraserd6b078baa5f9
diff --git a/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js b/e2e/test/scenarios/permissions/admin-permissions.cy.spec.jsindex b07dd22ce53..9f9bb397677 100644--- a/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js+++ b/e2e/test/scenarios/permissions/admin-permissions.cy.spec.js@@ -600,7 +600,7 @@ describe("scenarios > admin > permissions", () => {// from the browser, they will get the new values from local statecy.intercept("api/setting/show-updated-permission-modal", () => {tempState["show-updated-permission-modal"] = false;- });+ }).as("updateModalSetting");cy.intercept("api/setting/show-updated-permission-banner", () => {tempState["show-updated-permission-banner"] = false;@@ -612,7 +612,9 @@ describe("scenarios > admin > permissions", () => {cy.findByRole("dialog", { name: /permissions may look different/ }).findByRole("button", { name: "Got it" }).click();- cy.wait("@sessionProps");+ // Dismissing writes the setting optimistically and does not refetch the+ // session properties, so wait on the save itself.+ cy.wait("@updateModalSetting");cy.findByRole("menuitem", { name: "All Users" }).click();cy.findByRole("alert").should(@@ -647,11 +649,9 @@ describe("scenarios > admin > permissions", () => {});}).as("sessionProps");- // These calls are setting the permission to false, so update the local state. When the settings are refreshed- // from the browser, they will get the new values from local statecy.intercept("api/setting/show-updated-permission-modal", {statusCode: 500,- });+ }).as("updateModalSetting");cy.visit("/admin/permissions/");cy.wait("@sessionProps");@@ -659,8 +659,11 @@ describe("scenarios > admin > permissions", () => {cy.findByRole("dialog", { name: /permissions may look different/ }).findByRole("button", { name: "Got it" }).click();- cy.wait("@sessionProps");+ cy.wait("@updateModalSetting");+ cy.findByRole("dialog", { name: /permissions may look different/ }).should(+ "not.exist",+ );cy.findByRole("menuitem", { name: "All Users" }).click();});});diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.tsindex 17e55384bdb..6826a8727ee 100644--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts@@ -28,6 +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 { refetchSiteSettings, sessionApi } from "metabase/api";import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils";import { getSessionTokenHeaders } from "metabase/embedding/lib/auth/get-session-token-headers";import { setApiKeyHeader } from "metabase/embedding/lib/auth/set-api-key-header";@@ -39,11 +40,9 @@ import {import { samlTokenStorage } from "metabase/embedding-sdk/lib/saml-token-storage";import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";import { PLUGIN_API, PLUGIN_EMBEDDING_SDK } from "metabase/plugins";-import { loadSettings, refreshSiteSettings } from "metabase/redux/settings";import { refreshCurrentUser } from "metabase/redux/user";import { createAsyncThunk } from "metabase/redux/utils";import MetabaseSettings from "metabase/utils/settings";-import type { Settings } from "metabase-types/api";const GET_OR_REFRESH_SESSION = "sdk/token/GET_OR_REFRESH_SESSION";@@ -102,10 +101,18 @@ PLUGIN_EMBEDDING_SDK_AUTH.initAuth = async (}),);dispatch(refreshCurrentUser.fulfilled(authState.user, "", undefined));- // Unjustified type cast. FIXME- dispatch(loadSettings(authState.siteSettings as Settings));- // Unjustified type cast. FIXME- MetabaseSettings.setAll(authState.siteSettings as Settings);+ dispatch(+ sessionApi.util.upsertQueryData(+ "getSessionProperties",+ undefined,+ authState.siteSettings,+ ),+ );+ // Add a subscription so that the entry doesn't get deleted from the cache.+ // RTK will delete entries with no subscribers if they are invalidated,+ // and the SDK host page has no bootstrap to fall back to.+ dispatch(sessionApi.endpoints.getSessionProperties.initiate());+ MetabaseSettings.setAll(authState.siteSettings);// The session handler emits the X-Metabase-Session header on every API// call, renewing the token when it expires.@@ -152,7 +159,7 @@ PLUGIN_EMBEDDING_SDK_AUTH.initAuth = async (if ((e as Error).name === "MetabaseError") {throw e;}- // Unjustified type cast. FIXME+ // `instanceof Error` is unreliable here (see the TODO above)throw MetabaseError.REFRESH_TOKEN_BACKEND_ERROR(e as Error);}}@@ -160,7 +167,7 @@ PLUGIN_EMBEDDING_SDK_AUTH.initAuth = async (// Fetch user and site settingsconst [user, siteSettings] = await Promise.all([dispatch(refreshCurrentUser()),- dispatch(refreshSiteSettings()),+ dispatch(refetchSiteSettings()),]);if (!user.payload) {@@ -170,7 +177,7 @@ PLUGIN_EMBEDDING_SDK_AUTH.initAuth = async (throw MetabaseError.USER_FETCH_FAILED();}- if (!siteSettings.payload) {+ if (!siteSettings.data) {throw MetabaseError.USER_FETCH_FAILED();}};diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.tsindex 441403d35e3..dd22995376d 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.ts+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithBlurInput.ts@@ -1,4 +1,4 @@-import { useCallback, useEffect, useRef, useState } from "react";+import { useCallback, useEffect, useRef } from "react";import { useAdminSetting } from "metabase/api/utils";import { useBeforeUnload } from "metabase/common/hooks/use-before-unload";@@ -7,6 +7,8 @@ import type {EnterpriseSettings,} from "metabase-types/api";+import { useHydratedInput } from "./useHydratedInput";+type StringSettingKey = {[K in EnterpriseSettingKey]: EnterpriseSettings[K] extends| string@@ -21,16 +23,21 @@ type StringSettingKey = {* saves shouldn't be debounced (e.g. Metabot system prompts).*/export function useAdminSettingWithBlurInput(settingName: StringSettingKey) {- const { value: settingValue, updateSetting } = useAdminSetting(settingName);- const [inputValue, setInputValue] = useState(settingValue);+ const {+ value: settingValue,+ isLoading,+ updateSetting,+ } = useAdminSetting(settingName);const lastSavedRef = useRef(settingValue);- useEffect(() => {- if (lastSavedRef.current === undefined && settingValue !== undefined) {- setInputValue(settingValue);- lastSavedRef.current = settingValue;- }- }, [settingValue]);+ const { inputValue, setInputValueFromUser: handleInputChange } =+ useHydratedInput({+ value: settingValue,+ isLoading,+ onHydrate: useCallback((value: typeof settingValue) => {+ lastSavedRef.current = value;+ }, []),+ });const trimmedInput = (inputValue ?? "").trim();const trimmedSaved = (lastSavedRef.current ?? "").trim();@@ -56,7 +63,7 @@ export function useAdminSettingWithBlurInput(settingName: StringSettingKey) {return {inputValue,- handleInputChange: setInputValue,+ handleInputChange,handleBlur: save,};}diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.tsindex c29c2adf2ec..63d300baa76 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.ts+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useAdminSettingWithDebouncedInput.ts@@ -1,5 +1,5 @@import { useDebouncedCallback } from "@mantine/hooks";-import { useCallback, useEffect, useState } from "react";+import { useCallback } from "react";import { c } from "ttag";import { useAdminSetting } from "metabase/api/utils";@@ -9,27 +9,26 @@ import type {EnterpriseSettingValue,} from "metabase-types/api";+import { useHydratedInput } from "./useHydratedInput";+export const SAVE_DEBOUNCE_MS = 500;export function useAdminSettingWithDebouncedInput<T>(settingName: EnterpriseSettingKey,defaultValue: T | null = null,) {- const { value: settingValue, updateSetting } = useAdminSetting(settingName);- // Unjustified type cast. FIXME- const [inputValue, setInputValue] = useState<T>(settingValue as T);+ const {+ value: settingValue,+ isLoading,+ updateSetting,+ } = useAdminSetting(settingName);const { sendErrorToast } = useMetadataToasts();- // Local input state initialization- useEffect(() => {- if (- inputValue === undefined && // Input has not been initialized- settingValue !== undefined // and setting has been fetched- ) {- // Unjustified type cast. FIXME- setInputValue((settingValue || defaultValue) as T);- }- }, [defaultValue, inputValue, settingValue]);+ const { inputValue, setInputValueFromUser } = useHydratedInput<T>({+ // Unjustified type cast. FIXME+ value: (settingValue ?? defaultValue) as T,+ isLoading,+ });const debouncedSaveSetting = useDebouncedCallback(async (value: T) => {const response = await updateSetting({@@ -48,10 +47,10 @@ export function useAdminSettingWithDebouncedInput<T>(const handleInputChange = useCallback((newValue: T) => {- setInputValue(newValue);+ setInputValueFromUser(newValue);debouncedSaveSetting(newValue);},- [debouncedSaveSetting],+ [setInputValueFromUser, debouncedSaveSetting],);return {diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useHydratedInput.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useHydratedInput.tsnew file mode 100644index 00000000000..6b7745fe551--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/hooks/useHydratedInput.ts@@ -0,0 +1,37 @@+import { useCallback, useEffect, useRef, useState } from "react";++/**+ * Holds local input for a setting input+ *+ * Hydrates the local input from the setting value once it has loaded,+ * unless the user has already started editing the input.+ * This prevents the user from losing their input if the setting value changes while they are editing.+ */+export function useHydratedInput<T>({+ value,+ isLoading,+ onHydrate,+}: {+ value: T;+ isLoading: boolean;+ onHydrate?: (value: T) => void;+}) {+ const [inputValue, setInputValue] = useState<T>(value);+ const hasHydrated = useRef(false);+ const hasUserEdited = useRef(false);++ useEffect(() => {+ if (!hasHydrated.current && !isLoading && !hasUserEdited.current) {+ setInputValue(value);+ onHydrate?.(value);+ hasHydrated.current = true;+ }+ }, [isLoading, value, onHydrate]);++ const setInputValueFromUser = useCallback((newValue: T) => {+ hasUserEdited.current = true;+ setInputValue(newValue);+ }, []);++ return { inputValue, setInputValueFromUser };+}diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotCustomizationPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotCustomizationPage.unit.spec.tsxindex 61e8af09a83..740905d4814 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotCustomizationPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotCustomizationPage.unit.spec.tsx@@ -3,6 +3,7 @@ import {setupSettingsEndpoints,setupUpdateSettingEndpoint,} from "__support__/server-mocks";+import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { createMockSettings } from "metabase-types/api/mocks";@@ -17,17 +18,22 @@ function setup({metabotIcon?: string | null;showIllustrations?: boolean;} = {}) {- setupPropertiesEndpoints(- createMockSettings({- "metabot-name": metabotName,- "metabot-icon": metabotIcon,- "metabot-show-illustrations": showIllustrations,- }),- );+ const settings = createMockSettings({+ "metabot-name": metabotName,+ "metabot-icon": metabotIcon,+ "metabot-show-illustrations": showIllustrations,+ });++ setupPropertiesEndpoints(settings);setupSettingsEndpoints([]);setupUpdateSettingEndpoint();- renderWithProviders(<MetabotCustomizationPage />);+ // Seed the store state too: without it, the render harness seeds the+ // settings bootstrap with *defaults*, and assertions can run against the+ // bootstrap-rendered UI before the mocked properties fetch resolves.+ renderWithProviders(<MetabotCustomizationPage />, {+ storeInitialState: { settings: mockSettings(settings) },+ });}describe("MetabotCustomizationPage", () => {diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsxindex 20bc264f110..8a6e216d13b 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx@@ -10,6 +10,7 @@ import {setupUpdateAIControlsInstanceLimitEndpoint,} from "__support__/server-mocks/metabot";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { createMockSettingsState } from "metabase/redux/store/mocks";import type { MetabotLimitPeriod, MetabotLimitType } from "metabase-types/api";import { createMockSettings } from "metabase-types/api/mocks";@@ -22,34 +23,37 @@ type SetupOpts = {instanceMaxUsage?: number | null;};-function setup({+async function setup({limitType = "tokens",limitPeriod = "monthly",quotaMessage = "",// Unjustified type cast. FIXMEinstanceMaxUsage = null as number | null,}: SetupOpts = {}) {- setupPropertiesEndpoints(- createMockSettings({- "metabot-limit-unit": limitType,- "metabot-limit-reset-rate": limitPeriod,- "metabot-quota-reached-message": quotaMessage || null,- }),- );+ const settingValues = {+ "metabot-limit-unit": limitType,+ "metabot-limit-reset-rate": limitPeriod,+ "metabot-quota-reached-message": quotaMessage || null,+ };+ setupPropertiesEndpoints(createMockSettings(settingValues));setupSettingsEndpoints([]);setupUpdateSettingEndpoint();setupAIControlsInstanceLimitEndpoint({ max_usage: instanceMaxUsage });setupUpdateAIControlsInstanceLimitEndpoint();- renderWithProviders(<GeneralLimitsSettingsSection />);+ renderWithProviders(<GeneralLimitsSettingsSection />, {+ storeInitialState: { settings: createMockSettingsState(settingValues) },+ });++ await screen.findByText("How do you want to limit AI usage?");}describe("GeneralLimitsSettingsSection", () => {it("renders the limit type segmented control with saved value", async () => {- setup({ limitType: "messages" });+ await setup({ limitType: "messages" });expect(- await screen.findByText("How do you want to limit AI usage?"),+ screen.getByText("How do you want to limit AI usage?"),).toBeInTheDocument();expect(screen.getByText("By token usage")).toBeInTheDocument();expect(screen.getByText("By message count")).toBeInTheDocument();@@ -67,10 +71,10 @@ describe("GeneralLimitsSettingsSection", () => {});it("renders the reset period segmented control with saved value", async () => {- setup({ limitPeriod: "weekly" });+ await setup({ limitPeriod: "weekly" });expect(- await screen.findByText("When should usage limits reset?"),+ screen.getByText("When should usage limits reset?"),).toBeInTheDocument();expect(screen.getByText("Daily")).toBeInTheDocument();expect(screen.getByText("Weekly")).toBeInTheDocument();@@ -86,9 +90,7 @@ describe("GeneralLimitsSettingsSection", () => {});it("shows token-based label for instance limit when limit type is tokens", async () => {- setup({ limitType: "tokens" });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ limitType: "tokens" });await waitFor(() => {expect(screen.getByText("Total monthly instance token limit"),@@ -97,9 +99,7 @@ describe("GeneralLimitsSettingsSection", () => {});it("shows message-based label for instance limit when limit type is messages", async () => {- setup({ limitType: "messages" });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ limitType: "messages" });await waitFor(() => {expect(screen.getByText("Total monthly instance message limit"),@@ -108,43 +108,33 @@ describe("GeneralLimitsSettingsSection", () => {});it("populates the instance limit input from API data", async () => {- setup({ instanceMaxUsage: 500 });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ instanceMaxUsage: 500 });await waitFor(() => {expect(screen.getByDisplayValue("500")).toBeInTheDocument();});});it("shows 'Unlimited' placeholder when instance limit is null", async () => {- setup({ instanceMaxUsage: null });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ instanceMaxUsage: null });expect(screen.getByPlaceholderText("Unlimited")).toBeInTheDocument();});it("shows 'million' unit beside the instance limit input when limit type is tokens", async () => {- setup({ limitType: "tokens" });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ limitType: "tokens" });await waitFor(() => {expect(screen.getByText("million")).toBeInTheDocument();});});it("shows 'messages' unit beside the instance limit input when limit type is messages", async () => {- setup({ limitType: "messages" });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ limitType: "messages" });await waitFor(() => {expect(screen.getByText("messages")).toBeInTheDocument();});});it("renders the quota-reached message input with saved value", async () => {- setup({ quotaMessage: "You hit the limit!" });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ quotaMessage: "You hit the limit!" });await waitFor(() => {expect(screen.getByDisplayValue("You hit the limit!"),@@ -153,9 +143,7 @@ describe("GeneralLimitsSettingsSection", () => {});it("updates limit type setting when user clicks a different option", async () => {- setup({ limitType: "tokens" });- await screen.findByText("How do you want to limit AI usage?");-+ await setup({ limitType: "tokens" });await userEvent.click(screen.getByText("By message count"));expect(@@ -164,8 +152,8 @@ describe("GeneralLimitsSettingsSection", () => {});it("updates reset period setting when user clicks a different option", async () => {- setup({ limitPeriod: "monthly" });- await screen.findByText("When should usage limits reset?");+ await setup({ limitPeriod: "monthly" });+ expect(screen.getByRole("radio", { name: "Monthly" })).toBeChecked();await userEvent.click(screen.getByText("Daily"));diff --git a/enterprise/frontend/src/metabase-enterprise/api/gdrive.ts b/enterprise/frontend/src/metabase-enterprise/api/gdrive.tsindex 4a65e422a5e..f3fde80e86e 100644--- a/enterprise/frontend/src/metabase-enterprise/api/gdrive.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/gdrive.ts@@ -20,6 +20,8 @@ export const gdriveApi = EnterpriseApi.injectEndpoints({}),providesTags: ["gsheets-status"],}),+ // Connecting/disconnecting Google Sheets changes the `gsheets` setting+ // server-side, so these also invalidate session-properties.saveGsheetsFolderLink: builder.mutation<{ success: boolean },{ url: string; link_type?: "folder" | "file" }@@ -29,14 +31,14 @@ export const gdriveApi = EnterpriseApi.injectEndpoints({url: "/api/ee/gsheets/connection",body: body,}),- invalidatesTags: ["gsheets-status"],+ invalidatesTags: ["gsheets-status", "session-properties"],}),deleteGsheetsFolderLink: builder.mutation<{ success: boolean }, void>({query: () => ({method: "DELETE",url: "/api/ee/gsheets/connection",}),- invalidatesTags: ["gsheets-status"],+ invalidatesTags: ["gsheets-status", "session-properties"],}),syncGsheetsFolder: builder.mutation<{ db_id: DatabaseId }, void>({query: () => ({diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForDatabases.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForDatabases.unit.spec.tsxindex 63f58da139c..e6615ff597a 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForDatabases.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForDatabases.unit.spec.tsx@@ -1,6 +1,6 @@import userEvent from "@testing-library/user-event";-import { act, screen, waitFor, within } from "__support__/ui";+import { act, screen, within } from "__support__/ui";import type { SetupOpts } from "metabase/admin/performance/components/test-utils";import {setupStrategyEditorForDatabases as baseSetup,@@ -118,12 +118,6 @@ describe("StrategyEditorForDatabases", () => {await screen.findByTestId("strategy-form-submit-button"),);- await waitFor(() =>- expect(- screen.getByTestId("strategy-form-submit-button"),- ).toHaveTextContent(/Saved/i),- );-expect(await screen.findByLabelText(/Edit default policy/)).toHaveAttribute("aria-label","Edit default policy (currently: No caching)",@@ -180,11 +174,6 @@ describe("StrategyEditorForDatabases", () => {await userEvent.click(await screen.findByTestId("strategy-form-submit-button"),);- await waitFor(() =>- expect(- screen.getByTestId("strategy-form-submit-button"),- ).toHaveTextContent(/Saved/i),- );expect(await screen.findByLabelText(/Edit policy for database 'Database 1'/),diff --git a/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts b/enterprise/frontend/src/metabase-enterprise/embedding/selectors.tsindex 9dccf899607..ed8c060315b 100644--- a/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/embedding/selectors.ts@@ -1,8 +1,8 @@import { getPlan } from "metabase/common/utils/plan";+import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";-import type { EnterpriseState } from "metabase-enterprise/settings/types";-export const isInteractiveEmbeddingEnabled = (state: EnterpriseState) => {+export const isInteractiveEmbeddingEnabled = (state: State) => {const plan = getPlan(getSetting(state, "token-features"));return plan === "pro-cloud" || plan === "pro-self-hosted";};diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsxindex 4b1f30e9b0e..7f21a008dd8 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx@@ -6,8 +6,6 @@ import { skipToken, useGetUserQuery } from "metabase/api";import { CopyButton } from "metabase/common/components/CopyButton";import { ExternalLink } from "metabase/common/components/ExternalLink";import { Markdown } from "metabase/common/components/Markdown";-import { useDispatch } from "metabase/redux";-import { reloadSettings } from "metabase/redux/settings";import {Box,Button,@@ -98,7 +96,6 @@ function GoogleSheetsConnectModal({folderUrl: string | null;serviceAccountEmail: string;}) {- const dispatch = useDispatch();const [folderLink, setFolderLink] = useState(folderUrl ?? "");const [errorMessage, setErrorMessage] = useState("");const [linkType, setLinkType] = useState<UploadType>("folder");@@ -124,7 +121,6 @@ function GoogleSheetsConnectModal({}).unwrap().then(() => {- dispatch(reloadSettings());onClose(true);}).catch((response) => {diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsxindex 88ecd14490f..91ea9e3c6a5 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsx@@ -306,7 +306,7 @@ describe("MetabaseAIProviderSetup", () => {await screen.findByText("Current billing cycle"),).toBeInTheDocument();expect(screen.getByText("Total tokens")).toBeInTheDocument();- expect(screen.getByText("3,000,000")).toBeInTheDocument();+ expect(await screen.findByText("3,000,000")).toBeInTheDocument();expect(screen.getByText("Total cost")).toBeInTheDocument();// (3M - 1M) tokens at $3 per 1M tokens = $6.00expect(await screen.findByText("$6.00")).toBeInTheDocument();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 ad0d1d096f4..34c3fa836cf 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,6 +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 type { Card, Collection, Dashboard, Document } from "metabase-types/api";import { REMOTE_SYNC_INVALIDATION_TAGS, TRANSFORMS_KEY } from "../constants";@@ -49,7 +50,7 @@ function shouldInvalidateForRemoteSyncedModel(}function isTransformsSyncEnabled(state: State): boolean {- return !!state.settings?.values?.[TRANSFORMS_KEY];+ return !!getSetting(state, TRANSFORMS_KEY);}function shouldInvalidateForCollection(diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.tsindex 1a393d4b86e..d69495f8dd8 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.ts@@ -9,11 +9,14 @@ import {setupRemoteSyncDirtyEndpoint,setupUpdateCollectionEndpoint,} from "__support__/server-mocks";-import { Api } from "metabase/api";+import { Api, sessionApi } from "metabase/api";import { collectionApi } from "metabase/api/collection";-import { settings as settingsReducer } from "metabase/redux/settings";import { remoteSyncApi } from "metabase-enterprise/api/remote-sync";-import { createMockCollection } from "metabase-types/api/mocks";+import type { EnterpriseSettings } from "metabase-types/api";+import {+ createMockCollection,+ createMockSettings,+} from "metabase-types/api/mocks";import {type SyncTaskState,@@ -25,29 +28,19 @@ import { remoteSyncListenerMiddleware } from "./remote-sync-listener-middleware"interface TestState {remoteSyncPlugin: SyncTaskState;- settings: {- values: Record<string, unknown>;- loading: boolean;- };}-const createTestStore = (settingsOverrides: Record<string, unknown> = {}) => {- return configureStore({+const createTestStore = (+ settingsOverrides: Partial<EnterpriseSettings> = {},+) => {+ const store = configureStore({reducer: combineReducers({remoteSyncPlugin: remoteSyncReducer,- settings: settingsReducer,// EnterpriseApi is an enhanced version of Api, so they share the same reducer[Api.reducerPath]: Api.reducer,}),preloadedState: {remoteSyncPlugin: initialState,- settings: {- values: {- "remote-sync-transforms": false,- ...settingsOverrides,- },- loading: false,- },},middleware: (getDefaultMiddleware) =>getDefaultMiddleware({@@ -59,6 +52,22 @@ const createTestStore = (settingsOverrides: Record<string, unknown> = {}) => {// and the test store's State type (test store uses simplified State).concat(remoteSyncListenerMiddleware.middleware as any),});++ // Settings are served from the getSessionProperties RTK Query cache.+ store.dispatch(+ sessionApi.util.upsertQueryEntries([+ {+ endpointName: "getSessionProperties",+ arg: undefined,+ value: createMockSettings({+ "remote-sync-transforms": false,+ ...settingsOverrides,+ }),+ },+ ]),+ );++ return store;};const waitForCondition = async (diff --git a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts b/enterprise/frontend/src/metabase-enterprise/settings/selectors.tsindex 28d3675b048..f2b78fe9fec 100644--- a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts@@ -1,5 +1,6 @@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 type {EnterpriseSettings,@@ -8,8 +9,6 @@ import type {import { LOADING_MESSAGE_BY_SETTING } from "../whitelabel/lib/loading-message";-import type { EnterpriseState } from "./types";-const DEFAULT_LOGO_URL = "app/assets/img/logo.svg";const getCustomLogoUrl = (settingValues: EnterpriseSettings) => {@@ -20,13 +19,13 @@ const getCustomLogoUrl = (settingValues: EnterpriseSettings) => {);};-export const getLogoUrl = (state: EnterpriseState) =>+export const getLogoUrl = (state: State) =>getCustomLogoUrl(getSettings(state));-export const getIsDefaultMetabaseLogo = (state: EnterpriseState) =>+export const getIsDefaultMetabaseLogo = (state: State) =>getLogoUrl(state) === DEFAULT_LOGO_URL;-export const getLoadingMessage = (state: EnterpriseState) => {+export const getLoadingMessage = (state: State) => {const setting = getSetting(state, "loading-message");// default to empty string to account for a historical bug where the// setting could be set via MB_LOADING_MESSAGE to a value not in our enum@@ -35,20 +34,18 @@ export const getLoadingMessage = (state: EnterpriseState) => {// eslint-disable-next-line metabase/no-literal-metabase-strings -- This is a Metabase string we want to keep. It's used for comparison.const DEFAULT_APPLICATION_NAME = "Metabase";-export const getIsWhiteLabeling = (state: EnterpriseState) =>+export const getIsWhiteLabeling = (state: State) =>getApplicationName(state) !== DEFAULT_APPLICATION_NAME;-export function getApplicationName(state: EnterpriseState) {+export function getApplicationName(state: State) {return getSetting(state, "application-name");}-export function getShowMetabaseLinks(state: EnterpriseState) {+export function getShowMetabaseLinks(state: State) {return getSetting(state, "show-metabase-links");}-export function getLoginPageIllustration(- state: EnterpriseState,-): IllustrationValue {+export function getLoginPageIllustration(state: State): IllustrationValue {// Unjustified type cast. FIXMEconst illustrationOption = getSetting(state,@@ -74,9 +71,7 @@ export function getLoginPageIllustration(}}-export function getLandingPageIllustration(- state: EnterpriseState,-): IllustrationValue {+export function getLandingPageIllustration(state: State): IllustrationValue {// Unjustified type cast. FIXMEconst illustrationOption = getSetting(state,@@ -102,7 +97,7 @@ export function getLandingPageIllustration(}}-export function getNoDataIllustration(state: EnterpriseState): string | null {+export function getNoDataIllustration(state: State): string | null {// Unjustified type cast. FIXMEconst illustrationOption = getSetting(state,@@ -122,7 +117,7 @@ export function getNoDataIllustration(state: EnterpriseState): string | null {}}-export function getNoObjectIllustration(state: EnterpriseState): string | null {+export function getNoObjectIllustration(state: State): string | null {// Unjustified type cast. FIXMEconst illustrationOption = getSetting(state,diff --git a/enterprise/frontend/src/metabase-enterprise/settings/types.ts b/enterprise/frontend/src/metabase-enterprise/settings/types.tsdeleted file mode 100644index 92b6c96a97c..00000000000--- a/enterprise/frontend/src/metabase-enterprise/settings/types.ts+++ /dev/null@@ -1,10 +0,0 @@-import type { SettingsState, State } from "metabase/redux/store";-import type { EnterpriseSettings } from "metabase-types/api";--export interface EnterpriseState extends State {- settings: EnterpriseSettingsState;-}--interface EnterpriseSettingsState extends SettingsState {- values: EnterpriseSettings;-}diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsxindex b8412154461..6258fd2359d 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsx@@ -7,6 +7,7 @@ import {setupUpdateSettingEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import { createMockSettingsState } from "metabase/redux/store/mocks";import type { EnterpriseSettings } from "metabase-types/api";import { createMockSettings } from "metabase-types/api/mocks";@@ -39,7 +40,9 @@ const setup = async (]);setupUpdateSettingEndpoint();- renderWithProviders(<FontWidget />);+ renderWithProviders(<FontWidget />, {+ storeInitialState: { settings: createMockSettingsState(settings) },+ });await screen.findByText("Font");return waitFor(async () => {const gets = await findRequests("GET");diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsxindex db00e6a8fbc..0f7b76e88b7 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsx@@ -7,6 +7,7 @@ import {setupUpdateSettingEndpoint,} from "__support__/server-mocks";import { fireEvent, renderWithProviders, screen } from "__support__/ui";+import { createMockSettingsState } from "metabase/redux/store/mocks";import type { EnterpriseSettings } from "metabase-types/api";import { createMockSettings } from "metabase-types/api/mocks";@@ -19,16 +20,18 @@ const setup = async (settings?: Partial<EnterpriseSettings>;} = { settings: {} },) => {- const settings = createMockSettings({- "help-link": "metabase",+ const settingValues = {+ "help-link": "metabase" as const,"help-link-custom-destination": undefined,...settingOverrides,- });- setupPropertiesEndpoints(settings);+ };+ setupPropertiesEndpoints(createMockSettings(settingValues));setupSettingsEndpoints([]);setupUpdateSettingEndpoint();- renderWithProviders(<HelpLinkSettings />);+ renderWithProviders(<HelpLinkSettings />, {+ storeInitialState: { settings: createMockSettingsState(settingValues) },+ });await screen.findByText("Help link");};diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsxindex 0d541e401b3..313e411205e 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsx@@ -7,6 +7,7 @@ import {setupUpdateSettingEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { createMockSettingsState } from "metabase/redux/store/mocks";import type {EnterpriseSettingKey,EnterpriseSettings,@@ -15,6 +16,8 @@ import { createMockSettings } from "metabase-types/api/mocks";import { ImageUploadWidget } from "./ImageUploadWidget";+const DEFAULT_LOGO_URL = "app/assets/img/logo.png";+async function setup({name,title,@@ -26,15 +29,16 @@ async function setup({description?: React.ReactNode;settings?: Partial<EnterpriseSettings>;}) {- const settings = createMockSettings({- "application-logo-url": "app/assets/img/logo.png",+ const settingValues = {+ "application-logo-url": DEFAULT_LOGO_URL,...settingOverrides,- });+ };+ const settings = createMockSettings(settingValues);setupPropertiesEndpoints(settings);setupSettingsEndpoints([{key: "application-logo-url",- default: "app/assets/img/logo.png",+ default: DEFAULT_LOGO_URL,is_env_setting: false,description: "The logo of the application",env_name: "METABASE_APPLICATION_LOGO_URL",@@ -44,9 +48,16 @@ async function setup({renderWithProviders(<ImageUploadWidget name={name} title={title} description={description} />,+ { storeInitialState: { settings: createMockSettingsState(settingValues) } },);await screen.findByText(title);++ const isDefaultLogo =+ settingValues["application-logo-url"] === DEFAULT_LOGO_URL;+ await screen.findByText(+ isDefaultLogo ? "No file chosen" : "Remove uploaded image",+ );}describe("ImageUploadWidget", () => {@@ -68,7 +79,9 @@ describe("ImageUploadWidget", () => {},});- expect(screen.getByText("Remove uploaded image")).toBeInTheDocument();+ expect(+ await screen.findByText("Remove uploaded image"),+ ).toBeInTheDocument();});it("shows an image preview", async () => {@@ -80,7 +93,7 @@ describe("ImageUploadWidget", () => {},});- expect(screen.getByLabelText("Image preview")).toBeInTheDocument();+ expect(await screen.findByLabelText("Image preview")).toBeInTheDocument();});it("can remove an uploaded image", async () => {@@ -92,7 +105,7 @@ describe("ImageUploadWidget", () => {},});- await userEvent.click(screen.getByLabelText("close icon"));+ await userEvent.click(await screen.findByLabelText("close icon"));const [{ url, body }] = await findRequests("PUT");diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsxindex 8df42326e74..160040c429a 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsx@@ -7,6 +7,7 @@ import {setupUpdateSettingEndpoint,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";+import { createMockSettingsState } from "metabase/redux/store/mocks";import { createMockSettings } from "metabase-types/api/mocks";import { MetabotToggleWidget } from "./MetabotToggleWidget";@@ -14,14 +15,13 @@ import { MetabotToggleWidget } from "./MetabotToggleWidget";const TOGGLE_LABEL = "Display welcome message on the homepage";const setup = (value = true) => {- setupPropertiesEndpoints(- createMockSettings({- "show-metabot": !!value,- }),- );+ const settings = { "show-metabot": !!value };+ setupPropertiesEndpoints(createMockSettings(settings));setupUpdateSettingEndpoint();setupSettingsEndpoints([]);- renderWithProviders(<MetabotToggleWidget />, {});+ renderWithProviders(<MetabotToggleWidget />, {+ storeInitialState: { settings: createMockSettingsState(settings) },+ });};describe("MetabotToggleWidget", () => {diff --git a/frontend/src/embedding-sdk-bundle/analytics/snowplow.ts b/frontend/src/embedding-sdk-bundle/analytics/snowplow.tsindex c1aa2a3eb73..d04bc019a22 100644--- a/frontend/src/embedding-sdk-bundle/analytics/snowplow.ts+++ b/frontend/src/embedding-sdk-bundle/analytics/snowplow.ts@@ -5,6 +5,7 @@ import {} from "@snowplow/browser-tracker";import type { SdkStoreState } from "embedding-sdk-bundle/store/types";+import { getSettings } from "metabase/selectors/settings";import { trackMetaplowEvent } from "metabase/utils/metaplow";import type { SimpleEventSchema } from "metabase-types/analytics/event";@@ -69,7 +70,7 @@ export function initSdkTracker({sdkAuthMethod = authMethod;sdkLocaleUsed = localeUsed;- const settingValues = store.getState().settings?.values;+ const settingValues = getSettings(store.getState());sdkMetaplowEnabled = !!settingValues?.["metaplow-tracking-enabled"];newTracker(SDK_TRACKER_NAME, metabaseInstanceUrl, {@@ -113,7 +114,7 @@ function createSdkInstanceContextPlugin(store: {contexts(): SelfDescribingJson[] {// Settings are guaranteed present: initSdkTracker is only called after// isTrackingEnabled, which requires anon-tracking-enabled to be loaded.- const settings = store.getState().settings?.values;+ const settings = getSettings(store.getState());const version = settings?.["version"] ?? {};return [diff --git a/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts b/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.tsindex 1b879189067..e74bbc0cf29 100644--- a/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts+++ b/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts@@ -1,36 +1,46 @@-import type { SdkStoreState } from "embedding-sdk-bundle/store/types";+import { seedApiQueryCache } from "__support__/rtk-query-cache";import { createMockSdkState } from "embedding-sdk-bundle/test/mocks/state";-import { createMockSettingsState } from "metabase/redux/store/mocks/settings";import { createMockState } from "metabase/redux/store/mocks/state";import type { EnterpriseSettings } from "metabase-types/api";-import { createMockTokenFeatures } from "metabase-types/api/mocks";+import {+ createMockSettings,+ createMockTokenFeatures,+} from "metabase-types/api/mocks";const mockNewTracker = jest.fn();const mockTrackSelfDescribingEvent = jest.fn();const mockTrackMetaplowEvent = jest.fn();jest.mock("@snowplow/browser-tracker", () => ({- newTracker: mockNewTracker,- trackSelfDescribingEvent: mockTrackSelfDescribingEvent,+ newTracker: (...args: unknown[]) => mockNewTracker(...args),+ trackSelfDescribingEvent: (...args: unknown[]) =>+ mockTrackSelfDescribingEvent(...args),}));jest.mock("metabase/utils/metaplow", () => ({- trackMetaplowEvent: mockTrackMetaplowEvent,+ trackMetaplowEvent: (...args: unknown[]) => mockTrackMetaplowEvent(...args),}));// Re-import the module under test so its module-scoped init guard resets per test.const loadModule = () => import("./snowplow");function makeStore(overrides: Partial<EnterpriseSettings> = {}) {+ // Seed the `getSessionProperties` RTK Query cache.+ const state = createMockState({ sdk: createMockSdkState() });+ const stateWithSettings = {+ ...state,+ "metabase-api": seedApiQueryCache(state["metabase-api"], [+ {+ endpointName: "getSessionProperties",+ value: createMockSettings({+ "anon-tracking-enabled": true,+ ...overrides,+ }),+ },+ ]),+ };return {- getState: (): SdkStoreState => ({- ...createMockState(),- sdk: createMockSdkState(),- settings: createMockSettingsState({- "anon-tracking-enabled": true,- ...overrides,- }),- }),+ getState: () => stateWithSettings,};}diff --git a/frontend/src/embedding-sdk-bundle/bootstrap-auth.ts b/frontend/src/embedding-sdk-bundle/bootstrap-auth.tsindex 15b807567b5..cc53f86cdc0 100644--- a/frontend/src/embedding-sdk-bundle/bootstrap-auth.ts+++ b/frontend/src/embedding-sdk-bundle/bootstrap-auth.ts@@ -15,14 +15,7 @@ import {validateSession,} from "embedding/auth-common";import * as MetabaseError from "embedding-sdk-shared/errors";--type SdkAuthState = {- status: "idle" | "in-progress" | "completed" | "error" | "skipped";- session?: any;- user?: any;- siteSettings?: Record<string, any>;- error?: Error;-};+import type { SdkAuthState } from "embedding-sdk-shared/types/auth-state";const SDK_AUTH_STATE_KEY = "METABASE_EMBEDDING_SDK_AUTH_STATE";@@ -153,7 +146,7 @@ async function performFullAuthFlow(config: {}): Promise<{session: any;user: any;- siteSettings: Record<string, any>;+ siteSettings: SdkAuthState["siteSettings"];} | null> {const headers = getSdkRequestHeaders();diff --git a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsxindex e73fd3e30e5..35b0fed394a 100644--- a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx@@ -26,6 +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 { OverlayStackProvider } from "metabase/ui/components/overlays/overlay-stack";import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";import { initializePlugins } from "sdk-ee-plugins";@@ -48,8 +49,8 @@ let hasInitializedPlugins = false;* to avoid an extra frame where children render without plugins.*/function useInitPlugins(reduxStore: SdkStore) {- const tokenFeatures = useSelector(- (state) => state.settings.values["token-features"],+ const tokenFeatures = useSelector((state) =>+ getSetting(state, "token-features"),);// Modular Embedding already initializes the plugins in its entrypoint.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 faf3e163231..398b1862bdf 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@@ -13,7 +13,7 @@ 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 { getTokenFeature } from "metabase/selectors/settings";+import { getSetting, getTokenFeature } from "metabase/selectors/settings";export function useSdkUsageProblem({authConfig,@@ -42,7 +42,7 @@ export function useSdkUsageProblem({const isDevelopmentMode = useSdkSelector((state) => {// Assume that we are not in development mode until the setting is loaded- if (!state.settings.values?.["token-features"]) {+ if (!getSetting(state, "token-features")) {return false;}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 fbf5d890d00..673dae36d71 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,10 +1,10 @@import { merge } from "icepick";import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";+import { refetchSiteSettings } from "metabase/api";import type { OnBeforeRequestHandlerConfig } from "metabase/api/client";import { overrideRequestsForGuestEmbeds } from "metabase/embedding/lib/override-requests-for-embeds";import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";-import { refreshSiteSettings } from "metabase/redux/settings";import { createAsyncThunk } from "metabase/redux/utils";import { isJWT } from "metabase/utils/jwt";@@ -70,6 +70,6 @@ export const initGuestEmbed = createAsyncThunk<void, MetabaseAuthConfig>(};}- await dispatch(refreshSiteSettings());+ await dispatch(refetchSiteSettings());},);diff --git a/frontend/src/embedding-sdk-bundle/store/selectors.ts b/frontend/src/embedding-sdk-bundle/store/selectors.tsindex bac0feaac0b..da80e8e3456 100644--- a/frontend/src/embedding-sdk-bundle/store/selectors.ts+++ b/frontend/src/embedding-sdk-bundle/store/selectors.ts@@ -47,7 +47,7 @@ export const getAvailableFonts = (state: SdkStoreState) =>export const getHasTokenFeature = (state: SdkStoreState) => {// When the setting haven't been loaded or failed to query, we assume that the// feature is _enabled_ first.- if (!state.settings.values?.["token-features"]) {+ if (!getSetting(state, "token-features")) {return true;}diff --git a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsxindex 1dba3533b14..a10b8f3822c 100644--- a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx+++ b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx@@ -2,21 +2,25 @@ import { render } from "@testing-library/react";import _ from "underscore";import { getStore } from "__support__/entities-store";+import { seedApiQueryCache } from "__support__/rtk-query-cache";import { ComponentProviderInternal } from "embedding-sdk-bundle/components/public/ComponentProvider";import { sdkReducers } from "embedding-sdk-bundle/store";-import type { SdkStore } from "embedding-sdk-bundle/store/types";+import type { SdkStore, SdkStoreState } from "embedding-sdk-bundle/store/types";import { createMockSdkState } from "embedding-sdk-bundle/test/mocks/state";import type { MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-provider";import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";import { Api } from "metabase/api";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";-import { createMockState } from "metabase/redux/store/mocks";+import {+ type StoreSeedState,+ createMockState,+} from "metabase/redux/store/mocks";import type { MantineThemeOverride } from "metabase/ui";import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";export interface RenderWithSDKProvidersOptions {- storeInitialState?: Partial<State>;+ storeInitialState?: Partial<StoreSeedState>;componentProviderProps?: Partial<MetabaseProviderProps> | null;theme?: MantineThemeOverride;// Needed for Components/Hooks that retrieve Component/Hooks from the window.METABASE_EMBEDDING_SDK_BUNDLE@@ -35,8 +39,13 @@ export function renderWithSDKProviders(...options}: RenderWithSDKProvidersOptions = {},) {- let { routing, ...initialState }: Partial<State> =- createMockState(storeInitialState);+ // `settings` is served from the `getSessionProperties` RTK Query cache.+ // Capture any seeded settings here and seed the cache through `preloadedState` below.+ let {+ routing,+ settings: seededSettings,+ ...initialState+ }: Partial<StoreSeedState> = createMockState(storeInitialState);const sdkReducerNames = Object.keys(sdkReducers);initialState = _.pick(@@ -46,9 +55,26 @@ export function renderWithSDKProviders(// Enable the embedding_sdk premium feature and settings by default in SDK tests, unless explicitly disabled.// Without this, SDK components will not render due to missing token features and settings.- if (!storeInitialState.settings && initialState.settings) {- initialState.settings.values["token-features"].embedding_sdk = true;- initialState.settings.values["enable-embedding-sdk"] = true;+ if (!storeInitialState.settings && seededSettings) {+ seededSettings.values["token-features"].embedding_sdk = true;+ seededSettings.values["enable-embedding-sdk"] = true;+ }++ if (seededSettings?.values) {+ // Unjustified type cast. FIXME+ initialState = {+ ...initialState,+ [Api.reducerPath]: seedApiQueryCache(+ // Unjustified type cast. FIXME+ (initialState as Partial<State>)[Api.reducerPath],+ [+ {+ endpointName: "getSessionProperties",+ value: seededSettings.values,+ },+ ],+ ),+ } as SdkStoreState;}const storeMiddleware = _.compact([Api.middleware]);diff --git a/frontend/src/embedding-sdk-shared/types/auth-state.ts b/frontend/src/embedding-sdk-shared/types/auth-state.tsindex 0b77a3071a8..66fdfe80b42 100644--- a/frontend/src/embedding-sdk-shared/types/auth-state.ts+++ b/frontend/src/embedding-sdk-shared/types/auth-state.ts@@ -1,5 +1,5 @@import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";-import type { User } from "metabase-types/api";+import type { EnterpriseSettings, User } from "metabase-types/api";export const SDK_AUTH_STATE_KEY = "METABASE_EMBEDDING_SDK_AUTH_STATE";@@ -29,6 +29,6 @@ export interface SdkAuthState {status: SdkAuthStatus;session?: MetabaseEmbeddingSessionToken;user?: User;- siteSettings?: Record<string, any>;+ siteSettings?: EnterpriseSettings;error?: Error;}diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.tsindex 043a5159d6d..b7a22cda3ce 100644--- a/frontend/src/metabase-types/api/mocks/settings.ts+++ b/frontend/src/metabase-types/api/mocks/settings.ts@@ -366,6 +366,8 @@ export const createMockSettings = ("saml-attribute-group": null,"saml-group-sync": null,"saml-group-mappings": null,+ "jwt-group-mappings": null,+ "oidc-group-mappings": null,"scim-enabled": false,"scim-base-url": "http://localhost:3000/api/ee/scim/v2/","snowplow-url": "",diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 94f7073d6b7..b84b60c3acb 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -714,7 +714,7 @@ export type UserSettings = {** To further complicate things, there are two endpoints for fetching settings:* - `GET /api/setting` that _can only be used by admins!_ — returns `403` for non-admins.- * - `GET /api/session/properties` that can be used by any user (returns `200`), but some settings might be omitted (unavailable).+ * - `GET /api/session/properties` that can be used by any user (returns `200`), but some settings might be omitted.*/export type Settings = InstanceSettings &PublicSettings &@@ -805,6 +805,8 @@ export interface EnterpriseSettings extends Settings {"saml-attribute-group": string | null;"saml-group-sync": boolean | null;"saml-group-mappings": Record<string, GroupId[]> | null;+ "jwt-group-mappings": Record<string, GroupId[]> | null;+ "oidc-group-mappings": Record<string, GroupId[]> | null;"database-replication-enabled": boolean | null;"database-replication-connections"?: DatabaseReplicationConnections | null;"embedding-hub-test-embed-snippet-created": boolean;diff --git a/frontend/src/metabase/AppComponent.tsx b/frontend/src/metabase/AppComponent.tsxindex dc08f9d10b3..22b4860ac2b 100644--- a/frontend/src/metabase/AppComponent.tsx+++ b/frontend/src/metabase/AppComponent.tsx@@ -1,5 +1,6 @@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 {@@ -112,6 +113,10 @@ function App({usePageTitle(applicationName, { titleIndex: 0 });useTokenRefresh();+ // App-wide subscription that keeps the settings cache alive for the whole+ // session and makes `session-properties` invalidations refetch.+ // In RTK if there is no active subscriber, invalidating a tag does not trigger a refetch.+ useGetSettingsQuery();useEffect(() => {initializeIframeResizer();diff --git a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsxindex d7cd7b3503b..add469808bc 100644--- a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.unit.spec.tsx@@ -665,7 +665,10 @@ describe("AIProviderSettingsSection", () => {it("shows Connect instead of Disconnect when the configured API key input is dirty", async () => {await setup();- await screen.findByLabelText("API key");+ // Wait for the saved key from the setting-details+ await waitFor(() =>+ expect(screen.getByLabelText("API key")).not.toHaveValue(""),+ );expect(screen.getByRole("button", { name: "Disconnect" }),@@ -752,7 +755,10 @@ describe("AIProviderSettingsSection", () => {},});- expect(await screen.findByLabelText("API key")).toBeDisabled();+ // Wait for the env-backed state from setting-details+ await waitFor(() => {+ expect(screen.getByLabelText("API key")).toBeDisabled();+ });expect(await screen.findByText("Anthropic API key expired or invalid"),).toBeInTheDocument();@@ -2065,11 +2071,17 @@ describe("AIProviderSettingsSection", () => {apiKeyValues: { azure: "**********ey" },});- expect(await screen.findByLabelText("Model provider")).toHaveValue(- "Anthropic",+ // The saved values hydrate from the async setting-details fetch, so+ // wait for them rather than asserting synchronously.+ await waitFor(() =>+ expect(screen.getByLabelText("Model provider")).toHaveValue(+ "Anthropic",+ ),);- expect(screen.getByLabelText("Base URL")).toHaveValue(- "https://my-resource.services.ai.azure.com/anthropic",+ await waitFor(() =>+ expect(screen.getByLabelText("Base URL")).toHaveValue(+ "https://my-resource.services.ai.azure.com/anthropic",+ ),);expect(screen.getByLabelText("Deployment name")).toHaveValue("claude-sonnet-4-5",@@ -2091,6 +2103,11 @@ describe("AIProviderSettingsSection", () => {});const deploymentInput = await screen.findByLabelText("Deployment name");+ // Wait for the saved deployment to hydrate before editing it — clearing+ // the still-empty input is a no-op the arriving value then overwrites.+ await waitFor(() =>+ expect(deploymentInput).toHaveValue("claude-sonnet-4-5"),+ );await userEvent.clear(deploymentInput);await userEvent.type(deploymentInput, "renamed-deployment");@@ -2572,6 +2589,18 @@ describe("AIProviderSettingsSection with divergent settings reads", () => {expect(screen.getByLabelText("Model")).toHaveValue("Claude Sonnet 4.6");});+ // Let the session-properties refetch land before arming the one-shot stale marker.+ // Otherwise that in-flight refetch consumes it and the model-pick refetch below+ // gets fresh data instead of stale.+ await waitFor(() => {+ expect(+ fetchMock.callHistory.calls("path:/api/session/properties"),+ ).toHaveLength(2);+ });+ await act(async () => {+ await fetchMock.callHistory.flush(true);+ });+markNextSessionPropertiesReadStale();await userEvent.click(screen.getByLabelText("Model"));@@ -2583,8 +2612,10 @@ describe("AIProviderSettingsSection with divergent settings reads", () => {expect(backend.providerRow).toBe("anthropic/claude-sonnet-5");});+ // Wait for the stale refetch to flip the section back to the setup layout+ // then check the form kept the new selection instead of resetting to the stale snapshot.+ expect(await screen.findByLabelText("Provider")).toHaveValue("Anthropic");expect(screen.getByLabelText("API key")).toBeInTheDocument();expect(screen.getByLabelText("Model")).toHaveValue("Claude Sonnet 5");- expect(screen.getByLabelText("Provider")).toHaveValue("Anthropic");});});diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsxindex 3bd2642a38a..212461aa35d 100644--- a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx@@ -142,10 +142,24 @@ const setup = async ({},});+ // Wait for the settings queries to settle before returning.+ // When AI features are off the MCP toggles stay disabled by design, so there we just await render.if (page === "mcp") {- await screen.findByRole("switch", { name: "MCP server" });+ if (aiFeaturesEnabled) {+ await waitFor(() =>+ expect(+ screen.getByRole("switch", { name: "MCP server" }),+ ).toBeEnabled(),+ );+ } else {+ await screen.findByRole("switch", { name: "MCP server" });+ }} else {- await screen.findByText("Disable all AI features");+ await waitFor(() =>+ expect(+ screen.getByRole("switch", { name: "Disable all AI features" }),+ ).toBeEnabled(),+ );}return view;diff --git a/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx b/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsxindex 55882ba07d1..e4c06fa5111 100644--- a/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx@@ -16,8 +16,9 @@ import { McpServerUrlSection } from "./MCPServerUrlSection";const SITE_URL = "https://metabase.example.com";const MCP_URL = `${SITE_URL}/api/metabase-mcp`;-function setup({ siteUrl = SITE_URL }: { siteUrl?: string | undefined } = {}) {- const settings = createMockSettings({ "site-url": siteUrl });+function setup({ siteUrl = SITE_URL }: { siteUrl?: string | null } = {}) {+ // site-url setting can take null, but it's type doesn't reflect that+ const settings = createMockSettings({ "site-url": siteUrl as string });setupPropertiesEndpoints(settings);setupSettingsEndpoints([]);@@ -43,7 +44,7 @@ describe("McpServerUrlSection", () => {});it("renders nothing when site-url is not set", () => {- setup({ siteUrl: undefined });+ setup({ siteUrl: null });expect(screen.queryByDisplayValue(MCP_URL)).not.toBeInTheDocument();});diff --git a/frontend/src/metabase/admin/app/actions.ts b/frontend/src/metabase/admin/app/actions.tsindex 6e9f8ede05e..b6545cb352c 100644--- a/frontend/src/metabase/admin/app/actions.ts+++ b/frontend/src/metabase/admin/app/actions.ts@@ -1,4 +1,4 @@-import { updateSetting } from "metabase/redux/settings";+import { settingsApi } from "metabase/api";import { createAsyncThunk } from "metabase/redux/utils";import { getCurrentVersion } from "./selectors";@@ -6,10 +6,11 @@ import { getCurrentVersion } from "./selectors";export const disableNotice = createAsyncThunk("metabase/admin/app/DISABLE_NOTICE",async (_, { getState, dispatch }) => {- const setting = {- key: "deprecation-notice-version",- value: getCurrentVersion(getState()),- };- await dispatch(updateSetting(setting));+ await dispatch(+ settingsApi.endpoints.updateSetting.initiate({+ key: "deprecation-notice-version",+ value: getCurrentVersion(getState()),+ }),+ ).unwrap();},);diff --git a/frontend/src/metabase/admin/app/selectors.ts b/frontend/src/metabase/admin/app/selectors.tsindex 354203207fa..05623353bec 100644--- a/frontend/src/metabase/admin/app/selectors.ts+++ b/frontend/src/metabase/admin/app/selectors.ts@@ -1,6 +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 type Database from "metabase-lib/v1/metadata/Database";interface Props {@@ -19,10 +20,10 @@ export const hasDeprecatedDatabase = (state: State, props: Props): boolean => {export const isDeprecationNoticeEnabled = (state: State): boolean => {// check if the deprecation notice has been dismissed on this versionreturn (- state.settings?.values?.version?.tag !==- state.settings?.values?.["deprecation-notice-version"]+ getSetting(state, "version")?.tag !==+ getSetting(state, "deprecation-notice-version"));};export const getCurrentVersion = (state: State) =>- state.settings?.values.version?.tag ?? "";+ getSetting(state, "version")?.tag ?? "";diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsxindex 05cdf072497..ee9183101e1 100644--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx@@ -16,8 +16,7 @@ import {import { ExternalLink } from "metabase/common/components/ExternalLink";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { useDocsUrl, useSetting, useToast } from "metabase/common/hooks";-import { useDispatch, useSelector } from "metabase/redux";-import { refreshSiteSettings } from "metabase/redux/settings";+import { useSelector } from "metabase/redux";import {getApplicationName,getShowMetabaseLinks,@@ -73,7 +72,6 @@ export const ModelPersistenceConfiguration = () => {"persisted-model-refresh-cron-schedule",);- const dispatch = useDispatch();const [sendToast, removeToast] = useToast();const [enablePersist] = useEnablePersistMutation();const [disablePersist] = useDisablePersistMutation();@@ -115,8 +113,8 @@ export const ModelPersistenceConfiguration = () => {const promise = shouldEnable? enablePersist().unwrap(): disablePersist().unwrap();+ // The mutations invalidate session-properties, which refetches settings.await resolveWithToasts([promise]);- dispatch(refreshSiteSettings());};const { url: docsUrl } = useDocsUrl("data-modeling/model-persistence");@@ -169,7 +167,6 @@ export const ModelPersistenceConfiguration = () => {onChange={async (value: string) => {await resolveWithToasts([setRefreshSchedule({ cron: value }).unwrap(),- dispatch(refreshSiteSettings()),]);}}/>diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsxindex c5df3468cf0..3d995bcad94 100644--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx@@ -7,6 +7,7 @@ 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 { createMockSettings } from "metabase-types/api/mocks";@@ -39,9 +40,24 @@ const setup = ({const state = createMockState({ settings: mockSettings(settings) });- return renderWithProviders(<ModelPersistenceConfiguration />, {- storeInitialState: state,- });+ // The default settings subscription is managed in AppComponent.+ // This component doesn't create a subscription itself, but in RTK+ // invalidating a tag with no active subscriber doesn't refetch.+ // So we need to create a subscriber for this test to test the invalidation and refetching behaviour+ const SettingsSubscriber = () => {+ useGetSettingsQuery();+ return null;+ };++ return renderWithProviders(+ <>+ <SettingsSubscriber />+ <ModelPersistenceConfiguration />+ </>,+ {+ storeInitialState: state,+ },+ );};describe("ModelPersistenceConfiguration", () => {@@ -102,10 +118,20 @@ describe("ModelPersistenceConfiguration", () => {it("refetches site settings after toggling", async () => {setup({ persistedModelsEnabled: false });+ // the mounted settings subscription fetches once on mount+ await waitFor(() => {+ expect(+ fetchMock.callHistory.calls(SESSION_PROPERTIES_URL),+ ).toHaveLength(1);+ });+await userEvent.click(screen.getByRole("switch"));+ // enablePersist invalidates session-properties → the subscription refetchesawait waitFor(() => {- expect(fetchMock.callHistory.called(SESSION_PROPERTIES_URL)).toBe(true);+ expect(+ fetchMock.callHistory.calls(SESSION_PROPERTIES_URL),+ ).toHaveLength(2);});});});diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsxindex d68cf7fa51d..26bc99afe8b 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx@@ -1,24 +1,22 @@import { t } from "ttag";-import { useDispatch, useSelector } from "metabase/redux";-import { updateUserSetting } from "metabase/redux/settings";+import { useUpdateSettingMutation } from "metabase/api";+import { useSelector } from "metabase/redux";import { getDocsUrl } from "metabase/selectors/settings";import { Alert, Anchor, Box, Icon } from "metabase/ui";export const PermissionsEditorSplitPermsMessage = () => {- const dispatch = useDispatch();+ const [updateSetting] = useUpdateSettingMutation();const docsUrl = useSelector((state) =>getDocsUrl(state, { page: "permissions/no-self-service-deprecation" }),);const handleDismiss = () => {- dispatch(- updateUserSetting({- key: "show-updated-permission-banner",- value: false,- }),- );+ updateSetting({+ key: "show-updated-permission-banner",+ value: false,+ });};return (diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsxindex ad362712fad..51961a0c1e0 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx@@ -1,5 +1,5 @@import type { ReactNode } from "react";-import { useCallback } from "react";+import { useCallback, useState } from "react";import { t } from "ttag";import {@@ -15,9 +15,8 @@ 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 { useToggle } from "metabase/common/hooks/use-toggle";+import { useUserSetting } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";-import { updateUserSetting } from "metabase/redux/settings";import { push } from "metabase/router";import {Group,@@ -57,7 +56,7 @@ type PermissionsPageLayoutProps = {navigateToLocation?: (location: string) => void;navigateToTab?: (tab: string) => void;helpContent?: ReactNode;- showSplitPermsModal?: boolean;+ canShowSplitPermsModal?: boolean;};const CloseSidebarButtonWithDefault = ({@@ -76,10 +75,18 @@ export function PermissionsPageLayout({onSave,onLoad,helpContent,- showSplitPermsModal: _showSplitPermsModal = false,+ canShowSplitPermsModal = false,}: PermissionsPageLayoutProps) {- const [showSplitPermsModal, { turnOff: disableSplitPermsModal }] =- useToggle(_showSplitPermsModal);+ const [showModalSetting, setShowModalSetting] = useUserSetting(+ "show-updated-permission-modal",+ { shouldDebounce: false },+ );+ // Stops the split permissions modal from reopening after the user dismisses it once,+ // even if the save fails+ const [isSplitPermsModalDismissed, setIsSplitPermsModalDismissed] =+ useState(false);+ const showSplitPermsModal =+ canShowSplitPermsModal && !!showModalSetting && !isSplitPermsModalDismissed;const saveError = useSelector((state) => state.admin.permissions.saveError);const showRefreshModal = useSelector(showRevisionChangedModal);@@ -99,10 +106,8 @@ export function PermissionsPageLayout({}, [dispatch]);const handleDimissSplitPermsModal = () => {- disableSplitPermsModal();- dispatch(- updateUserSetting({ key: "show-updated-permission-modal", value: false }),- );+ setIsSplitPermsModalDismissed(true);+ setShowModalSetting(false);};return (diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsxindex ed0ed62050b..e50d7526417 100644--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx@@ -10,7 +10,6 @@ import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";import { useDispatch, useSelector } from "metabase/redux";import { Outlet, useParams } from "metabase/router";import { getMetadataUnfiltered } from "metabase/selectors/metadata";-import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";import type Database from "metabase-lib/v1/metadata/Database";import type { GroupInfo } from "metabase-types/api";@@ -40,9 +39,6 @@ function DataPermissionsPage() {const groups = data ?? EMPTY_GROUP_LIST;const isDirty = useSelector(getIsDirty);const diff = useSelector((state) => getDiff(state, { databases, groups }));- const showSplitPermsModal = useSelector((state) =>- getSetting(state, "show-updated-permission-modal"),- );const dispatch = useDispatch();const resetPermissions = () => dispatch(restoreLoadedPermissions());@@ -97,7 +93,7 @@ function DataPermissionsPage() {diff={diff}isDirty={isDirty}helpContent={<DataPermissionsHelp />}- showSplitPermsModal={showSplitPermsModal}+ canShowSplitPermsModal><Outlet /></PermissionsPageLayout>diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsxindex 5717a56c5eb..c61c0059e33 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx@@ -3,12 +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 { useDispatch, useSelector } from "metabase/redux";-import { refreshSiteSettings } from "metabase/redux/settings";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Box } from "metabase/ui";import type { CloudMigration } from "metabase-types/api/cloud-migration";@@ -39,7 +39,7 @@ export const CloudPanel = ({getPollingInterval = defaultGetPollingInterval,onMigrationStart = openCheckoutInNewTab,}: CloudPanelProps) => {- const dispatch = useDispatch();+ const [refetchSiteSettings] = useLazyGetSettingsQuery();const [pollingInterval, setPollingInterval] = useState<number | undefined>(undefined,);@@ -68,10 +68,10 @@ export const CloudPanel = ({useEffect(function syncSiteSettings() {if (migrationState) {- dispatch(refreshSiteSettings());+ refetchSiteSettings();}},- [dispatch, migrationState],+ [refetchSiteSettings, migrationState],);const [createCloudMigration, createCloudMigrationResult] =@@ -83,8 +83,8 @@ export const CloudPanel = ({);const handleCreateMigration = async () => {+ // createCloudMigration invalidates session-properties, which refetches settings.const newMigration = await createCloudMigration().unwrap();- await dispatch(refreshSiteSettings());onMigrationStart(storeUrl, plan, newMigration);};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 0bb03afba4c..fe93cdc79d4 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,6 +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 type { CloudMigration } from "metabase-types/api/cloud-migration";import { createMockSettings, createMockUser } from "metabase-types/api/mocks";@@ -30,8 +31,9 @@ const setup = () => {},);- const storeUrl = store.getState().settings.values["store-url"];- const plan = getPlan(store.getState().settings.values["token-features"]);+ const settings = getSettings(store.getState());+ const storeUrl = settings["store-url"];+ const plan = getPlan(settings["token-features"]);const metabaseStoreLink = `${storeUrl}/checkout?migration-source-plan=${plan}&migration-id=${BASE_RESPONSE.external_id}`;return { mockMigrationStart, store, metabaseStoreLink };diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsxindex b5cebbc781f..2b031ff65aa 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsx@@ -57,7 +57,7 @@ const setup = async (props: {},);- await screen.findByText(/From Name|SMTP/);+ await screen.findByText(props.hosted ? /SMTP/ : "From Name");await waitFor(async () => {const gets = await findRequests("GET");expect(gets).toHaveLength(2); // 2 settings fetches@@ -67,7 +67,6 @@ const setup = async (props: {describe("EmailSettingsPage", () => {it("should render an EmailSettingsPage", async () => {await setup({});-["From Name","From Address",@@ -75,7 +74,7 @@ describe("EmailSettingsPage", () => {"Add Recipients as CC or BCC","Approved domains for notifications","Suggest recipients on dashboard subscriptions and alerts",- ].forEach(async (text) => {+ ].forEach((text) => {expect(screen.getByText(text)).toBeInTheDocument();});});diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsxindex 0339112e525..dee4941984e 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { act } from "react-dom/test-utils";import {findRequests,@@ -53,11 +52,13 @@ const setup = async () => {},},);++ await screen.findByText("Instance language");};describe("LocalizationSettingsPage", () => {it("should render a LocalizationSettingsPage", async () => {- await act(() => setup());+ await setup();["Instance language","Report timezone",@@ -69,25 +70,23 @@ describe("LocalizationSettingsPage", () => {});it("should update multiple settings", async () => {- setup();+ await setup();const blur = async () => {const elementOutside = screen.getByText("Dates and times");await userEvent.click(elementOutside); // blur};- const timezoneInput = await screen.findByLabelText("Report timezone");+ const timezoneInput = screen.getByLabelText("Report timezone");await userEvent.clear(timezoneInput);await userEvent.type(timezoneInput, "Mount");await userEvent.click(await screen.findByText("US/Mountain"));blur();- const startOfWeekInput = await screen.findByLabelText(- "First day of the week",- );+ const startOfWeekInput = screen.getByLabelText("First day of the week");await userEvent.click(startOfWeekInput);await userEvent.click(await screen.findByText("Tuesday"));blur();- const currencyInput = await screen.findByLabelText("Unit of currency");+ const currencyInput = screen.getByLabelText("Unit of currency");await userEvent.click(currencyInput);await userEvent.click(await screen.findByText("New Zealand Dollar"));blur();diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsxindex 15ad967f52d..8d66e66869f 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsx@@ -1,5 +1,4 @@import userEvent from "@testing-library/user-event";-import { act } from "react-dom/test-utils";import {findRequests,@@ -77,13 +76,13 @@ const setup = async (enablePublicSharing = false) => {},},);++ await screen.findByText("Enable Public Sharing");};describe("PublicSharingSettingsPage", () => {it("should render the PublicSharingSettingsPage with public sharing disabled", async () => {- await act(() => setup(false));-- expect(screen.getByText("Enable Public Sharing")).toBeInTheDocument();+ await setup(false);["Shared dashboards",@@ -100,17 +99,19 @@ describe("PublicSharingSettingsPage", () => {});it("should render the PublicSharingSettingsPage with public sharing enabled", async () => {- await act(() => setup(true));+ await setup(true);++ // Each list loads from its own endpoint, so await one row per list.+ expect(await screen.findByText("Test Action")).toBeInTheDocument();+ expect(await screen.findByText("Test Dashboard")).toBeInTheDocument();+ expect(await screen.findByText("Test Question")).toBeInTheDocument();+ expect(await screen.findByText("Test Document")).toBeInTheDocument();+[- "Enable Public Sharing","Shared dashboards","Shared questions","Shared action forms","Shared documents",- "Test Action",- "Test Dashboard",- "Test Question",- "Test Document",].forEach((text) => {expect(screen.getByText(text)).toBeInTheDocument();});@@ -124,7 +125,7 @@ describe("PublicSharingSettingsPage", () => {expect(screen.queryByText("Shared Documents")).not.toBeInTheDocument();// Toggle public sharing on- const toggle = await screen.findByRole("switch");+ const toggle = screen.getByRole("switch");await userEvent.click(toggle);await waitFor(async () => {diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsxindex d6afb270111..7ff2a7115d5 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx@@ -1,5 +1,3 @@-import { act } from "react-dom/test-utils";-import {setupPropertiesEndpoints,setupSettingEndpoint,@@ -73,68 +71,62 @@ const setup = async (props: {},},);++ await screen.findByText(+ props.isHosted ? /We're a little lost/ : "Check for updates",+ );};describe("UpdatesSettingsPage", () => {it("should render a UpdatesSettingsPage", async () => {- await act(() =>- setup({- isHosted: false,- versionTag: "v1.53.8",- }),- );-- [- "Check for updates",- "You're running Metabase 1.53.8 which is the latest and greatest!",- ].forEach((text) => {- expect(screen.getByText(text)).toBeInTheDocument();+ await setup({+ isHosted: false,+ versionTag: "v1.53.8",});++ expect(screen.getByText("Check for updates")).toBeInTheDocument();+ expect(+ screen.getByText(+ "You're running Metabase 1.53.8 which is the latest and greatest!",+ ),+ ).toBeInTheDocument();});it("should load initial settings", async () => {- await act(() =>- setup({- isHosted: false,- versionTag: "v1.53.8",- }),- );- expect(await screen.findByRole("switch")).toBeChecked();+ await setup({+ isHosted: false,+ versionTag: "v1.53.8",+ });+ expect(screen.getByRole("switch")).toBeChecked();});it("should show upsell when not hosted", async () => {- await act(() =>- setup({- isHosted: false,- isPro: false,- versionTag: "v1.53.8",- }),- );+ await setup({+ isHosted: false,+ isPro: false,+ versionTag: "v1.53.8",+ });expect(await screen.findByText("Migrate to Metabase Cloud"),).toBeInTheDocument();});it("should not show upsell to self-hosted pro users", async () => {- await act(() =>- setup({- isHosted: false,- isPro: true,- versionTag: "v1.53.8",- }),- );+ await setup({+ isHosted: false,+ isPro: true,+ versionTag: "v1.53.8",+ });expect(screen.queryByText("Migrate to Metabase Cloud"),).not.toBeInTheDocument();});it("should not show upsell when hosted", async () => {- await act(() =>- setup({- isHosted: true,- versionTag: "v1.53.8",- }),- );+ await setup({+ isHosted: true,+ versionTag: "v1.53.8",+ });expect(screen.queryByText("Migrate to Metabase Cloud"),).not.toBeInTheDocument();diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsxindex 9e95d8ab927..49951dbb603 100644--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsx@@ -2,9 +2,8 @@ import userEvent from "@testing-library/user-event";import {findRequests,- setupPropertiesEndpoints,setupSettingsEndpoints,- setupUpdateSettingEndpoint,+ setupStatefulSettingsEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";@@ -19,8 +18,13 @@ import { FormattingWidget } from "./FormattingWidget";const setup = async () => {const settings = createMockSettings();- setupPropertiesEndpoints(settings);- setupUpdateSettingEndpoint();++ // Stateful mock: the widget saves one key then reads the refreshed settings+ // (session-properties is refetched on every save via tag invalidation), so+ // the properties endpoint must reflect prior PUTs — a static response would+ // hand back the pre-save snapshot and drop accumulated changes.+ setupStatefulSettingsEndpoints(settings);+setupSettingsEndpoints(Object.entries(settings).map(([key, value]) =>// Unjustified type cast. FIXMEdiff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsxindex 808608ce45e..2b12baedda7 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx@@ -1,35 +1,33 @@import { useCallback } from "react";import {+ sessionApi,useClearGroupMembershipMutation,useDeletePermissionsGroupMutation,useListPermissionsGroupsQuery,+ useUpdateSettingMutation,} from "metabase/api";import { useDispatch, useSelector } from "metabase/redux";-import { updateSetting } from "metabase/redux/settings";import { getSetting } from "metabase/selectors/settings";import type { GroupId, GroupInfo } from "metabase-types/api";-import type { Settings } from "metabase-types/api/settings";+import type { MappingSettingKey } from "./GroupMappingsWidgetView";import { GroupMappingsWidgetView } from "./GroupMappingsWidgetView";const EMPTY_GROUP_LIST: GroupInfo[] = [];type GroupMappingsWidgetProps = {- mappingSetting: string;+ mappingSetting: MappingSettingKey;[key: string]: unknown;};export function GroupMappingsWidget(props: GroupMappingsWidgetProps) {const dispatch = useDispatch();+ const [updateSetting] = useUpdateSettingMutation();const { data } = useListPermissionsGroupsQuery({});const allGroups = data ?? EMPTY_GROUP_LIST;const mappings = useSelector(- (state) =>- // Unjustified type cast. FIXME- (getSetting(state, props.mappingSetting as keyof Settings) as- | Record<string, GroupId[]>- | undefined) ?? {},+ (state) => getSetting(state, props.mappingSetting) ?? {},);const [deletePermissionsGroup] = useDeletePermissionsGroupMutation();@@ -44,10 +42,24 @@ export function GroupMappingsWidget(props: GroupMappingsWidgetProps) {[clearGroupMembership],);const handleUpdateSetting = useCallback(- async (args: { key: string; value: Record<string, GroupId[]> }) => {- await dispatch(updateSetting(args));+ async (args: {+ key: MappingSettingKey;+ value: Record<string, GroupId[]>;+ }) => {+ await updateSetting(args).unwrap();+ // 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 value+ dispatch(+ sessionApi.util.updateQueryData(+ "getSessionProperties",+ undefined,+ (draft) => {+ draft[args.key] = args.value;+ },+ ),+ );},- [dispatch],+ [updateSetting, dispatch],);return (diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.tsxindex 73d0053ec16..a2170a9fbe9 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.unit.spec.tsx@@ -5,6 +5,7 @@ import { FormProvider } from "metabase/forms";import type { GroupId, GroupInfo } from "metabase-types/api";import { createMockGroup } from "metabase-types/api/mocks";+import type { MappingSettingKey } from "./GroupMappingsWidgetView";import { GroupMappingsWidgetView } from "./GroupMappingsWidgetView";const defaultGroups: GroupInfo[] = [@@ -21,7 +22,7 @@ const defaultMappings: Record<string, GroupId[]> = {type SetupOptions = {mappings?: Record<string, GroupId[]>;- mappingSetting?: string;+ mappingSetting?: MappingSettingKey;clearGroupMember?: jest.Mock;deleteGroup?: jest.Mock;updateSetting?: jest.Mock;diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsxindex f582d9d24d3..088cda4402f 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx@@ -28,6 +28,13 @@ import { MappingRow } from "./MappingRow";const groupIsMappable = (group: GroupInfo) => !isDefaultGroup(group);+/** The auth-provider group-mapping settings this widget can edit. */+export type MappingSettingKey =+ | "ldap-group-mappings"+ | "saml-group-mappings"+ | "jwt-group-mappings"+ | "oidc-group-mappings";+const helpText = (mappingSetting: string) => {if (mappingSetting === "jwt-group-mappings") {return t`Mappings allow Metabase to automatically add and remove users from groups based on the membership information provided by the directory server. If no mappings are defined, groups will automatically be assigned based on exactly matching names.`;@@ -49,14 +56,14 @@ interface GroupMappingsWidgetViewProps {groupHeading: string;groupPlaceholder: string;allGroups: GroupInfo[];- mappingSetting: string; // seems like this should be SettingKey but we pass in values like "jwt-group-mappings"+ mappingSetting: MappingSettingKey;deleteGroup: ({ id }: { id: number }) => Promise<void>;clearGroupMember: ({ id }: { id: number }) => Promise<void>;updateSetting: ({key,value,}: {- key: string;+ key: MappingSettingKey;value: Record<string, GroupId[]>;}) => Promise<void>;mappings: Record<string, GroupId[]>;diff --git a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsxindex c284926619e..61e90d01e8f 100644--- a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx@@ -21,6 +21,7 @@ import {} from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";import { PLUGIN_HOMEPAGE_SETTING } from "metabase/plugins";+import { createMockSettingsState } from "metabase/redux/store/mocks";import {createMockCollection,createMockCollectionItem,@@ -120,6 +121,7 @@ const setup = ({<HomepageSetting /><UndoListing /></div>,+ { storeInitialState: { settings: createMockSettingsState(settings) } },);};diff --git a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsxindex 21b15fc255b..6dc95e7743c 100644--- a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsx@@ -2,12 +2,12 @@ import userEvent from "@testing-library/user-event";import {findRequests,- setupPropertiesEndpoints,setupSettingsEndpoints,- setupUpdateSettingEndpoint,+ setupStatefulSettingsEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";+import { createMockSettingsState } from "metabase/redux/store/mocks";import {createMockSettingDefinition,createMockSettings,@@ -33,8 +33,7 @@ const setup = ({[SETTING_NAME]: value,});- setupPropertiesEndpoints(settings);- setupUpdateSettingEndpoint();+ setupStatefulSettingsEndpoints(settings);setupSettingsEndpoints([createMockSettingDefinition({key: SETTING_NAME,@@ -50,6 +49,11 @@ const setup = ({<AnonymousTrackingInput /><UndoListing /></div>,+ {+ storeInitialState: {+ settings: createMockSettingsState({ [SETTING_NAME]: value }),+ },+ },);};@@ -67,6 +71,7 @@ describe("AnonymousTrackingInput", () => {it("should toggle the anonymous tracking setting off", async () => {setup({ value: true });+ expect(screen.getByRole("switch")).toBeChecked();await userEvent.click(screen.getByRole("switch"));expect(trackingFN).toHaveBeenCalledWith(false);@@ -79,6 +84,7 @@ describe("AnonymousTrackingInput", () => {it("should toggle the anonymous tracking setting on", async () => {setup({ value: false });+ expect(screen.getByRole("switch")).not.toBeChecked();await userEvent.click(screen.getByRole("switch"));const [{ url, body }] = await findRequests("PUT");diff --git a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsxindex 827573e5319..e76c4c9c455 100644--- a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsx@@ -2,12 +2,12 @@ import userEvent from "@testing-library/user-event";import {findRequests,- setupPropertiesEndpoints,setupSettingsEndpoints,- setupUpdateSettingEndpoint,+ setupStatefulSettingsEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";+import { createMockSettingsState } from "metabase/redux/store/mocks";import {createMockSettingDefinition,createMockSettings,@@ -31,8 +31,7 @@ const setup = ({[SETTING_NAME]: value,});- setupPropertiesEndpoints(settings);- setupUpdateSettingEndpoint();+ setupStatefulSettingsEndpoints(settings);setupSettingsEndpoints([createMockSettingDefinition({key: SETTING_NAME,@@ -49,6 +48,11 @@ const setup = ({<CollectUserDataInput /><UndoListing /></div>,+ {+ storeInitialState: {+ settings: createMockSettingsState({ [SETTING_NAME]: value }),+ },+ },);};@@ -74,6 +78,7 @@ describe("CollectUserDataInput", () => {it("should toggle the `analytics-pii-retention-enabled` setting off", async () => {setup({ value: true });+ expect(screen.getByRole("switch")).toBeChecked();await userEvent.click(screen.getByRole("switch"));expect(trackSimpleEvent).toHaveBeenCalledWith({event: "analytics_pii_retention_changed",@@ -90,6 +95,7 @@ describe("CollectUserDataInput", () => {it("should toggle the `analytics-pii-retention-enabled` setting on", async () => {setup({ value: false });+ expect(screen.getByRole("switch")).not.toBeChecked();await userEvent.click(screen.getByRole("switch"));const [{ url, body }] = await findRequests("PUT");diff --git a/frontend/src/metabase/api/cloud-migration.ts b/frontend/src/metabase/api/cloud-migration.tsindex aa699a77297..fd87e6cbc1c 100644--- a/frontend/src/metabase/api/cloud-migration.ts+++ b/frontend/src/metabase/api/cloud-migration.ts@@ -1,7 +1,7 @@import type { CloudMigration } from "metabase-types/api/cloud-migration";import { Api } from "./api";-import { listTag } from "./tags";+import { listTag, tag } from "./tags";export const clouldMigrationApi = Api.injectEndpoints({endpoints: (builder) => ({@@ -9,19 +9,27 @@ export const clouldMigrationApi = Api.injectEndpoints({query: () => `/api/cloud-migration`,providesTags: () => [listTag("cloud-migration")],}),+ // Starting/cancelling a migration flips server-side settings (e.g.+ // read-only mode), so both mutations also invalidate session-properties.createCloudMigration: builder.mutation<CloudMigration, void>({query: () => ({method: "POST",url: `/api/cloud-migration`,}),- invalidatesTags: () => [listTag("cloud-migration")],+ invalidatesTags: () => [+ listTag("cloud-migration"),+ tag("session-properties"),+ ],}),cancelCloudMigration: builder.mutation<void, void>({query: () => ({method: "PUT",url: `/api/cloud-migration/cancel`,}),- invalidatesTags: () => [listTag("cloud-migration")],+ invalidatesTags: () => [+ listTag("cloud-migration"),+ tag("session-properties"),+ ],}),}),});diff --git a/frontend/src/metabase/api/persist.ts b/frontend/src/metabase/api/persist.tsindex d42ec6d0ba0..4ccba434e17 100644--- a/frontend/src/metabase/api/persist.ts+++ b/frontend/src/metabase/api/persist.ts@@ -14,6 +14,7 @@ import {providePersistedInfoListTags,providePersistedInfoTags,providePersistedModelTags,+ tag,} from "./tags";export const persistApi = Api.injectEndpoints({@@ -44,13 +45,18 @@ export const persistApi = Api.injectEndpoints({}),providesTags: (model) => (model ? providePersistedModelTags(model) : []),}),+ // These three change settings server-side (`persisted-models-enabled`,+ // `persisted-model-refresh-cron-schedule`), so they also invalidate session-propertiesenablePersist: builder.mutation<void, void>({query: () => ({method: "POST",url: "/api/persist/enable",}),invalidatesTags: (_, error) =>- invalidateTags(error, [listTag("persisted-info")]),+ invalidateTags(error, [+ listTag("persisted-info"),+ tag("session-properties"),+ ]),}),disablePersist: builder.mutation<void, void>({query: () => ({@@ -58,7 +64,10 @@ export const persistApi = Api.injectEndpoints({url: "/api/persist/disable",}),invalidatesTags: (_, error) =>- invalidateTags(error, [listTag("persisted-info")]),+ invalidateTags(error, [+ listTag("persisted-info"),+ tag("session-properties"),+ ]),}),setRefreshSchedule: builder.mutation<void, PersistedInfoRefreshSchedule>({query: (body) => ({@@ -67,7 +76,10 @@ export const persistApi = Api.injectEndpoints({body,}),invalidatesTags: (_, error) =>- invalidateTags(error, [listTag("persisted-info")]),+ invalidateTags(error, [+ listTag("persisted-info"),+ tag("session-properties"),+ ]),}),}),});diff --git a/frontend/src/metabase/api/session.ts b/frontend/src/metabase/api/session.tsindex 9c11c32ff39..f60e3a32e71 100644--- a/frontend/src/metabase/api/session.ts+++ b/frontend/src/metabase/api/session.ts@@ -1,5 +1,4 @@import type { LoginData } from "metabase/redux/auth";-import { loadSettings } from "metabase/redux/settings";import {isValidColorScheme,setUserColorSchemeAfterUpdate,@@ -115,10 +114,13 @@ export const sessionApi = Api.injectEndpoints({url: sessionPropertiesPath,}),providesTags: ["session-properties"],- onQueryStarted: (_, { queryFulfilled, dispatch }) =>+ // 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) => {- dispatch(loadSettings(data));- // compatibility layer for legacy settings on the window object+ // 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@@ -143,7 +145,19 @@ export const {useForgotPasswordMutation,useCheckPasswordMutation,useGetSessionPropertiesQuery,+ useLazyGetSessionPropertiesQuery,} = sessionApi;-// alias for easier use+// aliases for easier useexport 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/settings.ts b/frontend/src/metabase/api/settings.tsindex 61b0c441500..ad029049578 100644--- a/frontend/src/metabase/api/settings.ts+++ b/frontend/src/metabase/api/settings.ts@@ -9,8 +9,20 @@ import type {} from "metabase-types/api";import { Api } from "./api";+import { sessionApi } from "./session";import { invalidateTags, listTag, tag } from "./tags";+export type UpdateSettingArg = {+ key: EnterpriseSettingKey;+ value: EnterpriseSettingValue<EnterpriseSettingKey>;+};++const putSettingQuery = ({ key, value }: UpdateSettingArg) => ({+ method: "PUT" as const,+ url: `/api/setting/${encodeURIComponent(key)}`,+ body: { value },+});+export const settingsApi = Api.injectEndpoints({endpoints: (builder) => ({// admin-only endpoint that returns all settings with lots of extra metadata@@ -41,18 +53,8 @@ export const settingsApi = Api.injectEndpoints({}),// don't provide a tag, this should never be refetched}),- updateSetting: builder.mutation<- void,- {- key: EnterpriseSettingKey;- value: EnterpriseSettingValue<EnterpriseSettingKey>;- }- >({- query: ({ key, value }) => ({- method: "PUT",- url: `/api/setting/${encodeURIComponent(key)}`,- body: { value },- }),+ updateSetting: builder.mutation<void, UpdateSettingArg>({+ query: putSettingQuery,invalidatesTags: (_, error, { key }) => {return invalidateTags(error, [tag("session-properties"),@@ -77,6 +79,63 @@ export const settingsApi = Api.injectEndpoints({listTag("embedding-hub-checklist"),]),}),+ // This mutation is the cheap write path for user preferences, such as+ // sidebar collapse state, dismissed prompts, and remembered formats.+ // These settings are written during ordinary UI interactions, sometimes+ // on every click, so they must update the UI instantly and must not+ // trigger refetches. To achieve that, this mutation patches the new value+ // into the session-properties cache before the PUT resolves, and it+ // deliberately does not invalidate the session-properties tag.+ // Invalidating would refetch the full settings payload on every toggle,+ // and it would do so twice because the admin setting-details query+ // provides the same tag. The old settings slice gave this kind of write+ // for free by assigning the value into local state, and this mutation is+ // the cache-era replacement.+ //+ // Use `updateSetting` for admin configuration instead. It is pessimistic,+ // meaning it waits for the server and then invalidates and refetches, so+ // the UI never shows state the server has not accepted.+ updateUserSetting: builder.mutation<void, UpdateSettingArg>({+ query: putSettingQuery,+ onQueryStarted: async ({ key, value }, { dispatch, queryFulfilled }) => {+ const patch = dispatch(+ sessionApi.util.updateQueryData(+ "getSessionProperties",+ undefined,+ (draft) => {+ // Unjustified type cast. FIXME+ (draft as Record<string, unknown>)[key] = value;+ },+ ),+ );+ try {+ await queryFulfilled;+ // `patch.patches.length === 0` means the settings cache was still+ // empty when we tried to patch it, because the boot-time settings+ // fetch has not returned yet. That leaves us with two problems:+ //+ // 1. Our optimistic patch did nothing, because `updateQueryData`+ // cannot patch a cache entry that does not exist.+ // 2. The response of that in-flight boot fetch will not contain this+ // write either, because the server produced it before our PUT.+ //+ // So once the boot fetch lands, the cache would hold pre-PUT values+ // and the user's change would be lost. Invalidate the tag to fetch+ // the settings again, now including the write. This is the only case+ // where this mutation causes a refetch.+ if (patch.patches.length === 0) {+ dispatch(+ sessionApi.util.invalidateTags([tag("session-properties")]),+ );+ }+ } catch {+ // The PUT failed, so the server never accepted the optimistically+ // patched value. Roll the cache back to the server's truth so that+ // the UI reverts instead of continuing to show unsaved state.+ patch.undo();+ }+ },+ }),}),});@@ -86,4 +145,5 @@ export const {useGetAdminSettingsDetailsQuery,useUpdateSettingMutation,useUpdateSettingsMutation,+ useUpdateUserSettingMutation,} = settingsApi;diff --git a/frontend/src/metabase/api/utils/settings.ts b/frontend/src/metabase/api/utils/settings.tsindex 07484b3bfba..768958c4bc4 100644--- a/frontend/src/metabase/api/utils/settings.ts+++ b/frontend/src/metabase/api/utils/settings.ts@@ -1,8 +1,11 @@import { useCallback, useMemo } from "react";+import { shallowEqual } from "react-redux";import { t } from "ttag";import _ from "underscore";import { useToast } from "metabase/common/hooks";+import { useSelector } from "metabase/redux";+import { getSetting, getSettings } from "metabase/selectors/settings";import type {EnterpriseSettingKey,EnterpriseSettingValue,@@ -26,7 +29,6 @@ export const useAdminSetting = <SettingName extends EnterpriseSettingKey>(settingName: SettingName,) => {const {- data: settings,isLoading: settingsLoading,isFetching: settingsFetching,...apiProps@@ -107,10 +109,10 @@ export const useAdminSetting = <SettingName extends EnterpriseSettingKey>([updateSettings, sendToast],);- // Unjustified type cast. FIXME- const settingValue = settings?.[- settingName- ] as EnterpriseSettingValue<SettingName>;+ // Read the value through `getSetting` so it resolves from the cache with a+ // synchronous fallback to the bootstrap (available before the fetch resolves),+ // the same as `useSetting`.+ const settingValue = useSelector((state) => getSetting(state, settingName));return {value: settingValue,@@ -175,10 +177,11 @@ export const useAdminSettings = <);type Values = { [K in SettingNames[number]]: EnterpriseSettings[K] };- const values = useMemo(() => {+ const values = useSelector(// Unjustified type cast. FIXME- return (settings ? _.pick(settings, ...settingNames) : {}) as Values;- }, [settings, settingNames]);+ (state) => _.pick(getSettings(state), ...settingNames) as Values,+ shallowEqual,+ );type Details = { [K in SettingNames[number]]: SettingDefinition<K> };const details = useMemo(() => {diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex 8df8f72ba88..73395b2be78 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -30,13 +30,13 @@ 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";import { MetabotProvider } from "metabase/metabot/context";import { PLUGIN_APP_INIT_FUNCTIONS } from "metabase/plugins";import { MetabaseReduxProvider } from "metabase/redux";-import { refreshSiteSettings } from "metabase/redux/settings";import { createV7Navigator } from "metabase/router/v7/navigator";import { getUserId } from "metabase/selectors/user";import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";@@ -111,7 +111,11 @@ function _init(reducers, getRoutes, callback) {registerVisualizations();registerDashboardVisualizations();- store.dispatch(refreshSiteSettings());+ // Populate the settings cache on load for every app entry.+ // The main app also keeps a live `useGetSettingsQuery` subscription in AppComponent,+ // but the public and embed entries don't mount AppComponent/+ // In RTK if there is no active subscriber, invalidating a tag does not trigger a refetch.+ store.dispatch(refetchSiteSettings());PLUGIN_APP_INIT_FUNCTIONS.forEach((init) => init());diff --git a/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsx b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsxindex 91afda5ef2d..208fb8e0901 100644--- a/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsx@@ -14,6 +14,7 @@ import {renderWithProviders,screen,waitForLoaderToBeRemoved,+ within,} from "__support__/ui";import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type { OmniPickerItem } from "metabase/common/components/Pickers";@@ -104,8 +105,13 @@ describe("FormCollectionAndDashboardPicker", () => {);await waitForLoaderToBeRemoved();- // Wait for picker content to load- expect(await screen.findByText("Our analytics")).toBeInTheDocument();+ // Wait for picker content to load. Scope to the modal because the picker button+ // behind it also renders "Our analytics" once the root collection resolves.+ expect(+ await within(screen.getByTestId("entity-picker-modal")).findByText(+ "Our analytics",+ ),+ ).toBeInTheDocument();expect(screen.queryByRole("button", { name: /new dashboard/i }),).not.toBeInTheDocument();diff --git a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts b/frontend/src/metabase/common/hooks/use-setting/use-setting.tsindex 250d34cc128..263247fa8cd 100644--- a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts+++ b/frontend/src/metabase/common/hooks/use-setting/use-setting.ts@@ -1,8 +1,12 @@import { useCallback, useMemo } from "react";import _ from "underscore";-import { useDispatch, useSelector } from "metabase/redux";-import { updateUserSetting } from "metabase/redux/settings";+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";@@ -27,12 +31,20 @@ export const useUserSetting = <T extends keyof UserSettings>(} = {},): [UserSettings[T], (value: UserSettings[T]) => void] => {const currentValue = useSetting(key);- const dispatch = useDispatch();+ // `shouldRefresh` chooses between pessimistic (invalidate + refetch all settings)+ // vs optimistic (patch the one value, no refetch).+ const [updateSetting] = useUpdateSettingMutation();+ const [updateUserSetting] = useUpdateUserSettingMutation();const setter = useCallback((value: UserSettings[T]) => {- dispatch(updateUserSetting({ key, value, shouldRefresh }));+ const mutate = shouldRefresh ? updateSetting : updateUserSetting;+ // Annotate the argument with the mutations' concrete input type. Passing+ // the object literal directly would make TypeScript infer through the+ // generic RTK trigger types, which hits the instantiation depth limit (TS2589).+ const args: UpdateSettingArg = { key, value };+ mutate(args);},- [dispatch, key, shouldRefresh],+ [updateSetting, updateUserSetting, key, shouldRefresh],);const debouncedSetter = useMemo(() => _.debounce(setter, debounceTimeout, debounceOnLeadingEdge),diff --git a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.tsindex 0877f7f4217..19f1e1384e3 100644--- a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts+++ b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts@@ -9,6 +9,7 @@ import {import { createMockEntitiesState } from "__support__/store";import { Api } from "metabase/api";import type { DashboardState, State } from "metabase/redux/store";+import type { StoreSeedState } from "metabase/redux/store/mocks";import {createMockDashboardState,createMockSettingsState,@@ -399,7 +400,7 @@ function setupConcurrencyTest(dashboardId: number, cardCount: number) {});const DASHBOARD = createMockDashboard({ id: dashboardId, dashcards });- const state: Partial<State> = {+ const state: Partial<StoreSeedState> = {dashboard: createMockDashboardState({dashboardId: DASHBOARD.id,dashboards: {@@ -488,7 +489,7 @@ describe("fetchDashboardCardData", () => {dashcards,});- const state: Partial<State> = {+ const state: Partial<StoreSeedState> = {dashboard: createMockDashboardState({dashboardId: DASHBOARD.id,selectedTabId: tab1.id,diff --git a/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts b/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.tsindex 6b20dd56f75..5fe94df6d77 100644--- a/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts+++ b/frontend/src/metabase/embedding/mcp/hooks/useMcpUserAndSettingsFetch.ts@@ -1,9 +1,8 @@import { useEffect, useState } from "react";import type { SdkStore } from "embedding-sdk-bundle/store/types";-import { userApi } from "metabase/api";+import { refetchSiteSettings, userApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";-import { refreshSiteSettings } from "metabase/redux/settings";import { userUpdated } from "metabase/redux/user";import {@@ -62,7 +61,7 @@ export function useMcpUserAndSettingsFetch({store.dispatch,userApi.endpoints.getCurrentUser,),- store.dispatch(refreshSiteSettings()),+ store.dispatch(refetchSiteSettings()),]);if (!isMounted) {diff --git a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsxindex cc1ad050a41..2af7cf87407 100644--- a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx+++ b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx@@ -1,12 +1,12 @@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 { updateSettings } from "metabase/redux/settings";import { addUndo, dismissUndo } from "metabase/redux/undo";import { refreshCurrentUser } from "metabase/redux/user";import { Box, Button, Flex, Modal, Text } from "metabase/ui";@@ -27,15 +27,14 @@ export const CustomHomePageModal = ({}: CustomHomePageModalProps) => {const [dashboardId, setDashboardId] = useState<DashboardId>();const dispatch = useDispatch();+ const [updateSettings] = useUpdateSettingsMutation();const handleSave = async () => {- await dispatch(- updateSettings({- [CUSTOM_HOMEPAGE_DASHBOARD_SETTING_KEY]: dashboardId,- [CUSTOM_HOMEPAGE_SETTING_KEY]: true,- [CUSTOM_HOMEPAGE_REDIRECT_TOAST_KEY]: true,- }),- );+ await updateSettings({+ [CUSTOM_HOMEPAGE_DASHBOARD_SETTING_KEY]: dashboardId,+ [CUSTOM_HOMEPAGE_SETTING_KEY]: true,+ [CUSTOM_HOMEPAGE_REDIRECT_TOAST_KEY]: true,+ }).unwrap();const id = Date.now();await dispatch(diff --git a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts b/frontend/src/metabase/home/components/EmbedHomepage/actions.tsindex 2e06122ba54..a4eb110343f 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts+++ b/frontend/src/metabase/home/components/EmbedHomepage/actions.ts@@ -1,4 +1,4 @@-import { updateSetting } from "metabase/redux/settings";+import { settingsApi } from "metabase/api";import { createAsyncThunk } from "metabase/redux/utils";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";@@ -7,7 +7,12 @@ import { trackEmbeddingHomepageDismissed } from "./analytics";export const dismissEmbeddingHomepage = createAsyncThunk("metabase/embedding-homepage/dismiss",async (reason: EmbeddingHomepageDismissReason, { dispatch }) => {- dispatch(updateSetting({ key: "embedding-homepage", value: reason }));+ dispatch(+ settingsApi.endpoints.updateSetting.initiate({+ key: "embedding-homepage",+ value: reason,+ }),+ );trackEmbeddingHomepageDismissed(reason);},);diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.tsxindex db37913852d..292985d4799 100644--- a/frontend/src/metabase/home/components/HomePage/HomePage.tsx+++ b/frontend/src/metabase/home/components/HomePage/HomePage.tsx@@ -1,10 +1,10 @@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 { updateUserSetting } from "metabase/redux/settings";import { addUndo } from "metabase/redux/undo";import { replace } from "metabase/router";import { getHasDismissedCustomHomePageToast } from "metabase/selectors/app";@@ -29,6 +29,7 @@ const useDashboardRedirect = () => {const { dashboardId, dashboard, isLoading } = useHomepageDashboard();const hasDismissedToast = useSelector(getHasDismissedCustomHomePageToast);const dispatch = useDispatch();+ const [updateSetting] = useUpdateSettingMutation();// This redirect must live inside a useLayoutEffect to prevent the browser from painting a frame of <HomeContent>// before firing the redirect (metabase#69917)@@ -48,12 +49,10 @@ const useDashboardRedirect = () => {icon: "info",timeout: 10000,action: () => {- dispatch(- updateUserSetting({- key: "dismissed-custom-dashboard-toast",- value: true,- }),- );+ updateSetting({+ key: "dismissed-custom-dashboard-toast",+ value: true,+ });},actionLabel: t`Got it`,canDismiss: false,@@ -65,6 +64,7 @@ const useDashboardRedirect = () => {dashboardId,hasDismissedToast,dispatch,+ updateSetting,dashboard?.archived,isLoading,]);diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsxindex 3009ff5f66c..4072168fe5e 100644--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx@@ -74,11 +74,16 @@ export function AIProviderConfigurationForm({const [updateMetabotSettings] = useUpdateMetabotSettingsMutation();const disconnectHandlerRef = useRef<(() => Promise<void>) | null>(null);- const { details: providerApiKeyDetails } = useAdminSettings([- "llm-anthropic-api-key",- "llm-openai-api-key",- "llm-openrouter-api-key",- ] as const);+ // Setting details come from a single admin endpoint, so one `isLoading`+ // covers every provider. Gate the provider fields on it below: their forms+ // use Formik `enableReinitialize`/hydrate-once effects that would wipe+ // in-progress input if they rendered before the saved credentials arrived.+ const { details: providerApiKeyDetails, isLoading: areDetailsLoading } =+ useAdminSettings([+ "llm-anthropic-api-key",+ "llm-openai-api-key",+ "llm-openrouter-api-key",+ ] as const);const disconnectProvider = useCallback(async () => {if (!connectedProvider) {@@ -251,35 +256,37 @@ export function AIProviderConfigurationForm({/>)}- {match(provider)- .with("metabase", () => (- <MetabaseAIProviderSetup onConnect={onClose} />- ))- .with("azure", () => (- <AzureProviderFields- connectedModel={connectedModel}- isCurrentConfigured={isCurrentConfigured}- isEnvSetting={isEnvSetting}- />- ))- .with("bedrock", () => (- <BedrockProviderFields- connectedModel={connectedModel}- isCurrentConfigured={isCurrentConfigured}- isEnvSetting={isEnvSetting}- />- ))- .with("anthropic", "openai", "openrouter", (selectedProvider) => (- <ApiKeyProviderFields- key={selectedProvider}- selectedProvider={selectedProvider}- connectedModel={connectedModel}- isCurrentConfigured={isCurrentConfigured}- isEnvSetting={isEnvSetting}- />- ))- .with(P.nullish, () => null)- .exhaustive()}+ {areDetailsLoading+ ? null+ : match(provider)+ .with("metabase", () => (+ <MetabaseAIProviderSetup onConnect={onClose} />+ ))+ .with("azure", () => (+ <AzureProviderFields+ connectedModel={connectedModel}+ isCurrentConfigured={isCurrentConfigured}+ isEnvSetting={isEnvSetting}+ />+ ))+ .with("bedrock", () => (+ <BedrockProviderFields+ connectedModel={connectedModel}+ isCurrentConfigured={isCurrentConfigured}+ isEnvSetting={isEnvSetting}+ />+ ))+ .with("anthropic", "openai", "openrouter", (selectedProvider) => (+ <ApiKeyProviderFields+ key={selectedProvider}+ selectedProvider={selectedProvider}+ connectedModel={connectedModel}+ isCurrentConfigured={isCurrentConfigured}+ isEnvSetting={isEnvSetting}+ />+ ))+ .with(P.nullish, () => null)+ .exhaustive()}{envSettingName && <SetByEnvVar varName={envSettingName} />}diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsxindex 8bcbe53271f..d1745acf078 100644--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx@@ -1,11 +1,10 @@import { useCallback, useMemo } from "react";import { t } from "ttag";-import { useGetVersionInfoQuery } from "metabase/api";+import { useGetVersionInfoQuery, useUpdateSettingMutation } from "metabase/api";import { useSetting } from "metabase/common/hooks";import { NavbarPromoCard } from "metabase/nav/components/NavbarPromoCard";-import { useDispatch, useSelector } from "metabase/redux";-import { updateSetting } from "metabase/redux/settings";+import { useSelector } from "metabase/redux";import { getIsEmbeddingIframe } from "metabase/selectors/embed";import { getIsWhiteLabeling } from "metabase/selectors/whitelabel";@@ -13,7 +12,7 @@ import Sparkles from "./sparkles.svg?component";import { getLatestEligibleReleaseNotes } from "./utils";export function WhatsNewNotification() {- const dispatch = useDispatch();+ const [updateSetting] = useUpdateSettingMutation();const isEmbeddingIframe = useSelector(getIsEmbeddingIframe);const { data: versionInfo } = useGetVersionInfoQuery();const currentVersion = useSetting("version");@@ -39,13 +38,11 @@ export function WhatsNewNotification() {]);const dismiss = useCallback(() => {- dispatch(- updateSetting({- key: "last-acknowledged-version",- value: currentVersion.tag,- }),- );- }, [currentVersion.tag, dispatch]);+ updateSetting({+ key: "last-acknowledged-version",+ value: currentVersion.tag,+ });+ }, [currentVersion.tag, updateSetting]);if (!url) {return null;diff --git a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsxindex 75a18696fd6..46a63a90911 100644--- a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx+++ b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx@@ -1,9 +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 { useDispatch } from "metabase/redux";-import { updateSetting } from "metabase/redux/settings";import { Button, Center, Stack, Text, Title } from "metabase/ui";export const LegaleseStep = ({@@ -11,15 +10,13 @@ export const LegaleseStep = ({}: {goToNextStep: () => void;}) => {- const dispatch = useDispatch();+ const [updateSetting] = useUpdateSettingMutation();const onAcceptTerms = () => {- dispatch(- updateSetting({- key: "show-static-embed-terms",- value: false,- }),- );+ updateSetting({+ key: "show-static-embed-terms",+ value: false,+ });goToNextStep();};diff --git a/frontend/src/metabase/query_builder/actions/modal.ts b/frontend/src/metabase/query_builder/actions/modal.tsdeleted file mode 100644index 105da0c90ea..00000000000--- a/frontend/src/metabase/query_builder/actions/modal.ts+++ /dev/null@@ -1,17 +0,0 @@-import { userApi } from "metabase/api";-import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";-import { createThunkAction } from "metabase/redux";-import { checkNotNull } from "metabase/utils/types";--export const CLOSE_QB_NEWB_MODAL = "metabase/qb/CLOSE_QB_NEWB_MODAL";-export const closeQbNewbModal = createThunkAction(CLOSE_QB_NEWB_MODAL, () => {- return async (dispatch, getState) => {- // persist the fact that this user has seen the NewbModal- const { currentUser } = getState();- await runRtkEndpoint(- checkNotNull(currentUser).id,- dispatch,- userApi.endpoints.updateUserModalQbnewb,- );- };-});diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.tsindex fe760733cd4..74a07b77d58 100644--- a/frontend/src/metabase/query_builder/actions/native.ts+++ b/frontend/src/metabase/query_builder/actions/native.ts@@ -1,9 +1,8 @@import { createAction } from "redux-actions";-import { cardApi } from "metabase/api";+import { cardApi, settingsApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { createThunkAction } from "metabase/redux";-import { updateUserSetting } from "metabase/redux/settings";import type { Dispatch, GetState } from "metabase/redux/store";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";import type {@@ -176,7 +175,7 @@ export const setTemplateTagConfig = createThunkAction();export const rememberLastUsedDatabase = (id: DatabaseId) =>- updateUserSetting({+ settingsApi.endpoints.updateSetting.initiate({key: "last-used-native-database-id",value: id,});diff --git a/frontend/src/metabase/query_builder/actions/ui.ts b/frontend/src/metabase/query_builder/actions/ui.tsindex 0df11762f75..215f3974eb7 100644--- a/frontend/src/metabase/query_builder/actions/ui.ts+++ b/frontend/src/metabase/query_builder/actions/ui.ts@@ -1,10 +1,10 @@+import { settingsApi } from "metabase/api";import { getOriginalCard } from "metabase/query_builder/selectors";import {CANCEL_QUERY,CANCEL_QUESTION_CHANGES,setUIControls,} from "metabase/redux/query-builder";-import { updateSetting, updateUserSetting } from "metabase/redux/settings";import type {DatasetEditorTab,Dispatch,@@ -50,14 +50,14 @@ export const setQueryBuilderMode =export const setDidFirstNonTableChartRender = (card: Card) => {trackFirstNonTableChartGenerated(card);- return updateSetting({+ return settingsApi.endpoints.updateSetting.initiate({key: "non-table-chart-generated",value: true,});};export const setNotebookNativePreviewSidebarWidth = (width: number) =>- updateUserSetting({+ settingsApi.endpoints.updateSetting.initiate({key: "notebook-native-preview-sidebar-width",value: width,});diff --git a/frontend/src/metabase/reducers-common.ts b/frontend/src/metabase/reducers-common.tsindex d82001a457e..42dc8554ae2 100644--- a/frontend/src/metabase/reducers-common.ts+++ b/frontend/src/metabase/reducers-common.ts@@ -13,7 +13,6 @@ import { reducer as downloads } from "metabase/redux/downloads";import { embed } from "metabase/redux/embed";import { reducer as embeddingDataPicker } from "metabase/redux/embedding-data-picker";import entities from "metabase/redux/entities";-import { settings } from "metabase/redux/settings";import { modal } from "metabase/redux/ui";import { undoReducer as undo } from "metabase/redux/undo";import upload from "metabase/redux/uploads";@@ -27,7 +26,6 @@ export const commonReducers = {embed,embeddingDataPicker,currentUser,- settings,undo,entities,documents,diff --git a/frontend/src/metabase/redux/auth.ts b/frontend/src/metabase/redux/auth.tsindex 0747b8acbdf..636656daabd 100644--- a/frontend/src/metabase/redux/auth.ts+++ b/frontend/src/metabase/redux/auth.ts@@ -4,6 +4,7 @@ import {createReducer,} from "@reduxjs/toolkit";+import { refetchSiteSettings } from "metabase/api";import { loadLocalization } from "metabase/api/localization";import {type MfaChallengeResponse,@@ -11,7 +12,6 @@ import {sessionApi,} from "metabase/api/session";import { openNavbar } from "metabase/redux/app";-import { refreshSiteSettings } from "metabase/redux/settings";import { clearCurrentUser, refreshCurrentUser } from "metabase/redux/user";import { createAsyncThunk } from "metabase/redux/utils";import { push } from "metabase/router";@@ -52,7 +52,7 @@ export const refreshSession = createAsyncThunk(async (_, { dispatch }) => {await Promise.all([dispatch(refreshCurrentUser()),- dispatch(refreshSiteSettings()),+ dispatch(refetchSiteSettings()),]);await dispatch(refreshLocale()).unwrap();},diff --git a/frontend/src/metabase/redux/settings.unit.spec.tsx b/frontend/src/metabase/redux/settings-cache.unit.spec.tsxsimilarity index 95%rename from frontend/src/metabase/redux/settings.unit.spec.tsxrename to frontend/src/metabase/redux/settings-cache.unit.spec.tsxindex 7431fb5bf64..07aaf8efa5d 100644--- a/frontend/src/metabase/redux/settings.unit.spec.tsx+++ b/frontend/src/metabase/redux/settings-cache.unit.spec.tsx@@ -15,8 +15,6 @@ import { createMockSettingsState } from "metabase/redux/store/mocks";import { getSetting } from "metabase/selectors/settings";import { createMockSettings } from "metabase-types/api/mocks";-import { refreshSiteSettings } from "./settings";-const TestGetComponent = () => {const siteNameFromSelector = useSelector((state: State) =>getSetting(state, "site-name"),@@ -55,7 +53,12 @@ const TestComponentWithForceUpdateHook = () => {const TestUpdateComponent = () => {const [showHiddenComponent, setShowHiddenComponent] = useState(false);const dispatch = useDispatch();- const refresh = () => dispatch(refreshSiteSettings());+ const refresh = () =>+ dispatch(+ sessionApi.endpoints.getSessionProperties.initiate(undefined, {+ forceRefetch: true,+ }),+ );const invalidate = () =>dispatch(sessionApi.util.invalidateTags(["session-properties"]));@@ -84,7 +87,7 @@ const setup = () => {});};-describe("metabase/redux/settings", () => {+describe("settings cache sync", () => {it("should load settings from initial store", () => {setup();// will be loading if called from the apidiff --git a/frontend/src/metabase/redux/settings.ts b/frontend/src/metabase/redux/settings.tsdeleted file mode 100644index 044aeceb774..00000000000--- a/frontend/src/metabase/redux/settings.ts+++ /dev/null@@ -1,166 +0,0 @@-import {- type ThunkDispatch,- type UnknownAction,- createAction,- createReducer,-} from "@reduxjs/toolkit";--import { sessionApi, settingsApi } from "metabase/api";-import type { State } from "metabase/redux/store";-import { createAsyncThunk, createThunkAction } from "metabase/redux/utils";-import type {- EnterpriseSettingKey,- EnterpriseSettingValue,- Settings,- UserSettings,-} from "metabase-types/api";--export const REFRESH_SITE_SETTINGS = "metabase/settings/REFRESH_SITE_SETTINGS";--export const refreshSiteSettings = createAsyncThunk(- REFRESH_SITE_SETTINGS,- async (_, { dispatch }) => {- const response = await dispatch(- sessionApi.endpoints.getSessionProperties.initiate(undefined, {- forceRefetch: true,- }),- );- return response.data;- },-);--export const loadSettings = createAction<Settings>(- "metabase/settings/LOAD_SETTINGS",-);--interface UpdateUserSettingProps<K extends keyof UserSettings> {- key: K;- value: UserSettings[K];- shouldRefresh?: boolean;-}--export const UPDATE_USER_SETTING = "metabase/settings/UPDATE_USER_SETTING";-export const updateUserSetting = createAsyncThunk(- UPDATE_USER_SETTING,- async (- {- key,- value,- shouldRefresh = true,- }: UpdateUserSettingProps<keyof UserSettings>,- { dispatch },- ) => {- const setting = {- key,- value,- };- try {- await dispatch(- settingsApi.endpoints.updateSetting.initiate(setting),- ).unwrap();- if (!shouldRefresh) {- // When we aren't refreshing all the settings, we need to put the setting into the state- return setting;- }- } catch (error) {- console.error("error updating user setting", setting, error);- throw error;- } finally {- if (shouldRefresh) {- await dispatch(refreshSiteSettings());- }- }- },-);--export const UPDATE_SETTING = "metabase/admin/settings/UPDATE_SETTING";-export const updateSetting = createThunkAction(- UPDATE_SETTING,- function (setting: { key: string; value: unknown }) {- return async function (dispatch: any) {- try {- // This admin thunk takes a loosely-typed setting; the RTK mutation is- // strict, so narrow it here.- await dispatch(- settingsApi.endpoints.updateSetting.initiate(- // Unjustified type cast. FIXME- setting as {- key: EnterpriseSettingKey;- value: EnterpriseSettingValue<EnterpriseSettingKey>;- },- ),- ).unwrap();- } catch (error) {- console.error("error updating setting", setting, error);- throw error;- } finally {- await dispatch(refreshSiteSettings());- }- };- },-);--export const reloadSettings =- () => async (dispatch: ThunkDispatch<State, unknown, UnknownAction>) => {- await dispatch(refreshSiteSettings());- };--export const INITIALIZE_SETTINGS =- "metabase/admin/settings/INITIALIZE_SETTINGS";-export const initializeSettings = createThunkAction(- INITIALIZE_SETTINGS,- () => async (dispatch) => {- try {- await dispatch(reloadSettings());- } catch (error) {- console.error("error fetching settings", error);- throw error;- }- },-);--export const UPDATE_SETTINGS = "metabase/admin/settings/UPDATE_SETTINGS";-export const updateSettings = createThunkAction(- UPDATE_SETTINGS,- function (settings) {- return async function (dispatch) {- try {- await dispatch(- settingsApi.endpoints.updateSettings.initiate(settings),- ).unwrap();- } catch (error) {- console.error("error updating settings", settings, error);- throw error;- } finally {- await dispatch(reloadSettings());- }- };- },-);--export const settings = createReducer(- // note: this sets the initial state to the current values in the window object- // this is necessary so that we never have empty settings- { values: window.MetabaseBootstrap || {}, loading: false },- (builder) => {- builder- .addCase(refreshSiteSettings.pending, (state) => {- state.loading = true;- })- .addCase(refreshSiteSettings.fulfilled, (state) => {- state.loading = false;- })- .addCase(refreshSiteSettings.rejected, (state) => {- state.loading = false;- })- .addCase(loadSettings, (state, { payload }) => {- state.loading = false;- state.values = payload;- })- .addCase(updateUserSetting.fulfilled, (state, { payload }) => {- if (payload) {- state.values[payload.key] = payload.value;- }- });- },-);diff --git a/frontend/src/metabase/redux/store/mocks/state.ts b/frontend/src/metabase/redux/store/mocks/state.tsindex 80ec9657aa9..ac24ca1e8d2 100644--- a/frontend/src/metabase/redux/store/mocks/state.ts+++ b/frontend/src/metabase/redux/store/mocks/state.ts@@ -1,5 +1,5 @@import type { SdkSharedStoreState } from "metabase/embedding-sdk/types/store";-import type { State } from "metabase/redux/store";+import type { SettingsState, State } from "metabase/redux/store";import { createMockUser } from "metabase-types/api/mocks";import { createMockAdminState } from "./admin";@@ -19,12 +19,22 @@ import { createMockSetupState } from "./setup";import { createMockUploadState } from "./upload";import { createMockVisualizerState } from "./visualizer";-export function createMockState(- opts: Partial<State> & SdkSharedStoreState,-): State & SdkSharedStoreState;-export function createMockState(opts?: Partial<State>): State;+/**+ * The shape accepted (and returned) by mock-state builders and test render+ * harnesses: `State` plus seed-only fields with no reducer behind them.+ * `settings` is mirrored into `window.MetabaseBootstrap` below; the render+ * harnesses strip it before it reaches `preloadedState`.+ */+export type StoreSeedState = State & {+ settings: SettingsState;+};++export function createMockState<S extends Pick<SdkSharedStoreState, "sdk">>(+ opts: Partial<StoreSeedState> & S,+): StoreSeedState & S;+export function createMockState(opts?: Partial<StoreSeedState>): StoreSeedState;export function createMockState(opts: any) {- return {+ const state = {admin: createMockAdminState(),app: createMockAppState(),auth: createMockAuthState(),@@ -48,4 +58,22 @@ export function createMockState(opts: any) {modal: createMockModalState(),...opts,};++ // Settings resolve from the `getSessionProperties` cache, falling back to+ // `window.MetabaseBootstrap`. Mirror the mock settings into the bootstrap so+ // store-less/selector tests can read them. This is only for jest, as the+ // the global would leak across Storybook stories).+ // Nothing is lost by replacing, because the consumers of that metadata read+ // the global once at module load, before any test body runs.+ const hasExplicitSettings = opts?.settings != null;+ if (+ process.env.NODE_ENV === "test" &&+ typeof window !== "undefined" &&+ state.settings?.values &&+ (hasExplicitSettings || window.MetabaseBootstrap === undefined)+ ) {+ window.MetabaseBootstrap = state.settings.values;+ }++ return state;}diff --git a/frontend/src/metabase/redux/store/state.ts b/frontend/src/metabase/redux/store/state.tsindex b8ea00d018c..b6f4adf423d 100644--- a/frontend/src/metabase/redux/store/state.ts+++ b/frontend/src/metabase/redux/store/state.ts@@ -17,7 +17,6 @@ import type { ModalState } from "./modal";import type { ParametersState } from "./parameters";import type { PulseState } from "./pulse";import type { QueryBuilderState } from "./qb";-import type { SettingsState } from "./settings";import type { SetupState } from "./setup";import type { UndoState } from "./undo";import type { FileUploadState } from "./upload";@@ -39,7 +38,6 @@ export interface State {pulse: PulseState;qb: QueryBuilderState;routing: RouterState;- settings: SettingsState;setup: SetupState;upload: FileUploadState;modal: ModalState;diff --git a/frontend/src/metabase/selectors/settings.ts b/frontend/src/metabase/selectors/settings.tsindex 730dc9184d5..894f104393d 100644--- a/frontend/src/metabase/selectors/settings.ts+++ b/frontend/src/metabase/selectors/settings.ts@@ -1,27 +1,51 @@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 { TokenFeature, TokenStatus, Version } from "metabase-types/api";--export const getSettings: <S extends State>(state: S) => GetSettings<S> =- createSelector(- (state: State) => state.settings,- (settings) => settings.values,- );--export const getSettingsLoading = createSelector(- (state: State) => state.settings,- (settings) => settings.loading,-);--type GetSettings<S extends State> = S["settings"]["values"];-type GetSettingKey<S extends State> = keyof GetSettings<S>;--export const getSetting = <S extends State, T extends GetSettingKey<S>>(- state: S,+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,-): GetSettings<S>[T] => {+): EnterpriseSettings[T] => {const settings = getSettings(state);const setting = settings[key];return setting;@@ -197,9 +221,7 @@ export const getUpgradeUrl = createSelector(utm_content: utmTags.utm_content,source_plan: plan,};- for (const key in searchParams) {- // Unjustified type cast. FIXME- const utmValue = searchParams[key as keyof typeof searchParams];+ for (const [key, utmValue] of Object.entries(searchParams)) {if (utmValue) {url.searchParams.append(key, utmValue);}diff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.tsindex 4ce176d1a0e..dad1b82cd64 100644--- a/frontend/src/metabase/setup/actions.ts+++ b/frontend/src/metabase/setup/actions.ts@@ -1,17 +1,17 @@import { createAction } from "@reduxjs/toolkit";import { t } from "ttag";-import { setupApi, userApi } from "metabase/api";+import {+ refetchSiteSettings,+ settingsApi,+ setupApi,+ userApi,+} from "metabase/api";import { loadLocalization } from "metabase/api/localization";import { isEmailAlreadyInUse } from "metabase/api/utils/errors";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { trackUserInvited } from "metabase/common/analytics";import { createDatabase } from "metabase/redux/databases";-import {- initializeSettings,- updateSetting,- updateSettings,-} from "metabase/redux/settings";import type {InviteInfo,Locale,@@ -116,7 +116,7 @@ export const submitUser = createAsyncThunk<void, UserInfo, ThunkConfig>(MetabaseSettings.set("setup-token", null);dispatch(goToNextStep());// load the settings after the user is logged, needed later by setEmbeddingHomepageFlags- dispatch(initializeSettings());+ dispatch(refetchSiteSettings());},);@@ -203,11 +203,11 @@ export const submitLicenseToken = createAsyncThunk(try {if (licenseToken) {await dispatch(- updateSetting({+ settingsApi.endpoints.updateSetting.initiate({key: "premium-embedding-token",value: licenseToken,}),- );+ ).unwrap();}trackLicenseTokenStepSubmitted(Boolean(licenseToken));} catch (err) {@@ -226,11 +226,11 @@ export const updateTracking = createAsyncThunk(async (isTrackingAllowed: boolean, { dispatch, rejectWithValue }) => {try {await dispatch(- updateSetting({+ settingsApi.endpoints.updateSetting.initiate({key: "anon-tracking-enabled",value: isTrackingAllowed,}),- );+ ).unwrap();trackTrackingChanged(isTrackingAllowed);MetabaseSettings.set("anon-tracking-enabled", isTrackingAllowed);} catch (error) {@@ -262,6 +262,6 @@ export const setEmbeddingHomepageFlags = createAsyncThunk(settingsToChange["setup-license-active-at-setup"] = isLicenseActive;- dispatch(updateSettings(settingsToChange));+ dispatch(settingsApi.endpoints.updateSettings.initiate(settingsToChange));},);diff --git a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsxindex 4aa3ac728f3..0aaf124ad30 100644--- a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx@@ -1,20 +1,16 @@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 { createMockSettings } from "metabase-types/api/mocks";import { RedirectIfSetup } from "./RedirectIfSetup";-// The `loadSettings` action, inlined: importing `metabase/redux/settings` pulls-// in an import graph large enough to exhaust the jest heap.-const loadSettings = (values: ReturnType<typeof createMockSettings>) => ({- type: "metabase/settings/LOAD_SETTINGS",- payload: values,-});-describe("RedirectIfSetup", () => {const setup = (hasUserSetup: boolean) =>renderWithProviders(@@ -46,19 +42,27 @@ describe("RedirectIfSetup", () => {expect(screen.queryByText("setup page")).not.toBeInTheDocument();});- it("stays on setup when has-user-setup flips to true mid-wizard", () => {+ it("stays on setup when has-user-setup flips to true mid-wizard", async () => {const { history, store } = setup(false);expect(screen.getByText("setup page")).toBeInTheDocument();- // The wizard's user step calls /api/setup, then reloads settings.- act(() => {- store.dispatch(- loadSettings(createMockSettings({ "has-user-setup": true })),+ // The wizard's user step calls /api/setup, then reloads settings via+ // `refetchSiteSettings`, flipping `has-user-setup` to true midway.+ // Mirror that by writing the refreshed value into the session-properties cache.+ await act(async () => {+ // The store's test-harness dispatch type isn't thunk-aware,+ // the app DispatchFn is.+ await (store.dispatch as DispatchFn)(+ sessionApi.util.upsertQueryData(+ "getSessionProperties",+ undefined,+ createMockSettings({ "has-user-setup": true }),+ ),);});- // Guards against the inlined action type drifting and voiding this test.- expect(store.getState().settings.values["has-user-setup"]).toBe(true);+ // Guards against the setting not actually flipping and voiding this test.+ expect(getSetting(store.getState(), "has-user-setup")).toBe(true);expect(history?.getCurrentLocation().pathname).toBe("/setup");expect(screen.getByText("setup page")).toBeInTheDocument();diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/utils.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/Progress/utils.unit.spec.tsindex 5b9864f48b3..6e9c843b79a 100644--- a/frontend/src/metabase/visualizations/visualizations/Progress/utils.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/Progress/utils.unit.spec.ts@@ -73,7 +73,7 @@ describe("getValue", () => {it("should return 0 for a malformed row that is not an array", () => {// rows[0] is a scalar, so rows[0][0] is undefined- // Unjustified type cast. FIXME+ // Intentionally invalid input, cast to exercise the runtime guard.expect(getValue([3] as any)).toBe(0);});});@@ -108,9 +108,9 @@ describe("getGoalValue", () => {});it("should return 0 for invalid goal types", () => {- // Unjustified type cast. FIXME+ // Intentionally invalid input, cast to exercise the runtime guard.expect(getGoalValue(null as any, mockColumns, rows)).toBe(0);- // Unjustified type cast. FIXME+ // Intentionally invalid input, cast to exercise the runtime guard.expect(getGoalValue(undefined as any, mockColumns, rows)).toBe(0);});});@@ -269,17 +269,17 @@ describe("calculateProgressMetrics", () => {});it("should handle null and undefined values", () => {- // Unjustified type cast. FIXME+ // Intentionally invalid input, cast to exercise the runtime guard.expect(calculateProgressMetrics(null as any, 100).hasValidValue).toBe(false,);- // Unjustified type cast. FIXME+ // Intentionally invalid input, cast to exercise the runtime guard.expect(calculateProgressMetrics(undefined as any, 100).hasValidValue).toBe(false,);- // Unjustified type cast. FIXME+ // Intentionally invalid input, cast to exercise the runtime guard.expect(calculateProgressMetrics(50, null as any).hasValidGoal).toBe(false);- // Unjustified type cast. FIXME+ // Intentionally invalid input, cast to exercise the runtime guard.expect(calculateProgressMetrics(50, undefined as any).hasValidGoal).toBe(false,);diff --git a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsxindex d27ccb66290..9ce0985bb3f 100644--- a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx+++ b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx@@ -83,6 +83,7 @@ function DocumentProviders({const initialState = _.pick(storeInitialState,...commonReducerNames,+ "settings", // `getStore` uses settings to seed the `getSessionProperties` cache entry) as State;return getStore(commonReducers, initialState, [Api.middleware]);}, []);diff --git a/frontend/test/__support__/entities-store.ts b/frontend/test/__support__/entities-store.tsindex 161f4012ca1..e2c5b6b9027 100644--- a/frontend/test/__support__/entities-store.ts+++ b/frontend/test/__support__/entities-store.ts@@ -8,6 +8,9 @@ import { mainReducers } from "metabase/reducers-main";import { publicReducers } from "metabase/reducers-public";import { reducer as entitiesReducer } from "metabase/redux/entities";import type { State } from "metabase/redux/store";+import type { StoreSeedState } from "metabase/redux/store/mocks";++import { seedApiQueryCache } from "./rtk-query-cache";// Re-exported from the test-support tier so specs can build a main-app store// without importing `metabase/reducers-main` directly, which would// cross module boundaries. The test-support tier is exempt from those rules.@@ -22,7 +25,7 @@ export { mainReducers };*/export function getStore(reducers: Record<string, Reducer<any, any, any>> = {},- initialState: Partial<State> = {},+ initialState: Partial<StoreSeedState> = {},middleware: Middleware[] = [],) {// Unjustified type cast. FIXME@@ -31,10 +34,21 @@ export function getStore(...reducers,}) as unknown as Reducer<State>;+ // Settings live in the `getSessionProperties` RTK Query cache, not a reducer.+ // When a `settings` seed field is present seed the cache entry and strip the raw field+ const { settings, ...preloadedState } = initialState;+ if (settings?.values && reducers[Api.reducerPath]) {+ // Unjustified type cast. FIXME+ (preloadedState as Record<string, unknown>)[Api.reducerPath] =+ seedApiQueryCache(preloadedState[Api.reducerPath], [+ { endpointName: "getSessionProperties", value: settings.values },+ ]);+ }+return configureStore({reducer,// Unjustified type cast. FIXME- preloadedState: initialState as State,+ preloadedState: preloadedState as State,// Unjustified type cast. FIXMEmiddleware: ((getDefaultMiddleware: any) =>@@ -51,10 +65,10 @@ export function getStore(* `metabase/reducers-main` into specs.*/export function getMainStore(- initialState: Partial<State> = {},+ initialState: Partial<StoreSeedState> = {},middleware: Middleware[] = [Api.middleware],) {- return getStore(+ return getManifestStore({ ...mainReducers, [Api.reducerPath]: Api.reducer },initialState,middleware,@@ -63,12 +77,12 @@ export function getMainStore(function getManifestStore(reducers: Record<string, Reducer<any, any, any>>,- initialState: Partial<State> = {},+ initialState: Partial<StoreSeedState> = {},middleware: Middleware[] = [Api.middleware],) {return getStore(reducers,- _.pick(initialState, ...Object.keys(reducers)),+ _.pick(initialState, ...Object.keys(reducers), "settings"),middleware,);}@@ -79,7 +93,7 @@ function getManifestStore(* `metabase/reducers-common` into stories, which would cross module boundaries.*/export function getCommonStore(- initialState: Partial<State> = {},+ initialState: Partial<StoreSeedState> = {},middleware: Middleware[] = [Api.middleware],) {return getManifestStore(commonReducers, initialState, middleware);@@ -94,7 +108,7 @@ export function getCommonStore(* point so public stories keep their own source of truth.*/export function getPublicStore(- initialState: Partial<State> = {},+ initialState: Partial<StoreSeedState> = {},middleware: Middleware[] = [Api.middleware],) {return getManifestStore(publicReducers, initialState, middleware);diff --git a/frontend/test/__support__/rtk-query-cache.ts b/frontend/test/__support__/rtk-query-cache.tsnew file mode 100644index 00000000000..66471d7b4e9--- /dev/null+++ b/frontend/test/__support__/rtk-query-cache.ts@@ -0,0 +1,58 @@+import { Api } from "metabase/api";++type ApiState = ReturnType<typeof Api.reducer>;++export type QueryCacheSeed = {+ endpointName: string;+ arg?: unknown;+ value: unknown;+};++/**+ * Synchronously seed RTK Query cache entries into a `preloadedState` slice for+ * the shared `Api`, without a live store. Use this to give a test server data+ * that the app reads from the query cache.+ *+ * Building the slice via `preloadedState` keeps it fully synchronous and per-store:+ * no cross-test leakage, and reads resolve on the first render.+ *+ * Note: a seeded entry is `fulfilled`, so `useXQuery` hooks won't refetch on mount.+ * A test that needs to assert a fetch happened should drive the query+ * explicitly, or not seed the cache, instead.+ */+export function seedApiQueryCache(+ currentApiState: ApiState | undefined,+ entries: QueryCacheSeed[],+): ApiState {+ // Skip entries that are already seeded. Upserting an existing entry leaves+ // it stuck `pending` (the second upsert keeps the first requestId, so the+ // fulfilled write is rejected), and under the default "delayed"+ // invalidation behaviour one forever-pending query silently defers every+ // tag invalidation in the store.+ const existingQueries = Object.values(currentApiState?.queries ?? {});+ const newEntries = entries.filter(+ ({ endpointName, arg }) =>+ !existingQueries.some(+ (query) =>+ query?.endpointName === endpointName &&+ JSON.stringify(query?.originalArgs) === JSON.stringify(arg),+ ),+ );++ if (newEntries.length === 0 && currentApiState) {+ return currentApiState;+ }++ // endpointName/value are validated at runtime by RTK against the injected+ // endpoint registry. The cast keeps this helper endpoint-agnostic.+ const upsertEntries = newEntries.map(({ endpointName, arg, value }) => ({+ endpointName,+ arg,+ value,+ })) as Parameters<typeof Api.util.upsertQueryEntries>[0];++ return Api.reducer(+ currentApiState,+ Api.util.upsertQueryEntries(upsertEntries),+ );+}diff --git a/frontend/test/__support__/server-mocks/settings.ts b/frontend/test/__support__/server-mocks/settings.tsindex f4dd10e7e94..fe0b3485f49 100644--- a/frontend/test/__support__/server-mocks/settings.ts+++ b/frontend/test/__support__/server-mocks/settings.ts@@ -7,6 +7,7 @@ import type {import type {EnterpriseSettingKey,EnterpriseSettingValue,+ EnterpriseSettings,SettingDefinition,} from "metabase-types/api";@@ -39,6 +40,47 @@ export function setupUpdateSettingEndpoint(fetchMock.put(new RegExp("/api/setting/"), { status }, { name: name });}+/**+ * Stateful settings mocks for save-then-read tests: PUT /api/setting(/:key)+ * mutate a shared store that GET /api/session/properties returns, so the+ * post-save refetch reflects the write instead of the pre-save snapshot.+ * Returns the mutable store for assertions.+ */+export function setupStatefulSettingsEndpoints(+ initialSettings: Partial<EnterpriseSettings> | Record<string, unknown>,+) {+ const store: Record<string, unknown> = { ...initialSettings };++ fetchMock.removeRoute("get-session-properties");+ fetchMock.get("path:/api/session/properties", () => ({ ...store }), {+ name: "get-session-properties",+ });++ fetchMock.removeRoute("update-setting");+ fetchMock.put(+ new RegExp("/api/setting/(.+)"),+ ({ url, options }) => {+ const key = decodeURIComponent(url.split("/api/setting/")[1]);+ const { value } = JSON.parse(String(options.body));+ store[key] = value;+ return { status: 204 };+ },+ { name: "update-setting" },+ );++ fetchMock.removeRoute("update-settings");+ fetchMock.put(+ "path:/api/setting",+ ({ options }) => {+ Object.assign(store, JSON.parse(String(options.body)));+ return { status: 204 };+ },+ { name: "update-settings" },+ );++ return store;+}+export function setupUpdateSettingsEndpoint({ status }: { status?: number } = { status: 204 },) {diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsxindex a500cbd5471..c457328e668 100644--- a/frontend/test/__support__/ui.tsx+++ b/frontend/test/__support__/ui.tsx@@ -31,7 +31,10 @@ import { makeMainReducers } from "metabase/reducers-main";import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider, useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";-import { createMockState } from "metabase/redux/store/mocks";+import {+ type StoreSeedState,+ createMockState,+} from "metabase/redux/store/mocks";import {type Action,type History,@@ -72,7 +75,7 @@ export interface RenderWithProvidersOptions {// public or sdk-specific testsmode?: "default" | "public";initialRoute?: string;- storeInitialState?: Partial<State>;+ storeInitialState?: Partial<StoreSeedState>;withRouter?: boolean;/** Renders children wrapped with kbar provider */withKBar?: boolean;@@ -186,8 +189,11 @@ export function getTestStoreAndWrapper({customReducers,theme,}: GetTestStoreAndWrapperOptions) {- let { routing, ...initialState }: Partial<State> =- createMockState(storeInitialState);+ let {+ routing,+ settings, // pull settings out because they aren't in the store+ ...initialState+ }: Partial<StoreSeedState> = createMockState(storeInitialState);if (mode === "public") {const publicReducerNames = Object.keys(publicReducers);diff --git a/frontend/test/jest-setup-env-core.js b/frontend/test/jest-setup-env-core.jsnew file mode 100644index 00000000000..d786d193989--- /dev/null+++ b/frontend/test/jest-setup-env-core.js@@ -0,0 +1,21 @@+import { createMockSettings } from "metabase-types/api/mocks";++// `metabase-bootstrap.js` runs once per test file, before any test executes.+// It sets `window.MetabaseBootstrap` to the metadata a real server-rendered page would inject:+// the semantic type hierarchy, available timezones, and locales. The shared afterEach in+// `jest-setup-env.js` deletes `window.MetabaseBootstrap` after every test,+// so from the second test onward that metadata is gone from the global and+// `setupFiles` never run again to restore it. Capture the value here, so we can+// restore it before each test complete with Metadata+const initialBootstrap = window.MetabaseBootstrap;++beforeEach(() => {+ // Give every core test the default settings a real Metabase page starts+ // with, since the server always injects a bootstrap before the app runs.+ // Tests that need specific values still seed them via+ // `storeInitialState.settings`, which overwrites this baseline. The SDK+ // project deliberately does not get this seeding, because an SDK host page+ // never has a bootstrap and its settings stay empty until auth fills the+ // cache.+ window.MetabaseBootstrap = { ...initialBootstrap, ...createMockSettings() };+});diff --git a/frontend/test/jest-setup-env.js b/frontend/test/jest-setup-env.jsindex 1888a25675b..eb391e474f8 100644--- a/frontend/test/jest-setup-env.js+++ b/frontend/test/jest-setup-env.js@@ -19,6 +19,8 @@ beforeEach(() => {afterEach(async () => {// Cleanup React components FIRST to trigger any unmount effectscleanup();++ delete window.MetabaseBootstrap;// Wait for any pending fetch requests to completeawait fetchMock.callHistory.flush();diff --git a/jest.config.js b/jest.config.jsindex 53922c2c120..485eaac32af 100644--- a/jest.config.js+++ b/jest.config.js@@ -177,6 +177,10 @@ const config = {{...baseConfig,displayName: "core",+ setupFilesAfterEnv: [+ ...baseConfig.setupFilesAfterEnv,+ "<rootDir>/frontend/test/jest-setup-env-core.js",+ ],testPathIgnorePatterns: [...(baseConfig.testPathIgnorePatterns || []),"<rootDir>/frontend/src/embedding-sdk-bundle",