Merge branch '216492-fix-two-spinners' into 'master'

Remove the manual loading icon

See merge request gitlab-org/gitlab!31075

ee/app/assets/javascripts/security_dashboard/components/csv_export_button.vue

 <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

@@ -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(findLoadingIcon().exists()).toBe(false);
+      expect(findCsvExportButton().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(findLoadingIcon().exists()).toBe(true);
+        expect(findCsvExportButton().props('loading')).toBe(true);
       });
     });