Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

actual fix for infinite loop (#64612)

Uladzimir Havenchykdd2effb8f4d5
diff --git a/e2e/test/scenarios/embedding/embedding-native.cy.spec.js b/e2e/test/scenarios/embedding/embedding-native.cy.spec.js
index 7c022c8f559..e022b81bd95 100644
--- a/e2e/test/scenarios/embedding/embedding-native.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-native.cy.spec.js
@@ -132,7 +132,8 @@ describe("scenarios > embedding > native questions", () => {
cy.location("search")
.should("include", "product_id=10")
.and("include", "created_at=")
- .and("include", "id=926&state=KS");
+ .and("include", "id=926")
+ .and("include", "state=KS");
});
it("should handle required parameters", () => {
diff --git a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx
index b40899ffe88..c2656e44575 100644
--- a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx
+++ b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx
@@ -16,6 +16,7 @@ import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { closeNavbar, setDetailView } from "metabase/redux/app";
import { getIsNavbarOpen } from "metabase/selectors/app";
+import { getMetadata } from "metabase/selectors/metadata";
import { extractRemappedColumns } from "metabase/visualizations";
import * as Lib from "metabase-lib";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
@@ -38,16 +39,19 @@ export function ModelDetailPage({ params }: Props) {
} = useGetCardQuery(cardId == null ? skipToken : { id: cardId });
const {
- data: metadata,
+ data: queryMetadata,
error: metadataError,
isLoading: isMetadataLoading,
} = useGetCardQueryMetadataQuery(cardId == null ? skipToken : cardId);
- const table = metadata?.tables?.find(
+ const table = queryMetadata?.tables?.find(
(table) => table.id === getQuestionVirtualTableId(cardId),
);
-
- const tableQuery = useMemo(() => getTableQuery(table), [table]);
+ const metadata = useSelector(getMetadata);
+ const tableQuery = useMemo(
+ () => getTableQuery(metadata, table),
+ [metadata, table],
+ );
const objectQuery = useMemo(() => {
return tableQuery && table
? filterByPk(tableQuery, table.fields ?? [], rowId)
diff --git a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx
index 384458549ac..24fa5455fd0 100644
--- a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx
+++ b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx
@@ -18,6 +18,7 @@ import {
import { useDispatch, useSelector } from "metabase/lib/redux";
import { closeNavbar, setDetailView } from "metabase/redux/app";
import { getIsNavbarOpen } from "metabase/selectors/app";
+import { getMetadata } from "metabase/selectors/metadata";
import { extractRemappedColumns } from "metabase/visualizations";
import * as Lib from "metabase-lib";
@@ -39,7 +40,11 @@ export function TableDetailPage({ params }: Props) {
} = useGetTableQueryMetadataQuery({ id: tableId });
const { data: tableForeignKeys } = useListTableForeignKeysQuery(tableId);
- const tableQuery = useMemo(() => getTableQuery(table), [table]);
+ const metadata = useSelector(getMetadata);
+ const tableQuery = useMemo(
+ () => getTableQuery(metadata, table),
+ [metadata, table],
+ );
const objectQuery = useMemo(() => {
return tableQuery && table
? filterByPk(tableQuery, table.fields ?? [], rowId)
diff --git a/frontend/src/metabase/detail-view/utils.ts b/frontend/src/metabase/detail-view/utils.ts
index d106ebe936f..7ae91cd3c52 100644
--- a/frontend/src/metabase/detail-view/utils.ts
+++ b/frontend/src/metabase/detail-view/utils.ts
@@ -1,4 +1,3 @@
-import { createMockMetadata } from "__support__/metadata";
import type { ContentTranslationFunction } from "metabase/i18n/types";
import { type OptionsType, formatValue } from "metabase/lib/formatting";
import { getComputedSettings } from "metabase/visualizations/lib/settings";
@@ -9,6 +8,7 @@ import {
} from "metabase/visualizations/lib/settings/column";
import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
import * as Lib from "metabase-lib";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
import {
isAvatarURL,
isEntityName,
@@ -174,14 +174,14 @@ export const getEntityIcon = (entityType?: Table["entity_type"]) => {
}
};
-export function getTableQuery(table: Table | undefined): Lib.Query | undefined {
+export function getTableQuery(
+ metadata: Metadata,
+ table: Table | undefined,
+): Lib.Query | undefined {
if (!table) {
return undefined;
}
- const metadata = createMockMetadata({
- tables: [table],
- });
const metadataProvider = Lib.metadataProvider(table.db_id, metadata);
const tableMetadata = Lib.tableOrCardMetadata(metadataProvider, table.id);
if (tableMetadata == null) {
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx
index 3c2967d135c..80b28de7331 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
import { skipToken, useListTableForeignKeysQuery } from "metabase/api";
import { DetailViewSidesheet } from "metabase/detail-view/components";
@@ -47,21 +47,28 @@ export function ObjectDetailWrapper({
question.supportsImplicitActions(),
);
- if (shouldShowModal) {
- const {
- canZoom,
- canZoomNextRow,
- canZoomPreviousRow,
- settings,
- table: tableWrapper,
- viewNextObjectDetail,
- viewPreviousObjectDetail,
- zoomedRow,
- zoomedRowID,
- } = rest;
- const table = getApiTable(tableWrapper);
- const columns = data?.cols;
+ const {
+ canZoom,
+ canZoomNextRow,
+ canZoomPreviousRow,
+ settings,
+ table: tableWrapper,
+ viewNextObjectDetail,
+ viewPreviousObjectDetail,
+ zoomedRow,
+ zoomedRowID,
+ } = rest;
+ const table = getApiTable(tableWrapper);
+ const columns = data?.cols;
+
+ const filteredQuery = useMemo(() => {
+ if (columns == null || zoomedRowID == null || question == null) {
+ return undefined;
+ }
+ return filterByPk(question.query(), columns, zoomedRowID);
+ }, [columns, zoomedRowID, question]);
+ if (shouldShowModal) {
if (columns != null && zoomedRowID != null && question != null) {
const columnsSettings = columns.map((column) => {
return settings?.column_settings?.[getColumnKey(column)];
@@ -72,7 +79,7 @@ export function ObjectDetailWrapper({
columnSettings={settings?.["table.columns"]}
columns={columns}
columnsSettings={columnsSettings}
- query={filterByPk(question.query(), columns, zoomedRowID)}
+ query={filteredQuery}
row={zoomedRow}
rowId={zoomedRowID}
showImplicitActions={areImplicitActionsEnabled}