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
Only fetch restricted field values for fields that should have them (#83482)
Andrei Simionescu70025975a1be
diff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/field_values_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/field_values_test.cljindex c75e7caef4d..4b01285b5f0 100644--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/field_values_test.clj+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/models/field_values_test.clj@@ -13,7 +13,7 @@(deftest get-or-create-field-values!-test(mt/with-premium-features #{:advanced-permissions}- (let [field (t2/select-one :model/Field :id (mt/id :categories :id))]+ (let [field (assoc (t2/select-one :model/Field :id (mt/id :categories :id)) :has_field_values :list)](try(testing "creates new field values for user using impersonation"(impersonation.util-test/with-impersonations! {:impersonations [{:db-id (mt/id) :attribute "impersonation_attr"}]diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/entity_details_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/entity_details_test.cljindex de11744ea15..ee16529c814 100644--- a/enterprise/backend/test/metabase_enterprise/metabot/tools/entity_details_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/entity_details_test.clj@@ -17,14 +17,19 @@(deftest sandboxed-field-values-test(met/with-gtaps! {:gtaps {:categories {:query (sandboxed-query)}}}- (let [field-id (mt/id :categories :name)]+ (let [field-ids [(mt/id :categories :id) (mt/id :categories :name)]](try- (let [result (entity-details/get-table-details {:entity-type :table :entity-id (mt/id :categories)})- name-field (some #(when (= "NAME" (:name %)) %) (get-in result [:structured-output :fields]))]+ (let [result (entity-details/get-table-details {:entity-type :table :entity-id (mt/id :categories)})+ field (fn [field-name]+ (some #(when (= field-name (:name %)) %) (get-in result [:structured-output :fields])))](testing "returns sandboxed field values"- (is (= ["African" "American"] (:field_values name-field)))))+ (is (= ["African" "American"] (:field_values (field "NAME")))))+ (testing "doesn't fetch values for the primary key"+ (is (some? (field "ID")))+ (is (nil? (:field_values (field "ID"))))+ (is (not (t2/exists? :model/FieldValues :field_id (mt/id :categories :id) :type :advanced)))))(finally- (t2/delete! :model/FieldValues :field_id field-id :type :advanced))))))+ (t2/delete! :model/FieldValues :field_id [:in field-ids] :type :advanced))))))(deftest sandboxed-model-fields-test(testing "get-table-details for a model over a column-sandboxed table only returns allowed fields"diff --git a/enterprise/backend/test/metabase_enterprise/sandbox/models/params/field_values_test.clj b/enterprise/backend/test/metabase_enterprise/sandbox/models/params/field_values_test.cljindex f6b8eccc4db..35003040d08 100644--- a/enterprise/backend/test/metabase_enterprise/sandbox/models/params/field_values_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sandbox/models/params/field_values_test.clj@@ -5,6 +5,8 @@[java-time.api :as t][metabase-enterprise.sandbox.models.params.field-values :as ee-params.field-values][metabase-enterprise.test :as met]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata][metabase.parameters.field-values :as params.field-values][metabase.request.core :as request][metabase.test :as mt]@@ -25,7 +27,7 @@:values (range 10):human_readable_values (map #(str "id_" %) (range 10))})(let [categories-id (mt/id :categories :id)- f (t2/select-one :model/Field :id (mt/id :categories :id))+ f (assoc (t2/select-one :model/Field :id (mt/id :categories :id)) :has_field_values :list)card-id (-> f :table_id (#'ee-params.field-values/table-id->sandbox) :card :id)fv (params.field-values/get-or-create-field-values! f)](is (= [(range 4 6)]@@ -36,8 +38,7 @@(is (= ["id_4" "id_5"] (:human_readable_values fv)))(is (some? (:hash_key fv)))(testing "call second time shouldn't create a new FieldValues"- (params.field-values/get-or-create-field-values!- (t2/select-one :model/Field :id (mt/id :categories :id)))+ (params.field-values/get-or-create-field-values! f)(is (= 1 (t2/count :model/FieldValues :field_id categories-id :type :advanced))))(testing "after changing the question, should create new FieldValues"(let [new-query (mt/mbql-query categories@@ -46,14 +47,32 @@(mt/with-test-user :crowberto(t2/update! :model/Card card-id {:dataset_query new-query:updated_at (t/local-date-time)})))- (params.field-values/get-or-create-field-values!- (t2/select-one :model/Field :id (mt/id :categories :id)))+ (params.field-values/get-or-create-field-values! f)(is (= [(range 4 6)(range 2 4)](t2/select-fn-vec :values :model/FieldValues:field_id categories-id :type :advanced{:order-by [:id]}))))))))+(deftest advanced-field-values-only-for-fields-that-should-have-them-test+ (met/with-gtaps! {:gtaps {:categories+ {:query (let [mp (mt/metadata-provider)]+ (lib/filter (lib/query mp (lib.metadata/table mp (mt/id :categories)))+ (lib/< (lib.metadata/field mp (mt/id :categories :id)) 6)))}}}+ (mt/with-temp-vals-in-db :model/Field (mt/id :categories :id) {:has_field_values "none"}+ (mt/with-temp-vals-in-db :model/Field (mt/id :categories :name) {:has_field_values "list"}+ (let [id->values (params.field-values/field-id->field-values-for-current-user+ [(mt/id :categories :id) (mt/id :categories :name)])]+ (is (= 5 (count (:values (id->values (mt/id :categories :name))))))+ (is (= {} (id->values (mt/id :categories :id))))+ (is (nil? (params.field-values/get-or-create-field-values!+ (t2/select-one :model/Field (mt/id :categories :id)))))+ (testing "no warehouse query runs for the field without FieldValues"+ (is (= #{(mt/id :categories :name)}+ (t2/select-fn-set :field_id :model/FieldValues+ :field_id [:in [(mt/id :categories :id) (mt/id :categories :name)]]+ :type :advanced)))))))))+(deftest advanced-field-values-hash-test(mt/with-premium-features #{:sandboxes};; copy at top level so that `with-gtaps-for-user!` does not have to create a new copy every time it gets called@@ -316,7 +335,7 @@:remappings {"state" [:dimension[:field (mt/id :people :state){:join-alias "People"}]]}}}}- (let [field (t2/select-one :model/Field :id (mt/id :orders :user_id))+ (let [field (assoc (t2/select-one :model/Field :id (mt/id :orders :user_id)) :has_field_values :list)fv-for (fn [user-kw state](met/with-user-attributes! user-kw {"state" state}(mt/with-test-user user-kwdiff --git a/src/metabase/parameters/field_values.clj b/src/metabase/parameters/field_values.cljindex 4f1a97d06cf..7a4a31c6c31 100644--- a/src/metabase/parameters/field_values.clj+++ b/src/metabase/parameters/field_values.clj@@ -86,8 +86,8 @@(defn field-id->field-values-for-current-user"Fetch *existing* FieldValues for a sequence of `field-ids` for the current User. Values are returned as a map of{field-id FieldValues-instance}- Returns `nil` if `field-ids` is empty or no matching FieldValues exist. A field whose restrictions can't be keyed- for the current User maps to an empty map."+ Returns `nil` if `field-ids` is empty or no matching FieldValues exist. A restricted field that shouldn't have+ FieldValues, or whose restrictions can't be keyed for the current User, maps to an empty map."[field-ids](let [fields (when (seq field-ids)(t2/hydrate (parameters.db/fields (set field-ids)) :table))@@ -168,13 +168,14 @@(defn- get-or-create-field-values-with-hash-input![field constraints hash-input]- (when hash-input+ (when (and hash-input (field-values/field-should-have-field-values? field))(if (not= hash-input {:field-id (u/the-id field)})(get-or-create-advanced-field-values! field constraints hash-input)(field-values/get-or-create-full-field-values! field))))(defn get-or-create-field-values!- "Gets or creates field values. Returns nil when [[hash-input-for-field-values]] can't key the current user's access."+ "Gets or creates field values. Returns nil when `field` shouldn't have any, or when [[hash-input-for-field-values]]+ can't key the current user's access."([field] (get-or-create-field-values! field nil))([field constraints](get-or-create-field-values-with-hash-input! field constraints (hash-input-for-field-values field constraints))))