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
540088f7
Commit
540088f7
authored
Jul 28, 2020
by
Juan J. Ramirez
Committed by
Miguel Rincon
Jul 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replacing button with GitLab UI
Import fixes and linting
parent
9a1a4e25
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
10 deletions
+23
-10
changelogs/unreleased/jj-ramirez-secure-btn-fix.yml
changelogs/unreleased/jj-ramirez-secure-btn-fix.yml
+5
-0
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
..._shared/security_reports/grouped_security_reports_app.vue
+10
-9
ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js
...red/security_reports/grouped_security_reports_app_spec.js
+8
-1
No files found.
changelogs/unreleased/jj-ramirez-secure-btn-fix.yml
0 → 100644
View file @
540088f7
---
title
:
Replacing View Full Report button with GitLab UI
merge_request
:
37236
author
:
type
:
changed
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
View file @
540088f7
...
@@ -7,12 +7,11 @@ import ReportSection from '~/reports/components/report_section.vue';
...
@@ -7,12 +7,11 @@ import ReportSection from '~/reports/components/report_section.vue';
import
SummaryRow
from
'
~/reports/components/summary_row.vue
'
;
import
SummaryRow
from
'
~/reports/components/summary_row.vue
'
;
import
Tracking
from
'
~/tracking
'
;
import
Tracking
from
'
~/tracking
'
;
import
GroupedIssuesList
from
'
~/reports/components/grouped_issues_list.vue
'
;
import
GroupedIssuesList
from
'
~/reports/components/grouped_issues_list.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
IssueModal
from
'
./components/modal.vue
'
;
import
IssueModal
from
'
./components/modal.vue
'
;
import
DastModal
from
'
./components/dast_modal.vue
'
;
import
DastModal
from
'
./components/dast_modal.vue
'
;
import
securityReportsMixin
from
'
./mixins/security_report_mixin
'
;
import
securityReportsMixin
from
'
./mixins/security_report_mixin
'
;
import
createStore
from
'
./store
'
;
import
createStore
from
'
./store
'
;
import
{
GlSprintf
,
GlLink
,
GlModalDirective
}
from
'
@gitlab/ui
'
;
import
{
Gl
Button
,
Gl
Sprintf
,
GlLink
,
GlModalDirective
}
from
'
@gitlab/ui
'
;
import
{
mrStates
}
from
'
~/mr_popover/constants
'
;
import
{
mrStates
}
from
'
~/mr_popover/constants
'
;
import
{
trackMrSecurityReportDetails
}
from
'
ee/vue_shared/security_reports/store/constants
'
;
import
{
trackMrSecurityReportDetails
}
from
'
ee/vue_shared/security_reports/store/constants
'
;
import
{
fetchPolicies
}
from
'
~/lib/graphql
'
;
import
{
fetchPolicies
}
from
'
~/lib/graphql
'
;
...
@@ -27,10 +26,10 @@ export default {
...
@@ -27,10 +26,10 @@ export default {
SummaryRow
,
SummaryRow
,
SecuritySummary
,
SecuritySummary
,
IssueModal
,
IssueModal
,
Icon
,
GlSprintf
,
GlSprintf
,
GlLink
,
GlLink
,
DastModal
,
DastModal
,
GlButton
,
},
},
directives
:
{
directives
:
{
'
gl-modal
'
:
GlModalDirective
,
'
gl-modal
'
:
GlModalDirective
,
...
@@ -368,12 +367,14 @@ export default {
...
@@ -368,12 +367,14 @@ export default {
</
template
>
</
template
>
<
template
v-if=
"pipelinePath"
#actionButtons
>
<
template
v-if=
"pipelinePath"
#actionButtons
>
<div>
<gl-button
<a
:href=
"securityTab"
target=
"_blank"
class=
"btn btn-default btn-sm float-right gl-mr-3"
>
:href=
"securityTab"
<span>
{{
s__
(
'
ciReport|View full report
'
)
}}
</span>
target=
"_blank"
<icon
:size=
"16"
name=
"external-link"
/>
icon=
"external-link"
</a>
class=
"gl-mr-3 report-btn"
</div>
>
{{
s__
(
'
ciReport|View full report
'
)
}}
</gl-button>
</
template
>
</
template
>
<
template
v-if=
"isMRActive && isBaseSecurityReportOutOfDate"
#subHeading
>
<
template
v-if=
"isMRActive && isBaseSecurityReportOutOfDate"
#subHeading
>
...
...
ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js
View file @
540088f7
...
@@ -355,7 +355,14 @@ describe('Grouped security reports app', () => {
...
@@ -355,7 +355,14 @@ describe('Grouped security reports app', () => {
});
});
it
(
'
should calculate the security tab path
'
,
()
=>
{
it
(
'
should calculate the security tab path
'
,
()
=>
{
expect
(
wrapper
.
vm
.
securityTab
).
toEqual
(
`
${
pipelinePath
}
/security`
);
const
button
=
wrapper
.
find
(
'
.report-btn
'
);
expect
(
button
.
attributes
(
'
target
'
)).
toBe
(
'
_blank
'
);
expect
(
button
.
attributes
(
'
href
'
)).
toBe
(
`
${
pipelinePath
}
/security`
);
});
it
(
'
should render view full report button
'
,
()
=>
{
const
button
=
wrapper
.
find
(
'
.report-btn
'
);
expect
(
button
.
exists
()).
toBe
(
true
);
});
});
});
});
...
...
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