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
127aa6fa
Commit
127aa6fa
authored
Apr 13, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve CSS scroll and DRY the show all button
parent
a53a95fa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
44 deletions
+24
-44
ee/app/assets/javascripts/vue_shared/security_reports/components/issues_list.vue
...ts/vue_shared/security_reports/components/issues_list.vue
+19
-5
ee/app/assets/javascripts/vue_shared/security_reports/components/report_section.vue
...vue_shared/security_reports/components/report_section.vue
+0
-14
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
..._shared/security_reports/grouped_security_reports_app.vue
+0
-20
ee/app/assets/stylesheets/pages/security_reports.scss
ee/app/assets/stylesheets/pages/security_reports.scss
+1
-1
spec/javascripts/vue_shared/security_reports/grouped_security_reports_app_spec.js
...red/security_reports/grouped_security_reports_app_spec.js
+4
-4
No files found.
ee/app/assets/javascripts/vue_shared/security_reports/components/issues_list.vue
View file @
127aa6fa
...
...
@@ -34,16 +34,21 @@ export default {
required
:
false
,
default
:
()
=>
[],
},
isFullReportVisible
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
type
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
return
{
isFullReportVisible
:
false
,
};
},
methods
:
{
openFullReport
()
{
this
.
isFullReportVisible
=
true
;
},
},
};
</
script
>
<
template
>
...
...
@@ -81,5 +86,14 @@ export default {
status=
"success"
:issues=
"resolvedIssues"
/>
<button
v-if=
"allIssues.length && !isFullReportVisible"
type=
"button"
class=
"btn-link btn-blank prepend-left-10 js-expand-full-list break-link"
@
click=
"openFullReport"
>
{{
s__
(
"
ciReport|Show complete code vulnerabilities report
"
)
}}
</button>
</div>
</
template
>
ee/app/assets/javascripts/vue_shared/security_reports/components/report_section.vue
View file @
127aa6fa
...
...
@@ -78,7 +78,6 @@ export default {
return
{
collapseText
:
__
(
'
Expand
'
),
isCollapsed
:
true
,
isFullReportVisible
:
false
,
};
},
...
...
@@ -125,9 +124,6 @@ export default {
const
text
=
this
.
isCollapsed
?
__
(
'
Expand
'
)
:
__
(
'
Collapse
'
);
this
.
collapseText
=
text
;
},
openFullReport
()
{
this
.
isFullReportVisible
=
true
;
},
},
};
</
script
>
...
...
@@ -182,17 +178,7 @@ export default {
:resolved-issues=
"resolvedIssues"
:all-issues=
"allIssues"
:type=
"type"
:is-full-report-visible=
"isFullReportVisible"
/>
<button
v-if=
"allIssues.length && !isFullReportVisible"
type=
"button"
class=
"btn-link btn-blank prepend-left-10 js-expand-full-list break-link"
@
click=
"openFullReport"
>
{{
s__
(
"
ciReport|Show complete code vulnerabilities report
"
)
}}
</button>
</slot>
</div>
</section>
...
...
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
View file @
127aa6fa
...
...
@@ -207,17 +207,7 @@
:resolved-issues=
"sast.resolvedIssues"
:all-issues=
"sast.allIssues"
:type=
"$options.sast"
:is-full-report-visible=
"isSastFullReportVisible"
/>
<button
v-if=
"sast.allIssues.length && !isSastFullReportVisible"
type=
"button"
class=
"btn-link btn-blank prepend-left-10 js-expand-full-list-sast break-link"
@
click=
"openSASTFullReport"
>
{{
s__
(
"
ciReport|Show complete code vulnerabilities report
"
)
}}
</button>
</
template
>
<
template
v-if=
"dependencyScanningHeadPath"
>
...
...
@@ -236,17 +226,7 @@
:resolved-issues=
"dependencyScanning.resolvedIssues"
:all-issues=
"dependencyScanning.allIssues"
:type=
"$options.sast"
:is-full-report-visible=
"isDependencyScanningFullReportVisible"
/>
<button
v-if=
"dependencyScanning.allIssues.length && !isDependencyScanningFullReportVisible"
type=
"button"
class=
"btn-link btn-blank prepend-left-10 js-expand-full-list-dss break-link"
@
click=
"openDependencyScanningFullReport"
>
{{
s__
(
"
ciReport|Show complete code vulnerabilities report
"
)
}}
</button>
</
template
>
<
template
v-if=
"sastContainerHeadPath"
>
...
...
ee/app/assets/stylesheets/pages/security_reports.scss
View file @
127aa6fa
.split-report-section
{
border-bottom
:
1px
solid
$gray-darker
;
.report-block-
list
{
.report-block-
container
{
max-height
:
500px
;
overflow
:
auto
;
}
...
...
spec/javascripts/vue_shared/security_reports/grouped_security_reports_app_spec.js
View file @
127aa6fa
...
...
@@ -213,8 +213,8 @@ describe('Grouped security reports app', () => {
it
(
'
render show all issues button for sast
'
,
done
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-expand-full-list-sa
st
'
)).
not
.
toBeNull
();
vm
.
$el
.
querySelector
(
'
.js-
expand-full-list-sa
st
'
).
click
();
expect
(
vm
.
$el
.
querySelector
(
'
js-sast-issue-list .js-expand-full-li
st
'
)).
not
.
toBeNull
();
vm
.
$el
.
querySelector
(
'
.js-
sast-issue-list .js-expand-full-li
st
'
).
click
();
vm
.
$nextTick
()
...
...
@@ -230,8 +230,8 @@ describe('Grouped security reports app', () => {
it
(
'
render show all issues button for dependency scanning
'
,
done
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-expand-full-list-dss
'
)).
not
.
toBeNull
();
vm
.
$el
.
querySelector
(
'
.js-expand-full-list-dss
'
).
click
();
expect
(
vm
.
$el
.
querySelector
(
'
js-dss-issue-list .js-expand-full-list
'
)).
not
.
toBeNull
();
vm
.
$el
.
querySelector
(
'
js-dss-issue-list .js-expand-full-list
'
).
click
();
vm
.
$nextTick
()
...
...
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