Skip to content

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

fix(channel): stop wrapping email card bodies in a link (#83269)

Aleksandr Lesnenkoee0929018547
diff --git a/src/metabase/channel/render/card.clj b/src/metabase/channel/render/card.clj
index 306b859f9ac..2e9aaed21c6 100644
--- a/src/metabase/channel/render/card.clj
+++ b/src/metabase/channel/render/card.clj
@@ -253,36 +253,25 @@
{pulse-body :content
body-attachments :attachments
text :render/text} (render-pulse-card-body render-type timezone-id card dashcard results)
- attachment-href (if dashcard
- (urls/dashcard-url dashcard)
- (card-href card))
inline-parameters (when (:channel.render/include-inline-parameters? options)
(-> dashcard :visualization_settings :inline_parameters))]
(cond-> {:attachments (merge title-attachments body-attachments)
:content [:p
;; Provide a horizontal scrollbar for tables that overflow container width.
;; Surrounding <p> element prevents buggy behavior when dragging scrollbar.
- [:div
- [:a (cond-> {:target "_blank"
- :rel "noopener noreferrer"
- :style (style/style
- (style/section-style)
- {:display :block
- :text-decoration :none})}
- (not (:channel.render/disable-links? options))
- (assoc :href attachment-href))
- title
- description
- (when (seq inline-parameters)
- [:div {:style (style/style {:padding-bottom :16px})}
- (render.util/render-parameters inline-parameters)])
- [:div {:class "pulse-body"
- :style (style/style {:overflow-x :auto ;; when content is wide enough, automatically show a horizontal scrollbar
- :display :block
- :margin :16px})}
- (if-let [more-results-message (body/attached-results-text render-type card)]
- (conj more-results-message (list pulse-body))
- pulse-body)]]]]}
+ [:div {:style (style/style (style/section-style))}
+ title
+ description
+ (when (seq inline-parameters)
+ [:div {:style (style/style {:padding-bottom :16px})}
+ (render.util/render-parameters inline-parameters)])
+ [:div {:class "pulse-body"
+ :style (style/style {:overflow-x :auto ;; when content is wide enough, automatically show a horizontal scrollbar
+ :display :block
+ :margin :16px})}
+ (if-let [more-results-message (body/attached-results-text render-type card)]
+ (conj more-results-message (list pulse-body))
+ pulse-body)]]]}
text (assoc :render/text text)))))
(mu/defn render-pulse-card-for-display
diff --git a/test/metabase/channel/render/card_test.clj b/test/metabase/channel/render/card_test.clj
index 99cbfe225c5..f5b09426c11 100644
--- a/test/metabase/channel/render/card_test.clj
+++ b/test/metabase/channel/render/card_test.clj
@@ -7,6 +7,8 @@
[hickory.select :as hik.s]
[metabase.channel.render.card :as channel.render.card]
[metabase.channel.render.core :as channel.render]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
[metabase.pulse.render.test-util :as render.tu]
[metabase.query-processor.test :as qp]
[metabase.test :as mt]
@@ -453,7 +455,7 @@
true)))))))
(deftest href-includes-scroll
- (testing "the title and body hrefs for cards in dashboards should be of the form '.../dashboard/<DASHBOARD_ID>#scrollTo=<DASHBOARD_CARD_ID>'"
+ (testing "the title href for cards in dashboards should be of the form '.../dashboard/<DASHBOARD_ID>#scrollTo=<DASHBOARD_CARD_ID>'"
(mt/with-temp [:model/Card card {:name "A Card"
:dataset_query (mt/mbql-query venues {:limit 1})}
:model/Dashboard dashboard {}
@@ -466,8 +468,8 @@
(qp/process-query (:dataset_query card))
{:channel.render/include-title? true}))
expected-href (format "https://mb.com/dashboard/%d#scrollTo=%d" (:dashboard_id dc1) (:id dc1))]
- (is (every? #(= % expected-href) (match/match-many rendered-card-content {:href href} href)))))))
- (testing "the title and body hrefs for visualizer cards should be of the form '.../dashboard/<DASHBOARD_ID>#scrollTo=<DASHBOARD_CARD_ID>'"
+ (is (= [expected-href] (match/match-many rendered-card-content {:href href} href)))))))
+ (testing "the title href for visualizer cards should be of the form '.../dashboard/<DASHBOARD_ID>#scrollTo=<DASHBOARD_CARD_ID>'"
(mt/with-temp [:model/Card card {:name "A Card"
:dataset_query (mt/mbql-query venues {:limit 1})}
:model/Dashboard dashboard {}
@@ -480,7 +482,23 @@
(qp/process-query (:dataset_query card))
{:channel.render/include-title? true}))
expected-href (format "https://mb.com/dashboard/%d#scrollTo=%d" (:dashboard_id dc1) (:id dc1))]
- (is (every? #(= % expected-href) (match/match-many rendered-card-content {:href href} href))))))))
+ (is (= [expected-href] (match/match-many rendered-card-content {:href href} href))))))))
+
+(deftest card-body-is-not-a-link-test
+ (testing "the card body is not wrapped in a link, so table cells can be selected; only the title links (#34165)"
+ (let [mp (mt/metadata-provider)]
+ (mt/with-temp [:model/Card card {:display :table
+ :dataset_query (-> (lib/query mp (lib.metadata/table mp (mt/id :venues)))
+ (lib/limit 1))}
+ :model/Dashboard dashboard {}
+ :model/DashboardCard dashcard {:dashboard_id (:id dashboard) :card_id (:id card)}]
+ (let [results (qp/process-query (:dataset_query card))]
+ (doseq [dc [nil dashcard]]
+ (testing (if dc "dashcard" "card")
+ (let [doc (hiccup->hickory (:content (channel.render/render-pulse-card :inline "UTC" card dc results
+ {:channel.render/include-title? true})))]
+ (is (seq (hik.s/select (hik.s/class "pulse-body") doc)))
+ (is (empty? (hik.s/select (hik.s/descendant (hik.s/tag :a) (hik.s/class "pulse-body")) doc)))))))))))
(deftest dashcard-title-override-wins-over-card-name-test
(testing "a dashcard's card.title override wins over the underlying card's own name in rendered emails (#18344)"