Revert "Fix more broken usages of bulkCreate (#76005) (#76131)"

This reverts commit 44a017b.
elastic · Aug 31, 2020 · 97f9e96 · 97f9e96
1 parent 2eb8e69
commit 97f9e96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 31 deletions.
diff --git a/src/plugins/home/public/application/components/tutorial/saved_objects_installer.js b/src/plugins/home/public/application/components/tutorial/saved_objects_installer.js
@@ -62,12 +62,9 @@ class SavedObjectsInstallerUi extends React.Component {
 
     let resp;
     try {
-      // Filter out the saved object version field, if present, to avoid inadvertently triggering optimistic concurrency control.
-      const objectsToCreate = this.props.savedObjects.map(
-        // eslint-disable-next-line no-unused-vars
-        ({ version, ...savedObject }) => savedObject
-      );
-      resp = await this.props.bulkCreate(objectsToCreate, { overwrite: this.state.overwrite });
+      resp = await this.props.bulkCreate(this.props.savedObjects, {
+        overwrite: this.state.overwrite,
+      });
     } catch (error) {
       if (!this._isMounted) {
         return;

diff --git a/src/plugins/home/public/application/components/tutorial/saved_objects_installer.test.js b/src/plugins/home/public/application/components/tutorial/saved_objects_installer.test.js
@@ -79,25 +79,4 @@ describe('bulkCreate', () => {
 
     expect(component).toMatchSnapshot();
   });
-
-  test('should filter out saved object version before calling bulkCreate', async () => {
-    const bulkCreateMock = jest.fn().mockResolvedValue({
-      savedObjects: [savedObject],
-    });
-    const component = mountWithIntl(
-      <SavedObjectsInstaller.WrappedComponent
-        bulkCreate={bulkCreateMock}
-        savedObjects={[{ ...savedObject, version: 'foo' }]}
-      />
-    );
-
-    findTestSubject(component, 'loadSavedObjects').simulate('click');
-
-    // Ensure all promises resolve
-    await new Promise((resolve) => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
-
-    expect(bulkCreateMock).toHaveBeenCalledWith([savedObject], expect.any(Object));
-  });
 });
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -20,7 +20,6 @@ import { getAuthorizationHeader } from '../../lib/request_authorization';
 import { MlInfoResponse } from '../../../common/types/ml_server_info';
 import {
   KibanaObjects,
-  KibanaObjectConfig,
   ModuleDataFeed,
   ModuleJob,
   Module,
@@ -101,7 +100,7 @@ interface ObjectExistResponse {
   id: string;
   type: string;
   exists: boolean;
-  savedObject?: { id: string; type: string; attributes: KibanaObjectConfig };
+  savedObject?: any;
 }
 
 interface SaveResults {
@@ -679,14 +678,14 @@ export class DataRecognizer {
     let results = { saved_objects: [] as any[] };
     const filteredSavedObjects = objectExistResults
       .filter((o) => o.exists === false)
-      .map((o) => o.savedObject!);
+      .map((o) => o.savedObject);
     if (filteredSavedObjects.length) {
       results = await this.savedObjectsClient.bulkCreate(
         // Add an empty migrationVersion attribute to each saved object to ensure
         // it is automatically migrated to the 7.0+ format with a references attribute.
         filteredSavedObjects.map((doc) => ({
           ...doc,
-          migrationVersion: {},
+          migrationVersion: doc.migrationVersion || {},
         }))
       );
     }