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 search values remap (#74770)
Alexander Polyankinbeea1993bf47
diff --git a/src/metabase/parameters/custom_values.clj b/src/metabase/parameters/custom_values.cljindex 6355c28b4c2..872c732e81f 100644--- a/src/metabase/parameters/custom_values.clj+++ b/src/metabase/parameters/custom_values.clj@@ -93,18 +93,20 @@id(pr-str field-ref)(pr-str (map (some-fn :lib/source-column-alias :name) visible-columns))))]- (let [label-column (when label-field- (or (lib/find-matching-column query -1 label-field visible-columns)- (log/warnf "Cannot get labels from Card %d: failed to find column for ref %s"- id- (pr-str label-field))))- textual? (lib.types.isa/string? value-column)- nonempty ((if textual? lib/not-empty lib/not-null) value-column)- query-filter (cond- (some? exact-value) (lib/= value-column exact-value)- query-string (if textual?- (lib/contains (lib/lower value-column) (u/lower-case-en query-string))- (lib/= value-column query-string)))]+ (let [label-column (when label-field+ (or (lib/find-matching-column query -1 label-field visible-columns)+ (log/warnf "Cannot get labels from Card %d: failed to find column for ref %s"+ id+ (pr-str label-field))))+ search-column (or label-column value-column)+ value-textual? (lib.types.isa/string? value-column)+ search-textual? (lib.types.isa/string? search-column)+ nonempty ((if value-textual? lib/not-empty lib/not-null) value-column)+ query-filter (cond+ (some? exact-value) (lib/= value-column exact-value)+ query-string (if search-textual?+ (lib/ignore-case (lib/contains search-column query-string))+ (lib/= search-column query-string)))](-> query(lib/limit *max-rows*)(lib/filter nonempty)diff --git a/test/metabase/parameters/custom_values_test.clj b/test/metabase/parameters/custom_values_test.cljindex 5e01111ae3d..3e49bb333de 100644--- a/test/metabase/parameters/custom_values_test.clj+++ b/test/metabase/parameters/custom_values_test.clj@@ -54,6 +54,22 @@[:field {:lib/uuid "00000000-0000-0000-0000-000000000000"} (mt/id :venues :id)]{:label-field [:field {:lib/uuid "00000000-0000-0000-0000-000000000001"} (mt/id :venues :name)]})))))))+(deftest ^:parallel search-by-label-field-test+ (testing "query-string with a label-field filters by the label, not the value"+ (mt/with-temp+ [:model/Card card (merge (mt/card-with-source-metadata-for-query (mt/mbql-query venues))+ {:database_id (mt/id)+ :type :question+ :table_id (mt/id :venues)})]+ (let [{:keys [values]} (custom-values/values-from-card+ card+ [:field {:lib/uuid "00000000-0000-0000-0000-000000000000"} (mt/id :venues :id)]+ {:query-string "bakery"+ :label-field [:field {:lib/uuid "00000000-0000-0000-0000-000000000001"}+ (mt/id :venues :name)]})]+ (is (seq values))+ (is (every? (fn [[_id label]] (re-find #"(?i)bakery" label)) values))))))+(deftest ^:parallel with-mbql-card-test-2(testing "source card is a model" ; Models are opaque, so this sees the post-aggregation columns.(binding [custom-values/*max-rows* 3]