🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #12734: #6916 Fix notice during Update Bundle Product without changes (by @dzianis-yurevich)
 - #12875: Add more parameters to ajax:addToCart (by @srenon)
 - magento-engcom/magento2ce#1036: #12712: [GitHub] Latest Google Chrome Browser issue with duplicate id… (by @serhii-balko)
 - #12859: Throw ValidationException for invalid xml (by @pmclain)
 - magento-engcom/magento2ce#921: 8830: Can`t delete row in dynamicRows component (by @RomaKis)


Fixed GitHub Issues:
 - #6916: Update Bundle Product without changes in bundle items  (reported by @magecodenet) has been fixed in #12734 by @dzianis-yurevich in 2.2-develop branch
   Related commits:
     1. e6a7a4e

 - #12712: Latest Google Chrome Browser issue with duplicate #email (reported by @lano-vargas) has been fixed in magento-engcom/magento2ce#1036 by @serhii-balko in 2.2-develop branch
   Related commits:
     1. 781ec89

 - #8830: Can`t delete row in dynamicRows component (reported by @MTheProgrammer) has been fixed in magento-engcom/magento2ce#921 by @RomaKis in 2.2-develop branch
   Related commits:
     1. 0a6a2d9
     2. 53c1fa3
     3. 1ab55ec
     4. cb24115
     5. bfb2e38
     6. 568d36e
     7. 0a72897

Author: magento-team

app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php

