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
fix: use the correct setting for enabling metabot in the embed wizard (#70820)
Nicolò Prettoa0e28bc77593
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsxindex 675702f1faf..1661914168e 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedExperienceStep.tsx@@ -16,7 +16,9 @@ export const SelectEmbedExperienceStep = () => {useSdkIframeEmbedSetupContext();const isGuestEmbed = !!settings.isGuest;- const isMetabotAvailable = useMetabotEnabledEmbeddingAware();+ const isMetabotAvailable = useMetabotEnabledEmbeddingAware({+ forceEmbedding: true,+ });const handleEmbedExperienceChange = useHandleExperienceChange();diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.tsindex ea2b01db88f..97dcea26064 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts@@ -3,12 +3,15 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { isWithinIframe } from "metabase/lib/dom";/** Returns the value for `metabot-enabled?` or `embedded-metabot-enabled?` depending on the context- * only if the metabot token feature is enabled. */-export const useMetabotEnabledEmbeddingAware = (): boolean => {+ * only if the metabot token feature is enabled.+ * Use `forceEmbedding` to always check the embedding setting (e.g. in the embed wizard). */+export const useMetabotEnabledEmbeddingAware = ({+ forceEmbedding = false,+}: { forceEmbedding?: boolean } = {}): boolean => {const hasMetabotV3 = useHasTokenFeature("metabot_v3");- const isEmbeddingIframe = isWithinIframe() || isEmbeddingSdk();+ const isEmbedding = forceEmbedding || isWithinIframe() || isEmbeddingSdk();const isEnabled = useSetting(- isEmbeddingIframe ? "embedded-metabot-enabled?" : "metabot-enabled?",+ isEmbedding ? "embedded-metabot-enabled?" : "metabot-enabled?",);return hasMetabotV3 && isEnabled;};