export all saved objects returned from search, not all saved objects …

…that exist
elastic · Sep 3, 2019 · cf8d874 · cf8d874
1 parent 4645468
commit cf8d874
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 52 deletions.
diff --git a/...ublic/management/sections/objects/components/objects_table/__jest__/objects_table.test.js b/...ublic/management/sections/objects/components/objects_table/__jest__/objects_table.test.js
@@ -20,7 +20,7 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
-import { ObjectsTable, POSSIBLE_TYPES } from '../objects_table';
+import { ObjectsTable } from '../objects_table';
 import { Flyout } from '../components/flyout/';
 import { Relationships } from '../components/relationships/';
 import { findObjects } from '../../../lib';
@@ -57,10 +57,6 @@ jest.mock('../../../lib/fetch_export_objects', () => ({
   fetchExportObjects: jest.fn(),
 }));
 
-jest.mock('../../../lib/fetch_export_by_type', () => ({
-  fetchExportByType: jest.fn(),
-}));
-
 jest.mock('../../../lib/get_saved_object_counts', () => ({
   getSavedObjectCounts: jest.fn().mockImplementation(() => {
     return {
@@ -318,7 +314,7 @@ describe('ObjectsTable', () => {
     });
 
     it('should export all', async () => {
-      const { fetchExportByType } = require('../../../lib/fetch_export_by_type');
+      const { fetchExportObjects } = require('../../../lib/fetch_export_objects');
       const { saveAs } = require('@elastic/filesaver');
       const component = shallowWithIntl(
         <ObjectsTable.WrappedComponent
@@ -333,11 +329,11 @@ describe('ObjectsTable', () => {
 
       // Set up mocks
       const blob = new Blob([JSON.stringify(allSavedObjects)], { type: 'application/ndjson' });
-      fetchExportByType.mockImplementation(() => blob);
+      fetchExportObjects.mockImplementation(() => blob);
 
       await component.instance().onExportAll();
 
-      expect(fetchExportByType).toHaveBeenCalledWith(POSSIBLE_TYPES, true);
+      expect(fetchExportObjects).toHaveBeenCalledWith(allSavedObjects.map(so => ({ type: so.type, id: so.id })), true);
       expect(saveAs).toHaveBeenCalledWith(blob, 'export.ndjson');
       expect(addSuccessMock).toHaveBeenCalledWith({ title: 'Your file is downloading in the background' });
     });

diff --git a/...ugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js b/...ugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js
@@ -58,7 +58,6 @@ import {
   getRelationships,
   getSavedObjectLabel,
   fetchExportObjects,
-  fetchExportByType,
   findObjects,
 } from '../../lib';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
@@ -303,20 +302,14 @@ class ObjectsTableUI extends Component {
 
   onExportAll = async () => {
     const { intl } = this.props;
-    const { exportAllSelectedOptions, isIncludeReferencesDeepChecked } = this.state;
-    const exportTypes = Object.entries(exportAllSelectedOptions).reduce(
-      (accum, [id, selected]) => {
-        if (selected) {
-          accum.push(id);
-        }
-        return accum;
-      },
-      []
-    );
+
+    const { exportAllSelectedOptions, isIncludeReferencesDeepChecked, savedObjects } = this.state;
+
+    const exportObjects = savedObjects.filter(so => exportAllSelectedOptions[so.type]).map(so => ({ type: so.type, id: so.id }));
 
     let blob;
     try {
-      blob = await fetchExportByType(exportTypes, isIncludeReferencesDeepChecked);
+      blob = await fetchExportObjects(exportObjects, isIncludeReferencesDeepChecked);
     } catch (e) {
       toastNotifications.addDanger({
         title: intl.formatMessage({

diff --git a/...legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_by_type.js b/...legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_by_type.js
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/index.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/index.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-export * from './fetch_export_by_type';
 export * from './fetch_export_objects';
 export * from './in_app_url';
 export * from './get_relationships';