fix the bug that create new with data source conflict

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
yujin-emma · Feb 6, 2024 · 7a2b14a · 7a2b14a
1 parent 8571a6f
commit 7a2b14a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/server/saved_objects/import/import_saved_objects.ts b/src/core/server/saved_objects/import/import_saved_objects.ts
@@ -135,7 +135,9 @@ export async function importSavedObjectsFromStream({
 
   // Create objects in bulk
   const createSavedObjectsParams = {
-    objects: dataSourceId ? collectSavedObjectsResult.collectedObjects.filter(object => object.type !== 'data-source') : collectSavedObjectsResult.collectedObjects,
+    objects: dataSourceId
+      ? collectSavedObjectsResult.collectedObjects.filter((object) => object.type !== 'data-source')
+      : collectSavedObjectsResult.collectedObjects,
     accumulatedErrors: errorAccumulator,
     savedObjectsClient,
     importIdMap,

diff --git a/src/core/server/saved_objects/import/regenerate_ids.ts b/src/core/server/saved_objects/import/regenerate_ids.ts
@@ -47,4 +47,3 @@ export const regenerateIds = (objects: SavedObject[], dataSourceId: string | und
   }, new Map<string, { id: string; omitOriginId?: boolean }>());
   return importIdMap;
 };
-