fix the local cluster 404 Not Found error and import.test integration…

… 500 error
yujin-emma · Feb 1, 2024 · 43f3465 · 43f3465
1 parent 27a2ba0
commit 43f3465
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/core/server/saved_objects/routes/import.ts b/src/core/server/saved_objects/routes/import.ts
@@ -60,7 +60,7 @@ export const registerImportRoute = (router: IRouter, config: SavedObjectConfig)
           {
             overwrite: schema.boolean({ defaultValue: false }),
             createNewCopies: schema.boolean({ defaultValue: false }),
-            dataSourceId: schema.string({ defaultValue: '' }),
+            dataSourceId: schema.maybe(schema.string({ defaultValue: '' })),
           },
           {
             validate: (object) => {
@@ -84,17 +84,17 @@ export const registerImportRoute = (router: IRouter, config: SavedObjectConfig)
       }
 
       // get datasource from saved object service
-      const dataSource = await context.core.savedObjects.client
+      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.title;
+      const dataSourceTitle = dataSource ? dataSource.title : '';
 
       let readStream: Readable;
       try {