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 conditional formatting colors for BigDecimal cells in email renderer (#74475)
Ngoc Khuat6f5f2eebafa5
diff --git a/src/metabase/channel/render/js/color.clj b/src/metabase/channel/render/js/color.cljindex c256e81a69e..b982519f920 100644--- a/src/metabase/channel/render/js/color.clj+++ b/src/metabase/channel/render/js/color.clj@@ -32,6 +32,22 @@[:name :string]]]][:rows [:sequential [:sequential :any]]]])+(defn- ->js-number+ "Coerce BigDecimal/BigInteger to primitive double/long so Graal's JS context sees them as numbers, not host objects.+ Returns nil when the value would overflow — BigInteger too wide for long, or BigDecimal magnitude beyond Double's+ finite range — since silently truncating would feed wrong values into gradient/comparison logic."+ [v]+ (cond+ (instance? BigDecimal v)+ (let [d (.doubleValue ^BigDecimal v)]+ (when (Double/isFinite d) d))++ (instance? BigInteger v)+ (when (<= (.bitLength ^BigInteger v) 63)+ (.longValue ^BigInteger v))++ :else v))+(defn- convert-bignumbers-by-column"Convert BigDecimal and BigInteger values to doubles/longs since Graal doesn't handle these"[data]@@ -54,14 +70,7 @@(map-indexed(fn [idx item](if (bignum-column-indices idx)- (cond- (instance? BigDecimal item)- (.doubleValue ^BigDecimal item)-- (instance? BigInteger item)- (.longValue ^BigInteger item)-- :else item)+ (->js-number item)item))row)))data)))))@@ -91,11 +100,11 @@^String [color-selector cell-value column-name row-index](let [cell-value (cond(formatter/NumericWrapper? cell-value)- (:num-value cell-value)+ (->js-number (:num-value cell-value))(formatter/TextWrapper? cell-value)(:original-value cell-value):else- cell-value)]+ (->js-number cell-value))](.asString (js.engine/execute-fn color-selector cell-value row-index column-name))))diff --git a/test/metabase/channel/render/body_test.clj b/test/metabase/channel/render/body_test.cljindex 713466452b0..476b92cbfb2 100644--- a/test/metabase/channel/render/body_test.clj+++ b/test/metabase/channel/render/body_test.clj@@ -969,6 +969,25 @@{:card (mapcat :content card-header-els):dashcard (mapcat :content dash-header-els)}))))))))+(deftest table-renders-range-conditional-formatting-on-decimal-columns+ (testing "range/gradient formatting colors BigDecimal cells in the email renderer (GDGT-2412)"+ (mt/dataset test-data+ (mt/with-temp [:model/Card {card-id :id}+ {:display :table+ :dataset_query (mt/native-query+ {:query "SELECT * FROM (VALUES (CAST(0.1 AS DECIMAL(10,4))), (0.5), (0.9)) t(pct)"})+ :visualization_settings+ {:table.column_formatting+ [{:columns ["PCT"]+ :type "range"+ :min_type "custom" :min_value 0+ :max_type "custom" :max_value 1+ :colors ["#ffffff" "#ff0000"]+ :id 0}]}}]+ (mt/with-current-user (mt/user->id :rasta)+ (let [cells (hik.s/select (hik.s/tag :td) (render.tu/render-card-as-hickory! card-id))]+ (is (every? #(some-> % :attrs :style (str/includes? "background-color")) cells))))))))+(deftest table-renders-respect-conditional-formatting(testing "Rendered Tables respect the conditional formatting on a card."(let [ids-to-colour [1 2 3 5 8 13]]diff --git a/test/metabase/channel/render/js/color_test.clj b/test/metabase/channel/render/js/color_test.cljindex 2131c3269f0..99077dba334 100644--- a/test/metabase/channel/render/js/color_test.clj+++ b/test/metabase/channel/render/js/color_test.clj@@ -8,6 +8,8 @@(:import[java.math BigDecimal BigInteger]))+(set! *warn-on-reflection* true)+(def ^:private red "#ff0000")(def ^:private green "#00ff00")@@ -122,4 +124,27 @@result (convert-fn data)](is (= [[123.456 789 "test"] [123.456 789 "another"]] result))(is (every? #(instance? Double (first %)) result))- (is (every? #(instance? Long (second %)) result))))))))+ (is (every? #(instance? Long (second %)) result))))++ (testing "values that overflow primitive ranges become nil rather than silently truncating"+ (let [too-big-int (.shiftLeft (BigInteger. "1") 65) ; doesn't fit in long+ too-big-dec (.scaleByPowerOfTen (BigDecimal. "1") 400)] ; beyond Double range+ (is (= [[nil] [42]] (convert-fn [[too-big-int] [(BigInteger. "42")]])))+ (is (= [[nil] [1.5]] (convert-fn [[too-big-dec] [(BigDecimal. "1.5")]])))))))))++(deftest bigdecimal-cell-gets-range-color-test+ (testing "get-background-color applies range colors to BigDecimal cell values (GDGT-2412)"+ (let [viz {:table.column_formatting+ [{:columns ["pct"] :type "range" :colors ["#ffffff" "#ff0000"]}]}+ selector (js.color/make-color-selector+ {:cols [{:name "pct"}] :rows [[0.0] [0.5] [1.0]]}+ viz)+ color-for (fn [n]+ (js.color/get-background-color+ selector+ (formatter/->NumericWrapper (str n) n)+ "pct"+ 1))]+ (is (= "rgba(255, 128, 128, 0.75)" (color-for 0.5)))+ (is (= "rgba(255, 128, 128, 0.75)" (color-for (BigDecimal. "0.5"))))+ (is (= "rgba(255, 0, 0, 0.75)" (color-for (BigInteger. "1")))))))diff --git a/test/metabase/pulse/render/test_util.clj b/test/metabase/pulse/render/test_util.cljindex d86e5807cd3..e1d6ccdb7f8 100644--- a/test/metabase/pulse/render/test_util.clj+++ b/test/metabase/pulse/render/test_util.clj@@ -93,10 +93,10 @@(defn- img-node-with-svg?[loc]- (let [[tag {:keys [src]}] (zip/node loc)]- (and- (= tag :img)- (str/starts-with? src "<svg"))))+ (let [[tag attrs] (zip/node loc)]+ (and (= tag :img)+ (map? attrs)+ (some-> ^String (:src attrs) (str/starts-with? "<svg")))))(def ^:private parse-svg #'js.svg/parse-svg-string)