Skip to content
Snippets Groups Projects
Unverified Commit ba1f8dcb authored by Noah Moss's avatar Noah Moss Committed by GitHub
Browse files

Include dashboard filters in email & slack subscriptions (#17824)

parent c897ff8f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 326 additions and 78 deletions
src/metabase/email/messages.clj
+ 51
− 5
View file @ ba1f8dcb
......@@ -14,6 +14,7 @@
[metabase.email :as email]
[metabase.public-settings :as public-settings]
[metabase.pulse.markdown :as markdown]
[metabase.pulse.parameters :as params]
[metabase.pulse.render :as render]
[metabase.pulse.render.body :as render.body]
[metabase.pulse.render.image-bundle :as image-bundle]
......@@ -292,7 +293,7 @@
(merge (common-context)
{:emailType "pulse"
:title (:name pulse)
:titleUrl (url/dashboard-url (:id dashboard))
:titleUrl (params/dashboard-url (:id dashboard) (params/parameters pulse dashboard))
:dashboardDescription (:description dashboard)
:creator (-> pulse :creator :common_name)
:sectionStyle (render.style/style (render.style/section-style))}
......@@ -406,15 +407,58 @@
(render/render-pulse-section timezone result)
{:content (markdown/process-markdown (:text result) :html)}))
(defn- render-message-body [message-type message-context timezone dashboard results]
(defn- render-filters
[notification dashboard]
(let [filters (params/parameters notification dashboard)
cells (map
(fn [filter]
[:td {:class "filter-cell"
:style (render.style/style {:width "50%"
:padding "0px"})}
[:table {:cellpadding "0"
:cellspacing "0"}
[:tr
[:td
{:style (render.style/style {:color render.style/color-text-medium
:min-width "100px"
:width "50%"
:padding "4px 4px 4px 0"
:vertical-align "baseline"})}
(:name filter)]
[:td
{:style (render.style/style {:color render.style/color-text-dark
:min-width "100px"
:width "50%"
:padding "4px 16px 4px 8px"
:vertical-align "baseline"})}
(params/value-string filter)]]]])
filters)
rows (partition 2 2 nil cells)]
(html
[:table {:style (render.style/style {:table-layout :fixed
:border-collapse :collapse
:cellpadding "0"
:cellspacing "0"
:width "100%"
:font-size "12px"
:font-weight 700
:margin-top "8px"})}
(for [row rows]
[:tr {} row])])))
(defn- render-message-body
[notification message-type message-context timezone dashboard results]
(let [rendered-cards (binding [render/*include-title* true]
(mapv #(render-result-card timezone %) results))
icon-name (case message-type
:alert :bell
:pulse :dashboard)
icon-attachment (first (map make-message-attachment (icon-bundle icon-name)))
filters (when dashboard
(render-filters notification dashboard))
message-body (assoc message-context :pulse (html (vec (cons :div (map :content rendered-cards))))
:iconCid (:content-id icon-attachment))
:filters filters
:iconCid (:content-id icon-attachment))
attachments (apply merge (map :attachments rendered-cards))]
(vec (concat [{:type "text/html; charset=utf-8" :content (stencil/render-file "metabase/email/pulse" message-body)}]
(map make-message-attachment attachments)
......@@ -431,7 +475,8 @@
(defn render-pulse-email
"Take a pulse object and list of results, returns an array of attachment objects for an email"
[timezone pulse dashboard results]
(render-message-body :pulse
(render-message-body pulse
:pulse
(pulse-context pulse dashboard)
timezone
dashboard
......@@ -487,7 +532,8 @@
(let [message-ctx (merge
(common-alert-context alert (alert-results-condition-text goal-value))
(alert-context alert))]
(render-message-body :alert
(render-message-body alert
:alert
(assoc message-ctx :firstRunOnly? alert_first_only)
timezone
nil
......
src/metabase/email/pulse.mustache
+ 28
− 13
View file @ ba1f8dcb
......@@ -58,7 +58,7 @@
}
{{!-- Emails on smaller devices should have less of our UI chrome to make the content easier to read --}}
@media screen and (max-width: 420px) {
@media screen and (max-width: 450px) {
.background {
background-color: #ffffff !important;
padding: 0px !important;
......@@ -66,6 +66,13 @@
.container {
padding: 10px !important;
}
{{!-- Collapse filters to a single column on small screens --}}
.filter-cell {
width: 100% !important;
display: block !important;
line-height: 12px !important;
}
}
</style>
</head>
......@@ -76,7 +83,7 @@
<div class="container" style="background-color: white; max-width: 555px; border-radius: 24px; margin: 0 auto; padding: 30px;">
<table class="header">
<tr>
<td>
<td width="28px">
<img class="icon" style="padding-top: 4px; padding-right: 16px; width: 100%; height: auto; max-width: 20px" src="cid:{{iconCid}}"/>
</td>
<td>
......@@ -86,14 +93,14 @@
</td>
</tr>
{{#dashboardDescription}}
<tr>
<td>&#8202;</td>
<td>
<div class="description" style="color: {{colorTextDark}}; font-size: 14px">
{{dashboardDescription}}
</div>
</td>
</tr>
<tr>
<td>&#8202;</td>
<td>
<div class="description" style="color: {{colorTextDark}}; font-size: 14px">
{{dashboardDescription}}
</div>
</td>
</tr>
{{/dashboardDescription}}
<tr>
<td>&#8202;</td>
......@@ -103,13 +110,21 @@
</div>
</td>
</tr>
{{#filters}}
<tr>
<td>&#8202;</td>
<td>
{{{filters}}}
</td>
</tr>
{{/filters}}
</table>
<hr style="border-width: 0; background: #F0F0F0; height: 1px; margin-top: 20px; margin-bottom: 20px;">
{{{pulse}}}
{{#firstRunOnly?}}
<p style="color: {{colorTextMedium}}; font-size: 12px; font-weight: 400">
We’ll stop sending you alerts about this question now.
</p>
<p style="color: {{colorTextMedium}}; font-size: 12px; font-weight: 400">
We’ll stop sending you alerts about this question now.
</p>
{{/firstRunOnly?}}
<hr style="border-width: 0; background: #F0F0F0; height: 1px; margin-top: 20px; margin-bottom: 20px;">
<div class="footer" style="font-size: 11px; width: max-content; margin: 0 auto">
......
src/metabase/pulse.clj
+ 59
− 28
View file @ ba1f8dcb
......@@ -11,9 +11,9 @@
[metabase.models.dashboard-card :refer [DashboardCard]]
[metabase.models.database :refer [Database]]
[metabase.models.pulse :as pulse :refer [Pulse]]
[metabase.plugins.classloader :as classloader]
[metabase.pulse.interface :as i]
[metabase.public-settings :as public-settings]
[metabase.pulse.markdown :as markdown]
[metabase.pulse.parameters :as params]
[metabase.pulse.render :as render]
[metabase.query-processor :as qp]
[metabase.query-processor.middleware.permissions :as qp.perms]
......@@ -28,15 +28,6 @@
(:import metabase.models.card.CardInstance))
(def ^:private parameters-impl
(u/prog1 (or (u/ignore-exceptions
(classloader/require 'metabase-enterprise.pulse)
(some-> (resolve 'metabase-enterprise.pulse/ee-strategy-parameters-impl)
var-get))
i/default-parameters-impl)))
;;; ------------------------------------------------- PULSE SENDING --------------------------------------------------
;; TODO - this is probably something that could live somewhere else and just be reused
......@@ -114,7 +105,7 @@
ordered-dashcards (sort dashcard-comparator dashcards)]
(for [dashcard ordered-dashcards]
(if-let [card-id (:card_id dashcard)]
(execute-dashboard-subscription-card pulse-creator-id dashboard dashcard card-id (i/the-parameters parameters-impl pulse dashboard))
(execute-dashboard-subscription-card pulse-creator-id dashboard dashcard card-id (params/parameters pulse dashboard))
;; For virtual cards, return the viz settings map directly
(-> dashcard :visualization_settings)))))
......@@ -170,6 +161,45 @@
:text (truncate-mrkdwn mrkdwn)}}]})))))
(remove nil?))))
(defn- subject
[{:keys [name cards dashboard_id]}]
(if (or dashboard_id
(some :dashboard_id cards))
name
(trs "Pulse: {0}" name)))
(defn- slack-dashboard-header
"Returns a block element that includes a dashboard's name, creator, and filters, for inclusion in a
Slack dashboard subscription"
[pulse dashboard]
(let [header-section {:type "header"
:text {:type "plain_text"
:text (subject pulse)
:emoji true}}
creator-section {:type "section"
:fields [{:type "mrkdwn"
:text (str "Sent by " (-> pulse :creator :common_name))}]}
filters (params/parameters pulse dashboard)
filter-fields (for [filter filters]
{:type "mrkdwn"
:text (str "*" (:name filter) "*\n" (params/value-string filter))})
filter-section (when (seq filter-fields)
{:type "section"
:fields filter-fields})]
(if filter-section
{:blocks [header-section filter-section creator-section]}
{:blocks [header-section creator-section]})))
(defn- slack-dashboard-footer
"Returns a block element with the footer text and link which should be at the end of a Slack dashboard subscription."
[pulse dashboard]
{:blocks
[{:type "divider"}
{:type "context"
:elements [{:type "mrkdwn"
:text (str "<" (params/dashboard-url (u/the-id dashboard) (params/parameters pulse dashboard)) "|"
"*Sent from " (public-settings/site-name) "*>")}]}]})
(def slack-width
"Width of the rendered png of html to be sent to slack."
1200)
......@@ -190,7 +220,7 @@
(-> (f attachment-data)
(assoc :text (:render/text rendered-info)))
(let [image-bytes (render/png-from-render-info rendered-info slack-width)
image-url (slack-attachment-uploader image-bytes attachment-name channel-id)]
image-url (slack-attachment-uploader image-bytes attachment-name channel-id)]
(-> (f attachment-data)
(assoc :image_url image-url)))))))
[]
......@@ -236,13 +266,6 @@
:alert
:pulse))
(defn- subject
[{:keys [name cards dashboard_id]}]
(if (or dashboard_id
(some :dashboard_id cards))
name
(trs "Pulse: {0}" name)))
(defmulti ^:private should-send-notification?
"Returns true if given the pulse type and resultset a new notification (pulse or alert) should be sent"
(fn [pulse _results] (alert-or-pulse pulse)))
......@@ -273,11 +296,11 @@
"Polymorphoic function for creating notifications. This logic is different for pulse type (i.e. alert vs. pulse) and
channel_type (i.e. email vs. slack)"
{:arglists '([alert-or-pulse results channel])}
(fn [pulse _ {:keys [channel_type] :as channel}]
(fn [pulse _ {:keys [channel_type]}]
[(alert-or-pulse pulse) (keyword channel_type)]))
(defmethod notification [:pulse :email]
[{pulse-id :id, pulse-name :name, dashboard-id :dashboard_id, :as pulse} results {:keys [recipients], :as channel}]
[{pulse-id :id, pulse-name :name, dashboard-id :dashboard_id, :as pulse} results {:keys [recipients]}]
(log/debug (u/format-color 'cyan (trs "Sending Pulse ({0}: {1}) with {2} Cards via email"
pulse-id (pr-str pulse-name) (count results))))
(let [email-recipients (filterv u/email? (map :email recipients))
......@@ -290,12 +313,17 @@
:message (messages/render-pulse-email timezone pulse dashboard results)}))
(defmethod notification [:pulse :slack]
[{pulse-id :id, pulse-name :name, :as pulse} results {{channel-id :channel} :details :as channel}]
[{pulse-id :id, pulse-name :name, dashboard-id :dashboard_id, :as pulse}
results
{{channel-id :channel} :details}]
(log/debug (u/format-color 'cyan (trs "Sending Pulse ({0}: {1}) with {2} Cards via Slack"
pulse-id (pr-str pulse-name) (count results))))
{:channel-id channel-id
:message (subject pulse)
:attachments (create-slack-attachment-data results)})
(let [dashboard (Dashboard :id dashboard-id)]
{:channel-id channel-id
:attachments (remove nil?
(flatten [(slack-dashboard-header pulse dashboard)
(create-slack-attachment-data results)
(when dashboard (slack-dashboard-footer pulse dashboard))]))}))
(defmethod notification [:alert :email]
[{:keys [id] :as pulse} results {:keys [recipients]}]
......@@ -316,8 +344,11 @@
[pulse results {{channel-id :channel} :details}]
(log/debug (u/format-color 'cyan (trs "Sending Alert ({0}: {1}) via Slack" (:id pulse) (:name pulse))))
{:channel-id channel-id
:message (trs "Alert: {0}" (first-question-name pulse))
:attachments (create-slack-attachment-data results)})
:attachments (cons {:blocks [{:type "header"
:text {:type "plain_text"
:text (str "🔔 " (first-question-name pulse))
:emoji true}}]}
(create-slack-attachment-data results))})
(defmethod notification :default
[_ _ {:keys [channel_type]}]
......
src/metabase/pulse/parameters.clj 0 → 100644
+ 42
− 0
View file @ ba1f8dcb
(ns metabase.pulse.parameters
"Utilities for processing parameters for inclusion in dashboard subscriptions."
(:require [clojure.string :as str]
[metabase.plugins.classloader :as classloader]
[metabase.pulse.interface :as i]
[metabase.util :as u]
[metabase.util.urls :as url]
[ring.util.codec :as codec]))
(def ^:private parameters-impl
(u/prog1 (or (u/ignore-exceptions
(classloader/require 'metabase-enterprise.pulse)
(some-> (resolve 'metabase-enterprise.pulse/ee-strategy-parameters-impl)
var-get))
i/default-parameters-impl)))
(defn parameters
"Returns the list of parameters applied to a dashboard subscription, filtering out ones
without a value"
[subscription dashboard]
(filter
#(or (:value %) (:default %))
(i/the-parameters parameters-impl subscription dashboard)))
(defn value-string
"Returns the value of a dashboard filter as a comma-separated string"
[parameter]
(let [values (u/one-or-many (or (:value parameter) (:default parameter)))]
(str/join ", " values)))
(defn dashboard-url
"Given a dashboard's ID and parameters, returns a URL for the dashboard with filters included"
[dashboard-id parameters]
(let [base-url (url/dashboard-url dashboard-id)
url-params (flatten
(for [param parameters]
(for [value (u/one-or-many (or (:value param) (:default param)))]
(str (codec/url-encode (:slug param))
"="
(codec/url-encode value)))))]
(str base-url (when (seq url-params)
(str "?" (str/join "&" url-params))))))
test/metabase/dashboard_subscription_test.clj
+ 75
− 19
View file @ ba1f8dcb
......@@ -18,9 +18,9 @@
:or {channel :email}}
f]
(mt/with-temp* [Pulse [{pulse-id :id, :as pulse}
(-> pulse
(merge {:name "Aviary KPIs"
:dashboard_id (u/the-id dashboard)}))]
(->> pulse
(merge {:name "Aviary KPIs"
:dashboard_id (u/the-id dashboard)}))]
PulseCard [_ (merge {:pulse_id pulse-id
:card_id (u/the-id card)
:position 0}
......@@ -64,15 +64,16 @@
:assert {:slack (fn [{:keys [pulse-id]} response]
(is (= {:sent pulse-id}
response)))}})"
[{:keys [card pulse pulse-card fixture], assertions :assert}]
[{:keys [card dashboard pulse pulse-card fixture], assertions :assert}]
{:pre [(map? assertions) ((some-fn :email :slack) assertions)]}
(doseq [channel-type [:email :slack]
:let [f (get assertions channel-type)]
:when f]
(assert (fn? f))
(testing (format "sent to %s channel" channel-type)
(mt/with-temp* [Dashboard [{dashboard-id :id} {:name "Aviary KPIs"
:description "How are the birds doing today?"}]
(mt/with-temp* [Dashboard [{dashboard-id :id} (->> dashboard
(merge {:name "Aviary KPIs"
:description "How are the birds doing today?"}))]
Card [{card-id :id} (merge {:name card-name} card)]]
(with-dashboard-sub-for-card [{pulse-id :id}
{:card card-id
......@@ -82,7 +83,9 @@
:pulse-card pulse-card
:channel channel-type}]
(letfn [(thunk* []
(f {:card-id card-id, :pulse-id pulse-id}
(f {:dashboard-id dashboard-id,
:card-id card-id,
:pulse-id pulse-id}
(pulse/send-pulse! (models.pulse/retrieve-notification pulse-id))))
(thunk []
(if fixture
......@@ -204,21 +207,28 @@
#"\"https://metabase.com/testmb/account/notifications\""
#"Manage your subscriptions"))))
:slack
(fn [{:keys [card-id]} [pulse-results]]
(fn [{:keys [card-id dashboard-id]} [pulse-results]]
;; If we don't force the thunk, the rendering code will never execute and attached-results-text won't be
;; called
(testing "\"more results in attachment\" text should not be present for Slack Pulses"
(testing "Pulse results"
(is (= {:channel-id "#general"
:message "Aviary KPIs"
:attachments
[{:title card-name
[{:blocks [{:type "header", :text {:type "plain_text", :text "Aviary KPIs", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:title card-name
:rendered-info {:attachments false
:content true}
:title_link (str "https://metabase.com/testmb/question/" card-id)
:attachment-name "image.png"
:channel-id "FOO"
:fallback card-name}]}
:fallback card-name}
{:blocks [{:type "divider"}
{:type "context"
:elements [{:type "mrkdwn"
:text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
"|*Sent from Metabase Test*>")}]}]}]}
(thunk->boolean pulse-results))))
(testing "attached-results-text should be invoked exactly once"
(is (= 1
......@@ -248,23 +258,69 @@
#"header")))))
:slack
(fn [{:keys [card-id]} [pulse-results]]
(fn [{:keys [card-id dashboard-id]} [pulse-results]]
(testing "Markdown cards are included in attachments list as :blocks sublists, and markdown is
converted to mrkdwn (Slack markup language)"
(is (= {:channel-id "#general"
:message "Aviary KPIs"
:attachments
[{:title card-name
:rendered-info {:attachments false, :content true, :render/text true},
[{:blocks [{:type "header", :text {:type "plain_text", :text "Aviary KPIs", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:title card-name
:rendered-info {:attachments false, :content true, :render/text true},
:title_link (str "https://metabase.com/testmb/question/" card-id)
:attachment-name "image.png"
:channel-id "FOO"
:fallback card-name}
{:blocks [{:type "section"
:text {:type "mrkdwn"
:text "*header*"}}]}]}
{:blocks [{:type "section" :text {:type "mrkdwn" :text "*header*"}}]}
{:blocks [{:type "divider"}
{:type "context"
:elements [{:type "mrkdwn"
:text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
"|*Sent from Metabase Test*>")}]}]}]}
(thunk->boolean pulse-results)))))}}))
(deftest dashboard-filter-test
(tests {:pulse {:skip_if_empty false}
:dashboard test-dashboard}
"Dashboard subscription that includes a dashboard filters"
{:card (checkins-query-card {})
:assert
{:email
(fn [_ _]
(testing "Markdown cards are included in email subscriptions"
(is (= (rasta-pulse-email {:body [{"Aviary KPIs" true
"<a class=\\\"title\\\" href=\\\"https://metabase.com/testmb/dashboard/\\d+\\?state=CA&amp;state=NY&amp;quarter_and_year=Q1-2021\\\"" true}
png-attachment]})
(mt/summarize-multipart-email #"Aviary KPIs"
#"<a class=\"title\" href=\"https://metabase.com/testmb/dashboard/\d+\?state=CA&amp;state=NY&amp;quarter_and_year=Q1-2021\"")))))
:slack
(fn [{:keys [card-id dashboard-id]} [pulse-results]]
(testing "Markdown cards are included in attachments list as :blocks sublists, and markdown is
converted to mrkdwn (Slack markup language)"
(is (= {:channel-id "#general"
:attachments
[{:blocks [{:type "header", :text {:type "plain_text", :text "Aviary KPIs", :emoji true}}
{:type "section",
:fields [{:type "mrkdwn", :text "*State*\nCA, NY"}
{:type "mrkdwn", :text "*Quarter and Year*\nQ1-2021"}]}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:title card-name
:rendered-info {:attachments false, :content true, :render/text true},
:title_link (str "https://metabase.com/testmb/question/" card-id)
:attachment-name "image.png"
:channel-id "FOO"
:fallback card-name}
{:blocks [{:type "divider"}
{:type "context"
:elements [{:type "mrkdwn"
:text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
"?state=CA&state=NY&quarter_and_year=Q1-2021|*Sent from Metabase Test*>")}]}]}]}
(thunk->boolean pulse-results)))))}}))
(deftest mrkdwn-length-limit-test
(tests {:pulse {:skip_if_empty false}}
"Dashboard subscription that includes a Markdown card that exceeds Slack's length limit when converted to mrkdwn"
......@@ -280,4 +336,4 @@
{:slack
(fn [{:keys [card-id]} [pulse-results]]
(is (= {:blocks [{:type "section" :text {:type "mrkdwn" :text "abcdefghi…"}}]}
(-> (thunk->boolean pulse-results) :attachments second))))}}))
(nth (:attachments (thunk->boolean pulse-results)) 2))))}}))
test/metabase/pulse/parameters_test.clj 0 → 100644
+ 28
− 0
View file @ ba1f8dcb
(ns metabase.pulse.parameters-test
(:require [clojure.test :refer :all]
[metabase.pulse.parameters :as params]
[metabase.pulse.test-util :refer :all]
[metabase.test :as mt]))
(deftest value-string-test
(testing "If a filter has multiple values, they are concatenated into a comma-separated string"
(is (= "CA, NY"
(params/value-string (-> test-dashboard :parameters first)))))
(testing "If a filter has a single default value, it is returned unmodified"
(is (= "Q1-2021"
(params/value-string (-> test-dashboard :parameters second))))))
(deftest dashboard-url-test
(mt/with-temporary-setting-values [site-url "https://metabase.com"]
(testing "A valid dashboard URL can be generated with filters included"
(is (= "https://metabase.com/dashboard/1?state=CA&state=NY&quarter_and_year=Q1-2021"
(params/dashboard-url 1 (:parameters test-dashboard)))))
(testing "If no filters are set, the base dashboard url is returned"
(is (= "https://metabase.com/dashboard/1"
(params/dashboard-url 1 {}))))
(testing "Filters slugs and values are encoded properly for the URL"
(is (= "https://metabase.com/dashboard/1?%26=contains%3F"
(params/dashboard-url 1 [{:value "contains?", :slug "&"}]))))))
test/metabase/pulse/test_util.clj
+ 23
− 0
View file @ ba1f8dcb
......@@ -138,3 +138,26 @@
:rendered-info
(fn [ri] (m/map-vals some? ri)))
attachment-info))))
(def test-dashboard
"A test dashboard with only the :parameters field included, for testing that dashboard filters
render correctly in Slack messages and emails"
{:parameters
[{:name "State",
:slug "state",
:id "63e719d0",
:default ["CA", "NY"],
:type "string/=",
:sectionId "location"}
{:name "Quarter and Year",
:slug "quarter_and_year",
:id "a6db3d8b",
:default "Q1-2021"
:type "date/quarter-year",
:sectionId "date"}
;; Filter without default, should not be included in subscription
{:name "Product title contains",
:slug "product_title_contains",
:id "acd0dfab",
:type "string/contains",
:sectionId "string"}]})
test/metabase/pulse_test.clj
+ 20
− 13
View file @ ba1f8dcb
......@@ -174,9 +174,10 @@
:slack
(fn [{:keys [card-id]} [pulse-results]]
(is (= {:channel-id "#general"
:message "Pulse: Pulse Name"
:attachments
[{:title card-name
[{:blocks [{:type "header", :text {:type "plain_text", :text "Pulse: Pulse Name", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:title card-name
:rendered-info {:attachments false
:content true}
:title_link (str "https://metabase.com/testmb/question/" card-id)
......@@ -214,9 +215,11 @@
(testing "\"more results in attachment\" text should not be present for Slack Pulses"
(testing "Pulse results"
(is (= {:channel-id "#general"
:message "Pulse: Pulse Name"
:attachments
[{:title card-name
[{:blocks
[{:type "header", :text {:type "plain_text", :text "Pulse: Pulse Name", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:title card-name
:rendered-info {:attachments false
:content true}
:title_link (str "https://metabase.com/testmb/question/" card-id)
......@@ -427,8 +430,8 @@
:slack
(fn [{:keys [card-id]} [result]]
(is (= {:channel-id "#general",
:message "Alert: Test card",
:attachments [{:title card-name
:attachments [{:blocks [{:type "header", :text {:type "plain_text", :text "🔔 Test card", :emoji true}}]}
{:title card-name
:rendered-info {:attachments false
:content true}
:title_link (str "https://metabase.com/testmb/question/" card-id)
......@@ -436,7 +439,7 @@
:channel-id "FOO"
:fallback card-name}]}
(thunk->boolean result)))
(is (every? produces-bytes? (:attachments result))))}}
(is (every? produces-bytes? (rest (:attachments result)))))}}
"with no data"
{:card
......@@ -639,9 +642,11 @@
(slack-test-setup
(let [[slack-data] (pulse/send-pulse! (models.pulse/retrieve-pulse pulse-id))]
(is (= {:channel-id "#general",
:message "Pulse: Pulse Name",
:attachments
[{:title card-name,
[{:blocks
[{:type "header", :text {:type "plain_text", :text "Pulse: Pulse Name", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:title card-name,
:rendered-info {:attachments false
:content true}
:title_link (str "https://metabase.com/testmb/question/" card-id-1),
......@@ -657,7 +662,7 @@
:fallback "Test card 2"}]}
(thunk->boolean slack-data)))
(testing "attachments"
(is (true? (every? produces-bytes? (:attachments slack-data))))))))))
(is (true? (every? produces-bytes? (rest (:attachments slack-data)))))))))))
(deftest create-and-upload-slack-attachments!-test
(let [slack-uploader (fn [storage]
......@@ -714,8 +719,10 @@
slack-data (m/find-first #(contains? % :channel-id) pulse-data)
email-data (m/find-first #(contains? % :subject) pulse-data)]
(is (= {:channel-id "#general"
:message "Pulse: Pulse Name"
:attachments [{:title card-name
:attachments [{:blocks
[{:type "header", :text {:type "plain_text", :text "Pulse: Pulse Name", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:title card-name
:title_link (str "https://metabase.com/testmb/question/" card-id)
:rendered-info {:attachments false
:content true}
......@@ -724,7 +731,7 @@
:fallback card-name}]}
(thunk->boolean slack-data)))
(is (= [true]
(map (comp some? :content :rendered-info) (:attachments slack-data))))
(map (comp some? :content :rendered-info) (rest (:attachments slack-data)))))
(is (= {:subject "Pulse: Pulse Name", :recipients ["rasta@metabase.com"], :message-type :attachments}
(select-keys email-data [:subject :recipients :message-type])))
(is (= 3
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment