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
Build the browse-tables virtual question from the store's builder (#82155)
Romeo Van Snickc90814629975
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsxindex 9834d97d433..50b3c05b57c 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.tsx@@ -6,18 +6,12 @@ import {useListDatabaseSchemaTablesQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { getMetadata } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import { getSetting } from "metabase/settings";import * as Urls from "metabase/urls";import { isSyncInProgress } from "metabase/utils/syncing";-import type Metadata from "metabase-lib/v1/metadata/Metadata";import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";-import {- type DatabaseId,- type Table,- isConcreteTableId,-} from "metabase-types/api";+import type { DatabaseId, Table } from "metabase-types/api";import { RELOAD_INTERVAL } from "../../constants";@@ -60,22 +54,10 @@ const getDatabaseId = (const getSchemaName = (props: TableBrowserContainerProps): string | undefined =>props.schemaName || props.params?.schemaName || undefined;-export const getTableUrl = (table: Table, metadata?: Metadata): string => {- // The Saved Questions virtual database exposes cards as "tables" with virtual- // ids (e.g. card__17). Those have no /table/:slug route, so fall back to the- // ad-hoc question URL for them.- if (!isConcreteTableId(table.id)) {- const question = metadata?.table(table.id)?.newQuestion();- return question ? Urls.question(question) : "";- }- return Urls.table({ id: table.id, name: table.display_name });-};-export const TableBrowser = (props: TableBrowserContainerProps) => {const dbId = getDatabaseId(props, { includeVirtual: true });const schemaName = getSchemaName(props);const { showSchemaInHeader } = props;- const metadata = useSelector(getMetadata);const xraysEnabled = useSelector((state) =>getSetting(state, "enable-xrays"),);@@ -117,8 +99,6 @@ export const TableBrowser = (props: TableBrowserContainerProps) => {<LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper><TableBrowserInnertables={tables}- getTableUrl={getTableUrl}- metadata={metadata}dbId={dbId}schemaName={schemaName}xraysEnabled={xraysEnabled}diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsxindex bf09588dd2f..dc7f1da85da 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx@@ -6,6 +6,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";+import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";import { TableBrowser } from "./TableBrowser";@@ -83,4 +84,28 @@ describe("TableBrowser", () => {fetchMock.callHistory.calls("path:/api/database/1/schema/"),).toHaveLength(0);});++ it("links a saved-question virtual table to an ad-hoc question", async () => {+ const table = createMockTable({+ id: "card__17",+ db_id: 1,+ name: "My question",+ display_name: "My question",+ initial_sync_status: "complete",+ });+ fetchMock.get(+ `path:/api/database/${SAVED_QUESTIONS_VIRTUAL_DB_ID}/schema/Everything else`,+ [table],+ );++ renderWithProviders(+ <TableBrowser+ dbId={SAVED_QUESTIONS_VIRTUAL_DB_ID}+ schemaName="Everything else"+ />,+ );++ const link = await screen.findByRole("link", { name: /My question/ });+ expect(link).toHaveAttribute("href", expect.stringMatching(/^\/question#/));+ });});diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsxindex 3db4fc41a8f..fcb4e6640d9 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx@@ -12,7 +12,6 @@ import { PLUGIN_TABLE_EDITING } from "metabase/plugins";import { useSelector } from "metabase/redux";import { ActionIcon, Flex, Group, Icon, Loader, Paper } from "metabase/ui";import { isSyncInProgress } from "metabase/utils/syncing";-import type Metadata from "metabase-lib/v1/metadata/Metadata";import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";import type {ConcreteTableId,@@ -28,14 +27,11 @@ import {} from "../analytics";import S from "./TableBrowser.module.css";+import { getTableUrl } from "./selectors";import { useDatabaseCrumb } from "./useDatabaseCrumb";-type GetTableUrl = (table: Table, metadata?: Metadata) => string;-type TableBrowserProps = {tables: Table[];- getTableUrl: GetTableUrl;- metadata?: Metadata;dbId: DatabaseId;schemaName?: string;xraysEnabled?: boolean;@@ -44,8 +40,6 @@ type TableBrowserProps = {export const TableBrowserInner = ({tables,- getTableUrl,- metadata,dbId,schemaName,xraysEnabled,@@ -78,9 +72,7 @@ export const TableBrowserInner = ({key={table.id}table={table}dbId={dbId}- getTableUrl={getTableUrl}xraysEnabled={xraysEnabled}- metadata={metadata}canEditTables={canEditTables}/>))}@@ -93,8 +85,6 @@ type TableBrowserItemProps = {table: Table;dbId: DatabaseId;xraysEnabled?: boolean;- metadata?: Metadata;- getTableUrl: GetTableUrl;canEditTables?: boolean;};@@ -102,17 +92,16 @@ const TableBrowserItem = ({table,dbId,xraysEnabled,- metadata,- getTableUrl,canEditTables,}: TableBrowserItemProps) => {+ const tableUrl = useSelector((state) => getTableUrl(state, table));const isVirtual = isVirtualCardId(table.id);const isLoading = isSyncInProgress(table);const isTableWritable = table.is_writable;return (<BrowseCard- to={!isSyncInProgress(table) ? getTableUrl(table, metadata) : ""}+ to={!isSyncInProgress(table) ? tableUrl : ""}icon="table"title={table.display_name || table.name}// Unjustified type cast. FIXMEdiff --git a/frontend/src/metabase/browse/tables/TableBrowser/selectors.ts b/frontend/src/metabase/browse/tables/TableBrowser/selectors.tsnew file mode 100644index 00000000000..88e7306ecbe--- /dev/null+++ b/frontend/src/metabase/browse/tables/TableBrowser/selectors.ts@@ -0,0 +1,23 @@+import { createSelector } from "@reduxjs/toolkit";++import { selectQuestionFromOptsBuilder } from "metabase/metadata-store";+import type { State } from "metabase/redux/store";+import * as Urls from "metabase/urls";+import { type Table, isConcreteTableId } from "metabase-types/api";++export const getTableUrl = createSelector(+ [selectQuestionFromOptsBuilder, (_state: State, table: Table) => table],+ (buildDraftQuestion, table): string => {+ // The Saved Questions virtual database exposes cards as "tables" with+ // virtual ids (e.g. card__17). Those have no /table/:slug route, so fall+ // back to the ad-hoc question URL for them.+ if (!isConcreteTableId(table.id)) {+ const question = buildDraftQuestion({+ DEPRECATED_RAW_MBQL_databaseId: table.db_id,+ DEPRECATED_RAW_MBQL_tableId: table.id,+ });+ return Urls.question(question.setDefaultDisplay());+ }+ return Urls.table({ id: table.id, name: table.display_name });+ },+);