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

Add a "See this dashboard" link for dashboard sub for slack (#45029)

parent 3dcbd7f9
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/metabase/channel/slack.clj
+ 7
− 17
View file @ 02db079b
......@@ -124,9 +124,12 @@
:text {:type "plain_text"
:text (:name dashboard)
:emoji true}}
creator-section {:type "section"
link-section {:type "section"
:fields [{:type "mrkdwn"
:text (str "Sent by " (-> pulse :creator :common_name))}]}
:text (format "<%s | *Sent from %s by %s*>"
(pulse-params/dashboard-url (:id dashboard) (pulse-params/parameters pulse dashboard))
(public-settings/site-name)
(-> pulse :creator :common_name))}]}
filters (pulse-params/parameters pulse dashboard)
filter-fields (for [filter filters]
{:type "mrkdwn"
......@@ -134,19 +137,7 @@
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 "<" (pulse-params/dashboard-url (:id dashboard) (pulse-params/parameters pulse dashboard)) "|"
"*Sent from " (public-settings/site-name) "*>")}]}]})
{:blocks (filter some? [header-section filter-section link-section])}))
(defn- create-slack-attachment-data
"Returns a seq of slack attachment data structures, used in `create-and-upload-slack-attachments!`"
......@@ -163,5 +154,4 @@
{:channel-id channel-id
:attachments (remove nil?
(flatten [(slack-dashboard-header pulse dashboard)
(create-slack-attachment-data payload)
(slack-dashboard-footer pulse dashboard)]))}))
(create-slack-attachment-data payload)]))}))
test/metabase/dashboard_subscription_test.clj
+ 31
− 51
View file @ 02db079b
......@@ -341,20 +341,16 @@
(is (= {:channel-id "#general"
:attachments
[{:blocks [{:type "header", :text {:type "plain_text", :text "Aviary KPIs", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:type "section", :fields [{:type "mrkdwn", :text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
" | *Sent from Metabase Test by Rasta Toucan*>")}]}]}
{:title pulse.test-util/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 pulse.test-util/card-name}
{:blocks [{:type "divider"}
{:type "context"
:elements [{:type "mrkdwn"
:text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
"|*Sent from Metabase Test*>")}]}]}]}
:fallback pulse.test-util/card-name}]}
(pulse.test-util/thunk->boolean pulse-results))))
(testing "attached-results-text should be invoked exactly once"
(is (= 1
......@@ -394,20 +390,16 @@
(is (= {:channel-id "#general"
:attachments
[{:blocks [{:type "header", :text {:type "plain_text", :text "Aviary KPIs", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:type "section", :fields [{:type "mrkdwn", :text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
" | *Sent from Metabase Test by Rasta Toucan*>")}]}]}
{:title pulse.test-util/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 pulse.test-util/card-name}
{: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*>")}]}]}]}
{:blocks [{:type "section" :text {:type "mrkdwn" :text "*header*"}}]}]}
(pulse.test-util/thunk->boolean pulse-results)))))}}))
(deftest virtual-card-heading-test
......@@ -441,20 +433,18 @@
(is (= {:channel-id "#general"
:attachments
[{:blocks [{:type "header", :text {:type "plain_text", :text "Aviary KPIs", :emoji true}}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:type "section", :fields [{:type "mrkdwn"
:text
(str "<https://metabase.com/testmb/dashboard/"
dashboard-id
" | *Sent from Metabase Test by Rasta Toucan*>")}]}]}
{:title pulse.test-util/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 pulse.test-util/card-name}
{:blocks [{:type "section" :text {:type "mrkdwn" :text "*# header, quote isn't escaped*"}}]}
{:blocks [{:type "divider"}
{:type "context"
:elements [{:type "mrkdwn"
:text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
"|*Sent from Metabase Test*>")}]}]}]}
{:blocks [{:type "section" :text {:type "mrkdwn" :text "*# header, quote isn't escaped*"}}]}]}
(pulse.test-util/thunk->boolean pulse-results)))))}}))
(deftest dashboard-filter-test
......@@ -482,26 +472,25 @@
: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) and truncated appropriately"
converted to mrkdwn (Slack markup language) and truncated appropriately"
(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…"} ;; "*State*\nCA, NY and NJ"
{:type "mrkdwn", :text "*Quarter and Y…"}]} ;; "*Quarter and Year*\nQ1, 2021"
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:type "section", :fields [{:type "mrkdwn", :text
(str "<https://metabase.com/testmb/dashboard/"
dashboard-id
"?state=CA&state=NY&state=NJ&quarter_and_year=Q1-2021 | *Sent from Metabase Test by Rasta Toucan*>")}]}]}
{:title pulse.test-util/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 pulse.test-util/card-name}
{:blocks [{:type "divider"}
{:type "context"
:elements [{:type "mrkdwn"
:text (str "<https://metabase.com/testmb/dashboard/"
dashboard-id
"?state=CA&state=NY&state=NJ&quarter_and_year=Q1-2021|*Sent from Metabase Test*>")}]}]}]}
:fallback pulse.test-util/card-name}]}
(pulse.test-util/thunk->boolean pulse-results)))))}})))
(deftest dashboard-with-link-card-test
......@@ -560,7 +549,10 @@
:fields
[{:type "mrkdwn", :text "*State*\nCA, NY, and NJ"}
{:type "mrkdwn", :text "*Quarter and Year*\nQ1, 2021"}]}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:type "section", :fields [{:type "mrkdwn",
:text
#"<https://metabase\.com/testmb/dashboard/\d+\?state=CA&state=NY&state=NJ&quarter_and_year=Q1-2021\ \| \*Sent from Metabase Test by Rasta Toucan\*>"}]}]}
{:title "Test card",
:rendered-info {:attachments false, :content true, :render/text true},
:title_link #"https://metabase.com/testmb/question/.+",
......@@ -594,14 +586,7 @@
:text
{:type "mrkdwn", :text #"\*<https://metabase\.com/testmb/question/\d+\|Linked model name>\*\nLinked model desc"}}]}
{:blocks
[{:type "section", :text {:type "mrkdwn", :text "*<https://metabase.com|https://metabase.com>*"}}]}
{:blocks
[{:type "divider"}
{:type "context",
:elements
[{:type "mrkdwn",
:text
#"<https://metabase\.com/testmb/dashboard/\d+\?state=CA&state=NY&state=NJ&quarter_and_year=Q1-2021\|\*Sent from Metabase Test\*>"}]}]}]}
[{:type "section", :text {:type "mrkdwn", :text "*<https://metabase.com|https://metabase.com>*"}}]}]}
(pulse.test-util/thunk->boolean pulse-results))))}}))
(deftest mrkdwn-length-limit-test
......@@ -921,7 +906,9 @@
:fields
[{:type "mrkdwn", :text "*State*\nCA, NY, and NJ"}
{:type "mrkdwn", :text "*Quarter and Year*\nQ1, 2021"}]}
{:type "section", :fields [{:type "mrkdwn", :text "Sent by Rasta Toucan"}]}]}
{:type "section", :fields [{:type "mrkdwn"
:text #"<https://metabase\.com/testmb/dashboard/\d+\?state=CA&state=NY&state=NJ&quarter_and_year=Q1-2021 \| \*Sent from Metabase Test by Rasta Toucan\*>"}]}]}
{:blocks [{:type "section", :text {:type "mrkdwn", :text "*The first tab*"}}]}
{:title "Test card",
:rendered-info {:attachments false, :content true, :render/text true},
......@@ -933,14 +920,7 @@
{:blocks [{:type "section", :text {:type "mrkdwn", :text "Card 2 tab-1"}}]}
{:blocks [{:type "section", :text {:type "mrkdwn", :text "*The second tab*"}}]}
{:blocks [{:type "section", :text {:type "mrkdwn", :text "Card 1 tab-2"}}]}
{:blocks [{:type "section", :text {:type "mrkdwn", :text "Card 2 tab-2"}}]}
{:blocks
[{:type "divider"}
{:type "context",
:elements
[{:type "mrkdwn"
:text
#"<https://metabase\.com/testmb/dashboard/\d+\?state=CA&state=NY&state=NJ&quarter_and_year=Q1-2021\|\*Sent from Metabase Test\*>"}]}]}]}
{:blocks [{:type "section", :text {:type "mrkdwn", :text "Card 2 tab-2"}}]}]}
(pulse.test-util/thunk->boolean pulse-results))))}}))
(defn- result-attachment
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment