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
Correctly hide/show card filters based on permissions (#70980)
Eric Normand693550cf45da
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex 738f523ccea..04012470c86 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -516,21 +516,33 @@ export function DashCardVisualization({const actionButtons = useMemo(() => {const result = series[0] as unknown as Dataset;- if (- !question ||- !DashCardMenu.shouldRender({+ const showMenu =+ question &&+ DashCardMenu.shouldRender({question,dashboard,dashcardMenu,result,- })- ) {+ });++ const cardResult = dashcard.card_id+ ? datasets?.[dashcard.card_id]+ : undefined;+ const errorStatus =+ cardResult?.error && typeof cardResult.error === "object"+ ? cardResult.error.status+ : undefined;+ const hasViewAccess = !cardResult || errorStatus !== 403;++ const showInlineParams = inlineParameters.length > 0 && hasViewAccess;++ if (!showMenu && !showInlineParams) {return null;}return (<Group>- {inlineParameters.length > 0 && (+ {showInlineParams && (<CollapsibleDashboardParameterListclassName={S.InlineParametersList}triggerClassName={S.InlineParametersMenuTrigger}@@ -541,7 +553,7 @@ export function DashCardVisualization({ref={parameterListRef}/>)}- {!isEditing && (+ {showMenu && !isEditing && (<DashCardMenuquestion={question}result={result}@@ -564,6 +576,7 @@ export function DashCardVisualization({dashboard,dashcard,dashcardMenu,+ datasets,isEditing,inlineParameters,onChangeCardAndRun,diff --git a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsxindex ae366ec42f8..43e01e14cdd 100644--- a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx@@ -11,6 +11,7 @@ import {screen,within,} from "__support__/ui";+import * as dashboardSelectors from "metabase/dashboard/selectors";import {MockDashboardContext,type MockDashboardContextProps,@@ -28,6 +29,8 @@ import {createMockHeadingDashboardCard,createMockIFrameDashboardCard,createMockLinkDashboardCard,+ createMockNativeCard,+ createMockParameter,createMockPlaceholderDashboardCard,createMockTable,createMockTextDashboardCard,@@ -105,7 +108,17 @@ function setup({} = {}) {const onReplaceCard = jest.fn();+ const dashcardIds = (dashboard.dashcards ?? []).map(+ (dc: { id: number } | number) => (typeof dc === "number" ? dc : dc.id),+ );const baseDashboardState = createMockDashboardState({+ dashboardId: dashboard.id,+ dashboards: {+ [dashboard.id]: {+ ...dashboard,+ dashcards: dashcardIds.length > 0 ? dashcardIds : [dashcard.id],+ },+ },dashcardData,dashcards: {[dashcard.id]: dashcard,@@ -530,4 +543,123 @@ describe("DashCard", () => {});});});++ describe("inline parameters", () => {+ it("should show inline parameters even when the card has an error and user cannot edit (GHY-3228)", () => {+ const parameter = createMockParameter({+ id: "param-1",+ name: "State",+ type: "string/=",+ slug: "state",+ });++ const nativeCard = createMockNativeCard({+ name: "SQL Card",+ can_write: false,+ });++ const dashcard = createMockDashboardCard({+ card: nativeCard,+ inline_parameters: [parameter.id],+ parameter_mappings: [+ {+ card_id: nativeCard.id,+ parameter_id: parameter.id,+ target: ["variable", ["template-tag", "state"]],+ },+ ],+ });++ const dashboard = createMockDashboard({+ parameters: [parameter],+ dashcards: [dashcard],+ });++ const dashcardData: DashCardDataMap = {+ [dashcard.id]: {+ [nativeCard.id]: createMockDataset({+ data: createMockDatasetData({ rows: [], cols: [] }),+ database_id: 1,+ context: "dashboard",+ status: "error",+ error: { status: 400 },+ }),+ },+ };++ jest+ .spyOn(dashboardSelectors, "getDashCardInlineValuePopulatedParameters")+ .mockReturnValue([parameter]);++ setup({+ dashboard,+ dashcard,+ dashcardData,+ });++ // The inline parameter filter should be visible even when the card+ // errors and the user cannot edit the question. Before the fix,+ // both inline parameters and the download button were gated behind+ // DashCardMenu.shouldRender(), which returned false in this case.+ expect(screen.getByText("State")).toBeInTheDocument();+ });++ it("should hide inline parameters when the card returns a 403 error (no view-data permission) (GHY-3228)", () => {+ const parameter = createMockParameter({+ id: "param-1",+ name: "State",+ type: "string/=",+ slug: "state",+ });++ const nativeCard = createMockNativeCard({+ name: "SQL Card",+ can_write: false,+ });++ const dashcard = createMockDashboardCard({+ card: nativeCard,+ inline_parameters: [parameter.id],+ parameter_mappings: [+ {+ card_id: nativeCard.id,+ parameter_id: parameter.id,+ target: ["variable", ["template-tag", "state"]],+ },+ ],+ });++ const dashboard = createMockDashboard({+ parameters: [parameter],+ dashcards: [dashcard],+ });++ const dashcardData: DashCardDataMap = {+ [dashcard.id]: {+ [nativeCard.id]: createMockDataset({+ data: createMockDatasetData({ rows: [], cols: [] }),+ database_id: 1,+ context: "dashboard",+ status: "error",+ error: { status: 403 },+ }),+ },+ };++ jest+ .spyOn(dashboardSelectors, "getDashCardInlineValuePopulatedParameters")+ .mockReturnValue([parameter]);++ setup({+ dashboard,+ dashcard,+ dashcardData,+ });++ // When the user has no view-data permission (403), the inline+ // parameter filter should be hidden — there's no point showing+ // a filter for data the user can't access.+ expect(screen.queryByText("State")).not.toBeInTheDocument();+ });+ });});diff --git a/src/metabase/query_processor/dashboard.clj b/src/metabase/query_processor/dashboard.cljindex 7583550fc0d..f491a8033a1 100644--- a/src/metabase/query_processor/dashboard.clj+++ b/src/metabase/query_processor/dashboard.clj@@ -9,6 +9,7 @@[metabase.events.core :as events][metabase.lib.core :as lib][metabase.lib.schema.id :as lib.schema.id]+ [metabase.permissions.core :as perms][metabase.query-processor.card :as qp.card][metabase.query-processor.error-type :as qp.error-type][metabase.query-processor.middleware.constraints :as qp.constraints]@@ -179,6 +180,17 @@;; [[qp.card/process-query-for-card]](api/read-check :model/Dashboard dashboard-id)(check-card-and-dashcard-are-in-dashboard dashboard-id card-id dashcard-id)+ ;; Early view-data permission check so that blocked users get a 403 *before* parameter+ ;; resolution. Without this, a missing required parameter would produce a 400, and the+ ;; frontend couldn't distinguish "no permission" (hide inline filters) from "missing+ ;; params" (show inline filters). The QP middleware's check-block-permissions does a+ ;; thorough check later on the resolved query; this is intentionally just the card's+ ;; database_id since we don't have the resolved query yet.+ (api/check-403+ (not= :blocked+ (perms/most-permissive-database-permission-for-user+ api/*current-user-id* :perms/view-data+ (t2/select-one-fn :database_id :model/Card card-id))))(let [resolved-params (resolve-params-for-query dashboard-id card-id dashcard-id parameters)options (merge{:ignore-cache falsediff --git a/test/metabase/dashboards_rest/api_test.clj b/test/metabase/dashboards_rest/api_test.cljindex bf8ad452899..a18f83abb9d 100644--- a/test/metabase/dashboards_rest/api_test.clj+++ b/test/metabase/dashboards_rest/api_test.clj@@ -3659,7 +3659,19 @@(data-perms/set-database-permission! (perms-group/all-users) (mt/id) :perms/view-data :unrestricted)(data-perms/set-database-permission! (perms-group/all-users) (mt/id) :perms/create-queries :no)(is (malli= (dashboard-card-query-expected-results-schema)- (mt/user-http-request :rasta :post 202 (url)))))))+ (mt/user-http-request :rasta :post 202 (url))))))+ (testing "Should return 403 if user does not have view-data permission (GHY-3228)"+ (mt/with-no-data-perms-for-all-users!+ (data-perms/set-database-permission! (perms-group/all-users) (mt/id) :perms/view-data :blocked)+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :post 403 (url))))))+ (testing "Should return 403 for blocked view-data even with invalid parameters (GHY-3228)"+ (mt/with-no-data-perms-for-all-users!+ (data-perms/set-database-permission! (perms-group/all-users) (mt/id) :perms/view-data :blocked)+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :post 403 (url)+ {:parameters [{:id "FAKE_PARAM"+ :value "fake"}]}))))))(testing "Validation"(testing "404s"(testing "Should return 404 if Dashboard doesn't exist"