From 147985f1a352e53c25bc99e4a7b905c98489e164 Mon Sep 17 00:00:00 2001
From: Ngoc Khuat <qn.khuat@gmail.com>
Date: Fri, 16 Aug 2024 17:11:48 +0700
Subject: [PATCH] no top level trs (#46911)
---
src/metabase/pulse/render/body.clj | 4 ++--
test/metabase/pulse/render/body_test.clj | 30 ++++++++++++------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/metabase/pulse/render/body.clj b/src/metabase/pulse/render/body.clj
index 71385e4da41..00f84492297 100644
--- a/src/metabase/pulse/render/body.clj
+++ b/src/metabase/pulse/render/body.clj
@@ -16,7 +16,7 @@
[metabase.shared.models.visualization-settings :as mb.viz]
[metabase.types :as types]
[metabase.util :as u]
- [metabase.util.i18n :refer [trs tru]]
+ [metabase.util.i18n :refer [deferred-trs trs tru]]
[metabase.util.malli :as mu]
[toucan2.core :as t2])
(:import
@@ -38,7 +38,7 @@
:padding :16px})}
(trs "There was a problem with this question.")]}))
-(def ^:private error-rendered-message (trs "An error occurred while displaying this card."))
+(def ^:private error-rendered-message (deferred-trs "An error occurred while displaying this card."))
(def ^:private error-rendered-info
"Default rendered-info map when there is an error displaying a card on the static viz side.
diff --git a/test/metabase/pulse/render/body_test.clj b/test/metabase/pulse/render/body_test.clj
index 963d50a7f72..55f6f6d95d6 100644
--- a/test/metabase/pulse/render/body_test.clj
+++ b/test/metabase/pulse/render/body_test.clj
@@ -260,7 +260,7 @@
(deftest error-test
(testing "renders error"
(is (= "An error occurred while displaying this card."
- (-> (body/render :render-error nil nil nil nil nil) :content last))))
+ (-> (body/render :render-error nil nil nil nil nil) :content last str))))
(testing "renders card error"
(is (= "There was a problem with this question."
(-> (body/render :card-error nil nil nil nil nil) :content last)))))
@@ -884,19 +884,19 @@
{:table.cell_column "TOTAL"
:column_settings {(format "[\"ref\",[\"field\",%d,null]]" (mt/id :orders :total))
{:column_title "CASH MONEY"}}}}]
- (mt/with-current-user (mt/user->id :rasta)
- (let [card-doc (render.tu/render-card-as-hickory card-id)
- card-header-els (hik.s/select (hik.s/tag :th) card-doc)
- dashcard-doc (render.tu/render-dashcard-as-hickory dashcard-id)
- dash-header-els (hik.s/select (hik.s/tag :th) dashcard-doc)
- card-header ["ID" "User ID" "Product ID" "SUB CASH MONEY" "Tax"
- "Total" "Discount ($)" "Created At" "Quantity"]
- dashcard-header ["ID" "User ID" "Product ID" "SUB CASH MONEY" "Tax"
- "CASH MONEY" "Discount ($)" "Created At" "Quantity"]]
- (is (= {:card card-header
- :dashcard dashcard-header}
- {:card (mapcat :content card-header-els)
- :dashcard (mapcat :content dash-header-els)}))))))))
+ (mt/with-current-user (mt/user->id :rasta)
+ (let [card-doc (render.tu/render-card-as-hickory card-id)
+ card-header-els (hik.s/select (hik.s/tag :th) card-doc)
+ dashcard-doc (render.tu/render-dashcard-as-hickory dashcard-id)
+ dash-header-els (hik.s/select (hik.s/tag :th) dashcard-doc)
+ card-header ["ID" "User ID" "Product ID" "SUB CASH MONEY" "Tax"
+ "Total" "Discount ($)" "Created At" "Quantity"]
+ dashcard-header ["ID" "User ID" "Product ID" "SUB CASH MONEY" "Tax"
+ "CASH MONEY" "Discount ($)" "Created At" "Quantity"]]
+ (is (= {:card card-header
+ :dashcard dashcard-header}
+ {:card (mapcat :content card-header-els)
+ :dashcard (mapcat :content dash-header-els)}))))))))
(deftest table-renders-respect-conditional-formatting
(testing "Rendered Tables respect the conditional formatting on a card."
@@ -928,7 +928,7 @@
(let [style-str (:style attrs)]
(when (str/includes? style-str "background-color")
(-> el :content first))))
- (mapcat :content (take 20 card-row-els))))))))))))
+ (mapcat :content (take 20 card-row-els))))))))))))
(deftest table-renders-conditional-formatting-even-with-hidden-column
(testing "Rendered Tables respect the conditional formatting on a card."
--
GitLab