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
Support entityId for guest embedded questions (#71246)
Timofey Kachalov366c74c02eab
diff --git a/e2e/test-component/scenarios/embedding-sdk/guest-embed-reproductions.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/guest-embed-reproductions.cy.spec.tsxindex dd1d410f059..62b5feb7c70 100644--- a/e2e/test-component/scenarios/embedding-sdk/guest-embed-reproductions.cy.spec.tsx+++ b/e2e/test-component/scenarios/embedding-sdk/guest-embed-reproductions.cy.spec.tsx@@ -30,6 +30,7 @@ describe("scenarios > embedding-sdk > guest-embed reproductions", () => {display,}).then(({ body: question }) => {cy.wrap(question.id).as("questionId");+ cy.wrap(question.entity_id).as("questionEntityId");});cy.signOut();@@ -67,4 +68,22 @@ describe("scenarios > embedding-sdk > guest-embed reproductions", () => {});});});++ it("should show question with a token containing entity id (EMB-1473)", () => {+ setup();++ cy.get("@questionEntityId").then(async (questionEntityId) => {+ const token = await getSignedJwtForResource({+ resourceId: questionEntityId as unknown as number,+ resourceType: "question",+ });++ mountGuestEmbedQuestion({ token, title: true, withDownloads: true });++ getSdkRoot().within(() => {+ cy.findByText("Product ID").should("be.visible");+ cy.findByText("Max of Quantity").should("be.visible");+ });+ });+ });});diff --git a/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.ts b/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.tsindex 7c85a6b07f8..87a28e4144b 100644--- a/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.ts+++ b/frontend/src/embedding-sdk-bundle/lib/sdk-question/load-question.ts@@ -63,8 +63,9 @@ export const loadQuestionSdk =const metadata = getMetadata(getState());- const originalQuestion =- originalCard && new Question(originalCard, metadata);+ const originalQuestion = originalCard+ ? new Question(originalCard, metadata)+ : undefined;let question = new Question(card, metadata);if (targetDashboardId) {diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.tsindex 23a2d71cc3a..417a7fc9188 100644--- a/frontend/src/metabase-types/api/card.ts+++ b/frontend/src/metabase-types/api/card.ts@@ -406,7 +406,7 @@ export interface ListCardsRequest {}export interface GetCardRequest {- id: CardId;+ id: CardId | EntityToken;context?: "collection";ignore_view?: boolean;ignore_error?: boolean;diff --git a/frontend/src/metabase/query_builder/actions/core/card.ts b/frontend/src/metabase/query_builder/actions/core/card.tsindex fe109a75f91..c2752607828 100644--- a/frontend/src/metabase/query_builder/actions/core/card.ts+++ b/frontend/src/metabase/query_builder/actions/core/card.ts@@ -1,4 +1,5 @@-import { Questions } from "metabase/entities/questions";+import { cardApi } from "metabase/api";+import type { Card } from "metabase-types/api";import type { EntityToken } from "metabase-types/api/entity";import type { Dispatch, GetState } from "metabase-types/store";@@ -11,28 +12,22 @@ export async function loadCard(cardId: string | number;token?: EntityToken | null;},- { dispatch, getState }: { dispatch: Dispatch; getState: GetState },+ { dispatch }: { dispatch: Dispatch; getState: GetState },) {try {- await dispatch(- Questions.actions.fetch(- { id: token ?? cardId },- {- properties: [- "id",- "dataset_query",- "display",- "visualization_settings",- ], // complies with Card interface- },- ),- );+ const result = (await dispatch(+ cardApi.endpoints.getCard.initiate({ id: token ?? cardId }),+ )) as { data?: Card; error?: unknown };- const question = Questions.selectors.getObject(getState(), {- entityId: cardId,- });+ if (result.error) {+ throw result.error;+ }- return question?.card();+ if (!result.data) {+ throw new Error("Card not found");+ }++ return result.data;} catch (error) {console.error("error loading card", error);throw error;diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.tsindex 16cdb4b1c02..6968ddb8852 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts@@ -188,7 +188,7 @@ async function fetchAndPrepareAdHocQuestionCards(type ResolveCardsResult = {card: Card;- originalCard?: Card;+ originalCard?: Card | null;};export async function resolveCards({diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.tsindex 8715353750c..3172ff2d8c5 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts@@ -142,7 +142,7 @@ async function setup({jest.spyOn(cardActions, "loadCard")- .mockReturnValue(Promise.resolve({ ...card }));+ .mockReturnValue(Promise.resolve({ ...card } as Card));return baseSetup({ location, params, ...opts });}@@ -441,7 +441,7 @@ describe("QB Actions > initializeQB", () => {jest.spyOn(cardActions, "loadCard")- .mockReturnValueOnce(Promise.resolve({ ...originalCard }));+ .mockReturnValueOnce(Promise.resolve({ ...originalCard } as Card));return setup({ card: q, ...opts });}diff --git a/frontend/src/metabase/query_builder/actions/core/parameterUtils.ts b/frontend/src/metabase/query_builder/actions/core/parameterUtils.tsindex ee7f410a302..90d0d115430 100644--- a/frontend/src/metabase/query_builder/actions/core/parameterUtils.ts+++ b/frontend/src/metabase/query_builder/actions/core/parameterUtils.ts@@ -30,7 +30,7 @@ function shouldPropagateDashboardParameters({}: {cardId?: number;deserializedCard: Card;- originalCard?: Card;+ originalCard?: Card | null;}): boolean {if (cardId && deserializedCard.parameters) {return true;@@ -105,7 +105,7 @@ export async function propagateDashboardParameters({}: {card: Card;deserializedCard: Card; // DashCard (has dashboardId and dashcardId)- originalCard?: Card;+ originalCard?: Card | null;dispatch: Dispatch;}) {const cardId = card.id;