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
9b5c22da
Commit
9b5c22da
authored
Apr 16, 2020
by
Dave Pisek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test and remove dead code
parent
7d141c7f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
60 deletions
+3
-60
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table.vue
...ecurity_dashboard/components/security_dashboard_table.vue
+1
-15
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table_row.vue
...ity_dashboard/components/security_dashboard_table_row.vue
+1
-44
ee/spec/frontend/security_dashboard/components/security_dashboard_table_row_spec.js
...dashboard/components/security_dashboard_table_row_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table.vue
View file @
9b5c22da
...
...
@@ -61,7 +61,7 @@ export default {
</
script
>
<
template
>
<div
class=
"ci-table js-security-dashboard-table
table-hover
"
data-qa-selector=
"security_report_content"
>
<div
class=
"ci-table js-security-dashboard-table"
data-qa-selector=
"security_report_content"
>
<selection-summary
v-if=
"isSelectingVulnerabilities"
/>
<div
class=
"gl-responsive-table-row table-row-header vulnerabilities-row-header px-2"
...
...
@@ -125,17 +125,3 @@ export default {
</
template
>
</div>
</template>
<
style
>
/*NOTE: when removed: font-size: 13px and background-color: #707070*/
/*.vulnerabilities-row-header {*/
/* background-color: #fafafa;*/
/* font-size: 14px;*/
/*}*/
/*NOTE: Can this just be removed? */
/*.vulnerabilities-row .section-10,*/
/*.vulnerabilities-row-header .section-10 {*/
/*min-width: 120px;*/
/*}*/
</
style
>
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table_row.vue
View file @
9b5c22da
...
...
@@ -68,10 +68,6 @@ export default {
return
Boolean
(
this
.
selectedVulnerabilities
[
this
.
vulnerability
.
id
]);
},
},
mounted
()
{
// this.$el.addEventListener('focusin', this.showActionButtons);
// this.$el.addEventListener('focusout', this.hideActionButtons);
},
methods
:
{
...
mapActions
(
'
vulnerabilities
'
,
[
'
openModal
'
,
'
selectVulnerability
'
,
'
deselectVulnerability
'
]),
toggleVulnerability
()
{
...
...
@@ -125,6 +121,7 @@ export default {
<gl-skeleton-loading
v-if=
"isLoading"
class=
"mt-2 js-skeleton-loader"
:lines=
"2"
/>
<template
v-else
>
<gl-deprecated-button
ref=
"vulnerability-title"
class=
"d-inline gl-line-height-inherit gl-text-align-inherit gl-white-space-normal"
variant=
"blank"
@
click=
"openModal(
{ vulnerability })"
...
...
@@ -174,12 +171,6 @@ export default {
<
style
scoped
>
@media
(
min-width
:
768px
)
{
/* NOTE: Can be removed: border are defined at: line 40, app/assets/stylesheets/framework/responsive_tables.scss*/
/*.vulnerabilities-row:last-child {*/
/* border-bottom: 1px solid transparent;*/
/*}*/
/*this should be done by gitlab-ui table and using `.table-hover`*/
.vulnerabilities-row
:hover
,
.vulnerabilities-row
:focus
{
background
:
#f6fafd
;
...
...
@@ -187,39 +178,5 @@ export default {
border-top
:
1px
solid
#c1daf4
;
margin-top
:
-1px
;
}
/*.vulnerabilities-row .action-buttons {*/
/* opacity: 0;*/
/*}*/
/*.vulnerabilities-row:hover .action-buttons,*/
/*.vulnerabilities-row:focus-within .action-buttons {*/
/* opacity: 1;*/
/*}*/
}
/*NOTE: replaced by gl-white-space-normal*/
/*.vulnerability-info {*/
/* white-space: normal;*/
/*}*/
/*.vulnerability-title {*/
/*NOTE: replaced by gl-text-align-inherit*/
/*text-align: inherit;*/
/*NOTE: replaced by gl-white-space-inherit*/
/*white-space: normal;*/
/*NOTE: replaced by gl-line-height-inherit*/
/*line-height: inherit;*/
/*}*/
.vulnerability-namespace
{
/*NOTE: using `.gl-text-gray-700` => $gray-700: #707070; for this instead*/
/*color: #707070;*/
/*
Note
:
replaced
with
<
small
>,
since
it
has
80
%
font
size
*/
/*font-size: 0.8em;*/
}
/*.dismissed .table-mobile-content:not(.action-buttons) {*/
/* opacity: 0.5;*/
/*}*/
</
style
>
ee/spec/frontend/security_dashboard/components/security_dashboard_table_row_spec.js
View file @
9b5c22da
...
...
@@ -89,7 +89,7 @@ describe('Security Dashboard Table Row', () => {
it
(
'
should fire the openModal action when clicked
'
,
()
=>
{
jest
.
spyOn
(
store
,
'
dispatch
'
).
mockImplementation
();
const
el
=
wrapper
.
find
(
'
.vulnerability-title
'
);
const
el
=
wrapper
.
find
(
{
ref
:
'
vulnerability-title
'
}
);
el
.
trigger
(
'
click
'
);
expect
(
store
.
dispatch
).
toHaveBeenCalledWith
(
'
vulnerabilities/openModal
'
,
{
...
...
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