Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
15997680
Commit
15997680
authored
Apr 25, 2020
by
lauraMon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds status dropdown to list and translations
parent
2b5c2980
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
1 deletion
+29
-1
app/assets/javascripts/alert_management/components/alert_management_list.vue
...pts/alert_management/components/alert_management_list.vue
+23
-1
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
app/assets/javascripts/alert_management/components/alert_management_list.vue
View file @
15997680
<
script
>
import
{
GlEmptyState
,
GlDeprecatedButton
,
GlLoadingIcon
,
GlTable
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
GlEmptyState
,
GlDeprecatedButton
,
GlLoadingIcon
,
GlTable
,
GlAlert
,
GlNewDropdown
,
GlNewDropdownItem
,
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
TimeAgo
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
getAlerts
from
'
../graphql/queries/getAlerts.query.graphql
'
;
...
...
@@ -42,6 +50,11 @@ export default {
label
:
s__
(
'
AlertManagement|Status
'
),
},
],
statuses
:
{
triggered
:
s__
(
'
AlertManagement|Triggered
'
),
acknowledged
:
s__
(
'
AlertManagement|Acknowledged
'
),
ignored
:
s__
(
'
AlertManagement|Ignored
'
),
},
components
:
{
GlEmptyState
,
GlLoadingIcon
,
...
...
@@ -49,6 +62,8 @@ export default {
GlAlert
,
GlDeprecatedButton
,
TimeAgo
,
GlNewDropdown
,
GlNewDropdownItem
,
},
props
:
{
projectPath
:
{
...
...
@@ -140,6 +155,13 @@ export default {
<
template
#cell(title)=
"{ item }"
>
<div
class=
"gl-max-w-full text-truncate"
>
{{
item
.
title
}}
</div>
</
template
>
<
template
#cell
(
status
)
>
<gl-new-dropdown
class=
"w-100"
>
<gl-new-dropdown-item
v-for=
"(label, field) in $options.statuses"
:key=
"field"
>
{{
label
}}
</gl-new-dropdown-item>
</gl-new-dropdown>
</
template
>
<
template
#empty
>
{{
s__
(
'
AlertManagement|No alerts to display.
'
)
}}
...
...
locale/gitlab.pot
View file @
15997680
...
...
@@ -1085,6 +1085,9 @@ msgstr ""
msgid "Account: %{account}"
msgstr ""
msgid "Acknowledged"
msgstr ""
msgid "Action to take when receiving an alert."
msgstr ""
...
...
@@ -22143,6 +22146,9 @@ msgstr ""
msgid "Trigger was successfully updated."
msgstr ""
msgid "Triggered"
msgstr ""
msgid "Triggerer"
msgstr ""
...
...
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