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
c7c5fcff
Commit
c7c5fcff
authored
Nov 20, 2019
by
Dheeraj Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move confidence column in the security dashboard
parent
b6bcd767
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
12 deletions
+17
-12
changelogs/unreleased/36483-move-the-confidence-column-in-the-security-dashboard.yml
...-move-the-confidence-column-in-the-security-dashboard.yml
+5
-0
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table.vue
...ecurity_dashboard/components/security_dashboard_table.vue
+3
-3
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table_row.vue
...ity_dashboard/components/security_dashboard_table_row.vue
+5
-5
ee/spec/javascripts/security_dashboard/components/security_dashboard_table_row_spec.js
...dashboard/components/security_dashboard_table_row_spec.js
+4
-4
No files found.
changelogs/unreleased/36483-move-the-confidence-column-in-the-security-dashboard.yml
0 → 100644
View file @
c7c5fcff
---
title
:
Move confidence column in the security dashboard
merge_request
:
20435
author
:
Dheeraj Joshi
type
:
changed
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table.vue
View file @
c7c5fcff
...
@@ -59,12 +59,12 @@ export default {
...
@@ -59,12 +59,12 @@ export default {
role=
"row"
role=
"row"
>
>
<div
class=
"table-section section-10"
role=
"rowheader"
>
{{
s__
(
'
Reports|Severity
'
)
}}
</div>
<div
class=
"table-section section-10"
role=
"rowheader"
>
{{
s__
(
'
Reports|Severity
'
)
}}
</div>
<div
class=
"table-section flex-grow-1"
role=
"rowheader"
>
{{
s__
(
'
Reports|Vulnerability
'
)
}}
</div>
<div
class=
"table-section section-10 ml-md-2"
role=
"rowheader"
>
<div
class=
"table-section section-10 ml-md-2"
role=
"rowheader"
>
{{
s__
(
'
Reports|Confidence
'
)
}}
{{
s__
(
'
Reports|Confidence
'
)
}}
</div>
</div>
<div
class=
"table-section flex-grow-1"
role=
"rowheader"
>
{{
s__
(
'
Reports|Vulnerability
'
)
}}
</div>
<div
class=
"table-section section-20"
role=
"rowheader"
></div>
<div
class=
"table-section section-20"
role=
"rowheader"
></div>
</div>
</div>
...
...
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table_row.vue
View file @
c7c5fcff
...
@@ -69,6 +69,11 @@ export default {
...
@@ -69,6 +69,11 @@ export default {
<div
class=
"table-mobile-content"
><severity-badge
:severity=
"severity"
/></div>
<div
class=
"table-mobile-content"
><severity-badge
:severity=
"severity"
/></div>
</div>
</div>
<div
class=
"table-section section-10 ml-md-2"
>
<div
class=
"table-mobile-header"
role=
"rowheader"
>
{{
s__
(
'
Reports|Confidence
'
)
}}
</div>
<div
class=
"table-mobile-content text-capitalize"
>
{{
confidence
}}
</div>
</div>
<div
class=
"table-section flex-grow-1"
>
<div
class=
"table-section flex-grow-1"
>
<div
class=
"table-mobile-header"
role=
"rowheader"
>
{{
s__
(
'
Reports|Vulnerability
'
)
}}
</div>
<div
class=
"table-mobile-header"
role=
"rowheader"
>
{{
s__
(
'
Reports|Vulnerability
'
)
}}
</div>
<div
class=
"table-mobile-content vulnerability-info"
>
<div
class=
"table-mobile-content vulnerability-info"
>
...
@@ -104,11 +109,6 @@ export default {
...
@@ -104,11 +109,6 @@ export default {
</div>
</div>
</div>
</div>
<div
class=
"table-section section-10 ml-md-2"
>
<div
class=
"table-mobile-header"
role=
"rowheader"
>
{{ s__('Reports|Confidence') }}
</div>
<div
class=
"table-mobile-content text-capitalize"
>
{{ confidence }}
</div>
</div>
<div
class=
"table-section section-20"
>
<div
class=
"table-section section-20"
>
<div
class=
"table-mobile-header"
role=
"rowheader"
>
{{ s__('Reports|Actions') }}
</div>
<div
class=
"table-mobile-header"
role=
"rowheader"
>
{{ s__('Reports|Actions') }}
</div>
<div
class=
"table-mobile-content action-buttons d-flex justify-content-end"
>
<div
class=
"table-mobile-content action-buttons d-flex justify-content-end"
>
...
...
ee/spec/javascripts/security_dashboard/components/security_dashboard_table_row_spec.js
View file @
c7c5fcff
...
@@ -31,7 +31,7 @@ describe('Security Dashboard Table Row', () => {
...
@@ -31,7 +31,7 @@ describe('Security Dashboard Table Row', () => {
it
(
'
should render a `–` for confidence
'
,
()
=>
{
it
(
'
should render a `–` for confidence
'
,
()
=>
{
expect
(
vm
.
confidence
).
toEqual
(
'
–
'
);
expect
(
vm
.
confidence
).
toEqual
(
'
–
'
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
2
].
textContent
).
toContain
(
'
–
'
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
1
].
textContent
).
toContain
(
'
–
'
);
});
});
it
(
'
should not render action buttons
'
,
()
=>
{
it
(
'
should not render action buttons
'
,
()
=>
{
...
@@ -63,19 +63,19 @@ describe('Security Dashboard Table Row', () => {
...
@@ -63,19 +63,19 @@ describe('Security Dashboard Table Row', () => {
it
(
'
should render the confidence
'
,
()
=>
{
it
(
'
should render the confidence
'
,
()
=>
{
expect
(
expect
(
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
2
].
textContent
.
toLowerCase
(),
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
1
].
textContent
.
toLowerCase
(),
).
toContain
(
props
.
vulnerability
.
confidence
);
).
toContain
(
props
.
vulnerability
.
confidence
);
});
});
describe
(
'
the project name
'
,
()
=>
{
describe
(
'
the project name
'
,
()
=>
{
it
(
'
should render the name
'
,
()
=>
{
it
(
'
should render the name
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
1
].
textContent
).
toContain
(
expect
(
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
2
].
textContent
).
toContain
(
props
.
vulnerability
.
name
,
props
.
vulnerability
.
name
,
);
);
});
});
it
(
'
should render the project namespace
'
,
()
=>
{
it
(
'
should render the project namespace
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
1
].
textContent
).
toContain
(
expect
(
vm
.
$el
.
querySelectorAll
(
'
.table-mobile-content
'
)[
2
].
textContent
).
toContain
(
props
.
vulnerability
.
project
.
full_name
,
props
.
vulnerability
.
project
.
full_name
,
);
);
});
});
...
...
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