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
[Metabot] Fix AI settings inputs flickering + losing focus (#74527)
Sloan Spargere364754e4c79
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsxindex 338d6f944cd..aadfb32dc74 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx@@ -164,7 +164,7 @@ export function MetabaseAIProviderSetup({removeCloudAddOn,]);- const { isLoading, handleDisconnect, resetProvider, isModal } =+ const { isMutating, handleDisconnect, resetProvider, isModal } =useMetabotSetupContext(connectAction, onDisconnect);const metabaseManagedAiPurchaseError = metabaseManagedAiPurchase.error@@ -253,7 +253,7 @@ export function MetabaseAIProviderSetup({.otherwise(() => (<Checkboxchecked={hasAcceptedTerms}- disabled={isLoading}+ disabled={isMutating}onChange={(event) =>setHasAcceptedTerms(event.currentTarget.checked)}diff --git a/frontend/src/metabase/admin/ai/MetabotSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSetup.tsxindex 174e6920829..8bbbf3cb96f 100644--- a/frontend/src/metabase/admin/ai/MetabotSetup.tsx+++ b/frontend/src/metabase/admin/ai/MetabotSetup.tsx@@ -69,14 +69,14 @@ function getModelDescription(provider: MetabotProvider | undefined) {const MetabotSetupContext = createContext<{connectHandlerRef: MutableRefObject<(() => Promise<void>) | null> | null;disconnectHandlerRef: MutableRefObject<(() => Promise<void>) | null> | null;- isLoading: boolean;+ isMutating: boolean;isConnectButtonEnabled: boolean;setIsConnectButtonEnabled: (enabled: boolean) => void;resetProvider: VoidFunction;handleDisconnect: VoidFunction;isModal: boolean;}>({- isLoading: false,+ isMutating: false,connectHandlerRef: null,disconnectHandlerRef: null,isConnectButtonEnabled: false,@@ -93,7 +93,7 @@ export function useMetabotSetupContext(const {connectHandlerRef,disconnectHandlerRef,- isLoading,+ isMutating,setIsConnectButtonEnabled,resetProvider,handleDisconnect,@@ -126,7 +126,7 @@ export function useMetabotSetupContext(};}, [disconnectHandlerRef, onDisconnect]);- return { isLoading, resetProvider, handleDisconnect, isModal };+ return { isMutating, resetProvider, handleDisconnect, isModal };}export function MetabotSetup({ id }: { id?: string }) {@@ -203,11 +203,9 @@ export function MetabotSetupInner({const offerMetabaseAiManaged = PLUGIN_METABOT.isEnabled;const [sendToast] = useToast();- const {- value: savedProviderValue,- settingDetails,- isFetching: isMetabotProviderLoading,- } = useAdminSetting("llm-metabot-provider");+ const { value: savedProviderValue, settingDetails } = useAdminSetting(+ "llm-metabot-provider",+ );const isEnvSetting =!!settingDetails &&!!settingDetails.is_env_setting &&@@ -346,11 +344,8 @@ export function MetabotSetupInner({}};- const isLoading =- isConnecting ||- isDisconnecting ||- updateSettingsResult.isLoading ||- isMetabotProviderLoading;+ const isMutating =+ isConnecting || isDisconnecting || updateSettingsResult.isLoading;const [isConnectButtonEnabled, setIsConnectButtonEnabled] = useState(false);@@ -359,7 +354,7 @@ export function MetabotSetupInner({value={{connectHandlerRef,disconnectHandlerRef,- isLoading,+ isMutating,setIsConnectButtonEnabled,isConnectButtonEnabled,resetProvider,@@ -375,7 +370,7 @@ export function MetabotSetupInner({data={providerOptions}value={provider}onChange={setProvider}- disabled={isEnvSetting || isLoading}+ disabled={isEnvSetting || isMutating}renderOption={({ option }) => (<Groupgap="xs"@@ -422,8 +417,8 @@ export function MetabotSetupInner({.with({ isModal: true, isCurrentConfigured: true }, () => (<Buttonvariant="filled"- loading={isLoading}- disabled={isLoading}+ loading={isMutating}+ disabled={isMutating}onClick={onClose}>{t`Done`}@@ -434,8 +429,8 @@ export function MetabotSetupInner({() => (<Buttonc="danger"- loading={isLoading}- disabled={isLoading}+ loading={isMutating}+ disabled={isMutating}onClick={handleDisconnect}>{t`Disconnect`}@@ -448,8 +443,8 @@ export function MetabotSetupInner({() => (<Buttonvariant="filled"- loading={isLoading}- disabled={isLoading || !isConnectButtonEnabled}+ loading={isMutating}+ disabled={isMutating || !isConnectButtonEnabled}onClick={handleConnect}>{t`Connect`}@@ -506,7 +501,7 @@ const AIProviderSetup = ({const connectHandler =!isCurrentConfigured || hasDirtyApiKey ? onConnect : null;- const { isLoading } = useMetabotSetupContext(connectHandler);+ const { isMutating } = useMetabotSetupContext(connectHandler);const { details: providerApiKeyDetails } = useAdminSettings(["llm-anthropic-api-key",@@ -593,7 +588,7 @@ const AIProviderSetup = ({value={displayApiKeyValue}error={apiKeyError}onChange={handleApiKeyChange}- disabled={isLoading || isEnvSetting || !!apiKeyEnvSettingName}+ disabled={isMutating || isEnvSetting || !!apiKeyEnvSettingName}w="100%"/>@@ -605,7 +600,7 @@ const AIProviderSetup = ({<Selectlabel={t`Model`}placeholder={- metabotSettingsQuery.isFetching+ metabotSettingsQuery.isLoading? t`Loading models...`: t`Select a model`}@@ -614,7 +609,7 @@ const AIProviderSetup = ({data={modelOptions}value={model}onChange={handleModelChange}- disabled={isEnvSetting || needsApiKey || isLoading}+ disabled={isEnvSetting || needsApiKey || isMutating}searchablenothingFoundMessage={t`No models found`}/>diff --git a/frontend/src/metabase/admin/ai/MetabotSetup.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotSetup.unit.spec.tsxindex 9a40653c5d3..b6151c724e4 100644--- a/frontend/src/metabase/admin/ai/MetabotSetup.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/MetabotSetup.unit.spec.tsx@@ -10,6 +10,7 @@ import {} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { act, renderWithProviders, screen, waitFor } from "__support__/ui";+import { Api } from "metabase/api";import { reinitialize } from "metabase/plugins";import { defer } from "metabase/utils/promise";import type {@@ -488,6 +489,44 @@ describe("MetabotSetup", () => {expect(screen.getAllByText("Coming soon")).toHaveLength(2);});+ it("BOT-1429: keeps the form interactive while session-properties refetches in the background", async () => {+ const { store } = await setup();+ const apiKey = await screen.findByLabelText("API key");+ const model = await screen.findByLabelText("Model");+ const disconnect = await screen.findByRole("button", {+ name: "Disconnect",+ });++ expect(apiKey).toBeEnabled();+ expect(model).toBeEnabled();+ expect(disconnect).toBeEnabled();+ expect(disconnect).not.toHaveAttribute("data-loading", "true");++ const sessionPropertiesDeferred = defer<unknown>();+ fetchMock.removeRoute("get-session-properties");+ fetchMock.get(+ "path:/api/session/properties",+ () => sessionPropertiesDeferred.promise,+ );++ act(() => {+ store.dispatch(Api.util.invalidateTags(["session-properties"]));+ });++ await waitFor(() => {+ expect(+ fetchMock.callHistory.calls("path:/api/session/properties").length,+ ).toBeGreaterThan(1);+ });++ expect(apiKey).toBeEnabled();+ expect(model).toBeEnabled();+ expect(disconnect).toBeEnabled();+ expect(disconnect).not.toHaveAttribute("data-loading", "true");++ sessionPropertiesDeferred.resolve({});+ });+it("shows the connected badge with the saved provider and model", async () => {await setup();await screen.findByLabelText("API key");