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
ae5ef47e
Commit
ae5ef47e
authored
Apr 30, 2020
by
lauraMon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes mock data, adds spec and translation
parent
6c9312cd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
16 deletions
+6
-16
app/assets/javascripts/alert_management/components/alert_details.vue
...javascripts/alert_management/components/alert_details.vue
+2
-1
app/assets/javascripts/alert_management/components/alerts.json
...ssets/javascripts/alert_management/components/alerts.json
+0
-15
spec/frontend/alert_management/components/alert_management_detail_spec.js
...ert_management/components/alert_management_detail_spec.js
+4
-0
No files found.
app/assets/javascripts/alert_management/components/alert_details.vue
View file @
ae5ef47e
...
...
@@ -6,7 +6,7 @@ export default {
statuses
:
{
triggered
:
s__
(
'
AlertManagement|Triggered
'
),
acknowledged
:
s__
(
'
AlertManagement|Acknowledged
'
),
ignored
:
s__
(
'
AlertManagement|Ignor
ed
'
),
resolved
:
s__
(
'
AlertManagement|Resolv
ed
'
),
},
i18n
:
{
fullAlertDetailsTitle
:
s__
(
'
AlertManagement|Full Alert Details
'
),
...
...
@@ -27,6 +27,7 @@ export default {
<gl-new-dropdown-item
v-for=
"(label, field) in $options.statuses"
:key=
"field"
data-testid=
"statusDropdownItem"
class=
"align-middle"
>
{{
label
}}
</gl-new-dropdown-item>
...
...
app/assets/javascripts/alert_management/components/alerts.json
deleted
100644 → 0
View file @
6c9312cd
{
"alerts"
:
[
{
"id"
:
1
,
"iid"
:
"1527542"
,
"title"
:
"SyntaxError: Invalid or unexpected token"
,
"severity"
:
"Critical"
,
"eventCount"
:
7
,
"startedAt"
:
"2020-04-17T23:18:14.996Z"
,
"endedAt"
:
"2020-04-17T23:18:14.996Z"
,
"status"
:
"triggered"
}
]
}
spec/frontend/alert_management/components/alert_management_detail_spec.js
View file @
ae5ef47e
...
...
@@ -30,5 +30,9 @@ describe('AlertDetails', () => {
it
(
'
renders alert details
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
[data-testid="startTimeItem"]
'
).
exists
()).
toBe
(
true
);
});
it
(
'
renders a status dropdown
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
[data-testid="statusDropdownItem"]
'
).
exists
()).
toBe
(
true
);
});
});
});
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