Merge branch 'ACP2E-3076' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-06-10-CE

Author: vkolesny

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js

@@ -71,25 +71,19 @@ define([
          * @param {Number|String} index - element index
          */
         removeBundleItemsFromOption: function (index) {
-            var bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName),
-                bundleSelectionsLength = (bundleSelections.elems() || []).length,
-                i;
+            let bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName);
 
-            if (bundleSelectionsLength) {
-                for (i = 0; i < bundleSelectionsLength; i++) {
-                    bundleSelections.elems()[0].destroy();
-                }
-            }
+            bundleSelections.destroyChildren();
         },
 
         /**
         * {@inheritdoc}
         */
         processingAddChild: function (ctx, index, prop) {
             var recordIds = _.map(this.recordData(), function (rec) {
-                return parseInt(rec['record_id'], 10);
-            }),
-            maxRecordId = _.max(recordIds);
+                    return parseInt(rec['record_id'], 10);
+                }),
+                maxRecordId = _.max(recordIds);
 
             prop = maxRecordId > -1 ? maxRecordId + 1 : prop;
             this._super(ctx, index, prop);

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -584,8 +584,8 @@ define([
                 updatedCollection;
 
             if (this.elems().filter(function (el) {
-                    return el.position || el.position === 0;
-                }).length !== this.getChildItems().length) {
+                return el.position || el.position === 0;
+            }).length !== this.getChildItems().length) {
 
                 return false;
             }
@@ -655,7 +655,10 @@ define([
 
             startIndex = page || this.startIndex;
 
-            return dataRecord.slice(startIndex, this.startIndex + parseInt(this.pageSize, 10));
+            if (dataRecord.length) {
+                return dataRecord.slice(startIndex, this.startIndex + parseInt(this.pageSize, 10));
+            }
+            return [];
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-dynamic-rows.test.js

@@ -0,0 +1,45 @@
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * ************************************************************************
+ */
+
+/*eslint max-nested-callbacks: 0*/
+define(['Magento_Bundle/js/components/bundle-dynamic-rows', 'uiRegistry', 'uiCollection'],
+    function (BundleDynamicRows, registry, uiCollection) {
+        'use strict';
+
+        describe('Magento_Bundle/js/components/bundle-dynamic-rows', function () {
+            let unit;
+
+            beforeEach(function () {
+                unit = new BundleDynamicRows({
+                    dataScope: 'bundle-dynamic-rows',
+                    label: 'Dynamic Rows',
+                    collapsibleHeader: true,
+                    columnsHeader: false,
+                    deleteProperty: false,
+                    addButton: false,
+                    name: 'dynamic',
+                    bundleSelectionsName: 'bundle_selections'
+                });
+            });
+
+            describe('test removeBundleItemsFromOption method', function () {
+                it('Check if bundle items are removed from option', function () {
+                    let bundleSelections = new uiCollection;
+
+                    spyOn(bundleSelections, 'destroyChildren').and.callThrough();
+                    spyOn(registry, 'get').and.returnValue(bundleSelections);
+                    spyOn(unit, 'removeBundleItemsFromOption').and.callThrough();
+
+                    unit.removeBundleItemsFromOption(1);
+
+                    expect(registry.get).toHaveBeenCalledWith('dynamic.1.bundle_selections');
+                    expect(bundleSelections.destroyChildren).toHaveBeenCalled();
+                });
+            });
+        });
+    });