format import api

src/core/server/saved_objects/routes/import.ts

@@ -84,15 +84,18 @@ export const registerImportRoute = (router: IRouter, config: SavedObjectConfig)
       }
 
       // get datasource from saved object service
-      const dataSource = dataSourceId ? await context.core.savedObjects.client
-        .get('data-source', dataSourceId)
-        .then((response) => {
-          const attributes: any = response?.attributes || {};
-          return {
-            id: response.id,
-            title: attributes.title,
-          };
-        }) : '';
+      // dataSource is '' when there is no dataSource pass in the url
+      const dataSource = dataSourceId
+        ? await context.core.savedObjects.client
+            .get('data-source', dataSourceId)
+            .then((response) => {
+              const attributes: any = response?.attributes || {};
+              return {
+                id: response.id,
+                title: attributes.title,
+              };
+            })
+        : '';
 
       const dataSourceTitle = dataSource ? dataSource.title : '';
 

test/functional/apps/management/_import_objects.js

@@ -31,6 +31,7 @@
 import expect from '@osd/expect';
 import path from 'path';
 import { keyBy } from 'lodash';
+import { wait } from '@hapi/hoek';
 
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
@@ -250,6 +251,7 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.savedObjects.clickImportDone();
         const objects = await PageObjects.savedObjects.getRowTitles();
         const isSavedObjectImported = objects.includes('saved object with index pattern conflict');
+        wait(10000);
         expect(isSavedObjectImported).to.be(true);
       });