From ce00c80bcfb188327c81774ac1100e9b8ac84b94 Mon Sep 17 00:00:00 2001
From: Jeremy Cloarec <159018898+JeremyCloarec@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:28:51 +0100
Subject: [PATCH] [frontend] reset searchTerm when highlighting changes in
 content mapping (#9520)

---
 .../containers/ContainerAddStixCoreObjects.jsx    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/opencti-platform/opencti-front/src/private/components/common/containers/ContainerAddStixCoreObjects.jsx b/opencti-platform/opencti-front/src/private/components/common/containers/ContainerAddStixCoreObjects.jsx
index 783d21ce3d38..18441ce53618 100644
--- a/opencti-platform/opencti-front/src/private/components/common/containers/ContainerAddStixCoreObjects.jsx
+++ b/opencti-platform/opencti-front/src/private/components/common/containers/ContainerAddStixCoreObjects.jsx
@@ -146,7 +146,18 @@ const ContainerAddStixCoreObjects = (props) => {
   const contextFilters = useBuildEntityTypeBasedFilterContext(targetStixCoreObjectTypes, filters);
 
   const containerRef = useRef(null);
-  const keyword = mapping && (searchTerm ?? '').length === 0 ? selectedText : searchTerm;
+  const [mappingSearch, setMappingSearch] = useState(null);
+  const [currentSelectedText, setCurrentSelectedText] = useState(selectedText);
+  if (currentSelectedText !== selectedText) {
+    setMappingSearch(null);
+    setCurrentSelectedText(selectedText);
+  }
+  let keyword;
+  if (!mapping) {
+    keyword = searchTerm;
+  } else {
+    keyword = !mappingSearch ? selectedText : mappingSearch;
+  }
   const handleOpenCreateEntity = () => {
     setOpenCreateEntity(true);
     setOpenSpeedDial(false);
@@ -319,7 +330,7 @@ const ContainerAddStixCoreObjects = (props) => {
         sortBy={sortBy}
         orderAsc={orderAsc}
         dataColumns={buildColumns()}
-        handleSearch={helpers.handleSearch}
+        handleSearch={mapping ? setMappingSearch : helpers.handleSearch}
         keyword={keyword}
         handleSort={helpers.handleSort}
         handleAddFilter={helpers.handleAddFilter}