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
Show clearer permission state on inaccessible metric pages (#75068)
Andrei Chernykhe81e4c8c9da3
diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.tsindex 4612aceef8f..11218ffa37f 100644--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/utils.ts@@ -3,14 +3,16 @@ import _ from "underscore";import { getColumnIcon } from "metabase/common/utils/columns";import { getRawTableFieldId } from "metabase/metadata/utils/field";+import { is403Error } from "metabase/utils/errors";import * as Lib from "metabase-lib";import { getRemappings } from "metabase-lib/v1/queries/utils/field";import { isEntityName, isFK } from "metabase-lib/v1/types/utils/isa";import type { Field, FieldId, FieldValue, Table } from "metabase-types/api";-import { isObject } from "metabase-types/guards";import type { RemappingValue } from "./DisplayValuesPicker";+export { is403Error };+export function getFkTargetTableEntityNameOrNull(targetTable: Table | undefined,): FieldId | undefined {@@ -79,10 +81,6 @@ function hasMappableNumeralValues();}-export function is403Error(error: unknown): boolean {- return isObject(error) && error.status === 403;-}-export function getFieldRemappedValues(fieldValues: FieldValue[] | undefined,): Map<number, string> {diff --git a/frontend/src/metabase/metadata/components/PreviewSection/utils.ts b/frontend/src/metabase/metadata/components/PreviewSection/utils.tsindex 1acc4eeaf71..f2fbc1a505a 100644--- a/frontend/src/metabase/metadata/components/PreviewSection/utils.ts+++ b/frontend/src/metabase/metadata/components/PreviewSection/utils.ts@@ -1,7 +1,8 @@import { t } from "ttag";import type { Dataset, Field } from "metabase-types/api";-import { isObject } from "metabase-types/guards";++export { is403Error } from "metabase/utils/errors";export function getPreviewTypeData() {return [@@ -25,10 +26,6 @@ export function getDataErrorMessage(data: Dataset): string {return error ?? t`Something went wrong`;}-export function is403Error(error: unknown): boolean {- return isObject(error) && error.status === 403;-}-export function isFieldHidden(field: Field) {return (field.visibility_type === "sensitive" ||diff --git a/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsxnew file mode 100644index 00000000000..ca75f7d6866--- /dev/null+++ b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx@@ -0,0 +1,47 @@+import type { ReactNode } from "react";++import { skipToken, useGetCardQueryQuery } from "metabase/api";+import { Unauthorized } from "metabase/common/components/ErrorPages";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";+import { Center } from "metabase/ui";+import * as Urls from "metabase/urls";+import { is403Error } from "metabase/utils/errors";+import type { Card } from "metabase-types/api";++interface MetricPageCardProps {+ cardId: string;+ children: (card: Card) => ReactNode;+}++/**+ * Loads a metric card and gates access for every metric page: renders the+ * unauthorized screen when the card or its query is forbidden (403), otherwise+ * renders `children` with the loaded card. Uses the query result (not a+ * permission flag) so sandboxed/no-source-access users who can still view the+ * metric aren't wrongly blocked.+ */+export function MetricPageCard({+ cardId: rawCardId,+ children,+}: MetricPageCardProps) {+ const cardId = Urls.extractEntityId(rawCardId);+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);+ const { error: datasetError, isLoading: isLoadingDataset } =+ useGetCardQueryQuery(cardId != null ? { cardId } : skipToken);++ if (is403Error(error) || is403Error(datasetError)) {+ return <Unauthorized />;+ }++ const loading = isLoading || isLoadingDataset;+ if (loading || error != null || card == null) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={loading} error={error} />+ </Center>+ );+ }++ return <>{children(card)}</>;+}diff --git a/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.unit.spec.tsxnew file mode 100644index 00000000000..933f324bba6--- /dev/null+++ b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.unit.spec.tsx@@ -0,0 +1,112 @@+import fetchMock from "fetch-mock";++import {+ setupCardEndpoints,+ setupCardQueryEndpoints,+ setupCardQueryMetadataEndpoint,+ setupDatabaseEndpoints,+ setupForbiddenCardEndpoints,+} from "__support__/server-mocks";+import { PERMISSION_ERROR } from "__support__/server-mocks/constants";+import { renderWithProviders, screen } from "__support__/ui";+import type { Card } from "metabase-types/api";+import {+ createMockCard,+ createMockCardQueryMetadata,+ createMockDataset,+ createMockDatasetData,+ createMockNumericColumn,+} from "metabase-types/api/mocks";+import {+ ORDERS_ID,+ SAMPLE_DB_ID,+ createSampleDatabase,+} from "metabase-types/api/mocks/presets";++import { MetricPageCard } from "./MetricPageCard";++const SAMPLE_DB = createSampleDatabase();+const CARD_ID = 42;++function makeMetricCard(): Card {+ return createMockCard({+ id: CARD_ID,+ type: "metric",+ name: "Count of Orders",+ database_id: SAMPLE_DB_ID,+ table_id: ORDERS_ID,+ dataset_query: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: { "source-table": ORDERS_ID, aggregation: [["count"]] },+ },+ });+}++function setupReadableCard(card: Card) {+ setupDatabaseEndpoints(SAMPLE_DB);+ setupCardEndpoints(card);+ setupCardQueryMetadataEndpoint(+ card,+ createMockCardQueryMetadata({ databases: [SAMPLE_DB] }),+ );+}++function setup() {+ renderWithProviders(+ <MetricPageCard cardId={String(CARD_ID)}>+ {(card) => <div data-testid="content">{card.name}</div>}+ </MetricPageCard>,+ );+}++describe("MetricPageCard", () => {+ it("renders the unauthorized state when the card itself is not readable", async () => {+ setupForbiddenCardEndpoints(CARD_ID);++ setup();++ expect(+ await screen.findByText(/permission to see that/i),+ ).toBeInTheDocument();+ expect(screen.queryByTestId("content")).not.toBeInTheDocument();+ });++ it("renders the unauthorized state when the metric query is forbidden", async () => {+ setupReadableCard(makeMetricCard());+ fetchMock.post(`path:/api/card/${CARD_ID}/query`, {+ status: 403,+ body: PERMISSION_ERROR,+ });++ setup();++ expect(+ await screen.findByText(/permission to see that/i),+ ).toBeInTheDocument();+ expect(screen.queryByTestId("content")).not.toBeInTheDocument();+ });++ it("renders children when the metric query succeeds (viewable without ad-hoc data access)", async () => {+ const card = makeMetricCard();+ setupReadableCard(card);+ setupCardQueryEndpoints(+ card,+ createMockDataset({+ data: createMockDatasetData({+ cols: [createMockNumericColumn({ name: "count" })],+ rows: [[18760]],+ }),+ }),+ );++ setup();++ expect(await screen.findByTestId("content")).toHaveTextContent(+ "Count of Orders",+ );+ expect(+ screen.queryByText(/permission to see that/i),+ ).not.toBeInTheDocument();+ });+});diff --git a/frontend/src/metabase/metrics/components/MetricPageCard/index.ts b/frontend/src/metabase/metrics/components/MetricPageCard/index.tsnew file mode 100644index 00000000000..250352de07a--- /dev/null+++ b/frontend/src/metabase/metrics/components/MetricPageCard/index.ts@@ -0,0 +1 @@+export { MetricPageCard } from "./MetricPageCard";diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsxindex 99530de0149..0b9dd1eb3c1 100644--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx@@ -1,9 +1,6 @@-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";-import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";-import { Center } from "metabase/ui";-import * as Urls from "metabase/urls";+import { MetricPageCard } from "../../components/MetricPageCard";import { MetricPageShell } from "../../components/MetricPageShell";import type { MetricPageProps } from "../../types";import { metricUrls as defaultUrls } from "../../urls";@@ -17,27 +14,20 @@ export function MetricAboutPage({showAppSwitcher,showDataStudioLink = true,}: MetricPageProps) {- const cardId = Urls.extractEntityId(params.cardId);- const { card, isLoading, error } = useLoadCardWithMetadata(cardId);-- if (isLoading || error != null || card == null) {- return (- <Center h="100%">- <LoadingAndErrorWrapper loading={isLoading} error={error} />- </Center>- );- }-return (- <PageContainer data-testid="metric-about-page" gap="xl">- <MetricPageShell- card={card}- urls={urls}- renderBreadcrumbs={renderBreadcrumbs}- showAppSwitcher={showAppSwitcher}- showDataStudioLink={showDataStudioLink}- />- <MetricAbout card={card} urls={urls} />- </PageContainer>+ <MetricPageCard cardId={params.cardId}>+ {(card) => (+ <PageContainer data-testid="metric-about-page" gap="xl">+ <MetricPageShell+ card={card}+ urls={urls}+ renderBreadcrumbs={renderBreadcrumbs}+ showAppSwitcher={showAppSwitcher}+ showDataStudioLink={showDataStudioLink}+ />+ <MetricAbout card={card} urls={urls} />+ </PageContainer>+ )}+ </MetricPageCard>);}diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsxnew file mode 100644index 00000000000..135ebd38396--- /dev/null+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.unit.spec.tsx@@ -0,0 +1,106 @@+import fetchMock from "fetch-mock";+import { Route } from "react-router";++import {+ setupCardEndpoints,+ setupCardQueryMetadataEndpoint,+ setupDatabaseEndpoints,+ setupForbiddenCardEndpoints,+ setupMetricEndpoint,+} from "__support__/server-mocks";+import { PERMISSION_ERROR } from "__support__/server-mocks/constants";+import { renderWithProviders, screen } from "__support__/ui";+import type { Card } from "metabase-types/api";+import {+ createMockCard,+ createMockCardQueryMetadata,+ createMockMetric,+} from "metabase-types/api/mocks";+import {+ ORDERS_ID,+ SAMPLE_DB_ID,+ createSampleDatabase,+} from "metabase-types/api/mocks/presets";++import { MetricAboutPage } from "./MetricAboutPage";++const SAMPLE_DB = createSampleDatabase();+const CARD_ID = 42;++function makeMetricCard(opts: Partial<Card> = {}): Card {+ return createMockCard({+ id: CARD_ID,+ type: "metric",+ name: "Count of Orders",+ database_id: SAMPLE_DB_ID,+ table_id: ORDERS_ID,+ dataset_query: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: {+ "source-table": ORDERS_ID,+ aggregation: [["count"]],+ },+ },+ ...opts,+ });+}++function setupBaseEndpoints(card: Card) {+ setupDatabaseEndpoints(SAMPLE_DB);+ setupCardEndpoints(card);+ setupCardQueryMetadataEndpoint(+ card,+ createMockCardQueryMetadata({ databases: [SAMPLE_DB] }),+ );+ setupMetricEndpoint(createMockMetric({ id: card.id, name: card.name }));+}++function renderPage() {+ renderWithProviders(+ <Route+ path="/metric/:cardId"+ component={(props: any) => <MetricAboutPage params={props.params} />}+ />,+ {+ withRouter: true,+ initialRoute: `/metric/${CARD_ID}`,+ },+ );+}++describe("MetricAboutPage", () => {+ it("renders the unauthorized state (no tabs) when the metric query is forbidden", async () => {+ setupBaseEndpoints(makeMetricCard());+ fetchMock.post(`path:/api/card/${CARD_ID}/query`, {+ status: 403,+ body: PERMISSION_ERROR,+ });++ renderPage();++ expect(+ await screen.findByText(/permission to see that/i),+ ).toBeInTheDocument();+ expect(+ screen.queryByRole("tab", { name: "About" }),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByRole("tab", { name: "History" }),+ ).not.toBeInTheDocument();+ });++ it("renders the unauthorized state when the card itself is not readable", async () => {+ setupDatabaseEndpoints(SAMPLE_DB);+ setupForbiddenCardEndpoints(CARD_ID);++ renderPage();++ expect(+ await screen.findByText(/permission to see that/i),+ ).toBeInTheDocument();+ expect(+ screen.queryByRole("tab", { name: "About" }),+ ).not.toBeInTheDocument();+ });+});diff --git a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsxindex eee8979d451..89e10ba8588 100644--- a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx@@ -1,12 +1,10 @@import type { ReactNode } from "react";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";-import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";-import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/urls";+import { Card } from "metabase/ui";+import { MetricPageCard } from "../../components/MetricPageCard";import { MetricPageShell } from "../../components/MetricPageShell";import type { MetricPageProps } from "../../types";import { metricUrls as defaultUrls } from "../../urls";@@ -23,36 +21,29 @@ export function MetricDependenciesPage({showAppSwitcher,showDataStudioLink = true,}: MetricDependenciesPageProps) {- const cardId = Urls.extractEntityId(params.cardId);- const { card, isLoading, error } = useLoadCardWithMetadata(cardId);-- if (isLoading || error != null || card == null) {- return (- <Center h="100%">- <LoadingAndErrorWrapper loading={isLoading} error={error} />- </Center>- );- }-return (- <PageContainer>- <MetricPageShell- card={card}- urls={urls}- renderBreadcrumbs={renderBreadcrumbs}- showAppSwitcher={showAppSwitcher}- showDataStudioLink={showDataStudioLink}- />- <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider- value={{- baseUrl: urls.dependencies(card.id),- defaultEntry: { id: card.id, type: "card" },- }}- >- <Card withBorder p={0} flex={1}>- {children}- </Card>- </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>- </PageContainer>+ <MetricPageCard cardId={params.cardId}>+ {(card) => (+ <PageContainer>+ <MetricPageShell+ card={card}+ urls={urls}+ renderBreadcrumbs={renderBreadcrumbs}+ showAppSwitcher={showAppSwitcher}+ showDataStudioLink={showDataStudioLink}+ />+ <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider+ value={{+ baseUrl: urls.dependencies(card.id),+ defaultEntry: { id: card.id, type: "card" },+ }}+ >+ <Card withBorder p={0} flex={1}>+ {children}+ </Card>+ </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>+ </PageContainer>+ )}+ </MetricPageCard>);}diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsxindex f73e8cf3706..ff82c9fef88 100644--- a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx@@ -1,10 +1,8 @@-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";-import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";-import { Box, Card, Center } from "metabase/ui";-import * as Urls from "metabase/urls";+import { Box, Card } from "metabase/ui";import { MetricActivityTimeline } from "../../components/MetricActivityTimeline";+import { MetricPageCard } from "../../components/MetricPageCard";import { MetricPageShell } from "../../components/MetricPageShell";import type { MetricPageProps } from "../../types";import { metricUrls as defaultUrls } from "../../urls";@@ -18,31 +16,24 @@ export function MetricHistoryPage({showAppSwitcher,showDataStudioLink = true,}: MetricPageProps) {- const cardId = Urls.extractEntityId(params.cardId);- const { card, isLoading, error } = useLoadCardWithMetadata(cardId);-- if (isLoading || error != null || card == null) {- return (- <Center h="100%">- <LoadingAndErrorWrapper loading={isLoading} error={error} />- </Center>- );- }-return (- <PageContainer>- <MetricPageShell- card={card}- urls={urls}- renderBreadcrumbs={renderBreadcrumbs}- showAppSwitcher={showAppSwitcher}- showDataStudioLink={showDataStudioLink}- />- <Card withBorder p="md" flex={1} className={S.card}>- <Box maw={800} pt="md" px="md">- <MetricActivityTimeline card={card} />- </Box>- </Card>- </PageContainer>+ <MetricPageCard cardId={params.cardId}>+ {(card) => (+ <PageContainer>+ <MetricPageShell+ card={card}+ urls={urls}+ renderBreadcrumbs={renderBreadcrumbs}+ showAppSwitcher={showAppSwitcher}+ showDataStudioLink={showDataStudioLink}+ />+ <Card withBorder p="md" flex={1} className={S.card}>+ <Box maw={800} pt="md" px="md">+ <MetricActivityTimeline card={card} />+ </Box>+ </Card>+ </PageContainer>+ )}+ </MetricPageCard>);}diff --git a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsxindex 5a24bb06f9d..01fddb5bf6e 100644--- a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx@@ -4,14 +4,14 @@ import { replace } from "react-router-redux";import { useGetMetricQuery } from "metabase/api/metric";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";-import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";import { useDispatch } from "metabase/redux";import { Center } from "metabase/ui";-import * as Urls from "metabase/urls";+import type { Card } from "metabase-types/api";import { MetricDimensionGrid } from "../../components/MetricDimensionGrid";+import { MetricPageCard } from "../../components/MetricPageCard";import { MetricPageShell } from "../../components/MetricPageShell";-import type { MetricPageProps } from "../../types";+import type { MetricPageProps, MetricUrls } from "../../types";import { metricUrls as defaultUrls } from "../../urls";export function MetricOverviewPage({@@ -21,32 +21,50 @@ export function MetricOverviewPage({showAppSwitcher,showDataStudioLink = true,}: MetricPageProps) {- const cardId = Urls.extractEntityId(params.cardId);+ return (+ <MetricPageCard cardId={params.cardId}>+ {(card) => (+ <MetricOverviewPageBody+ card={card}+ urls={urls}+ renderBreadcrumbs={renderBreadcrumbs}+ showAppSwitcher={showAppSwitcher}+ showDataStudioLink={showDataStudioLink}+ />+ )}+ </MetricPageCard>+ );+}++interface MetricOverviewPageBodyProps extends Omit<MetricPageProps, "params"> {+ card: Card;+ urls: MetricUrls;+}++function MetricOverviewPageBody({+ card,+ urls,+ renderBreadcrumbs,+ showAppSwitcher,+ showDataStudioLink,+}: MetricOverviewPageBodyProps) {const dispatch = useDispatch();- const {- card,- isLoading: isCardLoading,- error,- } = useLoadCardWithMetadata(cardId);const { data: metric, isLoading: isMetricLoading } = useGetMetricQuery(- cardId!,- { skip: cardId == null },+ card.id,);-- const isLoading = isCardLoading || isMetricLoading;const hasDimensions =metric?.dimensions != null && metric.dimensions.length > 0;useEffect(() => {- if (!isLoading && card != null && !hasDimensions) {+ if (!isMetricLoading && !hasDimensions) {dispatch(replace(urls.about(card.id)));}- }, [isLoading, card, hasDimensions, dispatch, urls]);+ }, [card.id, isMetricLoading, hasDimensions, dispatch, urls]);- if (isLoading || error != null || card == null) {+ if (isMetricLoading) {return (<Center h="100%">- <LoadingAndErrorWrapper loading={isLoading} error={error} />+ <LoadingAndErrorWrapper loading /></Center>);}@@ -64,7 +82,7 @@ export function MetricOverviewPage({showAppSwitcher={showAppSwitcher}showDataStudioLink={showDataStudioLink}/>- {card.id != null && <MetricDimensionGrid metricId={card.id} />}+ <MetricDimensionGrid metricId={card.id} /></PageContainer>);}diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsxindex 82b8f56e78f..c89910e4a7b 100644--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx@@ -5,22 +5,20 @@ import { t } from "ttag";import { useUpdateCardMutation } from "metabase/api";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";-import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";import { getResultMetadata } from "metabase/data-studio/common/utils";import { useMetadataToasts } from "metabase/metadata/hooks";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";-import { Card, Center } from "metabase/ui";-import * as Urls from "metabase/urls";+import { Card } from "metabase/ui";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type { Card as CardApiType } from "metabase-types/api";+import { MetricPageCard } from "../../components/MetricPageCard";import { MetricPageShell } from "../../components/MetricPageShell";import { MetricQueryEditor } from "../../components/MetricQueryEditor";import type { MetricPageProps, MetricUrls } from "../../types";@@ -39,26 +37,19 @@ export function MetricQueryPage({showAppSwitcher,showDataStudioLink = true,}: MetricQueryPageProps) {- const cardId = Urls.extractEntityId(params.cardId);- const { card, isLoading, error } = useLoadCardWithMetadata(cardId);-- if (isLoading || error != null || card == null) {- return (- <Center h="100%">- <LoadingAndErrorWrapper loading={isLoading} error={error} />- </Center>- );- }-return (- <MetricQueryPageBody- card={card}- route={route}- urls={urls}- renderBreadcrumbs={renderBreadcrumbs}- showAppSwitcher={showAppSwitcher}- showDataStudioLink={showDataStudioLink}- />+ <MetricPageCard cardId={params.cardId}>+ {(card) => (+ <MetricQueryPageBody+ card={card}+ route={route}+ urls={urls}+ renderBreadcrumbs={renderBreadcrumbs}+ showAppSwitcher={showAppSwitcher}+ showDataStudioLink={showDataStudioLink}+ />+ )}+ </MetricPageCard>);}diff --git a/frontend/src/metabase/utils/errors/index.ts b/frontend/src/metabase/utils/errors/index.tsindex a9bfa508187..84b3861617a 100644--- a/frontend/src/metabase/utils/errors/index.ts+++ b/frontend/src/metabase/utils/errors/index.ts@@ -2,5 +2,6 @@ export * from "./messages";export * from "./validation";export * from "./server-error-types";export * from "./console";+export * from "./is-403-error";export type { GenericErrorResponse } from "./types";diff --git a/frontend/src/metabase/utils/errors/is-403-error.ts b/frontend/src/metabase/utils/errors/is-403-error.tsnew file mode 100644index 00000000000..e1bb40d2e67--- /dev/null+++ b/frontend/src/metabase/utils/errors/is-403-error.ts@@ -0,0 +1,6 @@+import { isObject } from "metabase-types/guards";++/** True when an API error object is an HTTP 403 (forbidden). */+export function is403Error(error: unknown): boolean {+ return isObject(error) && error.status === 403;+}diff --git a/frontend/test/__support__/server-mocks/card.ts b/frontend/test/__support__/server-mocks/card.tsindex ccccebc411d..36115c0cdce 100644--- a/frontend/test/__support__/server-mocks/card.ts+++ b/frontend/test/__support__/server-mocks/card.ts@@ -102,6 +102,25 @@ export function setupUnauthorizedCardsEndpoints(cards: Card[]) {cards.forEach((card) => setupUnauthorizedCardEndpoints(card));}+/**+ * Makes the card's own endpoints (the card, its query metadata, and running its+ * query) all return 403, i.e. a card the current user has no access to at all.+ */+export function setupForbiddenCardEndpoints(cardId: CardId) {+ fetchMock.get(`path:/api/card/${cardId}`, {+ status: 403,+ body: PERMISSION_ERROR,+ });+ fetchMock.get(`path:/api/card/${cardId}/query_metadata`, {+ status: 403,+ body: PERMISSION_ERROR,+ });+ fetchMock.post(`path:/api/card/${cardId}/query`, {+ status: 403,+ body: PERMISSION_ERROR,+ });+}+export function setupCardQueryEndpoints(card: Card, dataset: Dataset) {fetchMock.post(`path:/api/card/${card.id}/query`, dataset);}