Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
dde11215
Unverified
Commit
dde11215
authored
Feb 15, 2021
by
Sofia Papagiannaki
Committed by
GitHub
Feb 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Alerting: Fix modal text for deleting obsolete notifier (#31171)
parent
23621357
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
public/app/features/alerting/AlertTabCtrl.ts
+10
-7
No files found.
public/app/features/alerting/AlertTabCtrl.ts
View file @
dde11215
...
...
@@ -219,16 +219,20 @@ export class AlertTabCtrl {
ThresholdMapper
.
alertToGraphThresholds
(
this
.
panel
);
for
(
const
addedNotification
of
alert
.
notifications
)
{
let
identifier
=
addedNotification
.
uid
;
// lookup notifier type by uid
let
model
:
any
=
_
.
find
(
this
.
notifications
,
{
uid
:
addedNotification
.
uid
});
let
model
:
any
=
_
.
find
(
this
.
notifications
,
{
uid
:
identifier
});
// fallback using id if uid is missing
if
(
!
model
&&
addedNotification
.
id
)
{
identifier
=
addedNotification
.
id
;
model
=
_
.
find
(
this
.
notifications
,
{
id
:
identifier
});
}
// fallback to using id if uid is missing
if
(
!
model
)
{
model
=
_
.
find
(
this
.
notifications
,
{
id
:
addedNotification
.
id
});
if
(
!
model
)
{
appEvents
.
emit
(
CoreEvents
.
showConfirmModal
,
{
title
:
'Notifier with invalid ID
is detected'
,
text
:
`Do you want to delete notifier with invalid ID:
${
addedNotification
.
id
}
from the dashboard JSON?`
,
title
:
'Notifier with invalid identifier
is detected'
,
text
:
`Do you want to delete notifier with invalid identifier:
${
identifier
}
from the dashboard JSON?`
,
text2
:
'After successful deletion, make sure to save the dashboard for storing the update JSON.'
,
icon
:
'trash-alt'
,
confirmText
:
'Delete'
,
...
...
@@ -238,7 +242,6 @@ export class AlertTabCtrl {
},
});
}
}
if
(
model
&&
model
.
isDefault
===
false
)
{
model
.
iconClass
=
this
.
getNotificationIcon
(
model
.
type
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment