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
Read three single-entity lookups from their own requests (#82550)
Romeo Van Snickd3db1a1c53fe
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsxindex 74dedd2a016..83a165772cd 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx@@ -3,9 +3,9 @@ import { useFormik } from "formik";import { useEffect } from "react";import { t } from "ttag";+import { skipToken, useGetTableQuery } from "metabase/api";import { FieldSet } from "metabase/common/components/FieldSet";import { Link } from "metabase/common/components/Link";-import { getShallowTables } from "metabase/metadata-store";import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { useSelector, useStore } from "metabase/redux";import type { State } from "metabase/redux/store";@@ -46,7 +46,6 @@ export const SegmentForm = ({// `validate` runs outside render, on values this render has not seen, so it// reads the store at call time rather than closing over a selected value.const store = useStore();- const tables = useSelector(getShallowTables);const isRemoteSyncReadOnly = useSelector(PLUGIN_REMOTE_SYNC.getIsRemoteSyncReadOnly,);@@ -63,8 +62,13 @@ export const SegmentForm = ({getSegmentQuery(state, definitionProps.value, tableIdProps.value),);const tableId = isNew ? tableIdProps.value : segment?.table_id;- const table = tableId ? tables[tableId] : undefined;- const isReadOnly = isRemoteSyncReadOnly && !!table?.is_published;+ const { data: table } = useGetTableQuery(+ tableId ? { id: tableId } : skipToken,+ );+ // Treat a table that has not loaded as published, so the form stays+ // read-only until the answer is known.+ const isReadOnly =+ isRemoteSyncReadOnly && tableId != null && (table?.is_published ?? true);useEffect(() => {onIsDirtyChange(dirty);diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsxindex 58f9074c7ba..3b5105b3da5 100644--- a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx+++ b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx@@ -7,11 +7,11 @@ import { useMount } from "react-use";import { t } from "ttag";import _ from "underscore";+import { skipToken, useGetDatabaseQuery } from "metabase/api";import {CodeMirror,type CodeMirrorRef,} from "metabase/common/components/CodeMirror";-import { getShallowDatabases } from "metabase/metadata-store";import {type ExpressionError,diagnoseAndCompile,@@ -20,7 +20,6 @@ import {} from "metabase/querying/expressions";import { tokenAtPos } from "metabase/querying/expressions";import { COMMA, GROUP } from "metabase/querying/expressions/pratt";-import { useSelector } from "metabase/redux";import { Button, Tooltip as ButtonTooltip, Flex, Icon } from "metabase/ui";import * as Lib from "metabase-lib";import type { Database } from "metabase-types/api";@@ -86,8 +85,8 @@ export function Editor(props: EditorProps) {const ref = useRef<CodeMirrorRef>(null);const databaseId = Lib.databaseID(query);- const database = useSelector((state) =>- databaseId != null ? getShallowDatabases(state)[databaseId] : undefined,+ const { data: database } = useGetDatabaseQuery(+ databaseId != null ? { id: databaseId } : skipToken,);const [isFunctionBrowserOpen, { toggle: toggleFunctionBrowser }] =useDisclosure();diff --git a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsxindex 3b933356b78..1aafa699e7b 100644--- a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsx@@ -1,7 +1,6 @@import userEvent from "@testing-library/user-event";-import { createMockState } from "__support__/state";-import { createMockEntitiesState } from "__support__/store";+import { setupDatabaseEndpoints } from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";import * as Lib from "metabase-lib";import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";@@ -215,6 +214,12 @@ async function setup(return Lib.displayInfo(query, stageIndex, getRecentExpressionClause());}+ setupDatabaseEndpoints(+ createSampleDatabase(+ databaseFeatures ? { features: databaseFeatures } : {},+ ),+ );+renderWithProviders(<ExpressionWidgetclause={undefined}@@ -227,13 +232,6 @@ async function setup(onClose={onClose}{...additionalProps}/>,- databaseFeatures && {- storeInitialState: createMockState({- entities: createMockEntitiesState({- databases: [createSampleDatabase({ features: databaseFeatures })],- }),- }),- },);await waitFor(() =>expect(screen.getByTestId("custom-expression-query-editor")).toHaveProperty(diff --git a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsxindex af7b6924edc..796956d2e8a 100644--- a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx@@ -1,9 +1,13 @@import userEvent from "@testing-library/user-event";+import { setupDatabaseEndpoints } from "__support__/server-mocks";import { act, renderWithProviders, screen, within } from "__support__/ui";import * as Lib from "metabase-lib";import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";-import { ORDERS_ID } from "metabase-types/api/mocks/presets";+import {+ ORDERS_ID,+ createSampleDatabase,+} from "metabase-types/api/mocks/presets";import { createMockNotebookStep } from "../../test-utils";@@ -29,6 +33,8 @@ function setup({return recentQuery;}+ setupDatabaseEndpoints(createSampleDatabase());+renderWithProviders(<ExpressionStepstep={step}diff --git a/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx b/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsxindex e60e3d7dbac..a55e20b9059 100644--- a/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx+++ b/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx@@ -1,15 +1,15 @@import cx from "classnames";import { useMemo } from "react";-import { getShallowTables, useQuestionFromCard } from "metabase/metadata-store";-import { useSelector } from "metabase/redux";+import { skipToken, useGetTableQuery } from "metabase/api";+import { useQuestionFromCard } from "metabase/metadata-store";import { Box } from "metabase/ui";import type {VisualizationPassThroughProps,VisualizationProps,} from "metabase/visualizations/types";import * as Lib from "metabase-lib";-import type { DatasetColumn } from "metabase-types/api";+import { type DatasetColumn, isConcreteTableId } from "metabase-types/api";import { LIST_DEFINITION } from "../../definition";import { ListView } from "../ListView/ListView";@@ -26,7 +26,6 @@ const ListVizComponent = ({onZoomRow,}: VisualizationProps & VisualizationPassThroughProps) => {const buildQuestion = useQuestionFromCard();- const tables = useSelector(getShallowTables);const question = useMemo(() => (card ? buildQuestion(card) : null),[card, buildQuestion],@@ -48,23 +47,25 @@ const ListVizComponent = ({return {};}, [question]);- const entityType = useMemo(() => {+ // A saved question's virtual table has no entity type, so only a real table+ // is worth asking for.+ const sourceTableId = useMemo(() => {if (!question) {return undefined;}-try {- const query = question.query();- const sourceTableId = Lib.sourceTableOrCardId(query);- return sourceTableId != null- ? (tables[sourceTableId]?.entity_type ?? undefined)- : undefined;+ const id = Lib.sourceTableOrCardId(question.query());+ return id != null && isConcreteTableId(id) ? id : undefined;} catch (error) {- // If there's an error getting the entity type, return undefined- console.warn("Could not determine entity type:", error);+ console.warn("Could not determine the source table:", error);return undefined;}- }, [question, tables]);+ }, [question]);++ const { data: table } = useGetTableQuery(+ sourceTableId != null ? { id: sourceTableId } : skipToken,+ );+ const entityType = table?.entity_type ?? undefined;const handleSort = (column: DatasetColumn) => {onVisualizationClick({ column });