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
31071e4d
Commit
31071e4d
authored
Jun 06, 2021
by
Fernando
Committed by
David O'Regan
Jun 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rework file imports
* Add EE_ELSE_CE
parent
5563e788
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue
...ts/artifact_downloads/merge_request_artifact_download.vue
+1
-1
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
..._shared/security_reports/grouped_security_reports_app.vue
+4
-4
spec/frontend/vue_shared/components/security_reports/artifact_downloads/merge_request_artifact_download_spec.js
...rtifact_downloads/merge_request_artifact_download_spec.js
+5
-5
No files found.
app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue
View file @
31071e4d
<
script
>
import
{
reportTypeToSecurityReportTypeEnum
}
from
'
ee/vue_shared/security_reports/constants
'
;
import
{
reportTypeToSecurityReportTypeEnum
}
from
'
ee
_else_ce
/vue_shared/security_reports/constants
'
;
import
createFlash
from
'
~/flash
'
;
import
{
s__
}
from
'
~/locale
'
;
import
SecurityReportDownloadDropdown
from
'
~/vue_shared/security_reports/components/security_report_download_dropdown.vue
'
;
...
...
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
View file @
31071e4d
...
...
@@ -10,8 +10,8 @@ import ReportSection from '~/reports/components/report_section.vue';
import
SummaryRow
from
'
~/reports/components/summary_row.vue
'
;
import
{
LOADING
}
from
'
~/reports/constants
'
;
import
Tracking
from
'
~/tracking
'
;
import
MergeRequestArtifactDownload
from
'
~/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue
'
;
import
SecuritySummary
from
'
~/vue_shared/security_reports/components/security_summary.vue
'
;
import
MrArtifactDownload
from
'
~/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue
'
;
import
DastModal
from
'
./components/dast_modal.vue
'
;
import
IssueModal
from
'
./components/modal.vue
'
;
import
{
securityReportTypeEnumToReportType
}
from
'
./constants
'
;
...
...
@@ -33,7 +33,7 @@ import {
export
default
{
store
:
createStore
(),
components
:
{
M
r
ArtifactDownload
,
M
ergeRequest
ArtifactDownload
,
GroupedIssuesList
,
ReportSection
,
SummaryRow
,
...
...
@@ -661,7 +661,7 @@ export default {
<template
#summary
>
<security-summary
:message=
"groupedCoverageFuzzingText"
/>
</
template
>
<m
r
-artifact-download
<m
erge-request
-artifact-download
v-if=
"shouldShowDownloadGuidance"
:report-types=
"$options.reportTypes.COVERAGE_FUZZING"
:target-project-full-path=
"targetProjectFullPath"
...
...
@@ -691,7 +691,7 @@ export default {
<security-summary
:message=
"groupedApiFuzzingText"
/>
</
template
>
<m
r
-artifact-download
<m
erge-request
-artifact-download
v-if=
"shouldShowDownloadGuidance"
:report-types=
"$options.reportTypes.API_FUZZING"
:target-project-full-path=
"targetProjectFullPath"
...
...
spec/frontend/vue_shared/components/security_reports/artifact_downloads/m
r
_artifact_download_spec.js
→
spec/frontend/vue_shared/components/security_reports/artifact_downloads/m
erge_request
_artifact_download_spec.js
View file @
31071e4d
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
Vue
from
'
vue
'
;
import
VueApollo
from
'
vue-apollo
'
;
import
Component
from
'
vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue
'
;
import
{
REPORT_TYPE_SAST
,
REPORT_TYPE_SECRET_DETECTION
,
}
from
'
vue_shared/security_reports/constants
'
;
import
createMockApollo
from
'
helpers/mock_apollo_helper
'
;
import
{
expectedDownloadDropdownProps
,
securityReportMergeRequestDownloadPathsQueryResponse
,
}
from
'
jest/vue_shared/security_reports/mock_data
'
;
import
createFlash
from
'
~/flash
'
;
import
Component
from
'
~/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue
'
;
import
SecurityReportDownloadDropdown
from
'
~/vue_shared/security_reports/components/security_report_download_dropdown.vue
'
;
import
{
REPORT_TYPE_SAST
,
REPORT_TYPE_SECRET_DETECTION
,
}
from
'
~/vue_shared/security_reports/constants
'
;
import
securityReportMergeRequestDownloadPathsQuery
from
'
~/vue_shared/security_reports/queries/security_report_merge_request_download_paths.query.graphql
'
;
jest
.
mock
(
'
~/flash
'
);
...
...
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