[Magento Community Engineering] Community Contributions - 2.4-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js

@@ -219,19 +219,18 @@ define([
             _.each(tmpData, function (row, index) {
                 path = this.dataScope + '.' + this.index + '.' + (this.startIndex + index);
                 row.attributes = $('<i></i>').text(row.attributes).html();
-                row.sku = row.sku;
                 this.source.set(path, row);
             }, this);
 
             this.source.set(this.dataScope + '.' + this.index, data);
             this.parsePagesData(data);
 
             // Render
-            dataCount = data.length;
+            dataCount = tmpData.length;
             elemsCount = this.elems().length;
 
             if (dataCount > elemsCount) {
-                this.getChildItems().each(function (elemData, index) {
+                tmpData.each(function (elemData, index) {
                     this.addChild(elemData, this.startIndex + index);
                 }, this);
             } else {
@@ -243,6 +242,15 @@ define([
             this.generateAssociatedProducts();
         },
 
+        /**
+         * Set initial property to records data
+         *
+         * @returns {Object} Chainable.
+         */
+        setInitialProperty: function () {
+            return this;
+        },
+
         /**
          * Parsed data
          *

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

@@ -1126,13 +1126,17 @@ define([
          * Update whether value differs from default value
          */
         setDifferedFromDefault: function () {
-            var recordData = utils.copy(this.recordData());
+            var recordData;
 
-            Array.isArray(recordData) && recordData.forEach(function (item) {
-                delete item['record_id'];
-            });
+            if (this.default) {
+                recordData = utils.copy(this.recordData());
+
+                Array.isArray(recordData) && recordData.forEach(function (item) {
+                    delete item['record_id'];
+                });
 
-            this.isDifferedFromDefault(!_.isEqual(recordData, this.default));
+                this.isDifferedFromDefault(!_.isEqual(recordData, this.default));
+            }
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.test.js

@@ -41,11 +41,9 @@ define([
                     })
                 };
 
-            model.getChildItems = jasmine.createSpy().and.returnValue($(''));
             model.source = sourceMock;
             model.processingUnionInsertData(mockData);
             expect(model.source.get).toHaveBeenCalled();
-            expect(model.getChildItems).toHaveBeenCalled();
             expect(expectedData[1].sku).toBe('Conf&-sdfs');
         });
 

setup/src/Magento/Setup/Model/FixtureGenerator/CustomerTemplateGenerator.php

@@ -10,6 +10,8 @@
 use Magento\Customer\Model\AddressFactory;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory as RegionCollectionFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -32,19 +34,29 @@ class CustomerTemplateGenerator implements TemplateEntityGeneratorInterface
      */
     private $storeManager;
 
+    /**
+     * @var RegionCollectionFactory
+     */
+    private $regionsCollectionFactory;
+
     /**
      * @param CustomerFactory $customerFactory
      * @param AddressFactory $addressFactory
      * @param StoreManagerInterface $storeManager
+     * @param RegionCollectionFactory|null $regionsCollectionFactory
      */
     public function __construct(
         CustomerFactory $customerFactory,
         AddressFactory $addressFactory,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        RegionCollectionFactory $regionsCollectionFactory = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->addressFactory = $addressFactory;
         $this->storeManager = $storeManager;
+        $this->regionsCollectionFactory = $regionsCollectionFactory ?: ObjectManager::getInstance()->get(
+            RegionCollectionFactory::class
+        );
     }
 
     /**
@@ -119,7 +131,7 @@ private function getAddressTemplate($customerId)
                 'street' => 'Green str, 67',
                 'lastname' => 'Smith',
                 'firstname' => 'John',
-                'region_id' => 1,
+                'region_id' => $this->getFirstRegionId(),
                 'fax' => '04040404',
                 'middlename' => '',
                 'prefix' => '',
@@ -131,4 +143,18 @@ private function getAddressTemplate($customerId)
             ]
         ]);
     }
+
+    /**
+     * Get first region id.
+     *
+     * @return mixed
+     */
+    private function getFirstRegionId()
+    {
+        $regionsCollection = $this->regionsCollectionFactory->create();
+        $regionsCollection->unshiftOrder('region_id', 'ASC');
+        $region = $regionsCollection->getFirstItem();
+
+        return $region->getRegionId();
+    }
 }