fix the bug that create new with data source conflict

Signed-off-by: yujin-emma <[email protected]>
yujin-emma · Feb 6, 2024 · 8571a6f · 8571a6f
1 parent 336b111
commit 8571a6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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,7 @@ export async function importSavedObjectsFromStream({
 
   // Create objects in bulk
   const createSavedObjectsParams = {
-    objects: 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,3 +47,4 @@ export const regenerateIds = (objects: SavedObject[], dataSourceId: string | und
   }, new Map<string, { id: string; omitOriginId?: boolean }>());
   return importIdMap;
 };
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,4 @@ export const regenerateIds = (objects: SavedObject[], dataSourceId: string \| und
		}, new Map<string, { id: string; omitOriginId?: boolean }>());
		return importIdMap;
		};

Check failure on line 50 in src/core/server/saved_objects/import/regenerate_ids.ts View workflow job for this annotation GitHub Actions / Build and Verify on Linux (ciGroup1) Delete `⏎`