Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

filter for active fields (#65245)

Riley Thompson2b2a22b86d86
diff --git a/src/metabase/parameters/params.clj b/src/metabase/parameters/params.clj
index d9ed63f74f5..f7dde438f2e 100644
--- a/src/metabase/parameters/params.clj
+++ b/src/metabase/parameters/params.clj
@@ -110,7 +110,8 @@
(when-let [table-ids (seq (map :table_id fields))]
(m/index-by :table_id (-> (t2/select Field:params-columns-only
:table_id [:in table-ids]
- :semantic_type (app-db/isa :type/Name))
+ :semantic_type (app-db/isa :type/Name)
+ :active true)
;; run [[metabase.lib.field/infer-has-field-values]] on these Fields so their values of
;; `has_field_values` will be consistent with what the FE expects. (e.g. we'll return
;; `:list` instead of `:auto-list`.)
diff --git a/test/metabase/parameters/params_test.clj b/test/metabase/parameters/params_test.clj
index a529dba99e0..89ed6dfd797 100644
--- a/test/metabase/parameters/params_test.clj
+++ b/test/metabase/parameters/params_test.clj
@@ -8,7 +8,7 @@
[metabase.util :as u]
[toucan2.core :as t2]))
-(deftest ^:parallel hydrate-name-field-test
+(deftest hydrate-name-field-test
(testing "make sure that we can hydrate the `name_field` property for PK Fields"
(is (= {:name "ID"
:table_id (mt/id :venues)
@@ -48,7 +48,21 @@
:name_field nil}
(-> (t2/select-one [:model/Field :name :table_id :semantic_type], :id (mt/id :checkins :id))
(t2/hydrate :name_field)
- mt/derecordize)))))
+ mt/derecordize))))
+
+ (testing "Inactive Entity Name fields should not be hydrated (#65207)"
+ (let [name-field-id (mt/id :venues :name)]
+ (try
+ (t2/update! :model/Field name-field-id {:active false})
+ (is (= {:name "ID"
+ :table_id (mt/id :venues)
+ :semantic_type :type/PK
+ :name_field nil}
+ (-> (t2/select-one [:model/Field :name :table_id :semantic_type], :id (mt/id :venues :id))
+ (t2/hydrate :name_field)
+ mt/derecordize)))
+ (finally
+ (t2/update! :model/Field name-field-id {:active true}))))))
;;; -------------------------------------------------- param_fields --------------------------------------------------