Merge branch '2.3-develop' into MAGETWO-91934

Author: Yevhen Miroshnychenko

.github/ISSUE_TEMPLATE.md

@@ -1,24 +1,35 @@
-<!--- Provide a general summary of the issue in the Title above -->
-<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this issue we recommend that you add the following information:
+     - Summary of the issue,
+     - Information on your environment,
+     - Steps to reproduce,
+     - Expected and actual results,
+
+    Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
 
 ### Preconditions
-<!--- Provide a more detailed information of environment you use -->
-<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
+<!---
+    Please provide as detailed information about your environment as possible.
+    For example Magento version, tag, HEAD, PHP & MySQL version, etc..
+-->
 1. 
 2. 
 
 ### Steps to reproduce
-<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant  -->
+<!---
+    It is important to provide a set of clear steps to reproduce this bug.
+    If relevant please include code samples
+-->
 1. 
 2. 
 3. 
 
 ### Expected result
 <!--- Tell us what should happen -->
-1. 
+1. [Screenshot, logs]
 
 ### Actual result
 <!--- Tell us what happens instead -->
 1. [Screenshot, logs]
-
-<!--- (This may be platform independent comment) -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,32 @@
-<!--- Provide a general summary of the Pull Request in the Title above -->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this pull request we recommend that you add the following information:
+     - Summary of the pull request,
+     - Issue(s) related to the changes made,
+     - Manual testing scenarios,
+-->
+
+<!--- Please provide a general summary of the Pull Request in the Title above -->
 
 ### Description
-<!--- Provide a description of the changes proposed in the pull request -->
+<!---
+    Please provide a description of the changes proposed in the pull request.
+    Letting us know what has changed and why it needed changing will help us validate this pull request.
+-->
 
 ### Fixed Issues (if relevant)
-<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant  -->
+<!---
+    If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
+    There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
+-->
 1. magento/magento2#<issue_number>: Issue title
 2. ...
 
 ### Manual testing scenarios
-<!--- Provide a set of unambiguous steps to test the proposed code change -->
+<!---
+    Please provide a set of unambiguous steps to test the proposed code change.
+    Giving us manual testing scenarios will help with the processing and validation process.
+-->
 1. ...
 2. ...
 

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -144,9 +144,6 @@
             <argument name="configs" xsi:type="array">
                 <item name="dev" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN</item>
             </argument>
-            <argument name="exemptions" xsi:type="array">
-                <item name="dev/debug/debug_logging" xsi:type="string"/>
-            </argument>
         </arguments>
     </type>
     <type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProductionWithoutScdOnDemand">

app/code/Magento/Braintree/etc/di.xml

@@ -447,7 +447,7 @@
     <!-- PayPal value handlers infrastructure -->
     <type name="Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler">
         <arguments>
-            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\AccountPaymentTokenFactory</argument>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Api\Data\PaymentTokenFactoryInterface</argument>
         </arguments>
     </type>
     <virtualType name="BraintreePayPalValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -314,7 +314,8 @@ protected function getBundleOptions()
                         'template' => 'ui/dynamic-rows/templates/collapsible',
                         'additionalClasses' => 'admin__field-wide',
                         'dataScope' => 'data.bundle_options',
-                        'bundleSelectionsName' => 'product_bundle_container.bundle_selections'
+                        'isDefaultFieldScope' => 'is_default',
+                        'bundleSelectionsName' => 'product_bundle_container.bundle_selections',
                     ],
                 ],
             ],
@@ -378,7 +379,10 @@ protected function getBundleOptions()
                                                     'selection_qty' => '',
                                                 ],
                                                 'links' => ['insertData' => '${ $.provider }:${ $.dataProvider }'],
-                                                'source' => 'product'
+                                                'imports' => [
+                                                    'inputType' => '${$.provider}:${$.dataScope}.type',
+                                                ],
+                                                'source' => 'product',
                                             ],
                                         ],
                                     ],
@@ -594,11 +598,14 @@ protected function getBundleSelections()
                     'config' => [
                         'componentType' => Container::NAME,
                         'isTemplate' => true,
-                        'component' => 'Magento_Bundle/js/components/bundle-record',
+                        'component' => 'Magento_Ui/js/dynamic-rows/record',
                         'is_collection' => true,
                         'imports' => [
-                            'onTypeChanged' => '${ $.provider }:${ $.bundleOptionsDataScope }.type'
-                        ]
+                            'inputType' => '${$.parentName}:inputType',
+                        ],
+                        'exports' => [
+                            'isDefaultValue' => '${$.parentName}:isDefaultValue.${$.index}',
+                        ],
                     ],
                 ],
             ],
@@ -691,11 +698,15 @@ protected function getBundleSelections()
                                 'componentType' => Form\Field::NAME,
                                 'formElement' => Form\Element\Checkbox::NAME,
                                 'dataType' => Form\Element\DataType\Price::NAME,
+                                'component' => 'Magento_Bundle/js/components/bundle-user-defined-checkbox',
                                 'label' => __('User Defined'),
                                 'dataScope' => 'selection_can_change_qty',
                                 'value' => '1',
                                 'valueMap' => ['true' => '1', 'false' => '0'],
                                 'sortOrder' => 110,
+                                'imports' => [
+                                    'inputType' => '${$.parentName}:inputType',
+                                ],
                             ],
                         ],
                     ],

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

