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
Use actual metadata in a Notebook in Embedding SDK/Embed JS (#67453)
Timofey Kachalov26f6e2b59054
diff --git a/e2e/test-component/scenarios/embedding-sdk/create-question.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/create-question.cy.spec.tsxindex 1c209679300..feb130601ff 100644--- a/e2e/test-component/scenarios/embedding-sdk/create-question.cy.spec.tsx+++ b/e2e/test-component/scenarios/embedding-sdk/create-question.cy.spec.tsx@@ -288,4 +288,37 @@ describe("scenarios > embedding-sdk > interactive-question > creating a questiongetSdkRoot().contains("My Orders");});});++ it("should show columns from joined table when there is no FK relationship (metabase#EMB-1102)", () => {+ cy.signOut();+ mockAuthProviderAndJwtSignIn();++ mountSdkContent(+ <Flex p="xl">+ <InteractiveQuestion questionId="new" />+ </Flex>,+ );++ popover().within(() => {+ cy.findByText("Orders").click();+ });++ getSdkRoot().within(() => {+ cy.button("Join data").click();+ });++ popover().within(() => {+ cy.findByText("Reviews").click();+ });++ popover().within(() => {+ cy.findByText("ID").click();+ });++ popover().within(() => {+ cy.findByText("Product ID").should("be.visible");+ cy.findByText("Reviewer").should("be.visible");+ cy.findByText("Custom Expression").should("be.visible");+ });+ });});diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsxindex daca68868fa..7a020396d13 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx@@ -8,9 +8,10 @@ import {isQuestionRunnable,} from "metabase/query_builder/utils/question";import { Notebook as QBNotebook } from "metabase/querying/notebook/components/Notebook";+import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";import { ScrollArea } from "metabase/ui";-import type Question from "metabase-lib/v1/Question";+import Question from "metabase-lib/v1/Question";/*** @interface@@ -40,8 +41,22 @@ export const Editor = ({// Loads databases and metadata so we can show notebook steps for the selected data sourceuseDatabaseListQuery();- const { question, originalQuestion, updateQuestion, queryQuestion } =- useSdkQuestionContext();+ const {+ question: rawQuestion,+ originalQuestion,+ updateQuestion,+ queryQuestion,+ } = useSdkQuestionContext();++ const metadata = useSelector(getMetadata);++ const question = useMemo(() => {+ if (!rawQuestion) {+ return rawQuestion;+ }++ return new Question(rawQuestion?.card(), metadata);+ }, [rawQuestion, metadata]);const isDirty = useMemo(() => {return isQuestionDirty(question, originalQuestion);