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
09a8b979
Commit
09a8b979
authored
Jan 17, 2020
by
Laura Montemayor
Committed by
Clement Ho
Jan 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates styles for table
* adds a fixed width variable
parent
357e5611
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
69 additions
and
15 deletions
+69
-15
app/assets/javascripts/error_tracking/components/error_tracking_list.vue
...scripts/error_tracking/components/error_tracking_list.vue
+27
-10
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
changelogs/unreleased/lm-resolve-sentry-errors-from-list-view.yml
...gs/unreleased/lm-resolve-sentry-errors-from-list-view.yml
+5
-0
spec/frontend/error_tracking/components/error_tracking_list_spec.js
...end/error_tracking/components/error_tracking_list_spec.js
+36
-5
No files found.
app/assets/javascripts/error_tracking/components/error_tracking_list.vue
View file @
09a8b979
...
@@ -28,29 +28,38 @@ export default {
...
@@ -28,29 +28,38 @@ export default {
{
{
key
:
'
error
'
,
key
:
'
error
'
,
label
:
__
(
'
Error
'
),
label
:
__
(
'
Error
'
),
thClass
:
'
w-
7
0p
'
,
thClass
:
'
w-
6
0p
'
,
tdClass
:
'
table-col d-flex
align-items-center d-sm-table-cell
'
,
tdClass
:
'
table-col d-flex
d-sm-table-cell px-3
'
,
},
},
{
{
key
:
'
events
'
,
key
:
'
events
'
,
label
:
__
(
'
Events
'
),
label
:
__
(
'
Events
'
),
tdClass
:
'
table-col d-flex align-items-center d-sm-table-cell
'
,
thClass
:
'
text-right
'
,
tdClass
:
'
table-col d-flex d-sm-table-cell
'
,
},
},
{
{
key
:
'
users
'
,
key
:
'
users
'
,
label
:
__
(
'
Users
'
),
label
:
__
(
'
Users
'
),
tdClass
:
'
table-col d-flex align-items-center d-sm-table-cell
'
,
thClass
:
'
text-right
'
,
tdClass
:
'
table-col d-flex d-sm-table-cell
'
,
},
},
{
{
key
:
'
lastSeen
'
,
key
:
'
lastSeen
'
,
label
:
__
(
'
Last seen
'
),
label
:
__
(
'
Last seen
'
),
thClass
:
'
w-15p
'
,
thClass
:
''
,
tdClass
:
'
table-col d-flex
align-items-center
d-sm-table-cell
'
,
tdClass
:
'
table-col d-flex d-sm-table-cell
'
,
},
},
{
{
key
:
'
ignore
'
,
key
:
'
ignore
'
,
label
:
''
,
label
:
''
,
tdClass
:
'
table-col d-flex align-items-center d-sm-table-cell
'
,
thClass
:
'
w-3rem
'
,
tdClass
:
'
table-col d-flex pl-0 d-sm-table-cell
'
,
},
{
key
:
'
resolved
'
,
label
:
''
,
thClass
:
'
w-3rem
'
,
tdClass
:
'
table-col d-flex pl-0 d-sm-table-cell
'
,
},
},
{
{
key
:
'
details
'
,
key
:
'
details
'
,
...
@@ -197,9 +206,7 @@ export default {
...
@@ -197,9 +206,7 @@ export default {
<
template
>
<
template
>
<div
class=
"error-list"
>
<div
class=
"error-list"
>
<div
v-if=
"errorTrackingEnabled"
>
<div
v-if=
"errorTrackingEnabled"
>
<div
<div
class=
"row flex-column flex-sm-row align-items-sm-center row-top m-0 mt-sm-2 p-0 p-sm-3"
>
class=
"row flex-column flex-sm-row align-items-sm-center row-top m-0 mt-sm-2 mx-sm-1 p-0 p-sm-3"
>
<div
class=
"search-box flex-fill mr-sm-2 my-3 m-sm-0 p-3 p-sm-0"
>
<div
class=
"search-box flex-fill mr-sm-2 my-3 m-sm-0 p-3 p-sm-0"
>
<div
class=
"filtered-search-box mb-0"
>
<div
class=
"filtered-search-box mb-0"
>
<gl-dropdown
<gl-dropdown
...
@@ -333,6 +340,16 @@ export default {
...
@@ -333,6 +340,16 @@ export default {
<gl-icon
name=
"eye-slash"
:size=
"12"
/>
<gl-icon
name=
"eye-slash"
:size=
"12"
/>
</gl-button>
</gl-button>
</
template
>
</
template
>
<
template
v-slot:resolved=
"errors"
>
<gl-button
ref=
"resolveError"
v-gl-tooltip
:title=
"__('Resolve')"
@
click=
"updateIssueStatus(errors.item.id, 'resolved')"
>
<gl-icon
name=
"check-circle"
:size=
"12"
/>
</gl-button>
</
template
>
<
template
v-slot:details=
"errors"
>
<
template
v-slot:details=
"errors"
>
<gl-button
<gl-button
:href=
"getDetailsLink(errors.item.id)"
:href=
"getDetailsLink(errors.item.id)"
...
...
app/assets/stylesheets/framework/common.scss
View file @
09a8b979
...
@@ -461,6 +461,7 @@ img.emoji {
...
@@ -461,6 +461,7 @@ img.emoji {
.w-3rem
{
width
:
3rem
;
}
.w-3rem
{
width
:
3rem
;
}
.w-15p
{
width
:
15%
;
}
.w-15p
{
width
:
15%
;
}
.w-30p
{
width
:
30%
;
}
.w-30p
{
width
:
30%
;
}
.w-60p
{
width
:
60%
;
}
.w-70p
{
width
:
70%
;
}
.w-70p
{
width
:
70%
;
}
.h-12em
{
height
:
12em
;
}
.h-12em
{
height
:
12em
;
}
...
...
changelogs/unreleased/lm-resolve-sentry-errors-from-list-view.yml
0 → 100644
View file @
09a8b979
---
title
:
Resolve Sentry errors from error tracking list
merge_request
:
23135
author
:
type
:
added
spec/frontend/error_tracking/components/error_tracking_list_spec.js
View file @
09a8b979
...
@@ -143,10 +143,14 @@ describe('ErrorTrackingList', () => {
...
@@ -143,10 +143,14 @@ describe('ErrorTrackingList', () => {
});
});
it
(
'
each error in the list should have an ignore button
'
,
()
=>
{
it
(
'
each error in the list should have an ignore button
'
,
()
=>
{
const
error
=
wrapper
.
findAll
(
'
tbody tr
'
);
findErrorListRows
().
wrappers
.
forEach
(
row
=>
{
expect
(
row
.
contains
(
'
glicon-stub[name="eye-slash"]
'
)).
toBe
(
true
);
});
});
error
.
wrappers
.
forEach
((
_
,
index
)
=>
{
it
(
'
each error in the list should have a resolve button
'
,
()
=>
{
expect
(
error
.
at
(
index
).
exists
(
'
glicon-stub[name="eye-slash"]
'
)).
toBe
(
true
);
findErrorListRows
().
wrappers
.
forEach
(
row
=>
{
expect
(
row
.
contains
(
'
glicon-stub[name="check-circle"]
'
)).
toBe
(
true
);
});
});
});
});
...
@@ -231,8 +235,7 @@ describe('ErrorTrackingList', () => {
...
@@ -231,8 +235,7 @@ describe('ErrorTrackingList', () => {
});
});
it
(
'
sends the "ignored" status and error ID
'
,
()
=>
{
it
(
'
sends the "ignored" status and error ID
'
,
()
=>
{
const
ignoreButton
=
wrapper
.
find
({
ref
:
'
ignoreError
'
});
wrapper
.
find
({
ref
:
'
ignoreError
'
}).
trigger
(
'
click
'
);
ignoreButton
.
trigger
(
'
click
'
);
expect
(
actions
.
updateStatus
).
toHaveBeenCalledWith
(
expect
(
actions
.
updateStatus
).
toHaveBeenCalledWith
(
expect
.
anything
(),
expect
.
anything
(),
{
{
...
@@ -245,6 +248,34 @@ describe('ErrorTrackingList', () => {
...
@@ -245,6 +248,34 @@ describe('ErrorTrackingList', () => {
});
});
});
});
describe
(
'
When the resolve button on an error is clicked
'
,
()
=>
{
beforeEach
(()
=>
{
store
.
state
.
list
.
loading
=
false
;
store
.
state
.
list
.
errors
=
errorsList
;
mountComponent
({
stubs
:
{
GlTable
:
false
,
GlLink
:
false
,
GlButton
:
false
,
},
});
});
it
(
'
sends "resolved" status and error ID
'
,
()
=>
{
wrapper
.
find
({
ref
:
'
resolveError
'
}).
trigger
(
'
click
'
);
expect
(
actions
.
updateStatus
).
toHaveBeenCalledWith
(
expect
.
anything
(),
{
endpoint
:
'
/project/test/-/error_tracking/3.json
'
,
redirectUrl
:
'
/error_tracking
'
,
status
:
'
resolved
'
,
},
undefined
,
);
});
});
describe
(
'
When error tracking is disabled and user is not allowed to enable it
'
,
()
=>
{
describe
(
'
When error tracking is disabled and user is not allowed to enable it
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
mountComponent
({
mountComponent
({
...
...
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