Merge pull request #232 from CSCfi/CSCFC4EMSCR-602

CSCFC4EMSCR-602 When filtering from mappings, results get duplicated.
CSCfi · Nov 12, 2024 · 61d7167 · 61d7167
2 parents 20830aa + dccae7b
commit 61d7167
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/mscr-ui/src/modules/crosswalk-editor/mappings-accordion/index.tsx b/mscr-ui/src/modules/crosswalk-editor/mappings-accordion/index.tsx
@@ -421,19 +421,27 @@ function filterMappings(nodeMappingsInput: NodeMapping[], value: string, showAtt
   let results: NodeMapping[] = [];
   const searchString = value.toLowerCase();
   nodeMappingsInput.forEach(item => {
-      if (item?.notes && item.notes.toLowerCase().includes(searchString)) {
+      let itemFound = false
+      if (item?.notes && item.notes.toLowerCase().includes(searchString) && !itemFound) {
         results.push(item);
+        itemFound = true;
+      }
+      if (!itemFound) {
+        item.source.forEach(src => {
+          if (src.label.toLowerCase().includes(searchString) && !itemFound) {
+            results.push(item);
+            itemFound = true;
+          }
+        });
+      }
+      if (!itemFound) {
+        item.target.forEach(src => {
+          if (src.label.toLowerCase().includes(searchString) && !itemFound) {
+            results.push(item);
+            itemFound = true;
+          }
+        });
       }
-      item.source.forEach(src => {
-        if (src.label.toLowerCase().includes(searchString)) {
-          results.push(item);
-        }
-      });
-      item.target.forEach(src => {
-        if (src.label.toLowerCase().includes(searchString)) {
-          results.push(item);
-        }
-      });
     }
   );
   return results;