@@ -14,7 +14,10 @@ define([
             clearing: false,
             parentContainer: '',
             parentSelections: '',
-            changer: ''
+            changer: '',
+            exports: {
+                value: '${$.parentName}:isDefaultValue'
+            }
         },
 
         /**
@@ -58,10 +61,6 @@ define([
 
             this.prefer = typeMap[type];
             this.elementTmpl(this.templates[typeMap[type]]);
-
-            if (this.prefer === 'radio' && this.checked()) {
-                this.clearValues();
-            }
         },
 
         /**

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

@@ -14,7 +14,57 @@ define([
             label: '',
             columnsHeader: false,
             columnsHeaderAfterRender: true,
-            addButton: false
+            addButton: false,
+            isDefaultFieldScope: 'is_default',
+            defaultRecords: {
+                use: [],
+                moreThanOne: false,
+                state: {}
+            },
+            listens: {
+                inputType: 'onInputTypeChange',
+                isDefaultValue: 'onIsDefaultValue'
+            }
+        },
+
+        /**
+         * Handler for type select.
+         *
+         * @param {String} inputType - changed.
+         */
+        onInputTypeChange: function (inputType) {
+            if (this.defaultRecords.moreThanOne && (inputType === 'radio' || inputType === 'select')) {
+                _.each(this.defaultRecords.use, function (index, counter) {
+                    this.source.set(
+                        this.dataScope + '.bundle_selections.' + index + '.' + this.isDefaultFieldScope,
+                        counter ? '0' : '1'
+                    );
+                }.bind(this));
+            }
+        },
+
+        /**
+         * Handler for is_default field.
+         *
+         * @param {Object} data - changed data.
+         */
+        onIsDefaultValue: function (data) {
+            var cb,
+                use = 0;
+
+            this.defaultRecords.use = [];
+
+            cb = function (elem, key) {
+
+                if (~~elem) {
+                    this.defaultRecords.use.push(key);
+                    use++;
+                }
+
+                this.defaultRecords.moreThanOne = use > 1;
+            }.bind(this);
+
+            _.each(data, cb);
         },
 
         /**
@@ -29,7 +79,6 @@ define([
                 recordIndex;
 
             this.parsePagesData(data);
-            this.templates.record.bundleOptionsDataScope = this.dataScope;
 
             if (newData.length) {
                 if (this.insertData().length) {

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-user-defined-checkbox.js

@@ -0,0 +1,30 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/single-checkbox'
+], function (Checkbox) {
+    'use strict';
+
+    return Checkbox.extend({
+        defaults: {
+            listens: {
+                inputType: 'onInputTypeChange'
+            }
+        },
+
+        /**
+         * Handler for "inputType" property
+         *
+         * @param {String} data
+         */
+        onInputTypeChange: function (data) {
+            data === 'checkbox' || data === 'multi' ?
+                this.clear()
+                    .visible(false) :
+                this.visible(true);
+        }
+    });
+});

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -139,9 +139,7 @@ public function execute()
                         ->setName($name)
                         ->getAttributeSet();
                 } catch (AlreadyExistsException $alreadyExists) {
-                    $this->messageManager->addErrorMessage(
-                        __('A "%1" attribute set name already exists. Create a new name and try again.', $name)
-                    );
+                    $this->messageManager->addErrorMessage(__('An attribute set named \'%1\' already exists.', $name));
                     $this->_session->setAttributeData($data);
                     return $this->returnResult('catalog/*/edit', ['_current' => true], ['error' => true]);
                 } catch (LocalizedException $e) {
@@ -202,6 +200,8 @@ public function execute()
                 }
             }
 
+            $data = $this->presentation->convertPresentationDataToInputType($data);
+
             if ($attributeId) {
                 if (!$model->getId()) {
                     $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
@@ -216,7 +216,7 @@ public function execute()
 
                 $data['attribute_code'] = $model->getAttributeCode();
                 $data['is_user_defined'] = $model->getIsUserDefined();
-                $data['frontend_input'] = $model->getFrontendInput();
+                $data['frontend_input'] = $data['frontend_input'] ?? $model->getFrontendInput();
             } else {
                 /**
                  * @todo add to helper and specify all relations for properties
@@ -229,8 +229,6 @@ public function execute()
                 );
             }
 
-            $data = $this->presentation->convertPresentationDataToInputType($data);
-
             $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
 
             if ($model->getIsUserDefined() === null || $model->getIsUserDefined() != 0) {

app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Eav;
 
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav;
+
 /**
  * Abstract action reindex class
  */
@@ -51,7 +53,7 @@ abstract public function execute($ids);
     /**
      * Retrieve array of EAV type indexers
      *
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav[]
+     * @return AbstractEav[]
      */
     public function getIndexers()
     {
@@ -69,7 +71,7 @@ public function getIndexers()
      * Retrieve indexer instance by type
      *
      * @param string $type
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav
+     * @return AbstractEav
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getIndexer($type)
@@ -108,7 +110,7 @@ public function reindex($ids = null)
     /**
      * Synchronize data between index storage and original storage
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav $indexer
+     * @param AbstractEav $indexer
      * @param string $destinationTable
      * @param array $ids
      * @throws \Exception
@@ -134,16 +136,17 @@ protected function syncData($indexer, $destinationTable, $ids)
     /**
      * Retrieve product relations by children and parent
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\AbstractEav $indexer
+     * @param AbstractEav $indexer
      * @param array $ids
-     *
      * @param bool $onlyParents
      * @return array $ids
      */
-    protected function processRelations($indexer, $ids, $onlyParents = false)
+    protected function processRelations(AbstractEav $indexer, array $ids, bool $onlyParents = false)
     {
         $parentIds = $indexer->getRelationsByChild($ids);
+        $parentIds = array_unique(array_merge($parentIds, $ids));
         $childIds = $onlyParents ? [] : $indexer->getRelationsByParent($parentIds);
+
         return array_unique(array_merge($ids, $childIds, $parentIds));
     }
 }