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
6852373e
Commit
6852373e
authored
May 05, 2020
by
Savas Vedova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the manual loading icon
parent
c752700b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
ee/app/assets/javascripts/security_dashboard/components/csv_export_button.vue
...ripts/security_dashboard/components/csv_export_button.vue
+1
-3
ee/spec/frontend/security_dashboard/components/csv_export_button_spec.js
...d/security_dashboard/components/csv_export_button_spec.js
+2
-3
No files found.
ee/app/assets/javascripts/security_dashboard/components/csv_export_button.vue
View file @
6852373e
<
script
>
import
{
GlPopover
,
GlIcon
,
GlLink
,
GlButton
,
GlTooltipDirective
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlPopover
,
GlIcon
,
GlLink
,
GlButton
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
createFlash
from
'
~/flash
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
...
...
@@ -14,7 +14,6 @@ export default {
GlButton
,
GlPopover
,
GlLink
,
GlLoadingIcon
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
...
...
@@ -77,7 +76,6 @@ export default {
name=
"export"
class=
"mr-0 position-top-0"
/>
<gl-loading-icon
v-else
/>
<gl-popover
ref=
"popover"
:target=
"() => $refs.csvExportButton.$el"
...
...
ee/spec/frontend/security_dashboard/components/csv_export_button_spec.js
View file @
6852373e
...
...
@@ -25,7 +25,6 @@ describe('Csv Button Export', () => {
const
findPopoverButton
=
()
=>
wrapper
.
find
({
ref
:
'
popoverButton
'
});
const
findPopover
=
()
=>
wrapper
.
find
({
ref
:
'
popover
'
});
const
findCsvExportButton
=
()
=>
wrapper
.
find
({
ref
:
'
csvExportButton
'
});
const
findLoadingIcon
=
()
=>
wrapper
.
find
(
GlLoadingIcon
);
const
findExportIcon
=
()
=>
wrapper
.
find
({
ref
:
'
exportIcon
'
});
const
createComponent
=
()
=>
{
...
...
@@ -103,7 +102,7 @@ describe('Csv Button Export', () => {
it
(
'
displays the export icon when not loading and the loading icon when loading
'
,
()
=>
{
expect
(
findExportIcon
().
props
(
'
name
'
)).
toBe
(
'
export
'
);
expect
(
find
LoadingIcon
().
exists
(
)).
toBe
(
false
);
expect
(
find
CsvExportButton
().
props
(
'
loading
'
)).
toBe
(
false
);
wrapper
.
setData
({
isPreparingCsvExport
:
true
,
...
...
@@ -111,7 +110,7 @@ describe('Csv Button Export', () => {
return
wrapper
.
vm
.
$nextTick
(()
=>
{
expect
(
findExportIcon
().
exists
()).
toBe
(
false
);
expect
(
find
LoadingIcon
().
exists
(
)).
toBe
(
true
);
expect
(
find
CsvExportButton
().
props
(
'
loading
'
)).
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