Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-2909' into Tier4-Kings-PR-07-16-2024

Author: lakshmana49

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

@@ -141,18 +141,13 @@ define([
          * @returns {Object} Chainable.
          */
         initElements: function (data) {
-            var newData = this.getNewData(data),
-                recordIndex;
+            var newData = this.getNewData(data);
 
             this.parsePagesData(data);
 
             if (newData.length) {
                 if (this.insertData().length) {
-                    recordIndex = data.length - newData.length - 1;
-
-                    _.each(newData, function (newRecord) {
-                        this.processingAddChild(newRecord, ++recordIndex, newRecord[this.identificationProperty]);
-                    }, this);
+                    this.parseProcessingAddChild(data, newData);
                 }
             }
 
@@ -181,6 +176,23 @@ define([
                     this.reload();
                 }
             }, this);
+        },
+
+        /**
+         * Parse and processing the add child method to update the latest records if the record index is not a number.
+         *
+         * @param {Array} data
+         * @param {Array} newData
+         */
+        parseProcessingAddChild: function (data, newData) {
+            let recordIndex;
+
+            recordIndex = data.length - newData.length - 1;
+            if (!isNaN(recordIndex)) {
+                _.each(newData, function (newRecord) {
+                    this.processingAddChild(newRecord, ++recordIndex, newRecord[this.identificationProperty]);
+                }, this);
+            }
         }
     });
 });

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

@@ -74,6 +74,7 @@ define([
             let bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName);
 
             bundleSelections.destroyChildren();
+            bundleSelections._elems.clear();
         },
 
         /**

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

@@ -0,0 +1,43 @@
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * ************************************************************************
+ */
+/*eslint max-nested-callbacks: 0*/
+define(['Magento_Bundle/js/components/bundle-dynamic-rows-grid'],
+    function (BundleDynamicRowsGrid) {
+        'use strict';
+
+        describe('Magento_Bundle/js/components/bundle-dynamic-rows-grid', function () {
+            let dynamicRowsGrid;
+
+            beforeEach(function () {
+                dynamicRowsGrid = new BundleDynamicRowsGrid();
+            });
+
+            describe('test parseProcessingAddChild method', function () {
+                it('Check the processingAddChild method should call when recordIndex is a valid number', function () {
+                    let data = [4], newData = [4];
+
+                    spyOn(dynamicRowsGrid, 'processingAddChild').and.callThrough();
+
+                    dynamicRowsGrid.parseProcessingAddChild(data, newData);
+
+                    expect(dynamicRowsGrid.processingAddChild).toHaveBeenCalled();
+                });
+
+                it('Check the processingAddChild method should not call when recordIndex is inValid number',
+                    function () {
+                        let data = NaN, newData = [2];
+
+                        spyOn(dynamicRowsGrid, 'processingAddChild').and.callThrough();
+
+                        dynamicRowsGrid.parseProcessingAddChild(data, newData);
+
+                        expect(dynamicRowsGrid.processingAddChild).not.toHaveBeenCalled();
+                    });
+            });
+        });
+    });

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

@@ -31,6 +31,10 @@ define(['Magento_Bundle/js/components/bundle-dynamic-rows', 'uiRegistry', 'uiCol
                 it('Check if bundle items are removed from option', function () {
                     let bundleSelections = new uiCollection;
 
+                    bundleSelections._elems = {
+                        clear: jasmine.createSpy('clear')
+                    };
+
                     spyOn(bundleSelections, 'destroyChildren').and.callThrough();
                     spyOn(registry, 'get').and.returnValue(bundleSelections);
                     spyOn(unit, 'removeBundleItemsFromOption').and.callThrough();
@@ -39,6 +43,7 @@ define(['Magento_Bundle/js/components/bundle-dynamic-rows', 'uiRegistry', 'uiCol
 
                     expect(registry.get).toHaveBeenCalledWith('dynamic.1.bundle_selections');
                     expect(bundleSelections.destroyChildren).toHaveBeenCalled();
+                    expect(bundleSelections._elems.clear).toHaveBeenCalled();
                 });
             });
         });