IBX-9322: ezobjectrelationlist field allows selecting the same conten…

…t multiple times
ibexa · Dec 13, 2024 · 1c5593e · 1c5593e
1 parent 843ac71
commit 1c5593e
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js b/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js
@@ -113,19 +113,20 @@
             sourceInput.dispatchEvent(new CustomEvent(EVENT_CUSTOM));
         };
         const onConfirm = (items) => {
-            items = excludeDuplicatedItems(items);
+            const itemsWithoutDuplicate = excludeDuplicatedItems(items);
 
-            renderRows(items);
+            renderRows(itemsWithoutDuplicate);
             attachRowsEventHandlers();
 
-            selectedItems = [...selectedItems, ...items.map((item) => item.ContentInfo.Content._id)];
+            selectedItems = [...selectedItems, ...itemsWithoutDuplicate.map((item) => item.ContentInfo.Content._id)];
 
             updateInputValue(selectedItems);
             closeUDW();
             updateFieldState();
             updateAddBtnState();
             relationsTable.dispatchEvent(new CustomEvent('ibexa-refresh-main-table-checkbox'));
         };
+
         const openUDW = (event) => {
             event.preventDefault();
 
@@ -157,11 +158,7 @@
                 }),
             );
         };
-        const excludeDuplicatedItems = (items) => {
-            selectedItemsMap = items.reduce((total, item) => ({ ...total, [item.ContentInfo.Content._id]: item }), selectedItemsMap);
-
-            return items.filter((item) => selectedItemsMap[item.ContentInfo.Content._id]);
-        };
+        const excludeDuplicatedItems = (items) => items.filter((item) => !selectedItems.includes(item.ContentInfo.Content._id));
         const renderRow = (item, index) => {
             const { escapeHTML } = ibexa.helpers.text;
             const { formatShortDateTime } = ibexa.helpers.timezone;
@@ -304,7 +301,6 @@
             updateInputValue(selectedItems);
         };
         let selectedItems = [...fieldContainer.querySelectorAll(SELECTOR_ROW)].map((row) => parseInt(row.dataset.contentId, 10));
-        let selectedItemsMap = selectedItems.reduce((total, item) => ({ ...total, [item]: item }), {});
 
         updateAddBtnState();
         attachRowsEventHandlers();