Merge remote-tracking branch 'mainline/develop' into PR_Branch_ES

Author: Ankur Kaneria

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1120,7 +1120,6 @@ protected function _saveProductAttributes(array $attributesData)
     {
         foreach ($attributesData as $tableName => $skuData) {
             $tableData = [];
-            $where = [];
             foreach ($skuData as $sku => $attributes) {
                 $productId = $this->skuProcessor->getNewSku($sku)['entity_id'];
 
@@ -1133,30 +1132,8 @@ protected function _saveProductAttributes(array $attributesData)
                             'value' => $storeValue,
                         ];
                     }
-                    /*
-                    If the store based values are not provided for a particular store,
-                    we default to the default scope values.
-                    In this case, remove all the existing store based values stored in the table.
-                    */
-                    $where[] = $this->_connection->quoteInto(
-                            '(store_id NOT IN (?)',
-                            array_keys($storeValues)
-                        ) . $this->_connection->quoteInto(
-                            ' AND attribute_id = ?',
-                            $attributeId
-                        ) . $this->_connection->quoteInto(
-                            ' AND entity_id = ?)',
-                            $productId
-                        );
-                    if (count($where) >= self::ATTRIBUTE_DELETE_BUNCH) {
-                        $this->_connection->delete($tableName, implode(' OR ', $where));
-                        $where = [];
-                    }
                 }
             }
-            if (!empty($where)) {
-                $this->_connection->delete($tableName, implode(' OR ', $where));
-            }
             $this->_connection->insertOnDuplicate($tableName, $tableData, ['value']);
         }
         return $this;

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

@@ -504,18 +504,6 @@ public function testSaveProductAttributes()
         $this->_connection->expects($this->any())
             ->method('quoteInto')
             ->willReturnCallback([$this, 'returnQuoteCallback']);
-        $this->_connection
-            ->expects($this->once())
-            ->method('delete')
-            ->with(
-                $this->equalTo($testTable),
-                $this->equalTo(
-                    '(store_id NOT IN ('
-                    . $storeId . ') AND attribute_id = '
-                    . $attributeId . ' AND entity_id = '
-                    . self::ENTITY_ID . ')'
-                )
-            );
 
         $tableData[] = [
             'entity_id' => self::ENTITY_ID,

app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js

@@ -57,34 +57,29 @@ define([
          * @param {Object} elem
          */
         validate: function (elem) {
-            var source = this.source,
-                result  = elem.delegate('validate'),
-                invalid = false;
+            var result  = elem.delegate('validate'),
+                invalid;
 
-            _.some(result, function (item) {
-                return !item.valid && (invalid = item.target);
+            invalid = _.find(result, function (item) {
+                return !item.valid;
             });
 
-            if (invalid && !source.get('params.invalid')) {
-                source.set('params.invalid', true);
-
+            if (invalid) {
                 elem.activate();
-                invalid.focused(true);
+                invalid.target.focused(true);
             }
+
+            return invalid;
         },
 
         /**
          * Sets 'allValid' property of instance to true, then calls 'validate' method
          * of instance for each element.
          */
         onValidate: function () {
-            var elems;
-
-            elems = this.elems.sortBy(function (elem) {
+            this.elems.sortBy(function (elem) {
                 return !elem.active();
-            });
-
-            elems.forEach(this.validate, this);
+            }).some(this.validate, this);
         }
     });
 });