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
f428c823
Commit
f428c823
authored
Dec 03, 2021
by
Daniel Tian
Committed by
Savas Vedova
Dec 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use vendor scanner filter on new project-level vulnerability report
parent
eced4b8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
2 deletions
+32
-2
ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/constants.js
...board/components/shared/vulnerability_report/constants.js
+2
-0
ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_report.vue
...ents/shared/vulnerability_report/vulnerability_report.vue
+12
-2
ee/spec/frontend/security_dashboard/components/shared/vulnerability_report/vulnerability_report_spec.js
.../shared/vulnerability_report/vulnerability_report_spec.js
+18
-0
No files found.
ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/constants.js
View file @
f428c823
...
@@ -13,6 +13,7 @@ import { REPORT_TYPE_CLUSTER_IMAGE_SCANNING } from '~/vue_shared/security_report
...
@@ -13,6 +13,7 @@ import { REPORT_TYPE_CLUSTER_IMAGE_SCANNING } from '~/vue_shared/security_report
export
const
REPORT_TAB
=
{
export
const
REPORT_TAB
=
{
DEVELOPMENT
:
'
DEVELOPMENT
'
,
DEVELOPMENT
:
'
DEVELOPMENT
'
,
OPERATIONAL
:
'
OPERATIONAL
'
,
OPERATIONAL
:
'
OPERATIONAL
'
,
DEVELOPMENT_PROJECT
:
'
DEVELOPMENT_PROJECT
'
,
};
};
export
const
FIELDS
=
{
export
const
FIELDS
=
{
...
@@ -93,6 +94,7 @@ export const FIELD_PRESETS = {
...
@@ -93,6 +94,7 @@ export const FIELD_PRESETS = {
};
};
export
const
FILTER_PRESETS
=
{
export
const
FILTER_PRESETS
=
{
DEVELOPMENT_PROJECT
:
[
FILTERS
.
STATUS
,
FILTERS
.
SEVERITY
,
FILTERS
.
TOOL_VENDOR
,
FILTERS
.
ACTIVITY
],
DEVELOPMENT
:
[
FILTERS
.
STATUS
,
FILTERS
.
SEVERITY
,
FILTERS
.
TOOL_SIMPLE
,
FILTERS
.
ACTIVITY
],
DEVELOPMENT
:
[
FILTERS
.
STATUS
,
FILTERS
.
SEVERITY
,
FILTERS
.
TOOL_SIMPLE
,
FILTERS
.
ACTIVITY
],
OPERATIONAL
:
[
FILTERS
.
STATUS
,
FILTERS
.
SEVERITY
,
FILTERS
.
ACTIVITY
],
OPERATIONAL
:
[
FILTERS
.
STATUS
,
FILTERS
.
SEVERITY
,
FILTERS
.
ACTIVITY
],
};
};
...
...
ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_report.vue
View file @
f428c823
<
script
>
<
script
>
import
{
DASHBOARD_TYPES
}
from
'
ee/security_dashboard/store/constants
'
;
import
VulnerabilityCounts
from
'
./vulnerability_counts.vue
'
;
import
VulnerabilityCounts
from
'
./vulnerability_counts.vue
'
;
import
VulnerabilityListGraphql
from
'
./vulnerability_list_graphql.vue
'
;
import
VulnerabilityListGraphql
from
'
./vulnerability_list_graphql.vue
'
;
import
VulnerabilityFilters
from
'
./vulnerability_filters.vue
'
;
import
VulnerabilityFilters
from
'
./vulnerability_filters.vue
'
;
...
@@ -17,7 +18,7 @@ export default {
...
@@ -17,7 +18,7 @@ export default {
VulnerabilityListGraphql
,
VulnerabilityListGraphql
,
VulnerabilityFilters
,
VulnerabilityFilters
,
},
},
inject
:
[
'
canAdminVulnerability
'
],
inject
:
[
'
dashboardType
'
,
'
canAdminVulnerability
'
],
props
:
{
props
:
{
type
:
{
type
:
{
type
:
String
,
type
:
String
,
...
@@ -40,7 +41,16 @@ export default {
...
@@ -40,7 +41,16 @@ export default {
},
},
computed
:
{
computed
:
{
filtersToShow
()
{
filtersToShow
()
{
return
[...
FILTER_PRESETS
[
this
.
type
],
...(
this
.
showProjectFilter
?
[
FILTERS
.
PROJECT
]
:
[])];
// Special case for project-level development tab, it needs to show the new vendor scanner
// filter instead of the old simple filter. This is a temporary workaround until this issue is
// addressed: https://gitlab.com/gitlab-org/gitlab/-/issues/332727 after which all report
// levels will use the new vendor scanner filter and this check can be removed.
const
type
=
this
.
type
===
REPORT_TAB
.
DEVELOPMENT
&&
this
.
dashboardType
===
DASHBOARD_TYPES
.
PROJECT
?
REPORT_TAB
.
DEVELOPMENT_PROJECT
:
this
.
type
;
return
[...
FILTER_PRESETS
[
type
],
...(
this
.
showProjectFilter
?
[
FILTERS
.
PROJECT
]
:
[])];
},
},
fieldsToShow
()
{
fieldsToShow
()
{
return
[
return
[
...
...
ee/spec/frontend/security_dashboard/components/shared/vulnerability_report/vulnerability_report_spec.js
View file @
f428c823
...
@@ -5,9 +5,11 @@ import VulnerabilityReport from 'ee/security_dashboard/components/shared/vulnera
...
@@ -5,9 +5,11 @@ import VulnerabilityReport from 'ee/security_dashboard/components/shared/vulnera
import
VulnerabilityCounts
from
'
ee/security_dashboard/components/shared/vulnerability_report/vulnerability_counts.vue
'
;
import
VulnerabilityCounts
from
'
ee/security_dashboard/components/shared/vulnerability_report/vulnerability_counts.vue
'
;
import
VulnerabilityFilters
from
'
ee/security_dashboard/components/shared/vulnerability_report/vulnerability_filters.vue
'
;
import
VulnerabilityFilters
from
'
ee/security_dashboard/components/shared/vulnerability_report/vulnerability_filters.vue
'
;
import
projectVulnerabilitiesQuery
from
'
ee/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql
'
;
import
projectVulnerabilitiesQuery
from
'
ee/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql
'
;
import
{
DASHBOARD_TYPES
}
from
'
ee/security_dashboard/store/constants
'
;
import
{
import
{
FIELD_PRESETS
,
FIELD_PRESETS
,
FIELDS
,
FIELDS
,
FILTER_PRESETS
,
REPORT_TAB
,
REPORT_TAB
,
REPORT_TYPE_PRESETS
,
REPORT_TYPE_PRESETS
,
}
from
'
ee/security_dashboard/components/shared/vulnerability_report/constants
'
;
}
from
'
ee/security_dashboard/components/shared/vulnerability_report/constants
'
;
...
@@ -19,6 +21,7 @@ describe('Vulnerability report component', () => {
...
@@ -19,6 +21,7 @@ describe('Vulnerability report component', () => {
type
=
REPORT_TAB
.
DEVELOPMENT
,
type
=
REPORT_TAB
.
DEVELOPMENT
,
showProjectFilter
=
false
,
showProjectFilter
=
false
,
canAdminVulnerability
=
false
,
canAdminVulnerability
=
false
,
dashboardType
=
DASHBOARD_TYPES
.
GROUP
,
}
=
{})
=>
{
}
=
{})
=>
{
wrapper
=
shallowMount
(
VulnerabilityReport
,
{
wrapper
=
shallowMount
(
VulnerabilityReport
,
{
propsData
:
{
propsData
:
{
...
@@ -27,6 +30,7 @@ describe('Vulnerability report component', () => {
...
@@ -27,6 +30,7 @@ describe('Vulnerability report component', () => {
showProjectFilter
,
showProjectFilter
,
},
},
provide
:
{
provide
:
{
dashboardType
,
canAdminVulnerability
,
canAdminVulnerability
,
},
},
});
});
...
@@ -70,6 +74,20 @@ describe('Vulnerability report component', () => {
...
@@ -70,6 +74,20 @@ describe('Vulnerability report component', () => {
REPORT_TYPE_PRESETS
.
OPERATIONAL
,
REPORT_TYPE_PRESETS
.
OPERATIONAL
,
);
);
});
});
it
.
each
`
dashboardType | type | expectedFilters
${
DASHBOARD_TYPES
.
GROUP
}
|
${
REPORT_TAB
.
DEVELOPMENT
}
|
${
FILTER_PRESETS
.
DEVELOPMENT
}
${
DASHBOARD_TYPES
.
INSTANCE
}
|
${
REPORT_TAB
.
OPERATIONAL
}
|
${
FILTER_PRESETS
.
OPERATIONAL
}
${
DASHBOARD_TYPES
.
PROJECT
}
|
${
REPORT_TAB
.
DEVELOPMENT
}
|
${
FILTER_PRESETS
.
DEVELOPMENT_PROJECT
}
`
(
'
shows the expected filter for the $type $dashboardType report
'
,
({
dashboardType
,
type
,
expectedFilters
})
=>
{
createWrapper
({
dashboardType
,
type
});
expect
(
findVulnerabilityFilters
().
props
(
'
filters
'
)).
toEqual
(
expectedFilters
);
},
);
});
});
describe
(
'
vulnerability list GraphQL component
'
,
()
=>
{
describe
(
'
vulnerability list GraphQL component
'
,
()
=>
{
...
...
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