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
Fix field filter dropdowns for users without create-queries permission GHY-1605 (#71046)
Eric Normand94cdeffdab19
diff --git a/e2e/test/scenarios/filters/view.cy.spec.js b/e2e/test/scenarios/filters/view.cy.spec.jsindex fe44de88f0a..32508d75a3e 100644--- a/e2e/test/scenarios/filters/view.cy.spec.js+++ b/e2e/test/scenarios/filters/view.cy.spec.js@@ -75,17 +75,19 @@ describe("scenarios > question > view", () => {cy.signIn("nodata");H.visitQuestion("@questionId");- // Filter by category and vendor+ // The nodata user has view-data permission (via All Users group) but no create-queries permission.+ // With param_fields hydration, field filter widgets now show as dropdowns with values.// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("This question is written in SQL.");cy.findAllByText("VENDOR").first().click();- H.dashboardParametersPopover().within(() => {- H.fieldValuesCombobox().type("Balistreri-Muller");+ H.popover().within(() => {+ cy.findByPlaceholderText("Search the list").type("Balistreri-Muller");+ cy.findByText("Balistreri-Muller").click();cy.findByText("Add filter").click();});cy.findAllByText("CATEGORY").first().click();- H.dashboardParametersPopover().within(() => {- H.fieldValuesCombobox().type("Widget");+ H.popover().within(() => {+ cy.findByText("Widget").click();cy.findByText("Add filter").click();});@@ -104,7 +106,9 @@ describe("scenarios > question > view", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("Question").click();- // Filter by category and vendor+ // The nodata user has view-data permission (via All Users group) but no create-queries+ // permission. The dashboard load populates field metadata into the entity cache via+ // addFields, so field filter widgets show as dropdowns when navigating to the question.// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("This question is written in SQL.");cy.findAllByText("VENDOR").first().click();@@ -115,7 +119,6 @@ describe("scenarios > question > view", () => {});cy.findAllByText("CATEGORY").first().click();H.popover().within(() => {- cy.findByPlaceholderText("Search the list").type("Widget");cy.findByText("Widget").click();cy.findByText("Add filter").click();});diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.tsindex 417a7fc9188..4de0f63ffd0 100644--- a/frontend/src/metabase-types/api/card.ts+++ b/frontend/src/metabase-types/api/card.ts@@ -74,6 +74,7 @@ export interface Card<Q extends DatasetQuery = DatasetQuery>parameter_usage_count?: number | null;result_metadata: Field[] | null;+ param_fields?: Record<ParameterId, Field[]>;moderation_reviews?: ModerationReview[];persisted?: boolean;diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.tsindex a39468ab0ac..78fa46ef7fc 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts@@ -14,6 +14,7 @@ import {} from "metabase/query_builder/selectors";import { loadMetadataForCard } from "metabase/questions/actions";import { setErrorPage } from "metabase/redux/app";+import { addFields } from "metabase/redux/metadata";import { getMetadata } from "metabase/selectors/metadata";import { canUserCreateQueries, getUser } from "metabase/selectors/user";import * as Lib from "metabase-lib";@@ -350,6 +351,14 @@ async function handleQBInit(}await dispatch(loadMetadataForCard(card));++ // Populate the metadata store with param_fields from the card response.+ // This ensures field filter widgets have has_field_values even when the user+ // lacks create-queries permission on the underlying table (GHY-1605).+ if (card.param_fields) {+ await dispatch(addFields(Object.values(card.param_fields).flat()));+ }+const metadata = getMetadata(getState());let question = new Question(card, metadata);diff --git a/src/metabase/queries_rest/api/card.clj b/src/metabase/queries_rest/api/card.cljindex 243087614ea..157ae333b30 100644--- a/src/metabase/queries_rest/api/card.clj+++ b/src/metabase/queries_rest/api/card.clj@@ -215,11 +215,21 @@:can_manage_db[:collection :is_personal][:moderation_reviews :moderator_details]+ :param_fields:is_remote_synced)+ (update :param_fields (fn [param-fields]+ (let [viewable? (memoize (fn [table-id]+ (perms/user-has-permission-for-table?+ api/*current-user-id*+ :perms/view-data :unrestricted+ (:database_id card) table-id)))]+ (update-vals param-fields+ (fn [fields]+ (filterv #(viewable? (:table_id %)) fields))))))(update :dashboard #(some-> % (select-keys [:name :id :moderation_status])))(cond->(queries/model? card) (t2/hydrate :persisted- ;; can_manage_db determines whether we should enable model persistence settings+ ;; can_manage_db determines whether we should enable model persistence settings:can_manage_db)))))(defn- get-carddiff --git a/test/metabase/queries_rest/api/card_test.clj b/test/metabase/queries_rest/api/card_test.cljindex f081b9823a1..77400870872 100644--- a/test/metabase/queries_rest/api/card_test.clj+++ b/test/metabase/queries_rest/api/card_test.clj@@ -3523,38 +3523,34 @@(is (not ((into #{} (mapcat identity) (:values response)) "The Virgil")))))))))(deftest field-filter-values-without-create-queries-permission-test- (testing "Users with view-data but without create-queries permission can still get field filter values (#70767)"- (let [param-key "name_param_id"]- (mt/with-temp [:model/Card field-filter-card- {:dataset_query {:database (mt/id)- :type :native- :native {:query "SELECT COUNT(*) FROM VENUES WHERE {{NAME}}"- :template-tags {"NAME" {:id param-key- :name "NAME"- :display_name "Name"- :type :dimension- :dimension [:field (mt/id :venues :name) nil]- :required true}}}}- :name "native card with field filter"- :parameters [{:id param-key- :type :string/=- :target [:dimension [:template-tag "NAME"]]- :name "Name"- :slug "NAME"}]}]- (mt/with-no-data-perms-for-all-users!- (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)- (testing "GET /api/card/:card-id/params/:param-key/values"- (let [response (mt/user-http-request :rasta :get 200- (param-values-url field-filter-card param-key))]- (is (false? (:has_more_values response)))- (is (set/subset? #{["20th Century Cafe"] ["33 Taps"]}- (-> response :values set)))))- (testing "GET /api/card/:card-id/params/:param-key/search/:query"- (let [response (mt/user-http-request :rasta :get 200- (param-values-url field-filter-card param-key "bar"))]- (is (set/subset? #{["Barney's Beanery"] ["bigmista's barbecue"]}- (-> response :values set))))))))))+ (testing "Users without create-queries permission can still get field filter values for saved cards (#GHY-1605)"+ (with-card-param-values-fixtures [{:keys [param-keys field-filter-card]}]+ (mt/with-no-data-perms-for-all-users!+ (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)+ (testing "GET /api/card/:card-id/params/:param-key/values"+ (let [response (mt/user-http-request :rasta :get 200+ (param-values-url field-filter-card (:field-values param-keys)))]+ (is (false? (:has_more_values response)))+ (is (set/subset? #{["20th Century Cafe"] ["33 Taps"]}+ (-> response :values set)))))+ (testing "GET /api/card/:card-id/params/:param-key/search/:query"+ (let [response (mt/user-http-request :rasta :get 200+ (param-values-url field-filter-card+ (:field-values param-keys)+ "bar"))]+ (is (set/subset? #{["Barney's Beanery"] ["bigmista's barbecue"]}+ (-> response :values set)))))))))++(deftest param-fields-excluded-without-view-data-permission-test+ (testing "param_fields should not include fields for tables where the user lacks view-data permission"+ (with-card-param-values-fixtures [{:keys [field-filter-card]}]+ (mt/with-no-data-perms-for-all-users!+ (data-perms/set-database-permission! (perms-group/all-users) (mt/id) :perms/view-data :blocked)+ (data-perms/set-database-permission! (perms-group/all-users) (mt/id) :perms/create-queries :no)+ (let [response (mt/user-http-request :rasta :get 200+ (format "card/%d" (:id field-filter-card)))]+ (is (every? empty? (vals (:param_fields response)))))))))(deftest parameters-with-field-to-field-remapping-test(let [param-key "id/param"]