revert: saved object management changes

Signed-off-by: SuZhou-Joe <[email protected]>

src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts

@@ -34,12 +34,10 @@ export async function fetchExportByTypeAndSearch(
   http: HttpStart,
   types: string[],
   search: string | undefined,
-  includeReferencesDeep: boolean = false,
-  body?: Record<string, unknown>
+  includeReferencesDeep: boolean = false
 ): Promise<Blob> {
   return http.post('/api/saved_objects/_export', {
     body: JSON.stringify({
-      ...body,
       type: types,
       search,
       includeReferencesDeep,

src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts

@@ -33,12 +33,10 @@ import { HttpStart } from 'src/core/public';
 export async function fetchExportObjects(
   http: HttpStart,
   objects: any[],
-  includeReferencesDeep: boolean = false,
-  body?: Record<string, unknown>
+  includeReferencesDeep: boolean = false
 ): Promise<Blob> {
   return http.post('/api/saved_objects/_export', {
     body: JSON.stringify({
-      ...body,
       objects,
       includeReferencesDeep,
     }),

src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts

@@ -34,7 +34,6 @@ export interface SavedObjectCountOptions {
   typesToInclude: string[];
   namespacesToInclude?: string[];
   searchString?: string;
-  workspaces?: string[];
 }
 
 export async function getSavedObjectCounts(

src/plugins/saved_objects_management/public/lib/import_file.ts

@@ -40,12 +40,12 @@ interface ImportResponse {
 export async function importFile(
   http: HttpStart,
   file: File,
-  { createNewCopies, overwrite, workspaces }: ImportMode,
+  { createNewCopies, overwrite }: ImportMode,
   selectedDataSourceId?: string
 ) {
   const formData = new FormData();
   formData.append('file', file);
-  const query = createNewCopies ? { createNewCopies, workspaces } : { overwrite, workspaces };
+  const query = createNewCopies ? { createNewCopies } : { overwrite };
   if (selectedDataSourceId) {
     query.dataSourceId = selectedDataSourceId;
   }

src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts

@@ -303,69 +303,4 @@ describe('resolveImportErrors', () => {
       }
     `);
   });
-
-  test('make http calls with workspaces', async () => {
-    httpMock.post.mockResolvedValueOnce({
-      success: false,
-      successCount: 0,
-      errors: [{ type: 'a', id: '1', error: { type: 'conflict' } }],
-    });
-    httpMock.post.mockResolvedValueOnce({
-      success: true,
-      successCount: 1,
-      successResults: [{ type: 'a', id: '1' }],
-    });
-    getConflictResolutions.mockResolvedValueOnce({});
-    getConflictResolutions.mockResolvedValueOnce({
-      'a:1': { retry: true, options: { overwrite: true } },
-    });
-    await resolveImportErrors({
-      http: httpMock,
-      getConflictResolutions,
-      state: {
-        importCount: 0,
-        unmatchedReferences: [{ existingIndexPatternId: '2', newIndexPatternId: '3', list: [] }],
-        failedImports: [
-          {
-            obj: { type: 'a', id: '1', meta: {} },
-            error: { type: 'missing_references', references: [{ type: 'index-pattern', id: '2' }] },
-          },
-        ],
-        importMode: { createNewCopies: false, overwrite: false },
-      },
-      workspaces: ['foo'],
-    });
-    expect(httpMock.post.mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          "/api/saved_objects/_resolve_import_errors",
-          Object {
-            "body": FormData {},
-            "headers": Object {
-              "Content-Type": undefined,
-            },
-            "query": Object {
-              "workspaces": Array [
-                "foo",
-              ],
-            },
-          },
-        ],
-        Array [
-          "/api/saved_objects/_resolve_import_errors",
-          Object {
-            "body": FormData {},
-            "headers": Object {
-              "Content-Type": undefined,
-            },
-            "query": Object {
-              "workspaces": Array [
-                "foo",
-              ],
-            },
-          },
-        ],
-      ]
-    `);
-  });
 });

src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts

@@ -90,13 +90,12 @@ async function callResolveImportErrorsApi(
   file: File,
   retries: any,
   createNewCopies: boolean,
-  selectedDataSourceId?: string,
-  workspaces?: string[]
+  selectedDataSourceId?: string
 ): Promise<SavedObjectsImportResponse> {
   const formData = new FormData();
   formData.append('file', file);
   formData.append('retries', JSON.stringify(retries));
-  const query = createNewCopies ? { createNewCopies, workspaces } : { workspaces };
+  const query = createNewCopies ? { createNewCopies } : {};
   if (selectedDataSourceId) {
     query.dataSourceId = selectedDataSourceId;
   }
@@ -173,7 +172,6 @@ export async function resolveImportErrors({
   getConflictResolutions,
   state,
   selectedDataSourceId,
-  workspaces,
 }: {
   http: HttpStart;
   getConflictResolutions: (
@@ -188,7 +186,6 @@ export async function resolveImportErrors({
     importMode: { createNewCopies: boolean; overwrite: boolean };
   };
   selectedDataSourceId: string;
-  workspaces?: string[];
 }) {
   const retryDecisionCache = new Map<string, RetryDecision>();
   const replaceReferencesCache = new Map<string, Reference[]>();
@@ -278,8 +275,7 @@ export async function resolveImportErrors({
       file!,
       retries,
       createNewCopies,
-      selectedDataSourceId,
-      workspaces
+      selectedDataSourceId
     );
     importCount = response.successCount; // reset the success count since we retry all successful results each time
     failedImports = [];

src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx

@@ -184,29 +184,6 @@ describe('Flyout', () => {
     );
   });
 
-  it('should call importFile / resolveImportErrors with workspaces', async () => {
-    const component = shallowRender({ ...defaultProps, workspaces: ['foo'] });
-
-    // Ensure all promises resolve
-    await new Promise((resolve) => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
-
-    await component.instance().import();
-    expect(importFileMock.mock.calls[0][2]).toMatchInlineSnapshot(`
-      Object {
-        "createNewCopies": true,
-        "overwrite": true,
-        "workspaces": Array [
-          "foo",
-        ],
-      }
-    `);
-
-    await component.instance().resolveImportErrors();
-    expect(resolveImportErrorsMock.mock.calls[0][0].workspaces).toEqual(['foo']);
-  });
-
   describe('conflicts', () => {
     beforeEach(() => {
       importFileMock.mockImplementation(() => ({
@@ -229,7 +206,6 @@ describe('Flyout', () => {
           },
         ],
       }));
-      resolveImportErrorsMock.mockClear();
       resolveImportErrorsMock.mockImplementation(() => ({
         status: 'success',
         importCount: 1,

src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx

@@ -97,7 +97,6 @@ export interface FlyoutProps {
   hideLocalCluster: boolean;
   savedObjects: SavedObjectsClientContract;
   notifications: NotificationsStart;
-  workspaces?: string[];
 }
 
 export interface FlyoutState {
@@ -190,21 +189,13 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
    * Does the initial import of a file, resolveImportErrors then handles errors and retries
    */
   import = async () => {
-    const { http, workspaces } = this.props;
+    const { http } = this.props;
     const { file, importMode, selectedDataSourceId } = this.state;
     this.setState({ status: 'loading', error: undefined });
 
     // Import the file
     try {
-      const response = await importFile(
-        http,
-        file!,
-        {
-          ...importMode,
-          workspaces,
-        },
-        selectedDataSourceId
-      );
+      const response = await importFile(http, file!, importMode, selectedDataSourceId);
       this.setState(processImportResponse(response), () => {
         // Resolve import errors right away if there's no index patterns to match
         // This will ask about overwriting each object, etc
@@ -260,15 +251,13 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
       status: 'loading',
       loadingMessage: undefined,
     });
-    const { workspaces } = this.props;
 
     try {
       const updatedState = await resolveImportErrors({
         http: this.props.http,
         state: this.state,
         getConflictResolutions: this.getConflictResolutions,
         selectedDataSourceId: this.state.selectedDataSourceId,
-        workspaces,
       });
       this.setState(updatedState);
     } catch (e) {

src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx

@@ -52,7 +52,6 @@ export interface ImportModeControlProps {
 export interface ImportMode {
   createNewCopies: boolean;
   overwrite: boolean;
-  workspaces?: string[];
 }
 
 const createNewCopiesDisabled = {