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(sdk-bundle): Fix New question breadcrumb dead-end after Visualize in metabase-browser (#73842)
Mahatthana (Kelvin) Nomsawadi0465a46e314e
diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding/metabase-browser.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding/metabase-browser.cy.spec.tsindex ef5af9c4c87..d70d374e9e2 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding/metabase-browser.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding/metabase-browser.cy.spec.ts@@ -178,7 +178,41 @@ describe("scenarios > embedding > sdk iframe embedding > metabase-browser", () =cy.findByTestId("sdk-breadcrumbs").findByText("New question").click();cy.findByText("Pick your starting data").should("be.visible");- cy.findByText("Orders").should("not.exist");+ cy.findByTestId("data-step-cell").should("not.have.text", "Orders");+ });+ });++ it("should reset `New question` editor state when clicking 'New question' breadcrumb after Visualize", () => {+ H.prepareSdkIframeEmbedTest({+ withToken: "bleeding-edge",+ signOut: false,+ });++ setupEmbed(`+ <metabase-browser+ initial-collection="root"+ read-only="false"+ />+ `);++ H.getSimpleEmbedIframeContent().within(() => {+ cy.findByText("New question").click();++ cy.findByText("Pick your starting data").should("be.visible");++ cy.intercept("POST", "/api/dataset/query_metadata").as("datasetMetadata");+ cy.findByText("Orders").click();+ cy.wait("@datasetMetadata");+ cy.findByTestId("data-step-cell").should("have.text", "Orders");++ cy.button("Visualize").click();+ cy.findByTestId("visualization-root").should("be.visible");++ cy.findByTestId("sdk-breadcrumbs").findByText("New question").click();++ // Expected: editor reopens fresh, prior table cleared.+ cy.findByText("Pick your starting data").should("be.visible");+ cy.findByTestId("data-step-cell").should("not.have.text", "Orders");});});});diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsxindex 56922aaaf65..90077756705 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx@@ -120,29 +120,18 @@ export const SdkQuestionDefaultView = ({question && shouldRunCardQuery({ question, isGuestEmbed }) && !queryResults;useEffect(() => {- const isNewQuestion = originalId === "new" || originalId === "new-native";- const isExistingQuestion =- question &&+ if (!isQuestionLoading &&question?.isSaved() &&- !isNewQuestion &&- queryResults;-- const onNavigate = onNavigateBack ?? onReset ?? undefined;-- if (isNewQuestion) {- reportLocation({- type: "question",- id: originalId,- name: "New question",- onNavigate,- });- } else if (isExistingQuestion) {+ originalId !== "new" &&+ originalId !== "new-native" &&+ queryResults+ ) {reportLocation({type: "question",id: question.id(),name: question.displayName() || "Question",- onNavigate,+ onNavigate: onNavigateBack ?? onReset ?? undefined,});}}, [diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/MetabaseBrowser.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/MetabaseBrowser.tsxindex e1066c1a167..70cc776d9d4 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/MetabaseBrowser.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/MetabaseBrowser.tsx@@ -52,6 +52,8 @@ export function MetabaseBrowser({ settings }: MetabaseBrowserProps) {id: initialCollection,});+ const [newQuestionKey, setNewQuestionKey] = useState(0);+useMount(() => {if (navigationContext.stack.length === 0) {// Populate the initial entry of the stack when this is the root/starting point@@ -84,6 +86,7 @@ export function MetabaseBrowser({ settings }: MetabaseBrowserProps) {.with({ type: "new-question" }, () => (<Box px="xl" h="100%"><InteractiveQuestion+ key={newQuestionKey}questionId="new"height="100%"withDownloads@@ -200,6 +203,7 @@ export function MetabaseBrowser({ settings }: MetabaseBrowserProps) {const handleNewQuestion = () => {setCurrentView({ type: "new-question" });+ reportLocation({ type: "question", id: "new", name: "New question" });};// Only show "New question" button if user has write access and it's enabled@@ -237,6 +241,12 @@ export function MetabaseBrowser({ settings }: MetabaseBrowserProps) {for (let i = 0; i < count; i++) {navigationContext.pop();}+ } else if (item.type === "question" && item.id === "new") {+ // EMB-1118 / EMB-1610: bump key to remount+ // InteractiveQuestion so the editor reopens fresh after+ // Visualize, with no stale queryResults.+ setNewQuestionKey((previousKey) => previousKey + 1);+ setCurrentView({ type: "new-question" });}}}/>