Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
ab73f3ef
Unverified
Commit
ab73f3ef
authored
7 years ago
by
Cam Saul
Browse files
Options
Downloads
Patches
Plain Diff
Fix multiseries cards in embedding (thanks to @alex-mcleod for help)
parent
7bc48936
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/metabase/api/embed.clj
+5
-1
5 additions, 1 deletion
src/metabase/api/embed.clj
test/metabase/api/embed_test.clj
+19
-6
19 additions, 6 deletions
test/metabase/api/embed_test.clj
with
24 additions
and
7 deletions
src/metabase/api/embed.clj
+
5
−
1
View file @
ab73f3ef
...
...
@@ -164,7 +164,11 @@
[
dashboard-id
dashcard-id
card-id
]
(
let
[
param-id->param
(
u/key-by
:id
(
db/select-one-field
:parameters
Dashboard
:id
dashboard-id
))]
;; throw a 404 if there's no matching DashboardCard so people can't get info about other Cards that aren't in this Dashboard
(
for
[
param-mapping
(
api/check-404
(
db/select-one-field
:parameter_mappings
DashboardCard
:id
dashcard-id,
:dashboard_id
dashboard-id,
:card_id
card-id
))
;; we don't need to check that card-id matches the DashboardCard because we might be trying to get param info for
;; a series belonging to this dashcard (card-id might be for a series)
(
for
[
param-mapping
(
api/check-404
(
db/select-one-field
:parameter_mappings
DashboardCard
:id
dashcard-id
:dashboard_id
dashboard-id
))
:when
(
=
(
:card_id
param-mapping
)
card-id
)
:let
[
param
(
get
param-id->param
(
:parameter_id
param-mapping
))]
:when
param
]
...
...
This diff is collapsed.
Click to expand it.
test/metabase/api/embed_test.clj
+
19
−
6
View file @
ab73f3ef
...
...
@@ -6,11 +6,14 @@
[
metabase
[
http-client
:as
http
]
[
util
:as
u
]]
[
metabase.api.public-test
:as
public-test
]
[
metabase.api
[
embed
:as
embed-api
]
[
public-test
:as
public-test
]]
[
metabase.models
[
card
:refer
[
Card
]]
[
dashboard
:refer
[
Dashboard
]]
[
dashboard-card
:refer
[
DashboardCard
]]]
[
dashboard-card
:refer
[
DashboardCard
]]
[
dashboard-card-series
:refer
[
DashboardCardSeries
]]]
[
metabase.test
[
data
:as
data
]
[
util
:as
tu
]]
...
...
@@ -413,10 +416,20 @@
;;; ------------------------------------------------------------ Other Tests ------------------------------------------------------------
(
tu/resolve-private-vars
metabase.api.embed
remove-locked-and-disabled-params
)
;; parameters that are not in the `embedding-params` map at all should get removed by `remove-locked-and-disabled-params`
(
expect
{
:parameters
[]}
(
remove-locked-and-disabled-params
{
:parameters
{
:slug
"foo"
}}
{}))
(
#
'embed-api/remove-locked-and-disabled-params
{
:parameters
{
:slug
"foo"
}}
{}))
;; make sure that multiline series word as expected (#4768)
(
expect
"completed"
(
with-embedding-enabled-and-new-secret-key
(
tt/with-temp
Card
[
series-card
{
:dataset_query
{
:database
(
data/id
)
:type
:query
:query
{
:source-table
(
data/id
:venues
)}}}]
(
with-temp-dashcard
[
dashcard
{
:dash
{
:enable_embedding
true
}}]
(
tt/with-temp
DashboardCardSeries
[
series
{
:dashboardcard_id
(
u/get-id
dashcard
)
:card_id
(
u/get-id
series-card
)
:position
0
}]
(
:status
(
http/client
:get
200
(
str
(
dashcard-url
(
assoc
dashcard
:card_id
(
u/get-id
series-card
)))))))))))
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment