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 the table and database from their own requests, not the entities mirror (#82472)
Romeo Van Snick7ff180c80a64
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsxindex dc7f1da85da..802e375ccb0 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.unit.spec.tsx@@ -1,5 +1,8 @@import fetchMock from "fetch-mock";+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";+import { mockSettings } from "__support__/settings";+import { createMockState } from "__support__/state";import {renderWithProviders,screen,@@ -7,7 +10,12 @@ import {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 {+ createMockDatabase,+ createMockTable,+ createMockTokenFeatures,+ createMockUser,+} from "metabase-types/api/mocks";import { TableBrowser } from "./TableBrowser";@@ -108,4 +116,37 @@ describe("TableBrowser", () => {const link = await screen.findByRole("link", { name: /My question/ });expect(link).toHaveAttribute("href", expect.stringMatching(/^\/question#/));});+ it("offers the edit action when the database allows table editing", async () => {+ const table = createMockTable({+ id: 123,+ name: "foo",+ display_name: "foo",+ initial_sync_status: "complete",+ is_writable: true,+ });+ const database = createMockDatabase({+ id: 1,+ tables: [table],+ settings: { "database-enable-table-editing": true },+ });+ fetchMock.get(`path:/api/database/${database.id}`, database);+ fetchMock.get(`path:/api/database/${database.id}/schema/public`, [table]);++ const state = createMockState({+ currentUser: createMockUser({ is_superuser: true }),+ settings: mockSettings({+ "token-features": createMockTokenFeatures({+ table_data_editing: true,+ }),+ }),+ });+ setupEnterpriseOnlyPlugin("table-editing");++ renderWithProviders(<TableBrowser dbId={1} schemaName="public" />, {+ storeInitialState: state,+ });++ expect(await screen.findByText("foo")).toBeInTheDocument();+ expect(await screen.findByTestId("edit-table-icon")).toBeInTheDocument();+ });});diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsxindex fcb4e6640d9..76753ccc8c8 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx@@ -1,24 +1,22 @@import cx from "classnames";import { t } from "ttag";+import { skipToken, useGetDatabaseQuery } from "metabase/api";import { BrowseCard } from "metabase/browse/components/BrowseCard";import { BrowseGrid } from "metabase/browse/components/BrowseGrid";import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";import { getUserIsAdmin } from "metabase/current-user";-import { getShallowDatabases as getDatabases } from "metabase/metadata-store";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 { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";-import type {- ConcreteTableId,- Database,- DatabaseId,- Table,-} from "metabase-types/api";+import {+ SAVED_QUESTIONS_VIRTUAL_DB_ID,+ isVirtualCardId,+} from "metabase-lib/v1/metadata/utils/saved-questions";+import type { ConcreteTableId, DatabaseId, Table } from "metabase-types/api";import {trackBrowseXRayClicked,@@ -45,15 +43,15 @@ export const TableBrowserInner = ({xraysEnabled,showSchemaInHeader = true,}: TableBrowserProps) => {- const databases = useSelector(getDatabases);- const database = databases[dbId];+ const { data: database } = useGetDatabaseQuery(+ dbId === SAVED_QUESTIONS_VIRTUAL_DB_ID ? skipToken : { id: dbId },+ );const isAdmin = useSelector(getUserIsAdmin);const databaseCrumb = useDatabaseCrumb(dbId);const canEditTables =!!database &&isAdmin &&- // Unjustified type cast. FIXME- PLUGIN_TABLE_EDITING.isDatabaseTableEditingEnabled(database as Database);+ PLUGIN_TABLE_EDITING.isDatabaseTableEditingEnabled(database);return (<>diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsxindex 5a26d353cf9..f9e48ee6cf4 100644--- a/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx@@ -29,6 +29,7 @@ export function DataModelMeasureDetailPage() {return (<MeasureDetailPagemeasure={measure}+ table={table}tabUrls={tabUrls}breadcrumbs={<DataModelMeasureBreadcrumbs table={table} measure={measure} />diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxindex 8a5f81425df..7b9b98bb891 100644--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -7,12 +7,11 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { PageContainer } from "metabase/common/data-studio/components/PageContainer";import { getUserCanWriteMeasures } from "metabase/common/data-studio/selectors";import { useMetadataToasts } from "metabase/common/hooks";-import { getShallowTables } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import { Button, Group } from "metabase/ui";import * as Urls from "metabase/urls";import * as Lib from "metabase-lib";-import type { Measure } from "metabase-types/api";+import type { Measure, Table } from "metabase-types/api";import { MeasureEditor } from "../../components/MeasureEditor";import { MeasureHeader } from "../../components/MeasureHeader";@@ -21,6 +20,7 @@ import type { MeasureTabUrls } from "../../types";type MeasureDetailPageProps = {measure: Measure;+ table: Table;tabUrls: MeasureTabUrls;breadcrumbs: ReactNode;onRemove: () => Promise<void>;@@ -28,14 +28,13 @@ type MeasureDetailPageProps = {export function MeasureDetailPage({measure,+ table,tabUrls,breadcrumbs,onRemove,}: MeasureDetailPageProps) {- const tables = useSelector(getShallowTables);- const table = tables[measure.table_id];const canWriteMeasures = useSelector((state) =>- getUserCanWriteMeasures(state, !!table?.is_published),+ getUserCanWriteMeasures(state, table.is_published),);const { sendSuccessToast, sendErrorToast } = useMetadataToasts();diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsxindex 8e623f5e898..8d713060d63 100644--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx@@ -27,6 +27,7 @@ export function PublishedTableMeasureDetailPage() {return (<MeasureDetailPagemeasure={measure}+ table={table}tabUrls={tabUrls}breadcrumbs={<PublishedTableMeasureBreadcrumbs table={table} measure={measure} />diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsxindex 5b12ac2daeb..9dbe0f31c5d 100644--- a/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelSegmentDetailPage/DataModelSegmentDetailPage.tsx@@ -29,6 +29,7 @@ export function DataModelSegmentDetailPage() {return (<SegmentDetailPagesegment={segment}+ table={table}tabUrls={tabUrls}breadcrumbs={<DataModelSegmentBreadcrumbs table={table} segment={segment} />diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsxindex e76ff089ab3..66a9280dbb6 100644--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage/PublishedTableSegmentDetailPage.tsx@@ -27,6 +27,7 @@ export function PublishedTableSegmentDetailPage() {return (<SegmentDetailPagesegment={segment}+ table={table}tabUrls={tabUrls}breadcrumbs={<PublishedTableSegmentBreadcrumbs table={table} segment={segment} />diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsxindex 89908fce9a9..cd2cefaf837 100644--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx@@ -8,11 +8,10 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContaiimport { getUserCanWriteSegments } from "metabase/common/data-studio/selectors";import { useMetadataToasts } from "metabase/common/hooks";import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";-import { getShallowTables } from "metabase/metadata-store";import { useSelector } from "metabase/redux";import { Button, Group } from "metabase/ui";import * as Lib from "metabase-lib";-import type { Segment } from "metabase-types/api";+import type { Segment, Table } from "metabase-types/api";import { SegmentEditor } from "../../components/SegmentEditor";import { SegmentHeader } from "../../components/SegmentHeader";@@ -21,6 +20,7 @@ import type { SegmentTabUrls } from "../../types";type SegmentDetailPageProps = {segment: Segment;+ table: Table;tabUrls: SegmentTabUrls;breadcrumbs: ReactNode;onRemove: () => Promise<void>;@@ -28,14 +28,13 @@ type SegmentDetailPageProps = {export function SegmentDetailPage({segment,+ table,tabUrls,breadcrumbs,onRemove,}: SegmentDetailPageProps) {- const tables = useSelector(getShallowTables);- const table = tables[segment.table_id];const canWriteSegments = useSelector((state) =>- getUserCanWriteSegments(state, !!table?.is_published),+ getUserCanWriteSegments(state, table.is_published),);const { sendSuccessToast, sendErrorToast } = useMetadataToasts();diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsxindex 3d4672ae006..5dcde658336 100644--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx@@ -128,6 +128,7 @@ export function setup({<SegmentDetailPage// Unjustified type cast. FIXMEsegment={segment}+ table={table}tabUrls={tabUrls}breadcrumbs={<DataModelSegmentBreadcrumbs table={table} segment={segment} />