@@ -127,7 +127,7 @@ protected function processBundleOptionsData(\Magento\Catalog\Model\Product $prod
         }
         $options = [];
         foreach ($bundleOptionsData as $key => $optionData) {
-            if ((bool)$optionData['delete']) {
+            if (!empty($optionData['delete'])) {
                 continue;
             }
 

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php

@@ -182,6 +182,11 @@ private function customizeAddAttributeModal(array $meta)
                                                 . '.create_new_attribute_modal',
                                             'actionName' => 'toggleModal',
                                         ],
+                                        [
+                                            'targetName' => 'product_form.product_form.add_attribute_modal'
+                                                . '.create_new_attribute_modal.product_attribute_add_form',
+                                            'actionName' => 'destroyInserted'
+                                        ],
                                         [
                                             'targetName'
                                             => 'product_form.product_form.add_attribute_modal'

app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml

@@ -147,7 +147,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">attribute_options.position</item>
                     </item>
                 </argument>
                 <field name="is_default" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -184,12 +183,8 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
                         <dataType>text</dataType>
                         <visible>false</visible>
-                        <dataScope>position</dataScope>
                     </settings>
                 </field>
             </container>

app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js

@@ -54,9 +54,16 @@ define([
             if (!_.isEmpty(this.suffixName) || _.isNumber(this.suffixName)) {
                 suffixName = '.' + this.suffixName;
             }
-            this.dataScope = 'data.' + this.prefixName + '.' + this.elementName + suffixName;
 
-            this.links.value = this.provider + ':' + this.dataScope;
+            this.exportDataLink = 'data.' + this.prefixName + '.' + this.elementName + suffixName;
+            this.exports.value = this.provider + ':' + this.exportDataLink;
+        },
+
+        /** @inheritdoc */
+        destroy: function () {
+            this._super();
+
+            this.source.remove(this.exportDataLink);
         },
 
         /**

app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html

@@ -7,7 +7,7 @@
 <button class="action-delete"
         attr="{'data-action': 'remove_row'}"
         data-bind="
-            click: function(){ $data.processingDeleteRecord($parents); },
+            click: function(){ $parent.processingDeleteRecord($record().index, $record.recordId); },
             attr: {
                 title: $parent.deleteButtonLabel
             }

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -97,7 +97,7 @@ define([
                 success: function (res) {
                     var eventData, parameters;
 
-                    $(document).trigger('ajax:addToCart', form.data().productSku);
+                    $(document).trigger('ajax:addToCart', form.data().productSku, form, res);
 
                     if (self.isLoaderEnabled()) {
                         $('body').trigger(self.options.processStop);

app/code/Magento/Config/Model/Config/Structure/Reader.php

@@ -124,14 +124,20 @@ protected function _readFiles($fileList)
      * Processing nodes of the document before merging
      *
      * @param string $content
+     * @throws \Magento\Framework\Config\Dom\ValidationException
      * @return string
      */
     protected function processingDocument($content)
     {
         $object = new DataObject();
         $document = new \DOMDocument();
 
-        $document->loadXML($content);
+        try {
+            $document->loadXML($content);
+        } catch (\Exception $e) {
+            throw new \Magento\Framework\Config\Dom\ValidationException($e->getMessage());
+        }
+
         $this->compiler->compile($document->documentElement, $object, $object);
 
         return $document->saveXML();

app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html

@@ -54,10 +54,10 @@
                   id="login-form">
                 <div class="fieldset login" data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
                     <div class="field email required">
-                        <label class="label" for="email"><span data-bind="i18n: 'Email Address'"></span></label>
+                        <label class="label" for="customer-email"><span data-bind="i18n: 'Email Address'"></span></label>
                         <div class="control">
                             <input name="username"
-                                   id="email"
+                                   id="customer-email"
                                    type="email"
                                    class="input-text"
                                    data-bind="attr: {autocomplete: autocomplete}"

app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml

@@ -87,7 +87,6 @@
                 <additionalClasses>
                     <class name="admin__field-wide">true</class>
                 </additionalClasses>
-                <dataScope>text_swatch</dataScope>
                 <componentType>dynamicRows</componentType>
             </settings>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
@@ -96,8 +95,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">text_swatch.position</item>
-                        <item name="dataScope" xsi:type="string"/>
                     </item>
                 </argument>
                 <field name="defaulttext" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -183,15 +180,11 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
                         <dataType>text</dataType>
                         <visible>false</visible>
-                        <dataScope>position</dataScope>
                     </settings>
                 </field>
-                <actionDelete name="action_delete" component="Magento_Catalog/js/form/element/action-delete" template="Magento_Catalog/form/element/action-delete">
+                <actionDelete name="action_delete">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="fit" xsi:type="boolean">true</item>
@@ -227,7 +220,6 @@
                     <class name="swatch-visual-options-container">true</class>
                     <class name="admin__field-wide">true</class>
                 </additionalClasses>
-                <dataScope>visual_swatch</dataScope>
                 <componentType>dynamicRows</componentType>
             </settings>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
@@ -236,8 +228,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">text_swatch.position</item>
-                        <item name="dataScope" xsi:type="string"/>
                     </item>
                 </argument>
                 <field name="defaultvisual" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -276,7 +266,6 @@
                             <class name="swatches-visual-col">true</class>
                         </additionalClasses>
                         <label translate="true">Swatch</label>
-                        <dataScope>swatchvisual</dataScope>
                     </settings>
                 </field>
                 <field name="optionvisual_default_store_view" component="Magento_Catalog/js/form/element/input" template="Magento_Catalog/form/element/input" formElement="input">
@@ -290,7 +279,6 @@
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Default Store View</label>
-                        <dataScope>optionvisual_default_store_view</dataScope>
                     </settings>
                 </field>
                 <field name="optionvisual_admin" component="Magento_Catalog/js/form/element/input" template="Magento_Catalog/form/element/input" formElement="input">
@@ -304,7 +292,6 @@
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Admin</label>
-                        <dataScope>optionvisual_admin</dataScope>
                     </settings>
                 </field>
                 <field name="position" component="Magento_Catalog/js/form/element/input" formElement="input">
@@ -315,15 +302,10 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
-                        <dataType>text</dataType>
-                        <visible>false</visible>
-                        <dataScope>position</dataScope>
+                         <visible>false</visible>
                     </settings>
                 </field>
-                <actionDelete name="action_delete" component="Magento_Catalog/js/form/element/action-delete" template="Magento_Catalog/form/element/action-delete">
+                <actionDelete name="action_delete">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="fit" xsi:type="boolean">true</item>

app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js

@@ -305,18 +305,30 @@ define([
          */
         initialize: function () {
             this._super()
-                .initOldCode();
+                .initOldCode()
+                .on('value', this.onChangeColor.bind(this));
 
             return this;
         },
 
+        /**
+         * Handler function that execute when color changes.
+         *
+         * @param {String} data - color
+         */
+        onChangeColor: function (data) {
+            if (!data) {
+                jQuery('.' + this.elementName).parent().removeClass('unavailable');
+            }
+        },
+
         /**
          * Initialize wrapped former implementation.
          *
          * @returns {Object} Chainable.
          */
         initOldCode: function () {
-            jQuery.async('.' + this.elementName, function (elem) {
+            jQuery.async('.' + this.elementName, this.name, function (elem) {
                 oldCode(this.value(), elem.parentElement, this.uploadUrl, this.elementName);
             }.bind(this));
 
@@ -336,9 +348,15 @@ define([
             this.elementName = this.prefixElementName + recordId;
 
             this.inputName = prefixName + '[' + this.elementName + ']';
-            this.dataScope = 'data.' + this.prefixName + '.' + this.elementName;
+            this.exportDataLink = 'data.' + this.prefixName + '.' + this.elementName;
+            this.exports.value = this.provider + ':' + this.exportDataLink;
+        },
+
+        /** @inheritdoc */
+        destroy: function () {
+            this._super();
 
-            this.links.value = this.provider + ':' + this.dataScope;
+            this.source.remove(this.exportDataLink);
         },
 
         /**