From 9b0d78c467d774d8b3ff839f9eb3345bb0250067 Mon Sep 17 00:00:00 2001
From: yujin-emma <yujin.emma.work@gmail.com>
Date: Tue, 6 Feb 2024 02:46:13 +0000
Subject: [PATCH] fix the overriden bug

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
---
 .../import/check_conflict_for_data_source.ts              | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/server/saved_objects/import/check_conflict_for_data_source.ts b/src/core/server/saved_objects/import/check_conflict_for_data_source.ts
index 2efb80b1e902..82ba7331dbf5 100644
--- a/src/core/server/saved_objects/import/check_conflict_for_data_source.ts
+++ b/src/core/server/saved_objects/import/check_conflict_for_data_source.ts
@@ -60,7 +60,12 @@ export async function checkConflictsForDataSource({
        * for import saved object from osd exported
        * when the imported saved objects with the different dataSourceId comparing to the current dataSourceId
        */
-      if (!previoudDataSourceId || previoudDataSourceId === dataSourceId) {
+      if (!previoudDataSourceId) {
+        filteredObjects.push({
+          ...object,
+          id: `${dataSourceId}_${object.id}`,
+        });
+      } else if (previoudDataSourceId === dataSourceId) {
         filteredObjects.push(object);
       } else if (previoudDataSourceId && previoudDataSourceId !== dataSourceId) {
         if (ignoreRegularConflicts) {
@@ -70,6 +75,7 @@ export async function checkConflictsForDataSource({
           const omitOriginId = ignoreRegularConflicts;
           const rawId = parts[1];
           importIdMap.set(`${type}:${id}`, { id: `${dataSourceId}_${rawId}`, omitOriginId });
+          pendingOverwrites.add(`${type}:${id}`);
           filteredObjects.push({ ...object, id: `${dataSourceId}_${rawId}` });
         } else {
           // not override