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
e8b8b87e
Commit
e8b8b87e
authored
May 19, 2020
by
David O'Regan
Committed by
Natalia Tepluhina
May 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Format the alert payload into a table view
parent
82097be5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
111 additions
and
57 deletions
+111
-57
app/assets/javascripts/alert_management/components/alert_details.vue
...javascripts/alert_management/components/alert_details.vue
+24
-17
app/assets/stylesheets/pages/alert_management/details.scss
app/assets/stylesheets/pages/alert_management/details.scss
+42
-0
app/assets/stylesheets/pages/alert_management/list.scss
app/assets/stylesheets/pages/alert_management/list.scss
+1
-34
app/assets/stylesheets/pages/alert_management/severity-icons.scss
...ts/stylesheets/pages/alert_management/severity-icons.scss
+26
-0
changelogs/unreleased/214243.yml
changelogs/unreleased/214243.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-3
spec/frontend/alert_management/components/alert_management_detail_spec.js
...ert_management/components/alert_management_detail_spec.js
+7
-3
No files found.
app/assets/javascripts/alert_management/components/alert_details.vue
View file @
e8b8b87e
...
@@ -10,6 +10,7 @@ import {
...
@@ -10,6 +10,7 @@ import {
GlTabs
,
GlTabs
,
GlTab
,
GlTab
,
GlButton
,
GlButton
,
GlTable
,
}
from
'
@gitlab/ui
'
;
}
from
'
@gitlab/ui
'
;
import
createFlash
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
...
@@ -30,7 +31,7 @@ export default {
...
@@ -30,7 +31,7 @@ export default {
errorMsg
:
s__
(
errorMsg
:
s__
(
'
AlertManagement|There was an error displaying the alert. Please refresh the page to try again.
'
,
'
AlertManagement|There was an error displaying the alert. Please refresh the page to try again.
'
,
),
),
fullAlertDetailsTitle
:
s__
(
'
AlertManagement|
Full a
lert details
'
),
fullAlertDetailsTitle
:
s__
(
'
AlertManagement|
A
lert details
'
),
overviewTitle
:
s__
(
'
AlertManagement|Overview
'
),
overviewTitle
:
s__
(
'
AlertManagement|Overview
'
),
reportedAt
:
s__
(
'
AlertManagement|Reported %{when}
'
),
reportedAt
:
s__
(
'
AlertManagement|Reported %{when}
'
),
reportedAtWithTool
:
s__
(
'
AlertManagement|Reported %{when} by %{tool}
'
),
reportedAtWithTool
:
s__
(
'
AlertManagement|Reported %{when} by %{tool}
'
),
...
@@ -46,6 +47,7 @@ export default {
...
@@ -46,6 +47,7 @@ export default {
GlTab
,
GlTab
,
GlTabs
,
GlTabs
,
GlButton
,
GlButton
,
GlTable
,
TimeAgoTooltip
,
TimeAgoTooltip
,
},
},
mixins
:
[
glFeatureFlagsMixin
()],
mixins
:
[
glFeatureFlagsMixin
()],
...
@@ -149,18 +151,16 @@ export default {
...
@@ -149,18 +151,16 @@ export default {
<strong>
{{
$options
.
severityLabels
[
alert
.
severity
]
}}
</strong>
<strong>
{{
$options
.
severityLabels
[
alert
.
severity
]
}}
</strong>
</div>
</div>
<span
class=
"mx-2"
>
•
</span>
<span
class=
"mx-2"
>
•
</span>
<span>
<gl-sprintf
:message=
"reportedAtMessage"
>
<gl-sprintf
:message=
"reportedAtMessage"
>
<template
#when
>
<template
#when
>
<time-ago-tooltip
:time=
"alert.createdAt"
class=
"gl-ml-3"
/>
<time-ago-tooltip
:time=
"alert.createdAt"
/>
</
template
>
</
template
>
<
template
#tool
>
{{
alert
.
monitoringTool
}}
</
template
>
<
template
#tool
>
{{
alert
.
monitoringTool
}}
</
template
>
</gl-sprintf>
</gl-sprintf>
</span>
</div>
</div>
<gl-button
<gl-button
v-if=
"glFeatures.createIssueFromAlertEnabled"
v-if=
"glFeatures.createIssueFromAlertEnabled"
class=
"gl-mt-3 mt-sm-0 align-self-center align-self-sm-baseline"
class=
"gl-mt-3 mt-sm-0 align-self-center align-self-sm-baseline
alert-details-create-issue-button
"
data-testid=
"createIssueBtn"
data-testid=
"createIssueBtn"
:href=
"newIssuePath"
:href=
"newIssuePath"
category=
"primary"
category=
"primary"
...
@@ -215,13 +215,20 @@ export default {
...
@@ -215,13 +215,20 @@ export default {
</ul>
</ul>
</gl-tab>
</gl-tab>
<gl-tab
data-testid=
"fullDetailsTab"
:title=
"$options.i18n.fullAlertDetailsTitle"
>
<gl-tab
data-testid=
"fullDetailsTab"
:title=
"$options.i18n.fullAlertDetailsTitle"
>
<ul
class=
"list-unstyled"
>
<gl-table
<li
v-for=
"(value, key) in alert"
v-if=
"key !== '__typename'"
:key=
"key"
>
class=
"alert-management-details-table"
<p
class=
"py-1 my-1 gl-font-base"
>
:items=
"[{ key: 'Value', ...alert }]"
<strong>
{{ key }}:
</strong>
{{ value }}
:show-empty=
"true"
</p>
:busy=
"loading"
</li>
stacked
</ul>
>
<
template
#empty
>
{{
s__
(
'
AlertManagement|No alert data to display.
'
)
}}
</
template
>
<
template
#table-busy
>
<gl-loading-icon
size=
"lg"
color=
"dark"
class=
"mt-3"
/>
</
template
>
</gl-table>
</gl-tab>
</gl-tab>
</gl-tabs>
</gl-tabs>
</div>
</div>
...
...
app/assets/stylesheets/pages/alert_management/details.scss
0 → 100644
View file @
e8b8b87e
.alert-management-details
{
// these styles need to be deleted once GlTable component looks in GitLab same as in @gitlab/ui
table
{
tr
{
td
{
@include
gl-border-0
;
@include
gl-p-5
;
border-color
:
transparent
;
border-bottom
:
1px
solid
$table-border-color
;
&
:first-child
{
div
{
font-weight
:
bold
;
}
}
&
:not
(
:first-child
)
{
&
:
:
before
{
color
:
$gray-700
;
font-weight
:
normal
!
important
;
}
div
{
color
:
$gray-700
;
}
}
@include
media-breakpoint-up
(
sm
)
{
div
{
text-align
:
left
!
important
;
}
}
}
}
}
@include
media-breakpoint-down
(
xs
)
{
.alert-details-create-issue-button
{
width
:
100%
;
}
}
}
app/assets/stylesheets/pages/alert
s_
list.scss
→
app/assets/stylesheets/pages/alert
_management/
list.scss
View file @
e8b8b87e
.alert-management-list
,
.alert-management-list
{
.alert-management-details
{
.icon-critical
{
color
:
$red-800
;
}
.icon-high
{
color
:
$red-600
;
}
.icon-medium
{
color
:
$orange-400
;
}
.icon-low
{
color
:
$orange-300
;
}
.icon-info
{
color
:
$blue-400
;
}
.icon-unknown
{
color
:
$gray-400
;
}
// consider adding these stateful variants to @gitlab-ui
// consider adding these stateful variants to @gitlab-ui
// https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/1178
// https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/1178
.hover-bg-blue-50
:hover
{
.hover-bg-blue-50
:hover
{
...
@@ -97,13 +71,6 @@
...
@@ -97,13 +71,6 @@
}
}
}
}
@include
media-breakpoint-down
(
xs
)
{
// TODO Remove in favour of a details CSS page
[
data-testid
=
'createIssueBtn'
]
{
width
:
100%
;
}
}
.gl-tab-nav-item
{
.gl-tab-nav-item
{
color
:
$gl-gray-600
;
color
:
$gl-gray-600
;
...
...
app/assets/stylesheets/pages/alert_management/severity-icons.scss
0 → 100644
View file @
e8b8b87e
.alert-management-list
,
.alert-management-details
{
.icon-critical
{
color
:
$red-800
;
}
.icon-high
{
color
:
$red-600
;
}
.icon-medium
{
color
:
$orange-400
;
}
.icon-low
{
color
:
$orange-300
;
}
.icon-info
{
color
:
$blue-400
;
}
.icon-unknown
{
color
:
$gray-400
;
}
}
changelogs/unreleased/214243.yml
0 → 100644
View file @
e8b8b87e
---
title
:
Format the alert payload into a table view
merge_request
:
32423
author
:
type
:
changed
locale/gitlab.pot
View file @
e8b8b87e
...
@@ -1748,6 +1748,9 @@ msgstr ""
...
@@ -1748,6 +1748,9 @@ msgstr ""
msgid "AlertManagement|Alert detail"
msgid "AlertManagement|Alert detail"
msgstr ""
msgstr ""
msgid "AlertManagement|Alert details"
msgstr ""
msgid "AlertManagement|Alerts"
msgid "AlertManagement|Alerts"
msgstr ""
msgstr ""
...
@@ -1772,9 +1775,6 @@ msgstr ""
...
@@ -1772,9 +1775,6 @@ msgstr ""
msgid "AlertManagement|Events"
msgid "AlertManagement|Events"
msgstr ""
msgstr ""
msgid "AlertManagement|Full alert details"
msgstr ""
msgid "AlertManagement|High"
msgid "AlertManagement|High"
msgstr ""
msgstr ""
...
@@ -1790,6 +1790,9 @@ msgstr ""
...
@@ -1790,6 +1790,9 @@ msgstr ""
msgid "AlertManagement|More information"
msgid "AlertManagement|More information"
msgstr ""
msgstr ""
msgid "AlertManagement|No alert data to display."
msgstr ""
msgid "AlertManagement|No alerts available to display. If you think you're seeing this message in error, refresh the page."
msgid "AlertManagement|No alerts available to display. If you think you're seeing this message in error, refresh the page."
msgstr ""
msgstr ""
...
...
spec/frontend/alert_management/components/alert_management_detail_spec.js
View file @
e8b8b87e
import
{
mount
,
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
mount
,
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlAlert
,
GlLoadingIcon
,
GlDropdownItem
}
from
'
@gitlab/ui
'
;
import
{
GlAlert
,
GlLoadingIcon
,
GlDropdownItem
,
GlTable
}
from
'
@gitlab/ui
'
;
import
AlertDetails
from
'
~/alert_management/components/alert_details.vue
'
;
import
AlertDetails
from
'
~/alert_management/components/alert_details.vue
'
;
import
updateAlertStatus
from
'
~/alert_management/graphql/mutations/update_alert_status.graphql
'
;
import
updateAlertStatus
from
'
~/alert_management/graphql/mutations/update_alert_status.graphql
'
;
import
createFlash
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
...
@@ -13,6 +13,7 @@ describe('AlertDetails', () => {
...
@@ -13,6 +13,7 @@ describe('AlertDetails', () => {
let
wrapper
;
let
wrapper
;
const
newIssuePath
=
'
root/alerts/-/issues/new
'
;
const
newIssuePath
=
'
root/alerts/-/issues/new
'
;
const
findStatusDropdownItem
=
()
=>
wrapper
.
find
(
GlDropdownItem
);
const
findStatusDropdownItem
=
()
=>
wrapper
.
find
(
GlDropdownItem
);
const
findDetailsTable
=
()
=>
wrapper
.
find
(
GlTable
);
function
mountComponent
({
function
mountComponent
({
data
,
data
,
...
@@ -133,9 +134,12 @@ describe('AlertDetails', () => {
...
@@ -133,9 +134,12 @@ describe('AlertDetails', () => {
});
});
describe
(
'
View full alert details
'
,
()
=>
{
describe
(
'
View full alert details
'
,
()
=>
{
it
(
'
should display a unstyled list of alert details
'
,
()
=>
{
beforeEach
(()
=>
{
mountComponent
({
data
:
{
alert
:
mockAlert
}
});
});
it
(
'
should display a table of raw alert details data
'
,
()
=>
{
wrapper
.
find
(
'
[data-testid="fullDetailsTab"]
'
).
trigger
(
'
click
'
);
wrapper
.
find
(
'
[data-testid="fullDetailsTab"]
'
).
trigger
(
'
click
'
);
expect
(
wrapper
.
find
(
'
.list-unstyled
'
).
exists
()).
toBe
(
true
);
expect
(
findDetailsTable
(
).
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