Skip to content
Snippets Groups Projects
Unverified Commit 147985f1 authored by Ngoc Khuat's avatar Ngoc Khuat Committed by GitHub
Browse files

no top level trs (#46911)

parent 8272ac47
No related branches found
No related tags found
No related merge requests found
......@@ -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.
......
......@@ -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."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment