Skip to content

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

Fix quick filter on binned columns (#75767)

Riley Thompson25a108bfb011
diff --git a/src/metabase/lib/drill_thru/quick_filter.cljc b/src/metabase/lib/drill_thru/quick_filter.cljc
index a796d6f932d..9faca526fbf 100644
--- a/src/metabase/lib/drill_thru/quick_filter.cljc
+++ b/src/metabase/lib/drill_thru/quick_filter.cljc
@@ -41,6 +41,7 @@
(:refer-clojure :exclude [select-keys mapv #?(:clj for)])
(:require
[medley.core :as m]
+ [metabase.lib.binning :as lib.binning]
[metabase.lib.drill-thru.column-filter :as lib.drill-thru.column-filter]
[metabase.lib.drill-thru.common :as lib.drill-thru.common]
[metabase.lib.expression :as lib.expression]
@@ -138,8 +139,10 @@
(when-let [drill-details (lib.drill-thru.column-filter/prepare-query-for-drill-addition
query stage-number column column-ref :filter)]
(let [temporal-unit (lib.temporal-bucket/temporal-bucket column-ref)
+ binning (lib.binning/binning column-ref)
column (cond-> (:column drill-details)
- temporal-unit (assoc :temporal-unit temporal-unit))]
+ temporal-unit (assoc :temporal-unit temporal-unit)
+ binning (assoc :lib/binning binning))]
(merge drill-details
{:lib/type :metabase.lib.drill-thru/drill-thru
:type :drill-thru/quick-filter
diff --git a/test/metabase/lib/drill_thru/quick_filter_test.cljc b/test/metabase/lib/drill_thru/quick_filter_test.cljc
index 19b3f1750c7..32ecea7b71b 100644
--- a/test/metabase/lib/drill_thru/quick_filter_test.cljc
+++ b/test/metabase/lib/drill_thru/quick_filter_test.cljc
@@ -342,3 +342,31 @@
[:field {:temporal-unit :month} (meta/id :orders :created-at)]
"2023-03-01T00:00:00Z"]]}]}
(lib/drill-thru base-query -1 nil drill "="))))))
+
+(deftest ^:parallel quick-filter-on-binned-column-keeps-binning-test
+ (let [query (-> (lib/query meta/metadata-provider (meta/table-metadata :orders))
+ (lib/aggregate (lib/count))
+ (lib/breakout (-> (meta/field-metadata :orders :total)
+ (lib/with-binning {:strategy :default}))))
+ count-col (m/find-first #(= (:name %) "count")
+ (lib/returned-columns query))
+ total-col (m/find-first #(= (:name %) "TOTAL")
+ (lib/returned-columns query))
+ context {:column total-col
+ :column-ref (lib/ref total-col)
+ :value 40
+ :row [{:column total-col
+ :column-ref (lib/ref total-col)
+ :value 40}
+ {:column count-col
+ :column-ref (lib/ref count-col)
+ :value 4107}]}
+ drill (m/find-first #(= (:type %) :drill-thru/quick-filter)
+ (lib/available-drill-thrus query context))
+ drilled (lib/drill-thru query -1 nil drill "=")]
+ (is (=? [[:= {}
+ [:field {:binning {:strategy :default, :lib/type :metabase.lib.binning/binning}} (:id total-col)]
+ 40]]
+ (lib/filters drilled)))
+ (is (= #{(:id count-col) (:id total-col)}
+ (set (map :id (lib/returned-columns drilled)))))))