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
b6b67a61
Unverified
Commit
b6b67a61
authored
10 months ago
by
Ngoc Khuat
Committed by
GitHub
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Delete pulses when archive dashboard (#42558)
parent
11c98539
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/models/dashboard.clj
+9
-7
9 additions, 7 deletions
src/metabase/models/dashboard.clj
test/metabase/models/dashboard_test.clj
+19
-0
19 additions, 0 deletions
test/metabase/models/dashboard_test.clj
with
28 additions
and
7 deletions
src/metabase/models/dashboard.clj
+
9
−
7
View file @
b6b67a61
...
...
@@ -20,7 +20,7 @@
[
metabase.models.parameter-card
:as
parameter-card
]
[
metabase.models.params
:as
params
]
[
metabase.models.permissions
:as
perms
]
[
metabase.models.pulse
:as
pulse
:refer
[
Pulse
]
]
[
metabase.models.pulse
:as
pulse
]
[
metabase.models.pulse-card
:as
pulse-card
]
[
metabase.models.revision
:as
revision
]
[
metabase.models.serialization
:as
serdes
]
...
...
@@ -97,11 +97,13 @@
(
t2/define-before-update
:model/Dashboard
[
dashboard
]
(
u/prog1
(
maybe-populate-initially-published-at
dashboard
)
(
params/assert-valid-parameters
dashboard
)
(
parameter-card/upsert-or-delete-from-parameters!
"dashboard"
(
:id
dashboard
)
(
:parameters
dashboard
))
(
collection/check-collection-namespace
Dashboard
(
:collection_id
dashboard
)))
(
maybe-populate-initially-published-at
dashboard
))
(
let
[
changes
(
t2/changes
dashboard
)]
(
u/prog1
(
maybe-populate-initially-published-at
dashboard
)
(
params/assert-valid-parameters
dashboard
)
(
parameter-card/upsert-or-delete-from-parameters!
"dashboard"
(
:id
dashboard
)
(
:parameters
dashboard
))
(
collection/check-collection-namespace
Dashboard
(
:collection_id
dashboard
))
(
when
(
:archived
changes
)
(
t2/delete!
:model/Pulse
:dashboard_id
(
u/the-id
dashboard
))))))
(
defn-
update-dashboard-subscription-pulses!
"Updates the pulses' names and collection IDs, and syncs the PulseCards"
...
...
@@ -140,7 +142,7 @@
:position
position
})]
(
t2/with-transaction
[
_conn
]
(
binding
[
pulse/*allow-moving-dashboard-subscriptions*
true
]
(
t2/update!
Pulse
{
:dashboard_id
dashboard-id
}
(
t2/update!
:model/
Pulse
{
:dashboard_id
dashboard-id
}
{
:name
(
:name
dashboard
)
:collection_id
(
:collection_id
dashboard
)})
(
pulse-card/bulk-create!
new-pulse-cards
)))))))
...
...
This diff is collapsed.
Click to expand it.
test/metabase/models/dashboard_test.clj
+
19
−
0
View file @
b6b67a61
...
...
@@ -10,6 +10,7 @@
[
metabase.models.dashboard-card
:as
dashboard-card
]
[
metabase.models.interface
:as
mi
]
[
metabase.models.permissions
:as
perms
]
[
metabase.models.pulse-channel-test
:as
pulse-channel-test
]
[
metabase.models.revision
:as
revision
]
[
metabase.models.serialization
:as
serdes
]
[
metabase.models.user
:as
user
]
...
...
@@ -756,6 +757,24 @@
:slug
"unnamed"
}
(
first
(
:parameters
dashboard
))))))))
(
deftest
archive-dashboard-delete-pulse-test
(
pulse-channel-test/with-send-pulse-setup!
(
mt/with-temp
[
:model/Card
{
card-id
:id
}
{}
:model/Dashboard
{
dash-id
:id
}
{}
:model/DashboardCard
{
dc-id
:id
}
{
:dashboard_id
dash-id
:card_id
card-id
}
:model/Pulse
{
pulse-id
:id
}
{
:dashboard_id
dash-id
}
:model/PulseChannel
_
{
:pulse_id
pulse-id
}
:model/PulseCard
_
{
:pulse_id
pulse-id
:card_id
card-id
:dashboard_card_id
dc-id
}]
(
testing
"sanity check that we have a trigger"
(
is
(
=
1
(
count
(
pulse-channel-test/send-pulse-triggers
pulse-id
)))))
(
t2/update!
:model/Dashboard
dash-id
{
:archived
true
})
(
testing
"archiving a Dashboard should delete its Pulse and SendPulse triggers"
(
is
(
nil?
(
t2/select-one
:model/Pulse
pulse-id
)))
(
is
(
=
0
(
count
(
pulse-channel-test/send-pulse-triggers
pulse-id
))))))))
(
deftest
post-update-test
(
t2.with-temp/with-temp
[
Collection
{
collection-id-1
:id
}
{}
Collection
{
collection-id-2
:id
}
{}
...
...
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